From d30e73013ecf9afd0b2277081d4700c08e2f8072 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 28 Nov 2015 22:25:37 +0000 Subject: [PATCH 01/49] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 4cefd35e9beabf52dedc8e74dd5d632eff990c8e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 30 Nov 2015 18:43:56 +0100 Subject: [PATCH 02/49] Initial import https://bugzilla.redhat.com/show_bug.cgi?id=1285338 --- .gitignore | 2 + openh264.spec | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 3 files changed, 122 insertions(+) create mode 100644 openh264.spec diff --git a/.gitignore b/.gitignore index e69de29..55f767f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/gmp-api-c5f1d0f.tar.gz +/openh264-21e44bd.tar.gz diff --git a/openh264.spec b/openh264.spec new file mode 100644 index 0000000..cc83eea --- /dev/null +++ b/openh264.spec @@ -0,0 +1,118 @@ +# v1.5.2-Firefox39 branch +%global commit0 21e44bda8b45ac85f6ba78e85b3bd37a1beb2a04 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + +# To get the gmp-api commit to use, run: +# rm -rf gmp-api;make gmp-bootstrap;cd gmp-api;git rev-parse HEAD +%global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 +%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) + +Name: openh264 +Version: 1.5.2 +Release: 0.2.git%{shortcommit0}%{?dist} +Summary: H.264 codec library + +License: BSD +URL: http://www.openh264.org/ +Source0: https://github.com/cisco/openh264/archive/%{commit0}/openh264-%{shortcommit0}.tar.gz +Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz + +BuildRequires: nasm + +%description +OpenH264 is a codec library which supports H.264 encoding and decoding. It is +suitable for use in real time applications such as WebRTC. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package -n mozilla-openh264 +Summary: H.264 codec support for Mozilla browsers +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: mozilla-filesystem%{?_isa} + +%description -n mozilla-openh264 +The mozilla-openh264 package contains a H.264 codec plugin for Mozilla +browsers. + + +%prep +%setup -qn openh264-%{commit0} + +# Extract gmp-api archive +tar -xf %{S:1} +mv gmp-api-%{commit1} gmp-api + +# Update the makefile with our build options +sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile +sed -i -e 's|^PREFIX=.*$|PREFIX=%{_prefix}|' Makefile +sed -i -e 's|^LIBDIR_NAME=.*$|LIBDIR_NAME=%{_lib}|' Makefile +sed -i -e 's|^SHAREDLIB_DIR=.*$|SHAREDLIB_DIR=%{_libdir}|' Makefile +sed -i -e '/^CFLAGS_OPT=/i LDFLAGS=%{__global_ldflags}' Makefile + + +%build +make %{?_smp_mflags} +make plugin %{?_smp_mflags} + + +%install +%make_install + +# Install mozilla plugin +mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed +cp -a libgmpopenh264.so* gmpopenh264.info $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed/ + +mkdir -p $RPM_BUILD_ROOT%{_libdir}/firefox/defaults/pref +cat > $RPM_BUILD_ROOT%{_libdir}/firefox/defaults/pref/gmpopenh264.js << EOF +pref("media.gmp-gmpopenh264.autoupdate", false); +pref("media.gmp-gmpopenh264.version", "system-installed"); +EOF + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +cat > $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/gmpopenh264.sh << EOF +MOZ_GMP_PATH="%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed" +export MOZ_GMP_PATH +EOF + +# Remove static libraries +rm $RPM_BUILD_ROOT%{_libdir}/*.a + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%license LICENSE +%doc README.md +%{_libdir}/libopenh264.so.1 + +%files devel +%{_includedir}/wels/ +%{_libdir}/libopenh264.so +%{_libdir}/pkgconfig/openh264.pc + +%files -n mozilla-openh264 +%{_sysconfdir}/profile.d/gmpopenh264.sh +%dir %{_libdir}/firefox +%dir %{_libdir}/firefox/defaults +%dir %{_libdir}/firefox/defaults/pref +%{_libdir}/firefox/defaults/pref/gmpopenh264.js +%{_libdir}/mozilla/plugins/gmp-gmpopenh264/ + + +%changelog +* Thu Nov 26 2015 Kalev Lember - 1.5.2-0.2.git21e44bd +- Pass Fedora LDFLAGS to the build to get full relro (#1285338) + +* Tue Nov 24 2015 Kalev Lember - 1.5.2-0.1.git21e44bd +- Initial Fedora packaging diff --git a/sources b/sources index e69de29..1c53465 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz +0821a30af77607e17bdf956faf5c64f2 openh264-21e44bd.tar.gz From 869b0f515c17d3417277a861a1ca0e7ed4126036 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 30 Nov 2015 18:52:28 +0100 Subject: [PATCH 03/49] Include the gstreamer plugin in gstreamer1-plugin-openh264 subpackage Sadly, the current build infrastructure doesn't let us build any external packages against openh264, so we have to include the gstreamer plugin build in the same source rpm. https://fedorahosted.org/fesco/ticket/1496 includes some background info why it can't be a separate package. --- .gitignore | 1 + gst-p-bad-cleanup.sh | 203 +++++++++++++++++++++++++++++++++++++++++++ openh264.spec | 116 ++++++++++++++++++++++++- sources | 1 + 4 files changed, 319 insertions(+), 2 deletions(-) create mode 100755 gst-p-bad-cleanup.sh diff --git a/.gitignore b/.gitignore index 55f767f..155ae3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gmp-api-c5f1d0f.tar.gz +/gst-plugins-bad-openh264-1.6.1.tar.xz /openh264-21e44bd.tar.gz diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh new file mode 100755 index 0000000..fcbcdbc --- /dev/null +++ b/gst-p-bad-cleanup.sh @@ -0,0 +1,203 @@ +#!/bin/sh + +# Process a gst-plugins-bad tarball to remove +# unwanted GStreamer plugins. +# +# This script here is taken from Fedora gstreamer1-plugins-bad-free repo, with +# only change being openh264 addition. +# +# See https://bugzilla.redhat.com/show_bug.cgi?id=532470 +# for details +# +# Bastien Nocera - 2010 +# + +SOURCE="$1" +NEW_SOURCE=`echo $SOURCE | sed 's/bad-/bad-openh264-/'` +DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'` + +ALLOWED=" +aacparse +accurip +adpcmdec +adpcmenc +aiff +aiffparse +amrparse +asfmux +audiofxbad +audiomixer +audioparsers +audiovisualizers +autoconvert +bayer +camerabin +camerabin2 +cdxaparse +coloreffects +colorspace +compositor +dataurisrc +dccp +debugutils +dtmf +faceoverlay +festival +fieldanalysis +freeverb +freeze +frei0r +gaudieffects +gdp +geometrictransform +h264parse +hdvparse +hls +id3tag +inter +interlace +invtelecine +ivfparse +ivtc +jpegformat +jp2kdecimator +legacyresample +librfb +liveadder +midi +mve +mpegdemux +mpeg4videoparse +mpegpsmux +mpegtsdemux +mpegtsmux +mpegvideoparse +mxf +nsf +nuvdemux +onvif +openh264 +patchdetect +pcapparse +pnm +qtmux +rawparse +removesilence +rtp +rtpmux +rtpvp8 +scaletempo +sdi +sdp +segmentclip +selector +smooth +speed +stereo +subenc +tta +valve +videofilters +videomaxrate +videomeasure +videoparsers +videosignal +vmnc +yadif +y4m +" + +NOT_ALLOWED=" +dvbsuboverlay +dvdspu +real +siren +" + +error() +{ + MESSAGE=$1 + echo $MESSAGE + exit 1 +} + +check_allowed() +{ + MODULE=$1 + for i in $ALLOWED ; do + if test x$MODULE = x$i ; then + return 0; + fi + done + # Ignore errors coming from ext/ directory + # they require external libraries so are ineffective anyway + return 1; +} + +check_not_allowed() +{ + MODULE=$1 + for i in $NOT_ALLOWED ; do + if test x$MODULE = x$i ; then + return 0; + fi + done + return 1; +} + +rm -rf $DIRECTORY +tar xJf $SOURCE || error "Cannot unpack $SOURCE" +pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\"" + +unknown="" +for subdir in gst ext sys; do + for dir in $subdir/* ; do + # Don't touch non-directories + if ! [ -d $dir ] ; then + continue; + fi + MODULE=`basename $dir` + if ( check_not_allowed $MODULE ) ; then + echo "**** Removing $MODULE ****" + echo "Removing directory $dir" + rm -r $dir || error "Cannot remove $dir" + if grep -q "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac ; then + echo "Removing element check for $MODULE" + grep -v "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac + fi + echo "Removing Makefile generation for $MODULE" + grep -v "$dir/Makefile" configure.ac > configure.ac.new && mv configure.ac.new configure.ac + # Urgh + if test $MODULE = real ; then + grep -v "AG_GST_DISABLE_PLUGIN(real)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac + fi + echo "Removing documentation for $MODULE" + if grep -q "$MODULE" docs/plugins/Makefile.am ; then + grep -v $dir docs/plugins/Makefile.am > docs/plugins/Makefile.am.new && mv docs/plugins/Makefile.am.new docs/plugins/Makefile.am + fi + echo + elif test $subdir = ext || test $subdir = sys; then + # Ignore library or system non-blacklisted plugins + continue; + elif ! ( check_allowed $MODULE ) ; then + echo "Unknown module in $dir" + unknown="$unknown $dir" + fi + done +done + +echo + +if test "x$unknown" != "x"; then + echo -n "Aborting due to unkown modules: " + echo "$unknown" | sed "s/ /\n /g" + exit 1 +fi + +autoreconf + +popd > /dev/null + +tar cJf $NEW_SOURCE $DIRECTORY +echo "$NEW_SOURCE is ready to use" + diff --git a/openh264.spec b/openh264.spec index cc83eea..937d76d 100644 --- a/openh264.spec +++ b/openh264.spec @@ -7,16 +7,27 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +%global gst_version 1.6.1 + Name: openh264 Version: 1.5.2 -Release: 0.2.git%{shortcommit0}%{?dist} +Release: 0.3.git%{shortcommit0}%{?dist} Summary: H.264 codec library License: BSD URL: http://www.openh264.org/ Source0: https://github.com/cisco/openh264/archive/%{commit0}/openh264-%{shortcommit0}.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz - +# The source is: +# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz +# modified with gst-p-bad-cleanup.sh from SOURCE3 +Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz +Source3: gst-p-bad-cleanup.sh + +BuildRequires: autoconf +BuildRequires: chrpath +BuildRequires: gstreamer1-devel >= %{gst_version} +BuildRequires: gstreamer1-plugins-base-devel >= %{gst_version} BuildRequires: nasm %description @@ -33,6 +44,17 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package -n gstreamer1-plugin-openh264 +Release: 2%{?dist} +Summary: GStreamer H.264 plugin + +%description -n gstreamer1-plugin-openh264 +GStreamer is a streaming media framework, based on graphs of elements which +operate on media data. + +This package contains the H.264 plugin. + + %package -n mozilla-openh264 Summary: H.264 codec support for Mozilla browsers Requires: %{name}%{?_isa} = %{version}-%{release} @@ -50,6 +72,9 @@ browsers. tar -xf %{S:1} mv gmp-api-%{commit1} gmp-api +# Extract gst-plugins-bad-free archive +tar -xf %{S:2} + # Update the makefile with our build options sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile sed -i -e 's|^PREFIX=.*$|PREFIX=%{_prefix}|' Makefile @@ -59,9 +84,26 @@ sed -i -e '/^CFLAGS_OPT=/i LDFLAGS=%{__global_ldflags}' Makefile %build +# First build the openh264 libraries make %{?_smp_mflags} + +# ... then build the mozilla plugin make plugin %{?_smp_mflags} +# ... and finally build the gstreamer plugin against the previously built +# openh264 libraries +pushd gst-plugins-bad-%{gst_version} +ln -s ../codec/api/svc wels +export OPENH264_CFLAGS="-I." +export OPENH264_LIBS="-L`pwd`/.. -lopenh264" +%configure \ + --with-package-name="Fedora gstreamer1-plugin-openh264 package" \ + --with-package-origin="http://www.openh264.org/" \ + --disable-static \ + --enable-openh264 +make V=1 %{?_smp_mflags} +popd + %install %make_install @@ -85,6 +127,69 @@ EOF # Remove static libraries rm $RPM_BUILD_ROOT%{_libdir}/*.a +# Install the gstreamer plugin +pushd gst-plugins-bad-%{gst_version} +%make_install + +# Register as an AppStream component to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-openh264.appdata.xml < + + + gstreamer-openh264 + CC0-1.0 + GStreamer Multimedia Codecs - H.264 + Multimedia playback for H.264 + +

+ This addon includes a codec for H.264 playback and encoding. +

+

+ These codecs can be used to encode and decode media files where the + format is not patent encumbered. +

+

+ A codec decodes audio and video for playback or editing and is also + used for transmission or storage. + Different codecs are used in video-conferencing, streaming media and + video editing applications. +

