[gstreamer1-libav] Update to 1.10.0
by jwrdegoede
commit 94b2020da8543088cb441adfb42054d63c0d97c9
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Fri Nov 11 16:04:31 2016 +0100
Update to 1.10.0
.gitignore | 1 +
gstreamer1-libav.spec | 9 +++++++--
sources | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f8856c..a9c89dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gst-libav-1.6.2.tar.xz
gst-libav-1.6.3.tar.xz
gst-libav-1.8.1.tar.xz
gst-libav-1.8.2.tar.xz
+/gst-libav-1.10.0.tar.xz
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index c5c6166..34d3045 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,6 +1,6 @@
Name: gstreamer1-libav
-Version: 1.8.2
-Release: 4%{?dist}
+Version: 1.10.0
+Release: 1%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
@@ -46,6 +46,8 @@ plug-in.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+# Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo
+sed -i 's/1.10.0/1.9.2/' configure
%build
@@ -73,6 +75,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Fri Nov 11 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.10.0-1
+- Update to 1.10.0
+
* Fri Nov 11 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.8.2-4
- Add patch to disable ffmpeg hardware acceleration for nvenc and qsv (rfbz#4334)
diff --git a/sources b/sources
index 9136f8f..d32f065 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95bc3dd0ea2dc664b4f3a96897005013 gst-libav-1.8.2.tar.xz
+5a91cea1affe136298db4f6185f78f72 gst-libav-1.10.0.tar.xz
8 years
[gstreamer1-plugins-ugly] Rebase to new upstream release 1.10.0
by jwrdegoede
commit 7754b706b70a5ecdbee33672e04008cf345f2b2d
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Fri Nov 11 16:04:14 2016 +0100
Rebase to new upstream release 1.10.0
.gitignore | 1 +
gstreamer1-plugins-ugly.spec | 9 +++++++--
sources | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 915790d..78ef26b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gst-plugins-ugly-1.6.2.tar.xz
gst-plugins-ugly-1.6.3.tar.xz
gst-plugins-ugly-1.8.1.tar.xz
gst-plugins-ugly-1.8.2.tar.xz
+/gst-plugins-ugly-1.10.0.tar.xz
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index c389be7..b44b1dc 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -1,6 +1,6 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
-Version: 1.8.2
+Version: 1.10.0
Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
@@ -52,6 +52,8 @@ be shipped in gstreamer-plugins-good because:
%prep
%setup -q -n gst-plugins-ugly-%{version}
+# Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo
+sed -i 's/1.10.0/1.9.2/' configure
%build
@@ -64,7 +66,7 @@ make %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
%find_lang gst-plugins-ugly-1.0
rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/*.la
@@ -98,6 +100,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/*.la
%changelog
+* Fri Nov 11 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.10.0-1
+- Rebase to new upstream release 1.10.0
+
* Sun Jun 12 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.8.2-1
- Rebase to new upstream release 1.8.2
diff --git a/sources b/sources
index c477bf0..0a05c3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f781790cf64b44522b01ab560f16d4de gst-plugins-ugly-1.8.2.tar.xz
+a640a30f3b1bac2257f0dcaad283660b gst-plugins-ugly-1.10.0.tar.xz
8 years
[gstreamer1-plugins-bad-nonfree] Update to 1.10.0
by jwrdegoede
commit ff83cfe9622e91ee93343c2707ac1042702912db
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Fri Nov 11 16:04:03 2016 +0100
Update to 1.10.0
.gitignore | 1 +
gstreamer1-plugins-bad-nonfree.spec | 7 ++++++-
sources | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2553f02..ad72ffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/gst-plugins-bad-1.4.5.tar.xz
/gst-plugins-bad-1.6.4.tar.xz
/gst-plugins-bad-1.8.2.tar.xz
+/gst-plugins-bad-1.10.0.tar.xz
diff --git a/gstreamer1-plugins-bad-nonfree.spec b/gstreamer1-plugins-bad-nonfree.spec
index edba256..aa6bde3 100644
--- a/gstreamer1-plugins-bad-nonfree.spec
+++ b/gstreamer1-plugins-bad-nonfree.spec
@@ -3,7 +3,7 @@
Summary: GStreamer 1.0 streaming media framework "bad" non-free plug-ins
Name: gstreamer1-plugins-bad-nonfree
-Version: 1.8.2
+Version: 1.10.0
Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
@@ -29,6 +29,8 @@ license.
%prep
%setup -q -n gst-plugins-bad-%{version}
+# Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo
+sed -i 's/1.10.0/1.9.2/' configure
%build
@@ -65,6 +67,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/*.la
%changelog
+* Fri Nov 11 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.10.0-1
+- Update to 1.10.0
+
* Sat Jul 9 2016 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.8.2-1
- Update to 1.8.2
diff --git a/sources b/sources
index 84c4fea..94fb2b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83abc2e70684e7b195f18ca2992ef6e8 gst-plugins-bad-1.8.2.tar.xz
+86916b5c8e5923cc070c1548f270e9b9 gst-plugins-bad-1.10.0.tar.xz
8 years
[gstreamer1-libav] Add patch to disable ffmpeg hardware acceleration for nvenc and qsv (rfbz#4334)
by Leigh Scott
commit 00fbe8e093f501ac175568a0d343285e419c37ca
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Nov 11 11:50:03 2016 +0000
Add patch to disable ffmpeg hardware acceleration for nvenc and qsv (rfbz#4334)
disable_ffmpeg_hw_acceleration.patch | 39 ++++++++++++++++++++++++++++++++++++
gstreamer1-libav.spec | 9 +++++++--
2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/disable_ffmpeg_hw_acceleration.patch b/disable_ffmpeg_hw_acceleration.patch
new file mode 100644
index 0000000..62bbeb9
--- /dev/null
+++ b/disable_ffmpeg_hw_acceleration.patch
@@ -0,0 +1,39 @@
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -2064,6 +2064,13 @@
+ if (strstr (in_plugin->name, "vaapi")) {
+ GST_DEBUG
+ ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg",
++ in_plugin->name);
++ goto next;
++ }
++
++ if (g_str_has_suffix (in_plugin->name, "_qsv")) {
++ GST_DEBUG
++ ("Ignoring qsv decoder %s. We can't handle this outside of ffmpeg",
+ in_plugin->name);
+ goto next;
+ }
+--- a/ext/libav/gstavvidenc.c
++++ b/ext/libav/gstavvidenc.c
+@@ -974,12 +974,19 @@ gst_ffmpegvidenc_register (GstPlugin * p
+ goto next;
+ }
+
+- if (g_str_has_suffix (in_plugin->name, "_nvenc")) {
++ if (strstr (in_plugin->name, "nvenc")) {
+ GST_DEBUG
+ ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg",
+ in_plugin->name);
+ goto next;
+ }
++
++ if (g_str_has_suffix (in_plugin->name, "_qsv")) {
++ GST_DEBUG
++ ("Ignoring qsv encoder %s. We can't handle this outside of ffmpeg",
++ in_plugin->name);
++ goto next;
++ }
+
+ /* only video encoders */
+ if (!av_codec_is_encoder (in_plugin)
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 9910738..c5c6166 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,6 +1,6 @@
Name: gstreamer1-libav
Version: 1.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
@@ -8,6 +8,7 @@ URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
Patch1: ignore_vaapi.patch
+Patch2: disable_ffmpeg_hw_acceleration.patch
BuildRequires: gstreamer1-devel >= 1.6.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0
BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel
@@ -44,6 +45,7 @@ plug-in.
%setup -q -n gst-libav-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
@@ -71,8 +73,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Fri Nov 11 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.8.2-4
+- Add patch to disable ffmpeg hardware acceleration for nvenc and qsv (rfbz#4334)
+
* Fri Nov 11 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.8.2-3
-- Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders
+- Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders (rfbz#4334)
* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.8.2-2
- Rebuilt for ffmpeg-3.1.1
8 years
[gstreamer1-libav] Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders (rfbz#4334)
by Leigh Scott
commit 578ce446d5b5fb5ccf50f9296c90256d0c44eba8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Nov 11 00:09:29 2016 +0000
Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders (rfbz#4334)
gstreamer1-libav.spec | 7 ++++++-
ignore_vaapi.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index aea3514..9910738 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,12 +1,13 @@
Name: gstreamer1-libav
Version: 1.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
+Patch1: ignore_vaapi.patch
BuildRequires: gstreamer1-devel >= 1.6.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0
BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel
@@ -42,6 +43,7 @@ plug-in.
%prep
%setup -q -n gst-libav-%{version}
%patch0 -p1
+%patch1 -p1
%build
@@ -69,6 +71,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
%changelog
+* Fri Nov 11 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.8.2-3
+- Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders
+
* Sat Jul 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.8.2-2
- Rebuilt for ffmpeg-3.1.1
diff --git a/ignore_vaapi.patch b/ignore_vaapi.patch
new file mode 100644
index 0000000..a79c992
--- /dev/null
+++ b/ignore_vaapi.patch
@@ -0,0 +1,53 @@
+From 8666d9fda0be7f86f548297dc83b09d92824de49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian(a)centricular.com>
+Date: Fri, 22 Jul 2016 14:42:59 +0300
+Subject: libav: Ignore VAAPI decoders and VAAPI/nvenc encoders
+
+These can show up when having a build against a system version of ffmpeg.
+
+diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
+index 53391ad..2fdff95 100644
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -2061,6 +2061,13 @@ gst_ffmpegviddec_register (GstPlugin * plugin)
+ goto next;
+ }
+
++ if (strstr (in_plugin->name, "vaapi")) {
++ GST_DEBUG
++ ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg",
++ in_plugin->name);
++ goto next;
++ }
++
+ GST_DEBUG ("Trying plugin %s [%s]", in_plugin->name, in_plugin->long_name);
+
+ /* no codecs for which we're GUARANTEED to have better alternatives */
+diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
+index 2d8391b..f22f697 100644
+--- a/ext/libav/gstavvidenc.c
++++ b/ext/libav/gstavvidenc.c
+@@ -973,6 +973,20 @@ gst_ffmpegvidenc_register (GstPlugin * plugin)
+ goto next;
+ }
+
++ if (strstr (in_plugin->name, "vaapi")) {
++ GST_DEBUG
++ ("Ignoring VAAPI encoder %s. We can't handle this outside of ffmpeg",
++ in_plugin->name);
++ goto next;
++ }
++
++ if (g_str_has_suffix (in_plugin->name, "_nvenc")) {
++ GST_DEBUG
++ ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg",
++ in_plugin->name);
++ goto next;
++ }
++
+ /* only video encoders */
+ if (!av_codec_is_encoder (in_plugin)
+ || in_plugin->type != AVMEDIA_TYPE_VIDEO)
+--
+cgit v0.10.2
+
8 years
