[arch-commits] Commit in gst-plugins-bad/trunk (2 files)

[Antonio Rojas]

    Date: Tuesday, May 18, 2021 @ 08:44:04
  Author: arojas
Revision: 415665

Fix build with GCC 11

Modified:
  gst-plugins-bad/trunk/PKGBUILD
Deleted:
  gst-plugins-bad/trunk/gst-plugins-bad-openexr3.patch

--------------------------------+
 PKGBUILD                       |    9 ++++-----
 gst-plugins-bad-openexr3.patch |   12 ------------
 2 files changed, 4 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-18 08:24:35 UTC (rev 415664)
+++ PKGBUILD	2021-05-18 08:44:04 UTC (rev 415665)
@@ -24,10 +24,8 @@
 checkdepends=(xorg-server-xvfb)
 options=(!emptydirs)
 _commit=8cb03bdf01ca6ad8c87f951bcd7962c3ca9f6860  # tags/1.18.4^0
-source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit"
-         gst-plugins-bad-openexr3.patch)
-sha256sums=('SKIP'
-            '6bf2b72021586efa41b35507beedb939e952cfd612ce50f5f9e704cf1bd1d876')
+source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgbase
@@ -36,7 +34,8 @@
 
 prepare() {
   cd $pkgbase
-  patch -p1 < ../gst-plugins-bad-openexr3.patch # Fix build with OpenEXR 3
+  git cherry-pick -n 68858358544dd3b7e20663f731db22fd74a78a45 # fix build with GCC 11
+  git cherry-pick -n a9fafd98b74fd184b178604095d35ac6105119b8 # fix build with OpenEXR 3
 }
 
 build() {

Deleted: gst-plugins-bad-openexr3.patch
===================================================================
--- gst-plugins-bad-openexr3.patch	2021-05-18 08:24:35 UTC (rev 415664)
+++ gst-plugins-bad-openexr3.patch	2021-05-18 08:44:04 UTC (rev 415665)
@@ -1,12 +0,0 @@
-diff --git a/ext/openexr/gstopenexrdec.cpp b/ext/openexr/gstopenexrdec.cpp
-index eeb316cb1..32b1d03c3 100644
---- a/ext/openexr/gstopenexrdec.cpp
-+++ b/ext/openexr/gstopenexrdec.cpp
-@@ -29,6 +29,7 @@
- 
- #include <ImfRgbaFile.h>
- #include <ImfIO.h>
-+#include <ImfInt64.h>
- using namespace Imf;
- using namespace Imath;
-