+ + http://gstreamer.freedesktop.org/ + https://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer + http://gstreamer.freedesktop.org/documentation/ + http://www.gnome.org/friends/ + + +EOF + +# Remove libtool .la files +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +# Remove unwanted gst-plugins-bad files +rm -rf $RPM_BUILD_ROOT%{_includedir}/gstreamer-1.0/ +rm -rf $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/Gst*.typelib +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gstreamer-*.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/libgst*.so* +rm -rf $RPM_BUILD_ROOT%{_datadir}/gir-1.0/Gst*.gir +rm -rf $RPM_BUILD_ROOT%{_datadir}/gstreamer-1.0/ +rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gst-plugins-bad*/ +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*/*/gst-plugins-bad-1.0.mo + +# Only keep libgstopenh264.so +find $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/ -not -name 'libgstopenh264.so' -type f | xargs rm + +# Kill rpath +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgstopenh264.so +popd + %post -p /sbin/ldconfig @@ -109,8 +214,15 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %{_libdir}/firefox/defaults/pref/gmpopenh264.js %{_libdir}/mozilla/plugins/gmp-gmpopenh264/ +%files -n gstreamer1-plugin-openh264 +%{_datadir}/appdata/*.appdata.xml +%{_libdir}/gstreamer-1.0/libgstopenh264.so + %changelog +* Mon Nov 30 2015 Kalev Lember - 1.5.2-0.3.git21e44bd +- Include the gstreamer plugin in gstreamer1-plugin-openh264 subpackage + * Thu Nov 26 2015 Kalev Lember - 1.5.2-0.2.git21e44bd - Pass Fedora LDFLAGS to the build to get full relro (#1285338) diff --git a/sources b/sources index 1c53465..ffb49b6 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz +74ec07ae3c1c5a678c761d3624f06060 gst-plugins-bad-openh264-1.6.1.tar.xz 0821a30af77607e17bdf956faf5c64f2 openh264-21e44bd.tar.gz From 0a19870cda4105542bf6b7db3a82d5040c8effac Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 30 Nov 2015 20:25:33 +0100 Subject: [PATCH 04/49] Use the gstreamer version for gstreamer1-plugin-openh264 subpackage --- openh264.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openh264.spec b/openh264.spec index 937d76d..8c17e94 100644 --- a/openh264.spec +++ b/openh264.spec @@ -45,7 +45,8 @@ developing applications that use %{name}. %package -n gstreamer1-plugin-openh264 -Release: 2%{?dist} +Version: %{gst_version} +Release: 1%{?dist} Summary: GStreamer H.264 plugin %description -n gstreamer1-plugin-openh264 From 75c18462ef81e493059822b54296312ecf63ac3e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 21 Mar 2016 20:45:26 -0500 Subject: [PATCH 05/49] move the mozila-openh264 definition before gstreamer1-plugin-openh264 - gstreamer1-plugin-openh264 redefines version and release messing up requires Signed-off-by: Dennis Gilmore --- openh264.spec | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/openh264.spec b/openh264.spec index 8c17e94..5b818eb 100644 --- a/openh264.spec +++ b/openh264.spec @@ -8,10 +8,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global gst_version 1.6.1 +#needs to be bumped for every build +%global gst_release 2 Name: openh264 Version: 1.5.2 -Release: 0.3.git%{shortcommit0}%{?dist} +Release: 0.4.git%{shortcommit0}%{?dist} Summary: H.264 codec library License: BSD @@ -44,9 +46,19 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package -n mozilla-openh264 +Summary: H.264 codec support for Mozilla browsers +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: mozilla-filesystem%{?_isa} + +%description -n mozilla-openh264 +The mozilla-openh264 package contains a H.264 codec plugin for Mozilla +browsers. + + %package -n gstreamer1-plugin-openh264 Version: %{gst_version} -Release: 1%{?dist} +Release: %{gst_release}%{?dist} Summary: GStreamer H.264 plugin %description -n gstreamer1-plugin-openh264 @@ -56,16 +68,6 @@ operate on media data. This package contains the H.264 plugin. -%package -n mozilla-openh264 -Summary: H.264 codec support for Mozilla browsers -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: mozilla-filesystem%{?_isa} - -%description -n mozilla-openh264 -The mozilla-openh264 package contains a H.264 codec plugin for Mozilla -browsers. - - %prep %setup -qn openh264-%{commit0} @@ -221,6 +223,10 @@ popd %changelog +* Mon May 21 2016 Dennis Gilmore - 1.5.2-0.4.git21e44bd +- move the mozila-openh264 definition before gstreamer1-plugin-openh264 +- gstreamer1-plugin-openh264 redefines version and release messing up requires + * Mon Nov 30 2015 Kalev Lember - 1.5.2-0.3.git21e44bd - Include the gstreamer plugin in gstreamer1-plugin-openh264 subpackage From 9b17063bd5eb6b206317472270c71a38b530af5e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 21 Mar 2016 21:08:08 -0500 Subject: [PATCH 06/49] Fix date Signed-off-by: Dennis Gilmore --- openh264.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openh264.spec b/openh264.spec index 5b818eb..1da69ef 100644 --- a/openh264.spec +++ b/openh264.spec @@ -223,7 +223,7 @@ popd %changelog -* Mon May 21 2016 Dennis Gilmore - 1.5.2-0.4.git21e44bd +* Mon Mar 21 2016 Dennis Gilmore - 1.5.2-0.4.git21e44bd - move the mozila-openh264 definition before gstreamer1-plugin-openh264 - gstreamer1-plugin-openh264 redefines version and release messing up requires From e9f28bfc999e2df6921d8642d6422505534a06c5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Apr 2016 12:03:30 +0200 Subject: [PATCH 07/49] Update openh264 to 1.5.3 git snapshot --- .gitignore | 2 +- openh264.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 155ae3e..fc3aba8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /gmp-api-c5f1d0f.tar.gz /gst-plugins-bad-openh264-1.6.1.tar.xz -/openh264-21e44bd.tar.gz +/openh264-2706e36.tar.gz diff --git a/openh264.spec b/openh264.spec index 1da69ef..98b25d7 100644 --- a/openh264.spec +++ b/openh264.spec @@ -1,5 +1,5 @@ -# v1.5.2-Firefox39 branch -%global commit0 21e44bda8b45ac85f6ba78e85b3bd37a1beb2a04 +# v1.5.3-Firefox39 branch +%global commit0 2706e36bf0a8b7c539c803ed877148c005ffca59 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # To get the gmp-api commit to use, run: @@ -12,8 +12,8 @@ %global gst_release 2 Name: openh264 -Version: 1.5.2 -Release: 0.4.git%{shortcommit0}%{?dist} +Version: 1.5.3 +Release: 0.1.git%{shortcommit0}%{?dist} Summary: H.264 codec library License: BSD @@ -223,6 +223,9 @@ popd %changelog +* Thu Apr 28 2016 Kalev Lember - 1.5.3-0.1.git2706e36 +- Update openh264 to 1.5.3 git snapshot + * Mon Mar 21 2016 Dennis Gilmore - 1.5.2-0.4.git21e44bd - move the mozila-openh264 definition before gstreamer1-plugin-openh264 - gstreamer1-plugin-openh264 redefines version and release messing up requires diff --git a/sources b/sources index ffb49b6..cbd752c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz 74ec07ae3c1c5a678c761d3624f06060 gst-plugins-bad-openh264-1.6.1.tar.xz -0821a30af77607e17bdf956faf5c64f2 openh264-21e44bd.tar.gz +259b33cec12941f32b367ff5270ef6a9 openh264-2706e36.tar.gz From 052514842e07f21e8f12f742b4997bf95fbb7b83 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Apr 2016 12:04:39 +0200 Subject: [PATCH 08/49] Update gstreamer plugin to 1.8.1 --- .gitignore | 2 +- gst-p-bad-cleanup.sh | 2 ++ openh264.spec | 5 +++-- sources | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fc3aba8..114fffb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /gmp-api-c5f1d0f.tar.gz -/gst-plugins-bad-openh264-1.6.1.tar.xz +/gst-plugins-bad-openh264-1.8.1.tar.xz /openh264-2706e36.tar.gz diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh index fcbcdbc..95b9f46 100755 --- a/gst-p-bad-cleanup.sh +++ b/gst-p-bad-cleanup.sh @@ -73,6 +73,7 @@ mpegtsdemux mpegtsmux mpegvideoparse mxf +netsim nsf nuvdemux onvif @@ -98,6 +99,7 @@ subenc tta valve videofilters +videoframe_audiolevel videomaxrate videomeasure videoparsers diff --git a/openh264.spec b/openh264.spec index 98b25d7..54257d6 100644 --- a/openh264.spec +++ b/openh264.spec @@ -7,9 +7,9 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global gst_version 1.6.1 +%global gst_version 1.8.1 #needs to be bumped for every build -%global gst_release 2 +%global gst_release 1 Name: openh264 Version: 1.5.3 @@ -225,6 +225,7 @@ popd %changelog * Thu Apr 28 2016 Kalev Lember - 1.5.3-0.1.git2706e36 - Update openh264 to 1.5.3 git snapshot +- Update gstreamer plugin to 1.8.1 * Mon Mar 21 2016 Dennis Gilmore - 1.5.2-0.4.git21e44bd - move the mozila-openh264 definition before gstreamer1-plugin-openh264 diff --git a/sources b/sources index cbd752c..c78f7ac 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz -74ec07ae3c1c5a678c761d3624f06060 gst-plugins-bad-openh264-1.6.1.tar.xz +ff63b5fc2234e566a6cb20d58ce85964 gst-plugins-bad-openh264-1.8.1.tar.xz 259b33cec12941f32b367ff5270ef6a9 openh264-2706e36.tar.gz From d45f26d804c393fba84d1e8e8b66fb0c650eb10f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 25 Aug 2016 08:56:24 +0200 Subject: [PATCH 09/49] Update openh264 to 1.6.0 --- .gitignore | 1 + openh264.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 114fffb..db268f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gmp-api-c5f1d0f.tar.gz /gst-plugins-bad-openh264-1.8.1.tar.xz /openh264-2706e36.tar.gz +/openh264-1.6.0.tar.gz diff --git a/openh264.spec b/openh264.spec index 54257d6..814f979 100644 --- a/openh264.spec +++ b/openh264.spec @@ -1,7 +1,3 @@ -# v1.5.3-Firefox39 branch -%global commit0 2706e36bf0a8b7c539c803ed877148c005ffca59 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - # To get the gmp-api commit to use, run: # rm -rf gmp-api;make gmp-bootstrap;cd gmp-api;git rev-parse HEAD %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 @@ -12,13 +8,13 @@ %global gst_release 1 Name: openh264 -Version: 1.5.3 -Release: 0.1.git%{shortcommit0}%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: H.264 codec library License: BSD URL: http://www.openh264.org/ -Source0: https://github.com/cisco/openh264/archive/%{commit0}/openh264-%{shortcommit0}.tar.gz +Source0: https://github.com/cisco/openh264/archive/v%{version}/openh264-%{version}.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz # The source is: # http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz @@ -69,7 +65,7 @@ This package contains the H.264 plugin. %prep -%setup -qn openh264-%{commit0} +%setup -q # Extract gmp-api archive tar -xf %{S:1} @@ -202,7 +198,7 @@ popd %files %license LICENSE %doc README.md -%{_libdir}/libopenh264.so.1 +%{_libdir}/libopenh264.so.3 %files devel %{_includedir}/wels/ @@ -223,6 +219,9 @@ popd %changelog +* Thu Aug 25 2016 Kalev Lember - 1.6.0-1 +- Update openh264 to 1.6.0 + * Thu Apr 28 2016 Kalev Lember - 1.5.3-0.1.git2706e36 - Update openh264 to 1.5.3 git snapshot - Update gstreamer plugin to 1.8.1 diff --git a/sources b/sources index c78f7ac..215e146 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz ff63b5fc2234e566a6cb20d58ce85964 gst-plugins-bad-openh264-1.8.1.tar.xz -259b33cec12941f32b367ff5270ef6a9 openh264-2706e36.tar.gz +44fa88fa8545ab1239a16ad535078be4 openh264-1.6.0.tar.gz From 2e67e3db836494ecc110d7b4c239db4e89f99b99 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 25 Aug 2016 08:56:37 +0200 Subject: [PATCH 10/49] Update gstreamer plugin to 1.8.3 --- .gitignore | 1 + openh264.spec | 3 ++- sources | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index db268f6..61ad125 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /gmp-api-c5f1d0f.tar.gz /gst-plugins-bad-openh264-1.8.1.tar.xz /openh264-2706e36.tar.gz +/gst-plugins-bad-openh264-1.8.3.tar.xz /openh264-1.6.0.tar.gz diff --git a/openh264.spec b/openh264.spec index 814f979..136d498 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,7 +3,7 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global gst_version 1.8.1 +%global gst_version 1.8.3 #needs to be bumped for every build %global gst_release 1 @@ -221,6 +221,7 @@ popd %changelog * Thu Aug 25 2016 Kalev Lember - 1.6.0-1 - Update openh264 to 1.6.0 +- Update gstreamer plugin to 1.8.3 * Thu Apr 28 2016 Kalev Lember - 1.5.3-0.1.git2706e36 - Update openh264 to 1.5.3 git snapshot diff --git a/sources b/sources index 215e146..d111b70 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz -ff63b5fc2234e566a6cb20d58ce85964 gst-plugins-bad-openh264-1.8.1.tar.xz +c59a39094b984b01238e6cb6cfe54ab8 gst-plugins-bad-openh264-1.8.3.tar.xz 44fa88fa8545ab1239a16ad535078be4 openh264-1.6.0.tar.gz From 81f62d87d576840de1250d9cd3986dce7d9a390b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 2 Sep 2016 09:35:40 +0200 Subject: [PATCH 11/49] Update gstreamer plugin to 1.9.2 --- .gitignore | 1 + gst-p-bad-cleanup.sh | 1 + openh264.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 61ad125..912d25f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /openh264-2706e36.tar.gz /gst-plugins-bad-openh264-1.8.3.tar.xz /openh264-1.6.0.tar.gz +/gst-plugins-bad-openh264-1.9.2.tar.xz diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh index 95b9f46..ffc1e6f 100755 --- a/gst-p-bad-cleanup.sh +++ b/gst-p-bad-cleanup.sh @@ -96,6 +96,7 @@ smooth speed stereo subenc +timecode tta valve videofilters diff --git a/openh264.spec b/openh264.spec index 136d498..88c7e82 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,13 +3,13 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global gst_version 1.8.3 +%global gst_version 1.9.2 #needs to be bumped for every build %global gst_release 1 Name: openh264 Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: H.264 codec library License: BSD @@ -219,6 +219,9 @@ popd %changelog +* Fri Sep 02 2016 Kalev Lember - 1.6.0-2 +- Update gstreamer plugin to 1.9.2 + * Thu Aug 25 2016 Kalev Lember - 1.6.0-1 - Update openh264 to 1.6.0 - Update gstreamer plugin to 1.8.3 diff --git a/sources b/sources index d111b70..7952463 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz -c59a39094b984b01238e6cb6cfe54ab8 gst-plugins-bad-openh264-1.8.3.tar.xz +07049ab87f7bd96ec27f8277424f47db gst-plugins-bad-openh264-1.9.2.tar.xz 44fa88fa8545ab1239a16ad535078be4 openh264-1.6.0.tar.gz From 05fb4c3bdf737f368432aa18140583ffa455da96 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 5 Dec 2016 11:26:34 +0100 Subject: [PATCH 12/49] Update gstreamer plugin to 1.10.2 --- .gitignore | 1 + openh264.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 912d25f..befeaf3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gst-plugins-bad-openh264-1.8.3.tar.xz /openh264-1.6.0.tar.gz /gst-plugins-bad-openh264-1.9.2.tar.xz +/gst-plugins-bad-openh264-1.10.2.tar.xz diff --git a/openh264.spec b/openh264.spec index 88c7e82..f1dfd3d 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,13 +3,13 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global gst_version 1.9.2 -#needs to be bumped for every build +%global gst_version 1.10.2 +# needs to be bumped for every rebuild %global gst_release 1 Name: openh264 Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: H.264 codec library License: BSD @@ -219,6 +219,9 @@ popd %changelog +* Mon Dec 05 2016 Kalev Lember - 1.6.0-3 +- Update gstreamer plugin to 1.10.2 + * Fri Sep 02 2016 Kalev Lember - 1.6.0-2 - Update gstreamer plugin to 1.9.2 diff --git a/sources b/sources index 7952463..c1cbb81 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz -07049ab87f7bd96ec27f8277424f47db gst-plugins-bad-openh264-1.9.2.tar.xz +a229df8256eaa6ec8292122c88b80e38 gst-plugins-bad-openh264-1.10.2.tar.xz 44fa88fa8545ab1239a16ad535078be4 openh264-1.6.0.tar.gz From dd4782e1fd3b1a91e6fa5d861f6d55668eb16f3f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 30 Jan 2017 23:19:02 +0100 Subject: [PATCH 13/49] Update gstreamer plugin to 1.10.3 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index befeaf3..b7b367f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /openh264-1.6.0.tar.gz /gst-plugins-bad-openh264-1.9.2.tar.xz /gst-plugins-bad-openh264-1.10.2.tar.xz +/gst-plugins-bad-openh264-1.10.3.tar.xz diff --git a/openh264.spec b/openh264.spec index f1dfd3d..5a3e0d9 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,13 +3,13 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global gst_version 1.10.2 +%global gst_version 1.10.3 # needs to be bumped for every rebuild %global gst_release 1 Name: openh264 Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: H.264 codec library License: BSD @@ -219,6 +219,9 @@ popd %changelog +* Mon Jan 30 2017 Kalev Lember - 1.6.0-4 +- Update gstreamer plugin to 1.10.3 + * Mon Dec 05 2016 Kalev Lember - 1.6.0-3 - Update gstreamer plugin to 1.10.2 diff --git a/sources b/sources index c1cbb81..64b3d0a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -961eb0256e27a12dd0a19421b56f3309 gmp-api-c5f1d0f.tar.gz -a229df8256eaa6ec8292122c88b80e38 gst-plugins-bad-openh264-1.10.2.tar.xz -44fa88fa8545ab1239a16ad535078be4 openh264-1.6.0.tar.gz +SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 +SHA512 (gst-plugins-bad-openh264-1.10.3.tar.xz) = 551d88eb524d6323b5071730a8e4531ec60ea479f9d41c043bf5db49112ff1c121b31db5cbdaabd5b5e9661f190a2ebbe46c4930f6f860a14c737a4cf78bc2df +SHA512 (openh264-1.6.0.tar.gz) = a2c98bf20c64bcacdc8aef7dd17962109d6d35af0d2b8e79b3d6c0073ed214fbae03d2aac4de2cf30816519217e07811fcf320073f4ce2d9c902a8473db54f51 From d1cdcad9cc36a65ac37c844b08bd3d243a54001e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 6 Mar 2017 10:30:02 +0100 Subject: [PATCH 14/49] Update gstreamer plugin to 1.10.4 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b7b367f..83fb870 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /gst-plugins-bad-openh264-1.9.2.tar.xz /gst-plugins-bad-openh264-1.10.2.tar.xz /gst-plugins-bad-openh264-1.10.3.tar.xz +/gst-plugins-bad-openh264-1.10.4.tar.xz diff --git a/openh264.spec b/openh264.spec index 5a3e0d9..3045bd4 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,13 +3,13 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global gst_version 1.10.3 +%global gst_version 1.10.4 # needs to be bumped for every rebuild %global gst_release 1 Name: openh264 Version: 1.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: H.264 codec library License: BSD @@ -219,6 +219,9 @@ popd %changelog +* Mon Mar 06 2017 Kalev Lember - 1.6.0-5 +- Update gstreamer plugin to 1.10.4 + * Mon Jan 30 2017 Kalev Lember - 1.6.0-4 - Update gstreamer plugin to 1.10.3 diff --git a/sources b/sources index 64b3d0a..b4ba973 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.10.3.tar.xz) = 551d88eb524d6323b5071730a8e4531ec60ea479f9d41c043bf5db49112ff1c121b31db5cbdaabd5b5e9661f190a2ebbe46c4930f6f860a14c737a4cf78bc2df +SHA512 (gst-plugins-bad-openh264-1.10.4.tar.xz) = 7a804ace53a0815afcc49c7aa2cc0a38f0b5723e806dc3db3b81d78da123de077cf5f6696c9e48a60c7db8b4e32ae8398a2ffd52b0115a61e049b70f1bacbb33 SHA512 (openh264-1.6.0.tar.gz) = a2c98bf20c64bcacdc8aef7dd17962109d6d35af0d2b8e79b3d6c0073ed214fbae03d2aac4de2cf30816519217e07811fcf320073f4ce2d9c902a8473db54f51 From 60b5e835e4b5973080c0d6f77415e8f86b8d932f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Jun 2017 09:34:39 +0200 Subject: [PATCH 15/49] Update openh264 to 1.7.0 --- .gitignore | 1 + openh264.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 83fb870..5857b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /gst-plugins-bad-openh264-1.10.2.tar.xz /gst-plugins-bad-openh264-1.10.3.tar.xz /gst-plugins-bad-openh264-1.10.4.tar.xz +/openh264-1.7.0.tar.gz diff --git a/openh264.spec b/openh264.spec index 3045bd4..266a29c 100644 --- a/openh264.spec +++ b/openh264.spec @@ -8,8 +8,8 @@ %global gst_release 1 Name: openh264 -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: H.264 codec library License: BSD @@ -198,7 +198,8 @@ popd %files %license LICENSE %doc README.md -%{_libdir}/libopenh264.so.3 +%{_libdir}/libopenh264.so.4 +%{_libdir}/libopenh264.so.%{version} %files devel %{_includedir}/wels/ @@ -219,6 +220,9 @@ popd %changelog +* Fri Jun 16 2017 Kalev Lember - 1.7.0-1 +- Update openh264 to 1.7.0 + * Mon Mar 06 2017 Kalev Lember - 1.6.0-5 - Update gstreamer plugin to 1.10.4 diff --git a/sources b/sources index b4ba973..c86ffe9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 SHA512 (gst-plugins-bad-openh264-1.10.4.tar.xz) = 7a804ace53a0815afcc49c7aa2cc0a38f0b5723e806dc3db3b81d78da123de077cf5f6696c9e48a60c7db8b4e32ae8398a2ffd52b0115a61e049b70f1bacbb33 -SHA512 (openh264-1.6.0.tar.gz) = a2c98bf20c64bcacdc8aef7dd17962109d6d35af0d2b8e79b3d6c0073ed214fbae03d2aac4de2cf30816519217e07811fcf320073f4ce2d9c902a8473db54f51 +SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa From 1cd62a3bd6945376b9608100c1b762d9529165db Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Jun 2017 09:56:16 +0200 Subject: [PATCH 16/49] Use openh264_version macro instead of the version macro We can't use %{version} in %files as it gets redefined by the gstreamer subpackage. --- openh264.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openh264.spec b/openh264.spec index 266a29c..e55ddb8 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,18 +3,19 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) +%global openh264_version 1.7.0 %global gst_version 1.10.4 # needs to be bumped for every rebuild %global gst_release 1 Name: openh264 -Version: 1.7.0 +Version: %{openh264_version} Release: 1%{?dist} Summary: H.264 codec library License: BSD URL: http://www.openh264.org/ -Source0: https://github.com/cisco/openh264/archive/v%{version}/openh264-%{version}.tar.gz +Source0: https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz # The source is: # http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz @@ -35,7 +36,7 @@ suitable for use in real time applications such as WebRTC. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{openh264_version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -44,7 +45,7 @@ developing applications that use %{name}. %package -n mozilla-openh264 Summary: H.264 codec support for Mozilla browsers -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{openh264_version}-%{release} Requires: mozilla-filesystem%{?_isa} %description -n mozilla-openh264 @@ -199,7 +200,7 @@ popd %license LICENSE %doc README.md %{_libdir}/libopenh264.so.4 -%{_libdir}/libopenh264.so.%{version} +%{_libdir}/libopenh264.so.%{openh264_version} %files devel %{_includedir}/wels/ From 34cfca9aa799bcbd19392ee25786eeb4ca4c7f30 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Jun 2017 11:50:19 +0200 Subject: [PATCH 17/49] Avoid a separate macro for gstreamer1-plugin-openh264 release This is just for symmetry with the openh264 package. --- openh264.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openh264.spec b/openh264.spec index e55ddb8..24b6262 100644 --- a/openh264.spec +++ b/openh264.spec @@ -5,11 +5,10 @@ %global openh264_version 1.7.0 %global gst_version 1.10.4 -# needs to be bumped for every rebuild -%global gst_release 1 Name: openh264 Version: %{openh264_version} +# Also bump the Release tag for gstreamer1-plugin-openh264 down below Release: 1%{?dist} Summary: H.264 codec library @@ -55,7 +54,7 @@ browsers. %package -n gstreamer1-plugin-openh264 Version: %{gst_version} -Release: %{gst_release}%{?dist} +Release: 1%{?dist} Summary: GStreamer H.264 plugin %description -n gstreamer1-plugin-openh264 From 31e1b24cce9efa6d3b10612a2d809c3b0e68a76a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 16 Jun 2017 12:07:32 +0200 Subject: [PATCH 18/49] Update gstreamer plugin to 1.12.0 --- .gitignore | 1 + gst-p-bad-cleanup.sh | 2 ++ openh264.spec | 3 ++- sources | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5857b7d..8c254b4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /gst-plugins-bad-openh264-1.10.3.tar.xz /gst-plugins-bad-openh264-1.10.4.tar.xz /openh264-1.7.0.tar.gz +/gst-plugins-bad-openh264-1.12.0.tar.xz diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh index ffc1e6f..d6235a7 100755 --- a/gst-p-bad-cleanup.sh +++ b/gst-p-bad-cleanup.sh @@ -25,8 +25,10 @@ aiff aiffparse amrparse asfmux +audiobuffersplit audiofxbad audiomixer +audiomixmatrix audioparsers audiovisualizers autoconvert diff --git a/openh264.spec b/openh264.spec index 24b6262..aa23794 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,7 +4,7 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.7.0 -%global gst_version 1.10.4 +%global gst_version 1.12.0 Name: openh264 Version: %{openh264_version} @@ -222,6 +222,7 @@ popd %changelog * Fri Jun 16 2017 Kalev Lember - 1.7.0-1 - Update openh264 to 1.7.0 +- Update gstreamer plugin to 1.12.0 * Mon Mar 06 2017 Kalev Lember - 1.6.0-5 - Update gstreamer plugin to 1.10.4 diff --git a/sources b/sources index c86ffe9..d4a656c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.10.4.tar.xz) = 7a804ace53a0815afcc49c7aa2cc0a38f0b5723e806dc3db3b81d78da123de077cf5f6696c9e48a60c7db8b4e32ae8398a2ffd52b0115a61e049b70f1bacbb33 +SHA512 (gst-plugins-bad-openh264-1.12.0.tar.xz) = 60dfe0af5705d3bae06e96c21bb22991917a2b9126ed87d5b2f9b2581d601b94e03668505c73ca1156062df40bbf3936ecfad95ca8a18a2e77cf5e27697562df SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa From 910594c97f0c4196f570b2cae4985728bdaf982b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Jun 2017 18:12:25 +0200 Subject: [PATCH 19/49] Update gstreamer plugin to 1.12.1 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8c254b4..2d3cee6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /gst-plugins-bad-openh264-1.10.4.tar.xz /openh264-1.7.0.tar.gz /gst-plugins-bad-openh264-1.12.0.tar.xz +/gst-plugins-bad-openh264-1.12.1.tar.xz diff --git a/openh264.spec b/openh264.spec index aa23794..e8bb6ed 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.7.0 -%global gst_version 1.12.0 +%global gst_version 1.12.1 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 1%{?dist} +Release: 2%{?dist} Summary: H.264 codec library License: BSD @@ -220,6 +220,9 @@ popd %changelog +* Tue Jun 20 2017 Kalev Lember - 1.7.0-2 +- Update gstreamer plugin to 1.12.1 + * Fri Jun 16 2017 Kalev Lember - 1.7.0-1 - Update openh264 to 1.7.0 - Update gstreamer plugin to 1.12.0 diff --git a/sources b/sources index d4a656c..0aba263 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.12.0.tar.xz) = 60dfe0af5705d3bae06e96c21bb22991917a2b9126ed87d5b2f9b2581d601b94e03668505c73ca1156062df40bbf3936ecfad95ca8a18a2e77cf5e27697562df +SHA512 (gst-plugins-bad-openh264-1.12.1.tar.xz) = d990bdfaf86b57b1104f1eff88e17046a68f202e14c7604bf69ccad63e0cd519279b6d7951fd84c7b0da0947292d80e81196f7ed4789af2e06d9c4d621d277fb SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa From 51b8ae244cb35f79607079e51411e9a852a4739b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 20 Jul 2017 22:08:34 +0200 Subject: [PATCH 20/49] Update gstreamer plugin to 1.12.2 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d3cee6..a497489 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /openh264-1.7.0.tar.gz /gst-plugins-bad-openh264-1.12.0.tar.xz /gst-plugins-bad-openh264-1.12.1.tar.xz +/gst-plugins-bad-openh264-1.12.2.tar.xz diff --git a/openh264.spec b/openh264.spec index e8bb6ed..93a2272 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.7.0 -%global gst_version 1.12.1 +%global gst_version 1.12.2 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 2%{?dist} +Release: 3%{?dist} Summary: H.264 codec library License: BSD @@ -220,6 +220,9 @@ popd %changelog +* Thu Jul 20 2017 Kalev Lember - 1.7.0-3 +- Update gstreamer plugin to 1.12.2 + * Tue Jun 20 2017 Kalev Lember - 1.7.0-2 - Update gstreamer plugin to 1.12.1 diff --git a/sources b/sources index 0aba263..8e7989c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.12.1.tar.xz) = d990bdfaf86b57b1104f1eff88e17046a68f202e14c7604bf69ccad63e0cd519279b6d7951fd84c7b0da0947292d80e81196f7ed4789af2e06d9c4d621d277fb +SHA512 (gst-plugins-bad-openh264-1.12.2.tar.xz) = c9ba173f0a7f609fde2c0d5a4350bb905a598530ff23f6ce50bdb26e331be6bc525565eba090f5fe3a238766748d526fde4228cb4d9203035dca9dc1a4f1f487 SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa From c717d1d210753df340ee20e3ee3ac8a46a1b8022 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 19 Sep 2017 15:23:13 +0200 Subject: [PATCH 21/49] Update gstreamer plugin to 1.12.3 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a497489..d1e702a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /gst-plugins-bad-openh264-1.12.0.tar.xz /gst-plugins-bad-openh264-1.12.1.tar.xz /gst-plugins-bad-openh264-1.12.2.tar.xz +/gst-plugins-bad-openh264-1.12.3.tar.xz diff --git a/openh264.spec b/openh264.spec index 93a2272..d8ed299 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.7.0 -%global gst_version 1.12.2 +%global gst_version 1.12.3 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 3%{?dist} +Release: 4%{?dist} Summary: H.264 codec library License: BSD @@ -220,6 +220,9 @@ popd %changelog +* Tue Sep 19 2017 Kalev Lember - 1.7.0-4 +- Update gstreamer plugin to 1.12.3 + * Thu Jul 20 2017 Kalev Lember - 1.7.0-3 - Update gstreamer plugin to 1.12.2 diff --git a/sources b/sources index 8e7989c..cbc95d5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.12.2.tar.xz) = c9ba173f0a7f609fde2c0d5a4350bb905a598530ff23f6ce50bdb26e331be6bc525565eba090f5fe3a238766748d526fde4228cb4d9203035dca9dc1a4f1f487 +SHA512 (gst-plugins-bad-openh264-1.12.3.tar.xz) = 5b33da0a58f37c9c6facc94c4b94281f3972e0a05a70592980002bb4bbcda26b64acca6db30724e97a62473cfbce565f14e7de300504070d8c6eca1e09087049 SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa From e87fbb4d2a0535fbefae03ac3137538b92a921bd Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 16 Dec 2017 14:23:05 +0100 Subject: [PATCH 22/49] Update gstreamer plugin to 1.12.4 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d1e702a..b25bc51 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /gst-plugins-bad-openh264-1.12.1.tar.xz /gst-plugins-bad-openh264-1.12.2.tar.xz /gst-plugins-bad-openh264-1.12.3.tar.xz +/gst-plugins-bad-openh264-1.12.4.tar.xz diff --git a/openh264.spec b/openh264.spec index d8ed299..d1164ce 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.7.0 -%global gst_version 1.12.3 +%global gst_version 1.12.4 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 4%{?dist} +Release: 5%{?dist} Summary: H.264 codec library License: BSD @@ -220,6 +220,9 @@ popd %changelog +* Sat Dec 16 2017 Kalev Lember - 1.7.0-5 +- Update gstreamer plugin to 1.12.4 + * Tue Sep 19 2017 Kalev Lember - 1.7.0-4 - Update gstreamer plugin to 1.12.3 diff --git a/sources b/sources index cbc95d5..9f9ee95 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.12.3.tar.xz) = 5b33da0a58f37c9c6facc94c4b94281f3972e0a05a70592980002bb4bbcda26b64acca6db30724e97a62473cfbce565f14e7de300504070d8c6eca1e09087049 +SHA512 (gst-plugins-bad-openh264-1.12.4.tar.xz) = 670ae3d17a86a8d3c44f6e3f2ef4e6da6eb06bb52dfab24fd9a1baa3a53b88b6903933d9f6f4958eb94eb9c4895c33d4627d59c279a3aefdb2da7be5ebc20e55 SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa From e6ebc5cbbbbe47927c1f8be8b05b7670a4294fe6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 6 Mar 2018 15:23:26 +0100 Subject: [PATCH 23/49] Update gstreamer plugin to 1.13.90 --- .gitignore | 1 + gst-p-bad-cleanup.sh | 6 +++++- openh264.spec | 7 +++++-- sources | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b25bc51..23ad980 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /gst-plugins-bad-openh264-1.12.2.tar.xz /gst-plugins-bad-openh264-1.12.3.tar.xz /gst-plugins-bad-openh264-1.12.4.tar.xz +/gst-plugins-bad-openh264-1.13.90.tar.xz diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh index d6235a7..e7e3d79 100755 --- a/gst-p-bad-cleanup.sh +++ b/gst-p-bad-cleanup.sh @@ -27,6 +27,7 @@ amrparse asfmux audiobuffersplit audiofxbad +audiolatency audiomixer audiomixmatrix audioparsers @@ -83,6 +84,7 @@ openh264 patchdetect pcapparse pnm +proxy qtmux rawparse removesilence @@ -199,7 +201,9 @@ if test "x$unknown" != "x"; then exit 1 fi -autoreconf +#autoreconf +NOCONFIGURE=1 \ +./autogen.sh popd > /dev/null diff --git a/openh264.spec b/openh264.spec index d1164ce..cb9c1ea 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.7.0 -%global gst_version 1.12.4 +%global gst_version 1.13.90 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 5%{?dist} +Release: 6%{?dist} Summary: H.264 codec library License: BSD @@ -220,6 +220,9 @@ popd %changelog +* Tue Mar 06 2018 Kalev Lember - 1.7.0-6 +- Update gstreamer plugin to 1.13.90 + * Sat Dec 16 2017 Kalev Lember - 1.7.0-5 - Update gstreamer plugin to 1.12.4 diff --git a/sources b/sources index 9f9ee95..53b4b58 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.12.4.tar.xz) = 670ae3d17a86a8d3c44f6e3f2ef4e6da6eb06bb52dfab24fd9a1baa3a53b88b6903933d9f6f4958eb94eb9c4895c33d4627d59c279a3aefdb2da7be5ebc20e55 +SHA512 (gst-plugins-bad-openh264-1.13.90.tar.xz) = 61497a696c7ce57bf4878a59d4f2cdec6bb48e680a844f88fa9a7b3b52fc1e3f9a8464f1e3877571c224d9fd03dc005ede3a987bf2448ac87037167c60c9c528 SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa From 1e0aad47de14edafb9f0d0d627a206a6bd06b9a7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 6 Mar 2018 16:09:00 +0100 Subject: [PATCH 24/49] Fix the build --- openh264.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openh264.spec b/openh264.spec index cb9c1ea..73362fb 100644 --- a/openh264.spec +++ b/openh264.spec @@ -99,6 +99,7 @@ export OPENH264_LIBS="-L`pwd`/.. -lopenh264" --with-package-name="Fedora gstreamer1-plugin-openh264 package" \ --with-package-origin="http://www.openh264.org/" \ --disable-static \ + --disable-gl \ --enable-openh264 make V=1 %{?_smp_mflags} popd From 451360458b9fb67e5926dc766cc2d8f3ce1c70f7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 27 Jun 2018 10:21:15 +0200 Subject: [PATCH 25/49] Update openh264 to 1.8.0 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 23ad980..a7ec3e1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /gst-plugins-bad-openh264-1.12.3.tar.xz /gst-plugins-bad-openh264-1.12.4.tar.xz /gst-plugins-bad-openh264-1.13.90.tar.xz +/openh264-1.8.0.tar.gz diff --git a/openh264.spec b/openh264.spec index 73362fb..d16b300 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,13 +3,13 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 1.7.0 +%global openh264_version 1.8.0 %global gst_version 1.13.90 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 6%{?dist} +Release: 1%{?dist} Summary: H.264 codec library License: BSD @@ -221,6 +221,9 @@ popd %changelog +* Wed Jun 27 2018 Kalev Lember - 1.8.0-1 +- Update openh264 to 1.8.0 + * Tue Mar 06 2018 Kalev Lember - 1.7.0-6 - Update gstreamer plugin to 1.13.90 diff --git a/sources b/sources index 53b4b58..95756f7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 SHA512 (gst-plugins-bad-openh264-1.13.90.tar.xz) = 61497a696c7ce57bf4878a59d4f2cdec6bb48e680a844f88fa9a7b3b52fc1e3f9a8464f1e3877571c224d9fd03dc005ede3a987bf2448ac87037167c60c9c528 -SHA512 (openh264-1.7.0.tar.gz) = 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa +SHA512 (openh264-1.8.0.tar.gz) = 4469e9193ed65abb60bfb318dac55fc8c909e82ea4c9d9fbba670d65d9ef1a4ef73f3d4b8bcfae0d88a267441170e9e91d1d6ca2d3337140f82d97ed5d83191c From 3dcdcd329092a6b4c0dc01cd8aa8e44fdc49ea99 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 27 Jun 2018 10:30:49 +0200 Subject: [PATCH 26/49] Update gstreamer plugin to 1.14.1 --- .gitignore | 1 + openh264.spec | 3 ++- sources | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a7ec3e1..6b06178 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /gst-plugins-bad-openh264-1.12.4.tar.xz /gst-plugins-bad-openh264-1.13.90.tar.xz /openh264-1.8.0.tar.gz +/gst-plugins-bad-openh264-1.14.1.tar.xz diff --git a/openh264.spec b/openh264.spec index d16b300..86901ea 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,7 +4,7 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.8.0 -%global gst_version 1.13.90 +%global gst_version 1.14.1 Name: openh264 Version: %{openh264_version} @@ -223,6 +223,7 @@ popd %changelog * Wed Jun 27 2018 Kalev Lember - 1.8.0-1 - Update openh264 to 1.8.0 +- Update gstreamer plugin to 1.14.1 * Tue Mar 06 2018 Kalev Lember - 1.7.0-6 - Update gstreamer plugin to 1.13.90 diff --git a/sources b/sources index 95756f7..9fe4972 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.13.90.tar.xz) = 61497a696c7ce57bf4878a59d4f2cdec6bb48e680a844f88fa9a7b3b52fc1e3f9a8464f1e3877571c224d9fd03dc005ede3a987bf2448ac87037167c60c9c528 +SHA512 (gst-plugins-bad-openh264-1.14.1.tar.xz) = 0e4400cb8fa2fbccd9a90fffa2b67f9fb69e208c214fb63a12327891c6db55adb4b55afa78666b33ad08b43bbd6d26bcd5f328ed1e4371b6b54c923a4bb8d3db SHA512 (openh264-1.8.0.tar.gz) = 4469e9193ed65abb60bfb318dac55fc8c909e82ea4c9d9fbba670d65d9ef1a4ef73f3d4b8bcfae0d88a267441170e9e91d1d6ca2d3337140f82d97ed5d83191c From 5e4cce3d4ef92833385431444583fdee7af9d89e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:44 +0200 Subject: [PATCH 27/49] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- openh264.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openh264.spec b/openh264.spec index 86901ea..cfca0f5 100644 --- a/openh264.spec +++ b/openh264.spec @@ -22,6 +22,7 @@ Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{ Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz Source3: gst-p-bad-cleanup.sh +BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: chrpath BuildRequires: gstreamer1-devel >= %{gst_version} From b64b76ed958dda566481cb12ac726887efcf5e88 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 12 Sep 2018 08:19:23 +0200 Subject: [PATCH 28/49] Update gstreamer plugin to 1.14.2 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6b06178..390685c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /gst-plugins-bad-openh264-1.13.90.tar.xz /openh264-1.8.0.tar.gz /gst-plugins-bad-openh264-1.14.1.tar.xz +/gst-plugins-bad-openh264-1.14.2.tar.xz diff --git a/openh264.spec b/openh264.spec index cfca0f5..289b2c7 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.8.0 -%global gst_version 1.14.1 +%global gst_version 1.14.2 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 1%{?dist} +Release: 2%{?dist} Summary: H.264 codec library License: BSD @@ -222,6 +222,9 @@ popd %changelog +* Wed Sep 12 2018 Kalev Lember - 1.8.0-2 +- Update gstreamer plugin to 1.14.2 + * Wed Jun 27 2018 Kalev Lember - 1.8.0-1 - Update openh264 to 1.8.0 - Update gstreamer plugin to 1.14.1 diff --git a/sources b/sources index 9fe4972..c0eb0ff 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.14.1.tar.xz) = 0e4400cb8fa2fbccd9a90fffa2b67f9fb69e208c214fb63a12327891c6db55adb4b55afa78666b33ad08b43bbd6d26bcd5f328ed1e4371b6b54c923a4bb8d3db +SHA512 (gst-plugins-bad-openh264-1.14.2.tar.xz) = 6a20c5a05027d9ebfd739d64c88db7a540841b4e49ad99ed9c6f7d3fb018199bf10868387c8f1e9b67f4f978e844c03e430e7d1741fb9d298225afee104b5adb SHA512 (openh264-1.8.0.tar.gz) = 4469e9193ed65abb60bfb318dac55fc8c909e82ea4c9d9fbba670d65d9ef1a4ef73f3d4b8bcfae0d88a267441170e9e91d1d6ca2d3337140f82d97ed5d83191c From c9a627200dbb39d6a44b8b6dcd1d8f974eef2e8d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 Feb 2019 11:49:20 +0100 Subject: [PATCH 29/49] Update gstreamer plugin to 1.15.1 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 390685c..3eb3976 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /openh264-1.8.0.tar.gz /gst-plugins-bad-openh264-1.14.1.tar.xz /gst-plugins-bad-openh264-1.14.2.tar.xz +/gst-plugins-bad-openh264-1.15.1.tar.xz diff --git a/openh264.spec b/openh264.spec index 289b2c7..5b0ed88 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 1.8.0 -%global gst_version 1.14.2 +%global gst_version 1.15.1 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 2%{?dist} +Release: 3%{?dist} Summary: H.264 codec library License: BSD @@ -222,6 +222,9 @@ popd %changelog +* Fri Feb 22 2019 Kalev Lember - 1.8.0-3 +- Update gstreamer plugin to 1.15.1 + * Wed Sep 12 2018 Kalev Lember - 1.8.0-2 - Update gstreamer plugin to 1.14.2 diff --git a/sources b/sources index c0eb0ff..64b8170 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.14.2.tar.xz) = 6a20c5a05027d9ebfd739d64c88db7a540841b4e49ad99ed9c6f7d3fb018199bf10868387c8f1e9b67f4f978e844c03e430e7d1741fb9d298225afee104b5adb +SHA512 (gst-plugins-bad-openh264-1.15.1.tar.xz) = 634fefe1c0b884eb492e0ecb5be7ce97f1fc126f64e25ef4c93a74d10087e6dafbb194648d27f34118f05d1fffefb9204f2b71042438598a6a505ca0ada05295 SHA512 (openh264-1.8.0.tar.gz) = 4469e9193ed65abb60bfb318dac55fc8c909e82ea4c9d9fbba670d65d9ef1a4ef73f3d4b8bcfae0d88a267441170e9e91d1d6ca2d3337140f82d97ed5d83191c From dd41c8d3ae623e78cc413486dec0fffee6f4fe3b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 4 Feb 2019 15:29:22 +0100 Subject: [PATCH 30/49] Update openh264 to 2.0.0 --- .gitignore | 1 + openh264.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3eb3976..c915022 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /gst-plugins-bad-openh264-1.14.1.tar.xz /gst-plugins-bad-openh264-1.14.2.tar.xz /gst-plugins-bad-openh264-1.15.1.tar.xz +/openh264-2.0.0.tar.gz diff --git a/openh264.spec b/openh264.spec index 5b0ed88..a7b159f 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,13 +3,13 @@ %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 1.8.0 +%global openh264_version 2.0.0 %global gst_version 1.15.1 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 3%{?dist} +Release: 1%{?dist} Summary: H.264 codec library License: BSD @@ -200,7 +200,7 @@ popd %files %license LICENSE %doc README.md -%{_libdir}/libopenh264.so.4 +%{_libdir}/libopenh264.so.5 %{_libdir}/libopenh264.so.%{openh264_version} %files devel @@ -222,6 +222,9 @@ popd %changelog +* Mon Jun 17 2019 Kalev Lember - 2.0.0-1 +- Update openh264 to 2.0.0 + * Fri Feb 22 2019 Kalev Lember - 1.8.0-3 - Update gstreamer plugin to 1.15.1 diff --git a/sources b/sources index 64b8170..44091dc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 SHA512 (gst-plugins-bad-openh264-1.15.1.tar.xz) = 634fefe1c0b884eb492e0ecb5be7ce97f1fc126f64e25ef4c93a74d10087e6dafbb194648d27f34118f05d1fffefb9204f2b71042438598a6a505ca0ada05295 -SHA512 (openh264-1.8.0.tar.gz) = 4469e9193ed65abb60bfb318dac55fc8c909e82ea4c9d9fbba670d65d9ef1a4ef73f3d4b8bcfae0d88a267441170e9e91d1d6ca2d3337140f82d97ed5d83191c +SHA512 (openh264-2.0.0.tar.gz) = 6cfa0c1d86a9695d8a491d26aeb2b9753ce0180e7268b8336ec0295eb5cd2cd3a5ecaa0cdfa4bd1f75934cfcf4394ebcd7e4dc2e05a71a21a771cd2c9038a459 From f9fa4df43131af0ad818025f7e09f76e32bf8c59 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 4 Feb 2019 15:33:15 +0100 Subject: [PATCH 31/49] Update gstreamer plugin to 1.16.0 --- .gitignore | 1 + openh264.spec | 3 ++- sources | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c915022..a529d1a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /gst-plugins-bad-openh264-1.14.2.tar.xz /gst-plugins-bad-openh264-1.15.1.tar.xz /openh264-2.0.0.tar.gz +/gst-plugins-bad-openh264-1.16.0.tar.xz diff --git a/openh264.spec b/openh264.spec index a7b159f..50c53e4 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,7 +4,7 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 2.0.0 -%global gst_version 1.15.1 +%global gst_version 1.16.0 Name: openh264 Version: %{openh264_version} @@ -224,6 +224,7 @@ popd %changelog * Mon Jun 17 2019 Kalev Lember - 2.0.0-1 - Update openh264 to 2.0.0 +- Update gstreamer plugin to 1.16.0 * Fri Feb 22 2019 Kalev Lember - 1.8.0-3 - Update gstreamer plugin to 1.15.1 diff --git a/sources b/sources index 44091dc..2f0c92d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.15.1.tar.xz) = 634fefe1c0b884eb492e0ecb5be7ce97f1fc126f64e25ef4c93a74d10087e6dafbb194648d27f34118f05d1fffefb9204f2b71042438598a6a505ca0ada05295 +SHA512 (gst-plugins-bad-openh264-1.16.0.tar.xz) = bb1591562a70b107140bc611ae9382abc95f7ab54bc7abff9b6c3ef3f540339f1276d70e4b49407aa7e52ab40c3006c7a24ba14c56dd0f9157bfd2dcbb8f2621 SHA512 (openh264-2.0.0.tar.gz) = 6cfa0c1d86a9695d8a491d26aeb2b9753ce0180e7268b8336ec0295eb5cd2cd3a5ecaa0cdfa4bd1f75934cfcf4394ebcd7e4dc2e05a71a21a771cd2c9038a459 From 2e361844faa07a6def58812c3dd8f16c6bb9ec42 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 4 Feb 2019 15:42:46 +0100 Subject: [PATCH 32/49] Fix the gst plugin build with openh264 2.0.0 --- ...c-Fix-compilation-with-openh264-v2.0.patch | 30 +++++++++++++++++++ openh264.spec | 6 ++++ 2 files changed, 36 insertions(+) create mode 100644 0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch diff --git a/0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch b/0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch new file mode 100644 index 0000000..de05950 --- /dev/null +++ b/0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch @@ -0,0 +1,30 @@ +From d2f6facbfb89f13a891e710b44e1561570de006a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= + +Date: Wed, 8 May 2019 13:35:25 +0200 +Subject: [PATCH] openh264enc: Fix compilation with openh264 v2.0 + +As OpenH264 increased its version to 2.0 the guard for structure +member is not valid. + +This patch will fix the compilation with gst-build and openh264. +--- + ext/openh264/gstopenh264enc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/openh264/gstopenh264enc.cpp b/ext/openh264/gstopenh264enc.cpp +index aa8138d7d..11be2a5b6 100644 +--- a/ext/openh264/gstopenh264enc.cpp ++++ b/ext/openh264/gstopenh264enc.cpp +@@ -739,7 +739,7 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder, + enc_params.bEnableSceneChangeDetect = openh264enc->scene_change_detection; + enc_params.bEnableFrameSkip = openh264enc->enable_frame_skip; + enc_params.bEnableLongTermReference = 0; +-#if OPENH264_MINOR >= 4 ++#if (OPENH264_MAJOR > 1 || (OPENH264_MAJOR == 1 && OPENH264_MINOR >= 4)) + enc_params.eSpsPpsIdStrategy = CONSTANT_ID; + #else + enc_params.bEnableSpsPpsIdAddition = 0; +-- +2.21.0 + diff --git a/openh264.spec b/openh264.spec index 50c53e4..46f48dd 100644 --- a/openh264.spec +++ b/openh264.spec @@ -22,6 +22,9 @@ Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{ Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz Source3: gst-p-bad-cleanup.sh +# Backported from upstream +Patch0: 0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch + BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: chrpath @@ -74,6 +77,9 @@ mv gmp-api-%{commit1} gmp-api # Extract gst-plugins-bad-free archive tar -xf %{S:2} +pushd gst-plugins-bad-%{gst_version} +%patch0 -p1 +popd # Update the makefile with our build options sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile From 7fb17ddf75bd37e90eaa79bdc774971ec11faaa5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 Mar 2020 17:13:12 +0100 Subject: [PATCH 33/49] Update to 2.1.0 This is actually a git snapshot, but mcatanzaro says that this commit, https://github.com/cisco/openh264/commit/a60e28efe227ea8ea760b1e29a8943e371ebe4b3 is 2.1.0 and that we should pretend that it's tagged as such. --- .gitignore | 1 + openh264.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a529d1a..c4bd020 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /gst-plugins-bad-openh264-1.15.1.tar.xz /openh264-2.0.0.tar.gz /gst-plugins-bad-openh264-1.16.0.tar.xz +/openh264-a60e28e.tar.gz diff --git a/openh264.spec b/openh264.spec index 46f48dd..36a918f 100644 --- a/openh264.spec +++ b/openh264.spec @@ -1,9 +1,13 @@ +# 2.1.0 release +%global commit0 a60e28efe227ea8ea760b1e29a8943e371ebe4b3 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + # To get the gmp-api commit to use, run: # rm -rf gmp-api;make gmp-bootstrap;cd gmp-api;git rev-parse HEAD %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.0.0 +%global openh264_version 2.1.0 %global gst_version 1.16.0 Name: openh264 @@ -14,7 +18,7 @@ Summary: H.264 codec library License: BSD URL: http://www.openh264.org/ -Source0: https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz +Source0: https://github.com/cisco/openh264/archive/%{commit0}/openh264-%{shortcommit0}.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz # The source is: # http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz @@ -69,7 +73,7 @@ This package contains the H.264 plugin. %prep -%setup -q +%setup -qn openh264-%{commit0} # Extract gmp-api archive tar -xf %{S:1} @@ -228,6 +232,9 @@ popd %changelog +* Tue Mar 10 2020 Kalev Lember - 2.1.0-1 +- Update to 2.1.0 + * Mon Jun 17 2019 Kalev Lember - 2.0.0-1 - Update openh264 to 2.0.0 - Update gstreamer plugin to 1.16.0 diff --git a/sources b/sources index 2f0c92d..7161627 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 SHA512 (gst-plugins-bad-openh264-1.16.0.tar.xz) = bb1591562a70b107140bc611ae9382abc95f7ab54bc7abff9b6c3ef3f540339f1276d70e4b49407aa7e52ab40c3006c7a24ba14c56dd0f9157bfd2dcbb8f2621 -SHA512 (openh264-2.0.0.tar.gz) = 6cfa0c1d86a9695d8a491d26aeb2b9753ce0180e7268b8336ec0295eb5cd2cd3a5ecaa0cdfa4bd1f75934cfcf4394ebcd7e4dc2e05a71a21a771cd2c9038a459 +SHA512 (openh264-a60e28e.tar.gz) = b0f426e30670edc5c56a6869ee619ac05a2159b6d531ecb239e796159c816617c3656d77fc52bfe933c3c802bc55711627cc11e2227ebd9718bdbfc3e4e128f7 From 339508016cadc6dde98bd6d644b4b489ef5f9e5e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 Mar 2020 17:22:29 +0100 Subject: [PATCH 34/49] Update gstreamer plugin to 1.16.2 --- .gitignore | 1 + openh264.spec | 9 ++------- sources | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c4bd020..eb6c1d4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /openh264-2.0.0.tar.gz /gst-plugins-bad-openh264-1.16.0.tar.xz /openh264-a60e28e.tar.gz +/gst-plugins-bad-openh264-1.16.2.tar.xz diff --git a/openh264.spec b/openh264.spec index 36a918f..d4b9aea 100644 --- a/openh264.spec +++ b/openh264.spec @@ -8,7 +8,7 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 2.1.0 -%global gst_version 1.16.0 +%global gst_version 1.16.2 Name: openh264 Version: %{openh264_version} @@ -26,9 +26,6 @@ Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{ Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz Source3: gst-p-bad-cleanup.sh -# Backported from upstream -Patch0: 0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch - BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: chrpath @@ -81,9 +78,6 @@ mv gmp-api-%{commit1} gmp-api # Extract gst-plugins-bad-free archive tar -xf %{S:2} -pushd gst-plugins-bad-%{gst_version} -%patch0 -p1 -popd # Update the makefile with our build options sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile @@ -234,6 +228,7 @@ popd %changelog * Tue Mar 10 2020 Kalev Lember - 2.1.0-1 - Update to 2.1.0 +- Update gstreamer plugin to 1.16.2 * Mon Jun 17 2019 Kalev Lember - 2.0.0-1 - Update openh264 to 2.0.0 diff --git a/sources b/sources index 7161627..f37ffb0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.16.0.tar.xz) = bb1591562a70b107140bc611ae9382abc95f7ab54bc7abff9b6c3ef3f540339f1276d70e4b49407aa7e52ab40c3006c7a24ba14c56dd0f9157bfd2dcbb8f2621 +SHA512 (gst-plugins-bad-openh264-1.16.2.tar.xz) = 02bbd2bda02b1edc6a7e25d5131107122ddaa963aa1fc94c2b869356290591e704d0f31d6a139099488a4151486183f7bb834e24d67831f72e56965c32fdd86f SHA512 (openh264-a60e28e.tar.gz) = b0f426e30670edc5c56a6869ee619ac05a2159b6d531ecb239e796159c816617c3656d77fc52bfe933c3c802bc55711627cc11e2227ebd9718bdbfc3e4e128f7 From 286021ebdc3681dd06711e193e3a72abde35bd39 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 Mar 2020 17:53:27 +0100 Subject: [PATCH 35/49] Explicitly disable hls Explicitly disable the hls plugin to avoid the build erroring out due to missing openssl. --- openh264.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openh264.spec b/openh264.spec index d4b9aea..fcb2f04 100644 --- a/openh264.spec +++ b/openh264.spec @@ -105,6 +105,7 @@ export OPENH264_LIBS="-L`pwd`/.. -lopenh264" --with-package-origin="http://www.openh264.org/" \ --disable-static \ --disable-gl \ + --disable-hls \ --enable-openh264 make V=1 %{?_smp_mflags} popd From 47788951d92f9c0cb0c82fc6cf15221038cbb5e3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 3 Apr 2020 14:53:04 +0200 Subject: [PATCH 36/49] Drop unused patch --- ...c-Fix-compilation-with-openh264-v2.0.patch | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch diff --git a/0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch b/0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch deleted file mode 100644 index de05950..0000000 --- a/0001-openh264enc-Fix-compilation-with-openh264-v2.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d2f6facbfb89f13a891e710b44e1561570de006a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= - -Date: Wed, 8 May 2019 13:35:25 +0200 -Subject: [PATCH] openh264enc: Fix compilation with openh264 v2.0 - -As OpenH264 increased its version to 2.0 the guard for structure -member is not valid. - -This patch will fix the compilation with gst-build and openh264. ---- - ext/openh264/gstopenh264enc.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/openh264/gstopenh264enc.cpp b/ext/openh264/gstopenh264enc.cpp -index aa8138d7d..11be2a5b6 100644 ---- a/ext/openh264/gstopenh264enc.cpp -+++ b/ext/openh264/gstopenh264enc.cpp -@@ -739,7 +739,7 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder, - enc_params.bEnableSceneChangeDetect = openh264enc->scene_change_detection; - enc_params.bEnableFrameSkip = openh264enc->enable_frame_skip; - enc_params.bEnableLongTermReference = 0; --#if OPENH264_MINOR >= 4 -+#if (OPENH264_MAJOR > 1 || (OPENH264_MAJOR == 1 && OPENH264_MINOR >= 4)) - enc_params.eSpsPpsIdStrategy = CONSTANT_ID; - #else - enc_params.bEnableSpsPpsIdAddition = 0; --- -2.21.0 - From b563d3e192a1f1a6cd7d35fd74d71a01a7b6ffeb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 May 2020 17:17:56 +0200 Subject: [PATCH 37/49] Update to 2.1.1 --- .gitignore | 1 + openh264.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index eb6c1d4..1bed52b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /gst-plugins-bad-openh264-1.16.0.tar.xz /openh264-a60e28e.tar.gz /gst-plugins-bad-openh264-1.16.2.tar.xz +/openh264-2.1.1.tar.gz diff --git a/openh264.spec b/openh264.spec index fcb2f04..e586465 100644 --- a/openh264.spec +++ b/openh264.spec @@ -1,13 +1,9 @@ -# 2.1.0 release -%global commit0 a60e28efe227ea8ea760b1e29a8943e371ebe4b3 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - # To get the gmp-api commit to use, run: # rm -rf gmp-api;make gmp-bootstrap;cd gmp-api;git rev-parse HEAD %global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.1.0 +%global openh264_version 2.1.1 %global gst_version 1.16.2 Name: openh264 @@ -18,7 +14,7 @@ Summary: H.264 codec library License: BSD URL: http://www.openh264.org/ -Source0: https://github.com/cisco/openh264/archive/%{commit0}/openh264-%{shortcommit0}.tar.gz +Source0: https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz # The source is: # http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz @@ -59,7 +55,7 @@ browsers. %package -n gstreamer1-plugin-openh264 Version: %{gst_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer H.264 plugin %description -n gstreamer1-plugin-openh264 @@ -70,7 +66,7 @@ This package contains the H.264 plugin. %prep -%setup -qn openh264-%{commit0} +%setup -q # Extract gmp-api archive tar -xf %{S:1} @@ -205,7 +201,7 @@ popd %files %license LICENSE %doc README.md -%{_libdir}/libopenh264.so.5 +%{_libdir}/libopenh264.so.6 %{_libdir}/libopenh264.so.%{openh264_version} %files devel @@ -227,6 +223,9 @@ popd %changelog +* Fri May 22 2020 Kalev Lember - 2.1.1-1 +- Update to 2.1.1 + * Tue Mar 10 2020 Kalev Lember - 2.1.0-1 - Update to 2.1.0 - Update gstreamer plugin to 1.16.2 diff --git a/sources b/sources index f37ffb0..0279331 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 SHA512 (gst-plugins-bad-openh264-1.16.2.tar.xz) = 02bbd2bda02b1edc6a7e25d5131107122ddaa963aa1fc94c2b869356290591e704d0f31d6a139099488a4151486183f7bb834e24d67831f72e56965c32fdd86f -SHA512 (openh264-a60e28e.tar.gz) = b0f426e30670edc5c56a6869ee619ac05a2159b6d531ecb239e796159c816617c3656d77fc52bfe933c3c802bc55711627cc11e2227ebd9718bdbfc3e4e128f7 +SHA512 (openh264-2.1.1.tar.gz) = f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79 From 8f60dd19b9bcb45ec63623eabd97b2f982d2415f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 May 2020 17:21:19 +0200 Subject: [PATCH 38/49] Add totem supplements to gstreamer1-plugin-openh264 As we are doing a build of openh264 anyway, move totem's 'Recommends: gstreamer1-plugin-openh264' to here, using reverse weak dependencies. This avoids having to reference another repo (fedora-cisco-openh264) from the main package collection. https://pagure.io/fedora-workstation/issue/84 --- openh264.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openh264.spec b/openh264.spec index e586465..c7f567c 100644 --- a/openh264.spec +++ b/openh264.spec @@ -57,6 +57,7 @@ browsers. Version: %{gst_version} Release: 2%{?dist} Summary: GStreamer H.264 plugin +Supplements: totem%{?_isa} %description -n gstreamer1-plugin-openh264 GStreamer is a streaming media framework, based on graphs of elements which @@ -225,6 +226,7 @@ popd %changelog * Fri May 22 2020 Kalev Lember - 2.1.1-1 - Update to 2.1.1 +- Add totem supplements to gstreamer1-plugin-openh264 * Tue Mar 10 2020 Kalev Lember - 2.1.0-1 - Update to 2.1.0 From 8af5733f808323e8efa2bfa7f2a4b43f4204c8ad Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 22 May 2020 20:57:15 +0200 Subject: [PATCH 39/49] Adapt to backwards incompatible change in GNU Make 4.3 https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4 https://bugzilla.redhat.com/show_bug.cgi?id=1799497 --- ...ild-adapt-to-backwards-incompatible-change.patch | 13 +++++++++++++ openh264.spec | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch diff --git a/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch b/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch new file mode 100644 index 0000000..817b842 --- /dev/null +++ b/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch @@ -0,0 +1,13 @@ +diff -urNp gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak gst-plugins-bad-1.16.2/common/gst-glib-gen.mak +--- gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak 2020-03-20 14:57:08.587740695 +0100 ++++ gst-plugins-bad-1.16.2/common/gst-glib-gen.mak 2020-03-20 15:00:42.584798988 +0100 +@@ -8,7 +8,8 @@ + #glib_gen_decl_banner=GST_EXPORT + #glib_gen_decl_include=\#include + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list diff --git a/openh264.spec b/openh264.spec index c7f567c..bd05d16 100644 --- a/openh264.spec +++ b/openh264.spec @@ -22,11 +22,18 @@ Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{ Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz Source3: gst-p-bad-cleanup.sh +# https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4 +# https://bugzilla.redhat.com/show_bug.cgi?id=1799497 +Patch0: gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch + BuildRequires: gcc-c++ BuildRequires: autoconf +BuildRequires: automake BuildRequires: chrpath +BuildRequires: gettext-devel BuildRequires: gstreamer1-devel >= %{gst_version} BuildRequires: gstreamer1-plugins-base-devel >= %{gst_version} +BuildRequires: libtool BuildRequires: nasm %description @@ -75,6 +82,9 @@ mv gmp-api-%{commit1} gmp-api # Extract gst-plugins-bad-free archive tar -xf %{S:2} +pushd gst-plugins-bad-%{gst_version} +%patch0 -p1 +popd # Update the makefile with our build options sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile @@ -97,6 +107,7 @@ pushd gst-plugins-bad-%{gst_version} ln -s ../codec/api/svc wels export OPENH264_CFLAGS="-I." export OPENH264_LIBS="-L`pwd`/.. -lopenh264" +autoreconf --force --install %configure \ --with-package-name="Fedora gstreamer1-plugin-openh264 package" \ --with-package-origin="http://www.openh264.org/" \ From 2dcc94bd9191a91917dc410cad4859c3f85c334e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:32:19 +0000 Subject: [PATCH 40/49] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- openh264.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openh264.spec b/openh264.spec index bd05d16..3fa76d8 100644 --- a/openh264.spec +++ b/openh264.spec @@ -26,6 +26,7 @@ Source3: gst-p-bad-cleanup.sh # https://bugzilla.redhat.com/show_bug.cgi?id=1799497 Patch0: gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: automake From 459630b44c0a6a6edbe72c2fc64171c91ec63832 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 11 Feb 2021 10:46:19 +0100 Subject: [PATCH 41/49] Sort BRs --- openh264.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openh264.spec b/openh264.spec index 3fa76d8..f4f252e 100644 --- a/openh264.spec +++ b/openh264.spec @@ -26,7 +26,6 @@ Source3: gst-p-bad-cleanup.sh # https://bugzilla.redhat.com/show_bug.cgi?id=1799497 Patch0: gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch -BuildRequires: make BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: automake @@ -35,6 +34,7 @@ BuildRequires: gettext-devel BuildRequires: gstreamer1-devel >= %{gst_version} BuildRequires: gstreamer1-plugins-base-devel >= %{gst_version} BuildRequires: libtool +BuildRequires: make BuildRequires: nasm %description From b90746d4ceadef73258033f17d83e15c89d2e394 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 11 Feb 2021 10:52:44 +0100 Subject: [PATCH 42/49] Drop unneeded ldconfig calls These are all handled by triggers now. --- openh264.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/openh264.spec b/openh264.spec index f4f252e..fb9e378 100644 --- a/openh264.spec +++ b/openh264.spec @@ -206,11 +206,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgstopenh264.so popd -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - %files %license LICENSE %doc README.md From 371c707e696bd37479b28eca8c98753f47ab6322 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 11 Feb 2021 13:00:22 +0100 Subject: [PATCH 43/49] Update gstreamer plugin to 1.18.2 ... and also switch the gstreamer plugin to use the meson build system. --- 0001-No-va-test-when-va-disabled.patch | 27 ++++++++ ...eck-opencv_dep-if-option-is-not-disa.patch | 32 ++++++++++ gst-p-bad-cleanup.sh | 23 ++----- ...apt-to-backwards-incompatible-change.patch | 13 ---- hardcode-openh264-dep.patch | 14 ++++ openh264.spec | 64 ++++++++----------- sources | 2 +- 7 files changed, 107 insertions(+), 68 deletions(-) create mode 100644 0001-No-va-test-when-va-disabled.patch create mode 100644 0001-examples-only-check-opencv_dep-if-option-is-not-disa.patch delete mode 100644 gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch create mode 100644 hardcode-openh264-dep.patch diff --git a/0001-No-va-test-when-va-disabled.patch b/0001-No-va-test-when-va-disabled.patch new file mode 100644 index 0000000..1f1fd9c --- /dev/null +++ b/0001-No-va-test-when-va-disabled.patch @@ -0,0 +1,27 @@ +From 3e57512bea64ae9d231441caae96037a96aef2bf Mon Sep 17 00:00:00 2001 +From: Troy Dawson +Date: Mon, 19 Oct 2020 14:09:32 -0700 +Subject: [PATCH] No va test when va disabled + +--- + tests/examples/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/examples/meson.build b/tests/examples/meson.build +index a41fc16..a73c81d 100644 +--- a/tests/examples/meson.build ++++ b/tests/examples/meson.build +@@ -13,7 +13,9 @@ if not get_option('opencv').disabled() + subdir('opencv', if_found: opencv_dep) + endif + subdir('uvch264') +-subdir('va') ++if not get_option('va').disabled() ++ subdir('va') ++endif + subdir('waylandsink') + subdir('webrtc') + +-- +2.18.4 + diff --git a/0001-examples-only-check-opencv_dep-if-option-is-not-disa.patch b/0001-examples-only-check-opencv_dep-if-option-is-not-disa.patch new file mode 100644 index 0000000..a5f1fc2 --- /dev/null +++ b/0001-examples-only-check-opencv_dep-if-option-is-not-disa.patch @@ -0,0 +1,32 @@ +From 9815fd1e2ab13f765b75b39e3764fe1e860cb251 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 10 Sep 2020 10:35:11 -0700 +Subject: [PATCH] examples: only check opencv_dep if option is not disabled + (#1406) + +We can't check opencv_dep if the option is disabled because it's +never initialized in that case, since 833a65cc . + +Signed-off-by: Adam Williamson +--- + tests/examples/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/examples/meson.build b/tests/examples/meson.build +index 2eba1d47e..a41fc1679 100644 +--- a/tests/examples/meson.build ++++ b/tests/examples/meson.build +@@ -9,7 +9,9 @@ subdir('mpegts') + subdir('msdk') + subdir('mxf') + subdir('nvcodec') +-subdir('opencv', if_found: opencv_dep) ++if not get_option('opencv').disabled() ++ subdir('opencv', if_found: opencv_dep) ++endif + subdir('uvch264') + subdir('va') + subdir('waylandsink') +-- +2.28.0 + diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh index e7e3d79..11b0dc6 100755 --- a/gst-p-bad-cleanup.sh +++ b/gst-p-bad-cleanup.sh @@ -44,6 +44,7 @@ dataurisrc dccp debugutils dtmf +dvbsubenc faceoverlay festival fieldanalysis @@ -88,6 +89,8 @@ proxy qtmux rawparse removesilence +rist +rtmp2 rtp rtpmux rtpvp8 @@ -100,7 +103,9 @@ smooth speed stereo subenc +switchbin timecode +transcode tta valve videofilters @@ -168,20 +173,6 @@ for subdir in gst ext sys; do echo "**** Removing $MODULE ****" echo "Removing directory $dir" rm -r $dir || error "Cannot remove $dir" - if grep -q "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac ; then - echo "Removing element check for $MODULE" - grep -v "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac - fi - echo "Removing Makefile generation for $MODULE" - grep -v "$dir/Makefile" configure.ac > configure.ac.new && mv configure.ac.new configure.ac - # Urgh - if test $MODULE = real ; then - grep -v "AG_GST_DISABLE_PLUGIN(real)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac - fi - echo "Removing documentation for $MODULE" - if grep -q "$MODULE" docs/plugins/Makefile.am ; then - grep -v $dir docs/plugins/Makefile.am > docs/plugins/Makefile.am.new && mv docs/plugins/Makefile.am.new docs/plugins/Makefile.am - fi echo elif test $subdir = ext || test $subdir = sys; then # Ignore library or system non-blacklisted plugins @@ -201,10 +192,6 @@ if test "x$unknown" != "x"; then exit 1 fi -#autoreconf -NOCONFIGURE=1 \ -./autogen.sh - popd > /dev/null tar cJf $NEW_SOURCE $DIRECTORY diff --git a/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch b/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch deleted file mode 100644 index 817b842..0000000 --- a/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNp gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak gst-plugins-bad-1.16.2/common/gst-glib-gen.mak ---- gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak 2020-03-20 14:57:08.587740695 +0100 -+++ gst-plugins-bad-1.16.2/common/gst-glib-gen.mak 2020-03-20 15:00:42.584798988 +0100 -@@ -8,7 +8,8 @@ - #glib_gen_decl_banner=GST_EXPORT - #glib_gen_decl_include=\#include - --enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+hash:=\# -+enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") - - # these are all the rules generating the relevant files - $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list diff --git a/hardcode-openh264-dep.patch b/hardcode-openh264-dep.patch new file mode 100644 index 0000000..fbedcd9 --- /dev/null +++ b/hardcode-openh264-dep.patch @@ -0,0 +1,14 @@ +diff -up gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig gst-plugins-bad-1.18.2/ext/openh264/meson.build +--- gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig 2020-12-06 14:24:13.000000000 +0100 ++++ gst-plugins-bad-1.18.2/ext/openh264/meson.build 2021-02-11 11:48:58.660450319 +0100 +@@ -4,9 +4,7 @@ openh264_sources = [ + 'gstopenh264plugin.c', + ] + +-openh264_dep = dependency('openh264', version : '>= 1.3.0', +- required : get_option('openh264'), +- fallback: ['openh264', 'openh264_dep']) ++openh264_dep = cc.find_library('openh264') + + if openh264_dep.found() + gstopenh264 = library('gstopenh264', diff --git a/openh264.spec b/openh264.spec index fb9e378..562368d 100644 --- a/openh264.spec +++ b/openh264.spec @@ -4,12 +4,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global openh264_version 2.1.1 -%global gst_version 1.16.2 +%global gst_version 1.18.2 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 1%{?dist} +Release: 2%{?dist} Summary: H.264 codec library License: BSD @@ -22,19 +22,21 @@ Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{ Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz Source3: gst-p-bad-cleanup.sh -# https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4 -# https://bugzilla.redhat.com/show_bug.cgi?id=1799497 -Patch0: gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch +# Fix build failure with opencv disabled: +# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1406 +# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1570 +Patch0: 0001-examples-only-check-opencv_dep-if-option-is-not-disa.patch +# Fix build failure with va disabled: +Patch1: 0001-No-va-test-when-va-disabled.patch + +# Don't use pkg-config for finding openh264 as we are building against an in-tree copy +Patch2: hardcode-openh264-dep.patch BuildRequires: gcc-c++ -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: chrpath -BuildRequires: gettext-devel BuildRequires: gstreamer1-devel >= %{gst_version} BuildRequires: gstreamer1-plugins-base-devel >= %{gst_version} -BuildRequires: libtool BuildRequires: make +BuildRequires: meson BuildRequires: nasm %description @@ -63,7 +65,7 @@ browsers. %package -n gstreamer1-plugin-openh264 Version: %{gst_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: GStreamer H.264 plugin Supplements: totem%{?_isa} @@ -85,6 +87,8 @@ mv gmp-api-%{commit1} gmp-api tar -xf %{S:2} pushd gst-plugins-bad-%{gst_version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 popd # Update the makefile with our build options @@ -106,17 +110,14 @@ make plugin %{?_smp_mflags} # openh264 libraries pushd gst-plugins-bad-%{gst_version} ln -s ../codec/api/svc wels -export OPENH264_CFLAGS="-I." -export OPENH264_LIBS="-L`pwd`/.. -lopenh264" -autoreconf --force --install -%configure \ - --with-package-name="Fedora gstreamer1-plugin-openh264 package" \ - --with-package-origin="http://www.openh264.org/" \ - --disable-static \ - --disable-gl \ - --disable-hls \ - --enable-openh264 -make V=1 %{?_smp_mflags} +CFLAGS="%{build_cflags} -I." \ +LDFLAGS="%{build_ldflags} -L`pwd`/.." \ +%meson \ + --auto-features=disabled \ + -D package-name="Fedora gstreamer1-plugin-openh264 package" \ + -D package-origin="http://www.openh264.org/" \ + -D openh264=enabled +%meson_build popd @@ -144,7 +145,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a # Install the gstreamer plugin pushd gst-plugins-bad-%{gst_version} -%make_install +%meson_install # Register as an AppStream component to be visible in the software center # @@ -185,24 +186,12 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-openh264.appdata.xml < EOF -# Remove libtool .la files -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - # Remove unwanted gst-plugins-bad files +rm -rf $RPM_BUILD_ROOT%{_bindir}/gst-transcoder-1.0 rm -rf $RPM_BUILD_ROOT%{_includedir}/gstreamer-1.0/ -rm -rf $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/Gst*.typelib rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gstreamer-*.pc rm -rf $RPM_BUILD_ROOT%{_libdir}/libgst*.so* -rm -rf $RPM_BUILD_ROOT%{_datadir}/gir-1.0/Gst*.gir rm -rf $RPM_BUILD_ROOT%{_datadir}/gstreamer-1.0/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gst-plugins-bad*/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*/*/gst-plugins-bad-1.0.mo - -# Only keep libgstopenh264.so -find $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/ -not -name 'libgstopenh264.so' -type f | xargs rm - -# Kill rpath -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgstopenh264.so popd @@ -231,6 +220,9 @@ popd %changelog +* Thu Feb 11 2021 Kalev Lember - 2.1.1-2 +- Update gstreamer plugin to 1.18.2 + * Fri May 22 2020 Kalev Lember - 2.1.1-1 - Update to 2.1.1 - Add totem supplements to gstreamer1-plugin-openh264 diff --git a/sources b/sources index 0279331..acacf0d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 -SHA512 (gst-plugins-bad-openh264-1.16.2.tar.xz) = 02bbd2bda02b1edc6a7e25d5131107122ddaa963aa1fc94c2b869356290591e704d0f31d6a139099488a4151486183f7bb834e24d67831f72e56965c32fdd86f +SHA512 (gst-plugins-bad-openh264-1.18.2.tar.xz) = a62e4715e79604d11f495ae01816b0caf6f7f6d3023cbe0d54b0e56933dc89a911ffed950a57325153bf5c899219893705926c34d29789ef45fe03385d86d758 SHA512 (openh264-2.1.1.tar.gz) = f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79 From 8dbfd9eb81a8b93ebab3f9d0af7d8bca013e0d80 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 11 Feb 2021 13:06:52 +0100 Subject: [PATCH 44/49] Remove totem supplements totem has recommends on gstreamer1-plugin-openh264 instead. --- openh264.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openh264.spec b/openh264.spec index 562368d..5f187c7 100644 --- a/openh264.spec +++ b/openh264.spec @@ -67,7 +67,6 @@ browsers. Version: %{gst_version} Release: 1%{?dist} Summary: GStreamer H.264 plugin -Supplements: totem%{?_isa} %description -n gstreamer1-plugin-openh264 GStreamer is a streaming media framework, based on graphs of elements which @@ -222,6 +221,8 @@ popd %changelog * Thu Feb 11 2021 Kalev Lember - 2.1.1-2 - Update gstreamer plugin to 1.18.2 +- Remove totem supplements as totem has recommends on + gstreamer1-plugin-openh264 instead * Fri May 22 2020 Kalev Lember - 2.1.1-1 - Update to 2.1.1 From 4e8e42802bd30e04d456d14c9598ef223c2077b2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 11 Feb 2021 13:44:59 +0100 Subject: [PATCH 45/49] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1bed52b..2febc72 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /openh264-a60e28e.tar.gz /gst-plugins-bad-openh264-1.16.2.tar.xz /openh264-2.1.1.tar.gz +/gst-plugins-bad-openh264-1.18.2.tar.xz From 4db9eb80f5f146027257777c564fa3376a42526d Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 16 Mar 2022 09:20:12 +0000 Subject: [PATCH 46/49] Update to 2.2.0 Update gmp-api to commit 3a01c08. --- .gitignore | 2 ++ openh264.spec | 16 ++++++++++------ sources | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2febc72..1c33a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /gst-plugins-bad-openh264-1.16.2.tar.xz /openh264-2.1.1.tar.gz /gst-plugins-bad-openh264-1.18.2.tar.xz +/openh264-2.2.0.tar.gz +/gmp-api-3a01c08.tar.gz diff --git a/openh264.spec b/openh264.spec index 5f187c7..cad2b55 100644 --- a/openh264.spec +++ b/openh264.spec @@ -1,19 +1,19 @@ # To get the gmp-api commit to use, run: # rm -rf gmp-api;make gmp-bootstrap;cd gmp-api;git rev-parse HEAD -%global commit1 c5f1d0f3213178818cbfb3e16f31d07328980560 +%global commit1 3a01c086d1b0394238ff1b5ad22e76022830625a %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.1.1 +%global openh264_version 2.2.0 %global gst_version 1.18.2 Name: openh264 Version: %{openh264_version} # Also bump the Release tag for gstreamer1-plugin-openh264 down below -Release: 2%{?dist} +Release: 1%{?dist} Summary: H.264 codec library License: BSD -URL: http://www.openh264.org/ +URL: https://www.openh264.org/ Source0: https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz # The source is: @@ -90,15 +90,16 @@ pushd gst-plugins-bad-%{gst_version} %patch2 -p1 popd + +%build # Update the makefile with our build options +# Must be done in %%build in order to pick up correct LDFLAGS. sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile sed -i -e 's|^PREFIX=.*$|PREFIX=%{_prefix}|' Makefile sed -i -e 's|^LIBDIR_NAME=.*$|LIBDIR_NAME=%{_lib}|' Makefile sed -i -e 's|^SHAREDLIB_DIR=.*$|SHAREDLIB_DIR=%{_libdir}|' Makefile sed -i -e '/^CFLAGS_OPT=/i LDFLAGS=%{__global_ldflags}' Makefile - -%build # First build the openh264 libraries make %{?_smp_mflags} @@ -219,6 +220,9 @@ popd %changelog +* Wed Mar 16 2022 David King - 2.2.0-1 +- Update to 2.2.0 + * Thu Feb 11 2021 Kalev Lember - 2.1.1-2 - Update gstreamer plugin to 1.18.2 - Remove totem supplements as totem has recommends on diff --git a/sources b/sources index acacf0d..6082505 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574 +SHA512 (openh264-2.2.0.tar.gz) = 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38 +SHA512 (gmp-api-3a01c08.tar.gz) = a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874 SHA512 (gst-plugins-bad-openh264-1.18.2.tar.xz) = a62e4715e79604d11f495ae01816b0caf6f7f6d3023cbe0d54b0e56933dc89a911ffed950a57325153bf5c899219893705926c34d29789ef45fe03385d86d758 -SHA512 (openh264-2.1.1.tar.gz) = f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79 From e3fb712b677415b35ca20f56606793eedd06320e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 1 Aug 2022 17:09:53 +0200 Subject: [PATCH 47/49] Update to 2.3.0 --- .gitignore | 1 + openh264.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1c33a9f..dc5477a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /gst-plugins-bad-openh264-1.18.2.tar.xz /openh264-2.2.0.tar.gz /gmp-api-3a01c08.tar.gz +/openh264-2.3.0.tar.gz diff --git a/openh264.spec b/openh264.spec index cad2b55..8c7e3f1 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,7 +3,7 @@ %global commit1 3a01c086d1b0394238ff1b5ad22e76022830625a %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.2.0 +%global openh264_version 2.3.0 %global gst_version 1.18.2 Name: openh264 @@ -109,8 +109,8 @@ make plugin %{?_smp_mflags} # ... and finally build the gstreamer plugin against the previously built # openh264 libraries pushd gst-plugins-bad-%{gst_version} -ln -s ../codec/api/svc wels -CFLAGS="%{build_cflags} -I." \ +CFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ +CXXFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ LDFLAGS="%{build_ldflags} -L`pwd`/.." \ %meson \ --auto-features=disabled \ @@ -220,6 +220,9 @@ popd %changelog +* Mon Aug 01 2022 Kalev Lember - 2.3.0-1 +- Update to 2.3.0 + * Wed Mar 16 2022 David King - 2.2.0-1 - Update to 2.2.0 diff --git a/sources b/sources index 6082505..1b45e2c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (openh264-2.2.0.tar.gz) = 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38 SHA512 (gmp-api-3a01c08.tar.gz) = a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874 SHA512 (gst-plugins-bad-openh264-1.18.2.tar.xz) = a62e4715e79604d11f495ae01816b0caf6f7f6d3023cbe0d54b0e56933dc89a911ffed950a57325153bf5c899219893705926c34d29789ef45fe03385d86d758 +SHA512 (openh264-2.3.0.tar.gz) = 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd From 60ff205441c4313838fdea8d888e77e3e4f450ea Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 29 Sep 2022 18:12:20 +0200 Subject: [PATCH 48/49] Update to 2.3.1 --- .gitignore | 1 + openh264.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc5477a..ea455ad 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /openh264-2.2.0.tar.gz /gmp-api-3a01c08.tar.gz /openh264-2.3.0.tar.gz +/openh264-2.3.1.tar.gz diff --git a/openh264.spec b/openh264.spec index 8c7e3f1..f8644bb 100644 --- a/openh264.spec +++ b/openh264.spec @@ -3,7 +3,7 @@ %global commit1 3a01c086d1b0394238ff1b5ad22e76022830625a %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.3.0 +%global openh264_version 2.3.1 %global gst_version 1.18.2 Name: openh264 @@ -198,7 +198,7 @@ popd %files %license LICENSE %doc README.md -%{_libdir}/libopenh264.so.6 +%{_libdir}/libopenh264.so.7 %{_libdir}/libopenh264.so.%{openh264_version} %files devel @@ -220,6 +220,9 @@ popd %changelog +* Thu Sep 29 2022 Kalev Lember - 2.3.1-1 +- Update to 2.3.1 + * Mon Aug 01 2022 Kalev Lember - 2.3.0-1 - Update to 2.3.0 diff --git a/sources b/sources index 1b45e2c..f7027d6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gmp-api-3a01c08.tar.gz) = a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874 SHA512 (gst-plugins-bad-openh264-1.18.2.tar.xz) = a62e4715e79604d11f495ae01816b0caf6f7f6d3023cbe0d54b0e56933dc89a911ffed950a57325153bf5c899219893705926c34d29789ef45fe03385d86d758 -SHA512 (openh264-2.3.0.tar.gz) = 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd +SHA512 (openh264-2.3.1.tar.gz) = fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1 From 52cdaec2a569e98ba4fda3f3b7990a8cd1bcc9cb Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 22 Nov 2023 16:39:24 +0300 Subject: [PATCH 49/49] Remove unnecessary files --- SPECS/openh264.spec | 309 ++++++++++++++++++++++++++++++++++++++++++++ sources | 3 - 2 files changed, 309 insertions(+), 3 deletions(-) create mode 100644 SPECS/openh264.spec delete mode 100644 sources diff --git a/SPECS/openh264.spec b/SPECS/openh264.spec new file mode 100644 index 0000000..f8644bb --- /dev/null +++ b/SPECS/openh264.spec @@ -0,0 +1,309 @@ +# To get the gmp-api commit to use, run: +# rm -rf gmp-api;make gmp-bootstrap;cd gmp-api;git rev-parse HEAD +%global commit1 3a01c086d1b0394238ff1b5ad22e76022830625a +%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) + +%global openh264_version 2.3.1 +%global gst_version 1.18.2 + +Name: openh264 +Version: %{openh264_version} +# Also bump the Release tag for gstreamer1-plugin-openh264 down below +Release: 1%{?dist} +Summary: H.264 codec library + +License: BSD +URL: https://www.openh264.org/ +Source0: https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz +Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz +# The source is: +# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz +# modified with gst-p-bad-cleanup.sh from SOURCE3 +Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz +Source3: gst-p-bad-cleanup.sh + +# Fix build failure with opencv disabled: +# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1406 +# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1570 +Patch0: 0001-examples-only-check-opencv_dep-if-option-is-not-disa.patch +# Fix build failure with va disabled: +Patch1: 0001-No-va-test-when-va-disabled.patch + +# Don't use pkg-config for finding openh264 as we are building against an in-tree copy +Patch2: hardcode-openh264-dep.patch + +BuildRequires: gcc-c++ +BuildRequires: gstreamer1-devel >= %{gst_version} +BuildRequires: gstreamer1-plugins-base-devel >= %{gst_version} +BuildRequires: make +BuildRequires: meson +BuildRequires: nasm + +%description +OpenH264 is a codec library which supports H.264 encoding and decoding. It is +suitable for use in real time applications such as WebRTC. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{openh264_version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package -n mozilla-openh264 +Summary: H.264 codec support for Mozilla browsers +Requires: %{name}%{?_isa} = %{openh264_version}-%{release} +Requires: mozilla-filesystem%{?_isa} + +%description -n mozilla-openh264 +The mozilla-openh264 package contains a H.264 codec plugin for Mozilla +browsers. + + +%package -n gstreamer1-plugin-openh264 +Version: %{gst_version} +Release: 1%{?dist} +Summary: GStreamer H.264 plugin + +%description -n gstreamer1-plugin-openh264 +GStreamer is a streaming media framework, based on graphs of elements which +operate on media data. + +This package contains the H.264 plugin. + + +%prep +%setup -q + +# Extract gmp-api archive +tar -xf %{S:1} +mv gmp-api-%{commit1} gmp-api + +# Extract gst-plugins-bad-free archive +tar -xf %{S:2} +pushd gst-plugins-bad-%{gst_version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +popd + + +%build +# Update the makefile with our build options +# Must be done in %%build in order to pick up correct LDFLAGS. +sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile +sed -i -e 's|^PREFIX=.*$|PREFIX=%{_prefix}|' Makefile +sed -i -e 's|^LIBDIR_NAME=.*$|LIBDIR_NAME=%{_lib}|' Makefile +sed -i -e 's|^SHAREDLIB_DIR=.*$|SHAREDLIB_DIR=%{_libdir}|' Makefile +sed -i -e '/^CFLAGS_OPT=/i LDFLAGS=%{__global_ldflags}' Makefile + +# First build the openh264 libraries +make %{?_smp_mflags} + +# ... then build the mozilla plugin +make plugin %{?_smp_mflags} + +# ... and finally build the gstreamer plugin against the previously built +# openh264 libraries +pushd gst-plugins-bad-%{gst_version} +CFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ +CXXFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ +LDFLAGS="%{build_ldflags} -L`pwd`/.." \ +%meson \ + --auto-features=disabled \ + -D package-name="Fedora gstreamer1-plugin-openh264 package" \ + -D package-origin="http://www.openh264.org/" \ + -D openh264=enabled +%meson_build +popd + + +%install +%make_install + +# Install mozilla plugin +mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed +cp -a libgmpopenh264.so* gmpopenh264.info $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed/ + +mkdir -p $RPM_BUILD_ROOT%{_libdir}/firefox/defaults/pref +cat > $RPM_BUILD_ROOT%{_libdir}/firefox/defaults/pref/gmpopenh264.js << EOF +pref("media.gmp-gmpopenh264.autoupdate", false); +pref("media.gmp-gmpopenh264.version", "system-installed"); +EOF + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +cat > $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/gmpopenh264.sh << EOF +MOZ_GMP_PATH="%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed" +export MOZ_GMP_PATH +EOF + +# Remove static libraries +rm $RPM_BUILD_ROOT%{_libdir}/*.a + +# Install the gstreamer plugin +pushd gst-plugins-bad-%{gst_version} +%meson_install + +# Register as an AppStream component to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-openh264.appdata.xml < + + + gstreamer-openh264 + CC0-1.0 + GStreamer Multimedia Codecs - H.264 + Multimedia playback for H.264 + +

