Compare commits

...

24 Commits
epel9 ... f38

Author SHA1 Message Date
Kalev Lember f866109211 Update gstreamer plugin to 1.22.9
1 year ago
Kalev Lember 2f9cd7c0c7 Sync gst-p-bad-cleanup.sh changes from gstreamer1-plugins-bad-free
1 year ago
Kalev Lember 7260bf6f4f Update to 2.4.1
1 year ago
Kalev Lember 3f2dfe0ea6 Reapply "Update gstreamer plugin to 1.22.7"
1 year ago
Kalev Lember d562a30a7b Revert "Update gstreamer plugin to 1.22.7"
1 year ago
Kalev Lember 5b52b0fe9b Filter out soname provides for mozilla gmp plugin
1 year ago
Kalev Lember 7367e268bd Guard MOZ_GMP_PATH for multiple inclusion
1 year ago
Kalev Lember e93b31c864 Fix off by one regression in decoder
1 year ago
Kalev Lember 7f3ed0363c Use SPDX license identifiers
1 year ago
Kalev Lember 166fe5bfeb Obsolete noopenh264 stub package
1 year ago
Kalev Lember 426f80b2ef Update gstreamer plugin to 1.22.7
1 year ago
Kalev Lember bd4bcb3462 Update to 2.4.0
1 year ago
Kalev Lember f6becfbecf Merge #2 `Set MOZ_GMP_PATH for fish user shell`
1 year ago
NoisyCoil b1cd1196f7 Set MOZ_GMP_PATH for fish user shell
1 year ago
NoisyCoil 01e104cfc7 Do not interpret /etc/profile.d here document
1 year ago
Dominik 'Rathann' Mierzejewski 10b5521dd0 Add Mozilla plugin path to MOZ_GMP_PATH instead of overriding unconditionally
1 year ago
Kalev Lember 93e5800314 Update gstreamer plugin to 1.22.1
2 years ago
Kalev Lember a143f9ccd2 Update to 2.3.1
2 years ago
Kalev Lember 5c90e5ba1d Rebuild
3 years ago
Kalev Lember 5575b57ec4 Drop upstreamed patch
3 years ago
Kalev Lember ba4c2e115d Update gstreamer plugin to 1.20.3
3 years ago
Kalev Lember 48485a8287 Update to 2.3.0
3 years ago
David King 2d683c4280 Update to 2.2.0
3 years ago
Kalev Lember 3c0784a92d Update gstreamer plugin to 1.19.1
3 years ago

13
.gitignore vendored

@ -24,3 +24,16 @@
/gst-plugins-bad-openh264-1.16.2.tar.xz
/openh264-2.1.1.tar.gz
/gst-plugins-bad-openh264-1.18.2.tar.xz
/gst-plugins-bad-openh264-1.19.1.tar.xz
/openh264-2.2.0.tar.gz
/gmp-api-3a01c08.tar.gz
/gst-plugins-bad-openh264-1.20.0.tar.xz
/openh264-2.3.0.tar.gz
/gst-plugins-bad-openh264-1.20.3.tar.xz
/openh264-2.3.1.tar.gz
/gst-plugins-bad-openh264-1.22.1.tar.xz
/openh264-2.4.0.tar.gz
/gmp-api-e7d30b9.tar.gz
/gst-plugins-bad-openh264-1.22.7.tar.xz
/openh264-2.4.1.tar.gz
/gst-plugins-bad-openh264-1.22.9.tar.xz

@ -1,27 +0,0 @@
From 3e57512bea64ae9d231441caae96037a96aef2bf Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
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

@ -1,32 +0,0 @@
From 9815fd1e2ab13f765b75b39e3764fe1e860cb251 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
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 <awilliam@redhat.com>
---
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

@ -37,6 +37,8 @@ bayer
camerabin
camerabin2
cdxaparse
codecalpha
codectimestamper
coloreffects
colorspace
compositor
@ -45,6 +47,7 @@ dccp
debugutils
dtmf
dvbsubenc
dvbsuboverlay
faceoverlay
festival
fieldanalysis
@ -99,6 +102,7 @@ sdi
sdp
segmentclip
selector
siren
smooth
speed
stereo
@ -120,10 +124,7 @@ y4m
"
NOT_ALLOWED="
dvbsuboverlay
dvdspu
real
siren
"
error()

