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

[Jan Steffens]

    Date: Thursday, September 16, 2021 @ 16:44:52
  Author: heftig
Revision: 424238

1.18.5-1

Modified:
  gst-plugins-bad/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-16 16:43:53 UTC (rev 424237)
+++ PKGBUILD	2021-09-16 16:44:52 UTC (rev 424238)
@@ -3,8 +3,8 @@
 
 pkgbase=gst-plugins-bad
 pkgname=(gst-plugins-bad-libs gst-plugins-bad gst-plugin-opencv gst-plugin-wpe)
-pkgver=1.18.4
-pkgrel=11
+pkgver=1.18.5
+pkgrel=1
 pkgdesc="Multimedia graph framework - bad plugins"
 url="https://gstreamer.freedesktop.org/"
 arch=(x86_64)
@@ -23,7 +23,7 @@
              zxing-cpp opencv libva wpewebkit)
 checkdepends=(xorg-server-xvfb)
 options=(!emptydirs)
-_commit=8cb03bdf01ca6ad8c87f951bcd7962c3ca9f6860  # tags/1.18.4^0
+_commit=d3af58d5b31941caa26c3ded85d7a7b84a91f0cc  # tags/1.18.5^0
 source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -34,8 +34,6 @@
 
 prepare() {
   cd $pkgbase
-  git cherry-pick -n 68858358544dd3b7e20663f731db22fd74a78a45 # fix build with GCC 11
-  git cherry-pick -n a9fafd98b74fd184b178604095d35ac6105119b8 # fix build with OpenEXR 3
 }
 
 build() {
@@ -67,7 +65,7 @@
   export XDG_RUNTIME_DIR
 
   # elements_dtls test hangs sometimes
-  xvfb-run -s '-screen 0 1920x1080x24 -nolisten local +iglx -noreset' \
+  xvfb-run -s '-nolisten local' \
     meson test -C build --print-errorlogs || :
 )
 
@@ -77,7 +75,7 @@
   conflicts=("gst-transcoder<1.18.0")
   replaces=("gst-transcoder<1.18.0")
 
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 
   mkdir -p ext/lib/gstreamer-1.0
   for _x in aom assrender bs2b bz2 chromaprint closedcaption colormanagement \