+ This addon includes a codec for H.264 playback and encoding. +

+

+ These codecs can be used to encode and decode media files where the + format is not patent encumbered. +

+

+ A codec decodes audio and video for playback or editing and is also + used for transmission or storage. + Different codecs are used in video-conferencing, streaming media and + video editing applications. +

+ + http://gstreamer.freedesktop.org/ + https://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer + http://gstreamer.freedesktop.org/documentation/ + http://www.gnome.org/friends/ + + +EOF + +# Remove unwanted gst-plugins-bad files +rm -rf $RPM_BUILD_ROOT%{_bindir}/gst-transcoder-1.0 +rm -rf $RPM_BUILD_ROOT%{_includedir}/gstreamer-1.0/ +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gstreamer-*.pc +rm -rf $RPM_BUILD_ROOT%{_libdir}/libgst*.so* +rm -rf $RPM_BUILD_ROOT%{_datadir}/gstreamer-1.0/ +popd + + +%files +%license LICENSE +%doc README.md +%{_libdir}/libopenh264.so.7 +%{_libdir}/libopenh264.so.%{openh264_version} + +%files devel +%{_includedir}/wels/ +%{_libdir}/libopenh264.so +%{_libdir}/pkgconfig/openh264.pc + +%files -n mozilla-openh264 +%{_sysconfdir}/profile.d/gmpopenh264.sh +%dir %{_libdir}/firefox +%dir %{_libdir}/firefox/defaults +%dir %{_libdir}/firefox/defaults/pref +%{_libdir}/firefox/defaults/pref/gmpopenh264.js +%{_libdir}/mozilla/plugins/gmp-gmpopenh264/ + +%files -n gstreamer1-plugin-openh264 +%{_datadir}/appdata/*.appdata.xml +%{_libdir}/gstreamer-1.0/libgstopenh264.so + + +%changelog +* Thu Sep 29 2022 Kalev Lember - 2.3.1-1 +- Update to 2.3.1 + +* Mon Aug 01 2022 Kalev Lember - 2.3.0-1 +- Update to 2.3.0 + +* Wed Mar 16 2022 David King - 2.2.0-1 +- Update to 2.2.0 + +* Thu Feb 11 2021 Kalev Lember - 2.1.1-2 +- Update gstreamer plugin to 1.18.2 +- Remove totem supplements as totem has recommends on + gstreamer1-plugin-openh264 instead + +* Fri May 22 2020 Kalev Lember - 2.1.1-1 +- Update to 2.1.1 +- Add totem supplements to gstreamer1-plugin-openh264 + +* Tue Mar 10 2020 Kalev Lember - 2.1.0-1 +- Update to 2.1.0 +- Update gstreamer plugin to 1.16.2 + +* Mon Jun 17 2019 Kalev Lember - 2.0.0-1 +- Update openh264 to 2.0.0 +- Update gstreamer plugin to 1.16.0 + +* Fri Feb 22 2019 Kalev Lember - 1.8.0-3 +- Update gstreamer plugin to 1.15.1 + +* Wed Sep 12 2018 Kalev Lember - 1.8.0-2 +- Update gstreamer plugin to 1.14.2 + +* Wed Jun 27 2018 Kalev Lember - 1.8.0-1 +- Update openh264 to 1.8.0 +- Update gstreamer plugin to 1.14.1 + +* Tue Mar 06 2018 Kalev Lember - 1.7.0-6 +- Update gstreamer plugin to 1.13.90 + +* Sat Dec 16 2017 Kalev Lember - 1.7.0-5 +- Update gstreamer plugin to 1.12.4 + +* Tue Sep 19 2017 Kalev Lember - 1.7.0-4 +- Update gstreamer plugin to 1.12.3 + +* Thu Jul 20 2017 Kalev Lember - 1.7.0-3 +- Update gstreamer plugin to 1.12.2 + +* Tue Jun 20 2017 Kalev Lember - 1.7.0-2 +- Update gstreamer plugin to 1.12.1 + +* Fri Jun 16 2017 Kalev Lember - 1.7.0-1 +- Update openh264 to 1.7.0 +- Update gstreamer plugin to 1.12.0 + +* Mon Mar 06 2017 Kalev Lember - 1.6.0-5 +- Update gstreamer plugin to 1.10.4 + +* Mon Jan 30 2017 Kalev Lember - 1.6.0-4 +- Update gstreamer plugin to 1.10.3 + +* Mon Dec 05 2016 Kalev Lember - 1.6.0-3 +- Update gstreamer plugin to 1.10.2 + +* Fri Sep 02 2016 Kalev Lember - 1.6.0-2 +- Update gstreamer plugin to 1.9.2 + +* Thu Aug 25 2016 Kalev Lember - 1.6.0-1 +- Update openh264 to 1.6.0 +- Update gstreamer plugin to 1.8.3 + +* Thu Apr 28 2016 Kalev Lember - 1.5.3-0.1.git2706e36 +- Update openh264 to 1.5.3 git snapshot +- Update gstreamer plugin to 1.8.1 + +* Mon Mar 21 2016 Dennis Gilmore - 1.5.2-0.4.git21e44bd +- move the mozila-openh264 definition before gstreamer1-plugin-openh264 +- gstreamer1-plugin-openh264 redefines version and release messing up requires + +* Mon Nov 30 2015 Kalev Lember - 1.5.2-0.3.git21e44bd +- Include the gstreamer plugin in gstreamer1-plugin-openh264 subpackage + +* Thu Nov 26 2015 Kalev Lember - 1.5.2-0.2.git21e44bd +- Pass Fedora LDFLAGS to the build to get full relro (#1285338) + +* Tue Nov 24 2015 Kalev Lember - 1.5.2-0.1.git21e44bd +- Initial Fedora packaging diff --git a/sources b/sources deleted file mode 100644 index f7027d6..0000000 --- a/sources +++ /dev/null @@ -1,3 +0,0 @@ -SHA512 (gmp-api-3a01c08.tar.gz) = a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874 -SHA512 (gst-plugins-bad-openh264-1.18.2.tar.xz) = a62e4715e79604d11f495ae01816b0caf6f7f6d3023cbe0d54b0e56933dc89a911ffed950a57325153bf5c899219893705926c34d29789ef45fe03385d86d758 -SHA512 (openh264-2.3.1.tar.gz) = fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1