[rfpkg/el8] (5 commits) ...Rebuild for python-3.8
by Leigh Scott
Summary of changes:
b17af39... Patch F30 to use python3 (*)
0950819... Add requires and Buildrequires python3-future (*)
435b206... Fix python2 shebang in python3 build (*)
7d80e7e... Fix --dist/--release option for 'master' %dist detection (*)
e04bd8f... Rebuild for python-3.8 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[libva-intel-driver] Adapt for el8
by Nicolas Chauvet
commit 8a3d216de30b3cbcf27abadc2a0d8831c5686bca
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Sep 23 17:25:14 2019 +0200
Adapt for el8
libva-intel-driver.spec | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/libva-intel-driver.spec b/libva-intel-driver.spec
index 071f46e..3035481 100644
--- a/libva-intel-driver.spec
+++ b/libva-intel-driver.spec
@@ -1,8 +1,11 @@
#global _with_gen4asm 1
+%if 0%{?rhel}
+%global _without_wayland 1
+%endif
Name: libva-intel-driver
Version: 2.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: HW video decode support for Intel integrated graphics
License: MIT and EPL
URL: https://01.org/linuxmediag
@@ -16,28 +19,25 @@ Patch0: 427.patch
ExclusiveArch: %{ix86} x86_64
BuildRequires: libtool
+BuildRequires: gcc
BuildRequires: python2
-%if 0%{?fedora} >= 28
# AppStream metadata generation
BuildRequires: libappstream-glib >= 0.6.3
-%endif
#Renamed when moved to 01.org
Provides: intel-vaapi-driver = %{version}-%{release}
%{?_with_gen4asm:BuildRequires: pkgconfig(intel-gen4asm)}
-BuildRequires: pkgconfig(libudev)
-BuildRequires: libXext-devel
-BuildRequires: libXfixes-devel
-BuildRequires: libdrm-devel >= 2.4.23
-BuildRequires: libpciaccess-devel
-BuildRequires: pkgconfig(libva) >= 1.0.0
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libEGL-devel
+BuildRequires: systemd%{?_isa}
+BuildRequires: libXext-devel%{?_isa}
+BuildRequires: libXfixes-devel%{?_isa}
+BuildRequires: libdrm-devel%{?_isa}
+BuildRequires: libpciaccess-devel%{?_isa}
+BuildRequires: libva-devel%{?_isa}
+BuildRequires: libGL-devel%{?_isa}
+BuildRequires: libEGL-devel%{?_isa}
%{!?_without_wayland:
-BuildRequires: wayland-devel
-BuildRequires: pkgconfig(wayland-client) >= 1
-BuildRequires: pkgconfig(wayland-scanner) >= 1
+BuildRequires: wayland-devel%{?_isa}
}
@@ -66,7 +66,7 @@ autoreconf -vif
%make_build
%install
-%make_install INSTALL="install -p"
+%make_install
find %{buildroot} -regex ".*\.la$" | xargs rm -f --
%{?_with_gen4asm:
@@ -74,13 +74,11 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
gendiff . .prebuilt
}
-%if 0%{?fedora} >= 28
# install AppData and add modalias provides
mkdir -p %{buildroot}%{_datadir}/appdata/
install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/
fn=%{buildroot}%{_datadir}/appdata/intel-vaapi-driver.metainfo.xml
%{SOURCE9} src/i965_pciids.h | xargs appstream-util add-provide ${fn} modalias
-%endif
%files
@@ -91,6 +89,9 @@ fn=%{buildroot}%{_datadir}/appdata/intel-vaapi-driver.metainfo.xml
%changelog
+* Mon Sep 23 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.0-5
+- Adapt for el8
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
[chromium-vaapi] Add patch from upstream to fix building with system harfbuzz
by hellbanger
commit 9d56b6cc5543d2ef921f3dd563afad3d4867dbfd
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Mon Sep 23 18:04:12 2019 +0530
Add patch from upstream to fix building with system harfbuzz
chromium-vaapi.spec | 6 +++++
link-against-harfbuzz-subset.patch | 55 ++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 77eb516..2e7183a 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -219,6 +219,9 @@ Patch71: chromium-unbundle-zlib.patch
Patch72: chromium-base-location.patch
Patch73: chromium-gcc9-r684731.patch
+# This patch fixes linking when build with system harfbuzz is enabled
+Patch74: link-against-harfbuzz-subset.patch
+
%description
%{name} is an open-source web browser, powered by WebKit (Blink)
@@ -231,6 +234,9 @@ Patch73: chromium-gcc9-r684731.patch
%if !%{freeworld}
%patch54 -p1 -R
%endif
+%if !%{with system_harfbuzz}
+%patch74 -p1 -R
+%endif
#Let's change the default shebang of python files.
diff --git a/link-against-harfbuzz-subset.patch b/link-against-harfbuzz-subset.patch
new file mode 100644
index 0000000..05731a5
--- /dev/null
+++ b/link-against-harfbuzz-subset.patch
@@ -0,0 +1,55 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz
+ is true
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+ ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+ SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Commit-Queue: Dominik Röttsches <drott(a)chromium.org>
+Reviewed-by: Dominik Röttsches <drott(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+ third_party/harfbuzz-ng/BUILD.gn | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e334c2..72013eb1db 100644
+--- a/third_party/harfbuzz-ng/BUILD.gn
++++ b/third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@ if (use_system_harfbuzz) {
+ "//third_party:freetype_harfbuzz",
+ "//third_party/freetype:freetype_source",
+ ]
+- packages = [ "harfbuzz" ]
++ packages = [
++ "harfbuzz",
++ "harfbuzz-subset",
++ ]
+ }
+ } else {
+ config("harfbuzz_config") {
4 years, 7 months
[chromium-vaapi] Revert "Rebundle harfbuzz"
by hellbanger
commit 5b41de233dca6c39c414577eecb4f0e1ae37e34c
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Mon Sep 23 18:00:13 2019 +0530
Revert "Rebundle harfbuzz"
This reverts commit 6724e3f89f1fef91edbc74706ae83ecbd0e16dae.
chromium-vaapi.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 57db676..77eb516 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -26,7 +26,11 @@
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
%global _python_bytecompile_extra 1
#Require harfbuzz >= 2.4.0 for hb_subset_input_set_retain_gids
+%if 0%{?fedora} >= 31
+%bcond_without system_harfbuzz
+%else
%bcond_with system_harfbuzz
+%endif
# Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
%bcond_without system_libxml2
4 years, 7 months
[gstreamer1-plugins-bad-nonfree] No point in keeping this as kalev has obsoleted it without consulting us first
by Leigh Scott
commit 30641c2ded63d12e099d32cb814bab8244f48c90
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Mon Sep 23 12:06:35 2019 +0100
No point in keeping this as kalev has obsoleted it without consulting us first
.gitignore | 2 -
dead.package | 1 +
gstreamer1-plugins-bad-nonfree.spec | 162 ------------------------------------
sources | 1 -
4 files changed, 1 insertion(+), 165 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..27e2a2e
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+No point in keeping this as kalev has obsoleted it without consulting us first
4 years, 7 months
[gstreamer1-plugins-bad-nonfree/el8] Add fdk-aac 2.0.0 patch
by Xavier Bachelot
commit 3985df80723d3c171cbede6070096afdcc8638cf
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Sep 20 15:54:02 2019 +0200
Add fdk-aac 2.0.0 patch
fdk-acc-2.0.0.patch | 26 ++++++++++++++++++++++++++
gstreamer1-plugins-bad-nonfree.spec | 4 ++++
2 files changed, 30 insertions(+)
---
diff --git a/fdk-acc-2.0.0.patch b/fdk-acc-2.0.0.patch
new file mode 100644
index 0000000..b61ddf0
--- /dev/null
+++ b/fdk-acc-2.0.0.patch
@@ -0,0 +1,26 @@
+--- a/ext/fdkaac/gstfdkaacenc.c
++++ b/ext/fdkaac/gstfdkaacenc.c
+@@ -71,10 +71,6 @@
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, {
+- 3, MODE_2_1, {
+- GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+- GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+- GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
+ 4, MODE_1_2_1, {
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+
+--- a/ext/fdkaac/gstfdkaacdec.c
++++ b/ext/fdkaac/gstfdkaacdec.c
+@@ -159,7 +159,7 @@
+ }
+
+ if ((err =
+- aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED,
++ aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING,
+ 1)) != AAC_DEC_OK) {
+ GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err);
+ return FALSE;
+
diff --git a/gstreamer1-plugins-bad-nonfree.spec b/gstreamer1-plugins-bad-nonfree.spec
index a5b0a79..b2efb99 100644
--- a/gstreamer1-plugins-bad-nonfree.spec
+++ b/gstreamer1-plugins-bad-nonfree.spec
@@ -8,6 +8,9 @@ Release: 1%{?dist}.1
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: %url/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
+# Fixes FTBFS with new fdk-acc version.
+# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825
+Patch0: fdk-acc-2.0.0.patch
BuildRequires: gcc
BuildRequires: gstreamer1-devel >= %{version}
@@ -73,6 +76,7 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
* Fri Sep 20 2019 Xavier Bachelot <xavier(a)bachelot.org> - 1.14.0-1.1
- Backport spec changes from master.
- Add BuildRequires: python3.
+- Add patch to build against fdk-aac 2.0.0.
* Sun Apr 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.14.0-1
- Update to 1.14.0
4 years, 7 months
[gstreamer1-plugins-bad-nonfree/el8] Add BuildRequires: python3
by Xavier Bachelot
commit f168eb71e473379bdafd619a42ca7a4d04b052f0
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Sep 20 15:15:24 2019 +0200
Add BuildRequires: python3
gstreamer1-plugins-bad-nonfree.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/gstreamer1-plugins-bad-nonfree.spec b/gstreamer1-plugins-bad-nonfree.spec
index 6b1fbf6..a5b0a79 100644
--- a/gstreamer1-plugins-bad-nonfree.spec
+++ b/gstreamer1-plugins-bad-nonfree.spec
@@ -20,6 +20,7 @@ BuildRequires: orc-devel
BuildRequires: libdca-devel
BuildRequires: faac-devel
BuildRequires: fdk-aac-devel
+BuildRequires: python3
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -71,6 +72,7 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%changelog
* Fri Sep 20 2019 Xavier Bachelot <xavier(a)bachelot.org> - 1.14.0-1.1
- Backport spec changes from master.
+- Add BuildRequires: python3.
* Sun Apr 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.14.0-1
- Update to 1.14.0
4 years, 7 months
[gstreamer1-plugins-bad-nonfree/el8] Backport spec changes from master
by Xavier Bachelot
commit 1461ed4648317988d8b2283ec9ec15376952d6fb
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Sep 20 15:15:04 2019 +0200
Backport spec changes from master
gstreamer1-plugins-bad-nonfree.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/gstreamer1-plugins-bad-nonfree.spec b/gstreamer1-plugins-bad-nonfree.spec
index 51cdd57..6b1fbf6 100644
--- a/gstreamer1-plugins-bad-nonfree.spec
+++ b/gstreamer1-plugins-bad-nonfree.spec
@@ -4,10 +4,12 @@
Summary: GStreamer 1.0 streaming media framework "bad" non-free plug-ins
Name: gstreamer1-plugins-bad-nonfree
Version: 1.14.0
-Release: 1%{?dist}
+Release: 1%{?dist}.1
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
-Source0: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{ve...
+Source0: %url/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
+
+BuildRequires: gcc
BuildRequires: gstreamer1-devel >= %{version}
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
BuildRequires: check
@@ -28,7 +30,7 @@ license.
%prep
-%autosetup -n gst-plugins-bad-%{version}
+%autosetup -p1 -n gst-plugins-bad-%{version}
%build
@@ -67,6 +69,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%{_libdir}/gstreamer-1.0/libgstfdkaac.so
%changelog
+* Fri Sep 20 2019 Xavier Bachelot <xavier(a)bachelot.org> - 1.14.0-1.1
+- Backport spec changes from master.
+
* Sun Apr 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.14.0-1
- Update to 1.14.0
4 years, 7 months
[gstreamer1-plugins-bad-nonfree/el8] Revert to 1.14.0 to match EL8
by Xavier Bachelot
commit daf71b092e814c6e4510193211f649fa4d33c703
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Sep 20 15:03:26 2019 +0200
Revert to 1.14.0 to match EL8
gstreamer1-plugins-bad-nonfree.spec | 43 ++++---------------------------------
sources | 2 +-
2 files changed, 5 insertions(+), 40 deletions(-)
---
diff --git a/gstreamer1-plugins-bad-nonfree.spec b/gstreamer1-plugins-bad-nonfree.spec
index 8e0c9dd..51cdd57 100644
--- a/gstreamer1-plugins-bad-nonfree.spec
+++ b/gstreamer1-plugins-bad-nonfree.spec
@@ -3,13 +3,11 @@
Summary: GStreamer 1.0 streaming media framework "bad" non-free plug-ins
Name: gstreamer1-plugins-bad-nonfree
-Version: 1.16.0
-Release: 2%{?dist}
+Version: 1.14.0
+Release: 1%{?dist}
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
-Source0: %url/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
-
-BuildRequires: gcc
+Source0: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{ve...
BuildRequires: gstreamer1-devel >= %{version}
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
BuildRequires: check
@@ -30,7 +28,7 @@ license.
%prep
-%autosetup -p1 -n gst-plugins-bad-%{version}
+%autosetup -n gst-plugins-bad-%{version}
%build
@@ -69,39 +67,6 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%{_libdir}/gstreamer-1.0/libgstfdkaac.so
%changelog
-* Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.16.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Apr 24 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.16.0-1
-- 1.16.0
-
-* Mon Mar 18 2019 Sérgio Basto <sergio(a)serjux.com> - 1.15.2-1
-- Update to 1.15.2
-
-* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.15.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Feb 09 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.15.1-1
-- 1.15.1
-
-* Sat Nov 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14.4-2
-- Rebuild for new fdk-aac
-
-* Tue Oct 09 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.4-1
-- 1.14.4
-
-* Tue Sep 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14.3-1
-- 1.14.3
-
-* Sat Aug 18 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.2-1
-- 1.14.2
-
-* Fri Jul 27 2018 RPM Fusion Release Engineering <sergio(a)serjux.com> - 1.14.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu May 31 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 1.14.1-1
-- 1.14.1
-
* Sun Apr 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.14.0-1
- Update to 1.14.0
diff --git a/sources b/sources
index 43d01c5..c9f1bbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9e562d86c1527c44d904500dd35e326 gst-plugins-bad-1.16.0.tar.xz
+555bbe7232fb4653c31b78e1f79068cf gst-plugins-bad-1.14.0.tar.xz
4 years, 7 months
[gstreamer1-plugins-bad-nonfree/f31] (3 commits) ...And again
by Leigh Scott
Summary of changes:
b474aff... Remove Br fdk-aac-devel, the fedora package provides it (*)
0aaa9be... Use configure to disable fdk-aac (*)
fe4e2ec... And again (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