@ -1,19 +1,22 @@
# 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 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
%global openh264_version 2.1.1
%global gst_version 1.18.2
%global openh264_version 2.4.1
%global gst_version 1.22.9
# Filter out soname provides for the mozilla plugin
%global __provides_exclude_from ^%{_libdir}/mozilla/plugins/
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/
License: BSD-2-Clause
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:
@ -22,13 +25,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
# 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
@ -39,6 +35,9 @@ BuildRequires: make
BuildRequires: meson
BuildRequires: nasm
# Replace the stub package
Obsoletes: noopenh264 < 1:0
%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.
@ -47,6 +46,8 @@ suitable for use in real time applications such as WebRTC.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{openh264_version}-%{release}
# Replace the stub package
Obsoletes: noopenh264-devel < 1:0
%description devel
The %{name}-devel package contains libraries and header files for
@ -85,20 +86,19 @@ 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
%build
# First build the openh264 libraries
make %{?_smp_mflags}
@ -108,8 +108,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 \
@ -134,9 +134,21 @@ 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
cat > $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/gmpopenh264.sh << 'EOF'
if [[ ":$MOZ_GMP_PATH:" != *":%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed:"* ]]; then
MOZ_GMP_PATH="${MOZ_GMP_PATH}${MOZ_GMP_PATH:+:}%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed"
export MOZ_GMP_PATH
fi
EOF
mkdir -p $RPM_BUILD_ROOT%{_datadir}/fish/vendor_conf.d
cat > $RPM_BUILD_ROOT%{_datadir}/fish/vendor_conf.d/gmpopenh264.fish << 'EOF'
set -x --path MOZ_GMP_PATH $MOZ_GMP_PATH
set dir %{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed
if not contains $dir $MOZ_GMP_PATH
set -p MOZ_GMP_PATH $dir
end
set -e dir
EOF
# Remove static libraries
@ -197,7 +209,7 @@ popd
%files
%license LICENSE
%doc README.md
%{_libdir}/libopenh264.so.6
%{_libdir}/libopenh264.so.7
%{_libdir}/libopenh264.so.%{openh264_version}
%files devel
@ -212,6 +224,9 @@ popd
%dir %{_libdir}/firefox/defaults/pref
%{_libdir}/firefox/defaults/pref/gmpopenh264.js
%{_libdir}/mozilla/plugins/gmp-gmpopenh264/
%dir %{_datadir}/fish
%dir %{_datadir}/fish/vendor_conf.d
%{_datadir}/fish/vendor_conf.d/gmpopenh264.fish
%files -n gstreamer1-plugin-openh264
%{_datadir}/appdata/*.appdata.xml
@ -219,6 +234,48 @@ popd
%changelog
* Fri Feb 02 2024 Kalev Lember <klember@redhat.com> - 2.4.1-1
- Update to 2.4.1
- Update gstreamer plugin to 1.22.9
* Mon Dec 04 2023 Kalev Lember <klember@redhat.com> - 2.4.0-2
- Fix off by one regression in decoder
- Filter out soname provides for mozilla gmp plugin
* Fri Nov 24 2023 Kalev Lember <klember@redhat.com> - 2.4.0-1
- Update to 2.4.0
- Update gstreamer plugin to 1.22.7
- Obsolete noopenh264 stub package
- Use SPDX license identifiers
* Wed Nov 22 2023 NoisyCoil <noisycoil@tutanota.com> - 2.3.1-4
- Set MOZ_GMP_PATH for fish user shell
- Partially resolves: rhbz#2250527
* Thu Aug 17 2023 Dominik Mierzejewski <dominik@greysector.net> - 2.3.1-3
- Add Mozilla plugin path to MOZ_GMP_PATH instead of overriding unconditionally
- Resolves: rhbz#2225112
* Mon Mar 13 2023 Kalev Lember <klember@redhat.com> - 2.3.1-2
- Update gstreamer plugin to 1.22.1
* Thu Sep 29 2022 Kalev Lember <klember@redhat.com> - 2.3.1-1
- Update to 2.3.1
* Wed Aug 10 2022 Kalev Lember <klember@redhat.com> - 2.3.0-2
- Rebuild
* Mon Aug 01 2022 Kalev Lember <klember@redhat.com> - 2.3.0-1
- Update to 2.3.0
- Update gstreamer plugin to 1.20.3
* Wed Mar 16 2022 David King <amigadave@amigadave.com> - 2.2.0-1
- Update to 2.2.0
- Update gstreamer plugin to 1.20.0
* Tue Sep 07 2021 Kalev Lember <klember@redhat.com> - 2.1.1-3
- Update gstreamer plugin to 1.19.1
* Thu Feb 11 2021 Kalev Lember <klember@redhat.com> - 2.1.1-2
- Update gstreamer plugin to 1.18.2
- Remove totem supplements as totem has recommends on

@ -1,3 +1,3 @@
SHA512 (gmp-api-c5f1d0f.tar.gz) = 20bf28b117b4d1d24ee659809940f14e9985757fc09fff1e900feac3f17343033c38248782c4d6c3f15a0eeb1f994c4d91283a3b2131ea94b83e340cd54ef574
SHA512 (gst-plugins-bad-openh264-1.18.2.tar.xz) = a62e4715e79604d11f495ae01816b0caf6f7f6d3023cbe0d54b0e56933dc89a911ffed950a57325153bf5c899219893705926c34d29789ef45fe03385d86d758
SHA512 (openh264-2.1.1.tar.gz) = f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79
SHA512 (gmp-api-e7d30b9.tar.gz) = f1c75007d4f1e1ef3a11b8eb9c703935408a5e4051c8eab408e4edc09f265a71f172025269442fdab9d4c2a8b108fa69397bfbd84af4ecda22881b50de804de9
SHA512 (gst-plugins-bad-openh264-1.22.9.tar.xz) = c2822f8db2a9ba2af7c7f3ad3910f17cfeaded2efe18ac1a1ebc78eb61363153fd2b682fe7edcd915689b61111923523a54062b4dafba539a7178a5949e7ff6a
SHA512 (openh264-2.4.1.tar.gz) = eb99144addd2e9c352bb95e752366e104ac6b0ddc84311dc7c87dafb803f8e7fe4d1e726833d49f8cc6d3914508e19c3a25ef82637a4993e8af3f504aa005baf

Loading…
Cancel
Save