[ffmpeg/f31] Fixup for i686
by Leigh Scott
commit e8109f72e22765cbc50f0d62e0f650d26a94f26e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Mar 11 21:40:15 2020 +0000
Fixup for i686
ffmpeg.spec | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4c6ae96..69db056 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -11,13 +11,13 @@
%global _without_aom 1
%global _without_dav1d 1
%global _without_frei0r 1
-%global _without_mfx 1
%global _without_opus 1
%global _without_vpx 1
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
%ifarch x86_64
+%global _with_mfx 1
%global _with_vmaf 1
%endif
%endif
@@ -139,8 +139,8 @@ BuildRequires: libv4l-devel
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0}
+%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1}
%ifarch %{ix86} x86_64
-%{!?_without_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1}
BuildRequires: nasm
%endif
%{?_with_webp:BuildRequires: libwebp-devel}
@@ -337,9 +337,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%ifarch %{ix86}
--cpu=%{_target_cpu} \
%endif
-%ifarch %{ix86} x86_64
- %{!?_without_mfx:--enable-libmfx} \
-%endif
+ %{?_with_mfx:--enable-libmfx} \
%ifarch %{ix86} x86_64 %{power64}
--enable-runtime-cpudetect \
%endif
4 years, 8 months
[ffmpeg] Update to 20200313git
by Leigh Scott
commit 07c18388419be4b93d98919cae3dc0e1c311accf
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 13 12:48:41 2020 +0000
Update to 20200313git
.gitignore | 1 +
ffmpeg.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47ba5e7..15f6731 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ ffmpeg-*.rpm
/ffmpeg-20200222.tar.bz2
/ffmpeg-20200225.tar.bz2
/ffmpeg-20200305.tar.bz2
+/ffmpeg-20200313.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 38a95cc..c4888af 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,7 +1,7 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20200305
+%global date 20200313
#global rel rc1
%ifarch ppc64le
@@ -93,7 +93,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.3
-Release: 0.7.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 0.8.%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -437,6 +437,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Fri Mar 13 2020 leigh123linux <leigh123linux(a)googlemail.com> - 4.3-0.8.20200313git
+- Update to 20200313git
+
* Wed Mar 11 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-0.7.20200305git
- Rebuilt for i686
diff --git a/sources b/sources
index 4d670a3..bc38034 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-20200305.tar.bz2) = 48c015ccd2f60a7123d8590caba1abf48f4e7894ed847dbfc31504ce52dd78bef91815d676276b76ef69c8f9c8d3f0f6505478b4c5b2ab61c3a57568c11ff3aa
+SHA512 (ffmpeg-20200313.tar.bz2) = e68b8983c0d60ac585a00f38883b7dbcb437763fdc2975db31169d986ca7b73ac657d31cae7dd74b8bcd64d3b32dc24b9fd83608dcc1c79f3ab9be6453b0b7ce
4 years, 8 months
[gstreamer1-plugins-bad-freeworld] Fixup for i686
by Leigh Scott
commit 24388eeee7b78b6c7bc111a67243006466ced5bc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 13 02:46:02 2020 +0000
Fixup for i686
gstreamer1-plugins-bad-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index 2fcf567..da12d44 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -5,7 +5,7 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
Version: 1.16.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
@@ -99,6 +99,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%changelog
+* Fri Mar 13 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.16.2-5
+- Fixup for i686
+
* Thu Mar 12 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.16.2-4
- Rebuilt for i686
4 years, 8 months
[gstreamer1-plugins-bad-freeworld] Revert "Disable libde265 for i686"
by Leigh Scott
commit 0f93958293b318abf2a9c83b84ae143c8c8c126b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 13 02:44:30 2020 +0000
Revert "Disable libde265 for i686"
This reverts commit 81a06a5110b411beef9d37bae30d23ecac841c45.
gstreamer1-plugins-bad-freeworld.spec | 8 --------
1 file changed, 8 deletions(-)
---
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index b4afc51..2fcf567 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -1,10 +1,6 @@
# which plugins to actually build and install
%global gstdirs gst/dvbsuboverlay gst/dvdspu gst/siren
-%ifnarch i686
%global extdirs ext/dts ext/faad ext/libde265 ext/libmms ext/mpeg2enc ext/mplex ext/rtmp ext/voamrwbenc ext/x265
-%else
-%global extdirs ext/dts ext/faad ext/libmms ext/mpeg2enc ext/mplex ext/rtmp ext/voamrwbenc ext/x265
-%endif
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
@@ -31,9 +27,7 @@ BuildRequires: vo-amrwbenc-devel
#BuildRequires: vo-aacenc-devel
BuildRequires: libusbx-devel
BuildRequires: x265-devel
-%ifnarch i686
BuildRequires: libde265-devel
-%endif
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -92,9 +86,7 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%{_libdir}/gstreamer-1.0/libgstsiren.so
# Plugins with external dependencies
-%ifnarch i686
%{_libdir}/gstreamer-1.0/libgstde265.so
-%endif
%{_libdir}/gstreamer-1.0/libgstdtsdec.so
%{_libdir}/gstreamer-1.0/libgstfaad.so
%{_libdir}/gstreamer-1.0/libgstmms.so
4 years, 8 months
[libde265/f32] (2 commits) ...Fixup
by Leigh Scott
Summary of changes:
18c4ce9... Fixup for i686 (*)
3e5b61f... Fixup (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
[libde265] Fixup
by Leigh Scott
commit 3e5b61f5403d25cb4c442fdbeba446886615d915
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 13 02:29:41 2020 +0000
Fixup
libde265.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/libde265.spec b/libde265.spec
index d0e94e1..0cb109f 100644
--- a/libde265.spec
+++ b/libde265.spec
@@ -56,7 +56,7 @@ Sample applications using libde265 are provided by this package.
%configure \
--disable-silent-rules \
--disable-static \
-%ifarch i686 x86_64
+%ifarch i686
--disable-sherlock265 \
%endif
--enable-shared
4 years, 8 months
[libde265] Fixup for i686
by Leigh Scott
commit 18c4ce9d3031a9c40e181198de0f0638ee709597
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 13 02:27:00 2020 +0000
Fixup for i686
libde265.spec | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/libde265.spec b/libde265.spec
index 291c796..d0e94e1 100644
--- a/libde265.spec
+++ b/libde265.spec
@@ -11,8 +11,10 @@ BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkgconfig(libswscale)
+%ifnarch i686
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
+%endif
BuildRequires: pkgconfig(sdl)
@@ -34,7 +36,6 @@ API makes it easy to integrate it into other software.
The development headers for compiling programs that use libde265
are provided by this package.
-
%package examples
# The entire examples source code is GPLv3+ except extra/getopt* which is BSD.
License: GPLv3+ and BSD
@@ -48,12 +49,18 @@ API makes it easy to integrate it into other software.
Sample applications using libde265 are provided by this package.
-
%prep
%autosetup -p1
%build
-%configure --disable-silent-rules --disable-static --enable-shared
+%configure \
+ --disable-silent-rules \
+ --disable-static \
+%ifarch i686 x86_64
+ --disable-sherlock265 \
+%endif
+ --enable-shared
+
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build
@@ -62,16 +69,18 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_install
find %buildroot -name '*.la' -or -name '*.a' | xargs rm -f
mv %{buildroot}%{_bindir}/dec265 %{buildroot}%{_bindir}/libde265-dec265
+%ifnarch i686
mv %{buildroot}%{_bindir}/sherlock265 %{buildroot}%{_bindir}/libde265-sherlock265
+%endif
# Don't package internal development tools.
-rm %{buildroot}%{_bindir}/bjoentegaard
-rm %{buildroot}%{_bindir}/block-rate-estim
-rm %{buildroot}%{_bindir}/enc265
-rm %{buildroot}%{_bindir}/gen-enc-table
-rm %{buildroot}%{_bindir}/hdrcopy
-rm %{buildroot}%{_bindir}/rd-curves
-rm %{buildroot}%{_bindir}/tests
-rm %{buildroot}%{_bindir}/yuv-distortion
+rm -f %{buildroot}%{_bindir}/bjoentegaard
+rm -f %{buildroot}%{_bindir}/block-rate-estim
+rm -f %{buildroot}%{_bindir}/enc265
+rm -f %{buildroot}%{_bindir}/gen-enc-table
+rm -f %{buildroot}%{_bindir}/hdrcopy
+rm -f %{buildroot}%{_bindir}/rd-curves
+rm -f %{buildroot}%{_bindir}/tests
+rm -f %{buildroot}%{_bindir}/yuv-distortion
%ldconfig_scriptlets
@@ -86,10 +95,13 @@ rm %{buildroot}%{_bindir}/yuv-distortion
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
+
%files examples
%doc README.md
%{_bindir}/libde265-dec265
+%ifnarch i686
%{_bindir}/libde265-sherlock265
+%endif
%{_bindir}/acceleration_speed
%changelog
4 years, 8 months