[olive] Fix ffmpeg-5.1 build
by Leigh Scott
commit b05233b478eea579da8c56c0bc1175891c41832b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 9 13:16:38 2022 +0100
Fix ffmpeg-5.1 build
ffmpeg51.patch | 11 +++++++++++
olive.spec | 9 +++++----
2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ffmpeg51.patch b/ffmpeg51.patch
new file mode 100644
index 0000000..6bd8ace
--- /dev/null
+++ b/ffmpeg51.patch
@@ -0,0 +1,11 @@
+diff -uNrp a/app/codec/ffmpeg/ffmpegdecoder.h b/app/codec/ffmpeg/ffmpegdecoder.h
+--- a/app/codec/ffmpeg/ffmpegdecoder.h 2022-02-28 05:47:17.000000000 +0000
++++ b/app/codec/ffmpeg/ffmpegdecoder.h 2022-08-09 13:12:07.305793787 +0100
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ #include <libswresample/swresample.h>
++#include <libavcodec/avcodec.h>
+ }
+
+ #include <QAtomicInt>
diff --git a/olive.spec b/olive.spec
index 082c42f..9c78104 100644
--- a/olive.spec
+++ b/olive.spec
@@ -26,8 +26,9 @@ Source0: https://github.com/olive-editor/%{name}/archive/%{commit0}/%{nam
%else
Source0: https://github.com/olive-editor/%{name}/archive/%{version}.tar.gz#/%{name...
%endif
+Patch0: ffmpeg51.patch
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: frei0r-devel
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5OpenGL)
@@ -74,11 +75,11 @@ A Feature list is a the moment not available.
sed -i -e 's@3.0@(a)g' CMakeLists.txt
%build
-%cmake3
-%cmake3_build
+%cmake -DUSE_WERROR=OFF
+%cmake_build
%install
-%cmake3_install
+%cmake_install
rm -rf %buildroot/usr/share/icons/hicolor/1024x1024
#%%find_lang %%{name} --all-name --with-qt
2 years, 3 months
[xine-lib] Add missing includes needed for ffmpeg-5.1 compile
by Leigh Scott
commit 1fb60cf5f1b4ff14c249dd192134fdffeafd1312
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 9 12:46:39 2022 +0100
Add missing includes needed for ffmpeg-5.1 compile
ffmpeg51.patch | 35 +++++++++++++++++++++++++++++++++++
xine-lib.spec | 2 ++
2 files changed, 37 insertions(+)
---
diff --git a/ffmpeg51.patch b/ffmpeg51.patch
new file mode 100644
index 0000000..40cec1e
--- /dev/null
+++ b/ffmpeg51.patch
@@ -0,0 +1,35 @@
+diff -uNrp a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
+--- a/src/combined/ffmpeg/ffmpeg_compat.h 2022-03-06 16:31:23.000000000 +0000
++++ b/src/combined/ffmpeg/ffmpeg_compat.h 2022-08-09 12:09:50.709059577 +0100
+@@ -19,6 +19,8 @@
+ *
+ * Compability macros for various ffmpeg versions
+ */
++#include <libavcodec/version.h>
++#include <libavutil/version.h>
+
+ #ifndef XINE_AVCODEC_COMPAT_H
+ #define XINE_AVCODEC_COMPAT_H
+diff -uNrp a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h
+--- a/src/combined/ffmpeg/ffmpeg_decoder.h 2022-03-06 16:31:23.000000000 +0000
++++ b/src/combined/ffmpeg/ffmpeg_decoder.h 2022-08-09 12:42:16.081772933 +0100
+@@ -17,6 +17,8 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ */
++#include <libavcodec/version.h>
++#include <libavformat/avformat.h>
+
+ #ifndef HAVE_XINE_DECODER_H
+ #define HAVE_XINE_DECODER_H
+diff -uNrp a/src/combined/ffmpeg/input_avio.c b/src/combined/ffmpeg/input_avio.c
+--- a/src/combined/ffmpeg/input_avio.c 2022-03-06 16:31:23.000000000 +0000
++++ b/src/combined/ffmpeg/input_avio.c 2022-08-09 11:33:54.527895581 +0100
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <pthread.h>
+
++#include <libavutil/avutil.h>
+ #include <libavformat/avio.h>
+
+ #define LOG_MODULE "libavio"
diff --git a/xine-lib.spec b/xine-lib.spec
index f070f92..ac4dfeb 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -59,6 +59,7 @@ Source1: make_xinelib_snapshot.sh
Patch1: xine-lib-1.2.12-fix_older_libcaca.patch
# https://sourceforge.net/p/xine/xine-lib-1.2/ci/97248a71021428baa49e2b2af3...
Patch2: xine-lib-1.2.12-dav1d_100_support.patch
+Patch3: ffmpeg51.patch
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -155,6 +156,7 @@ This package contains extra plugins for %{name}:
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%else
%setup -q -n %{name}-%{version}-%{date}hg%{revision}
%endif
2 years, 3 months
[r5u87x-firmware] Spec cleanup and fix build
by Sérgio M. Basto
commit 23953d3b4c8661eadf41f2f23fc5c67bb67a830c
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 8 17:15:47 2022 +0100
Spec cleanup and fix build
r5u87x-firmware.spec | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/r5u87x-firmware.spec b/r5u87x-firmware.spec
index b61e128..0c434ce 100644
--- a/r5u87x-firmware.spec
+++ b/r5u87x-firmware.spec
@@ -12,8 +12,13 @@ Url: http://bitbucket.org/ahixon/r5u87x/wiki/Home
Source0: http://bitbucket.org/ahixon/r5u87x/get/%{snapshot}.bz2
# Distro specific firmware path adjustments
Patch0: r5u87x-firmware-path.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel libusb-devel gcc
+BuildRequires: glib2-devel
+%if 0%{?fedora} >= 37
+BuildRequires: libusb-compat-0.1-devel
+%else
+BuildRequires: libusb-devel
+%endif
+BuildRequires: gcc
# For /lib/udev/rules.d dir ownership
Requires: udev
@@ -38,16 +43,10 @@ make %{?_smp_mflags} PREFIX= rules
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc docs/*.txt README COPYING
/sbin/r5u87x-loader
/lib/udev/rules.d/90-r5u87x-loader.rules
@@ -58,6 +57,8 @@ rm -rf $RPM_BUILD_ROOT
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.2.0-19.a9b2171d762b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
+- Spec cleanup
+- Fix build
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.2.0-18.a9b2171d762b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
2 years, 3 months
[zerotier-one] - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1
by Sérgio M. Basto
commit 1b6981395fef489710e05fc006f57b7648c22de6
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 8 16:08:19 2022 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1
Signed-off-by: Sérgio M. Basto <sergio(a)serjux.com>
zerotier-one.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 002c284..caedc01 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,6 +1,6 @@
Name: zerotier-one
Version: 1.8.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Smart Ethernet Switch for Earth
# Boost: README.md
@@ -122,6 +122,10 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
%changelog
+* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.8.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+ 5.1
+
* Wed Jun 22 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.8.9-2
- The official package is built against openssl1.1
2 years, 3 months
[xv] - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1
by Sérgio M. Basto
commit 60461db84d12d18bd8a1718b50212c311a2c278f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 8 16:08:04 2022 +0100
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1
Signed-off-by: Sérgio M. Basto <sergio(a)serjux.com>
xv.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/xv.spec b/xv.spec
index 7b16509..d9c246e 100644
--- a/xv.spec
+++ b/xv.spec
@@ -3,7 +3,7 @@
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 41%{?dist}
+Release: 42%{?dist}
Summary: Interactive image display program for X
Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
@@ -308,6 +308,10 @@ done
%doc %{_docdir}/%{name}-%{vprog}/manuals/
%changelog
+* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.10a.jumbopatch.20070520-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+ 5.1
+
* Thu Mar 3 2022 Paul Howarth <paul(a)city-fan.org> - 3.10a.jumbopatch.20070520-41
- Fix incorrectly applied corrupt GIF patch
2 years, 3 months