[arch-commits] Commit in gst-plugins-bad/repos/extra-x86_64 (4 files)

Jan Steffens heftig at gemini.archlinux.org
Wed Nov 3 21:54:45 UTC 2021


    Date: Wednesday, November 3, 2021 @ 21:54:44
  Author: heftig
Revision: 427087

archrelease: copy trunk to extra-x86_64

Added:
  gst-plugins-bad/repos/extra-x86_64/1267.patch
    (from rev 427082, gst-plugins-bad/trunk/1267.patch)
  gst-plugins-bad/repos/extra-x86_64/PKGBUILD
    (from rev 427082, gst-plugins-bad/trunk/PKGBUILD)
  gst-plugins-bad/repos/extra-x86_64/wpe-1.1.diff
    (from rev 427083, gst-plugins-bad/trunk/wpe-1.1.diff)
Deleted:
  gst-plugins-bad/repos/extra-x86_64/PKGBUILD

--------------+
 1267.patch   |   25 +++++
 PKGBUILD     |  275 +++++++++++++++++++++++++++++----------------------------
 wpe-1.1.diff |   13 ++
 3 files changed, 179 insertions(+), 134 deletions(-)

Copied: gst-plugins-bad/repos/extra-x86_64/1267.patch (from rev 427082, gst-plugins-bad/trunk/1267.patch)
===================================================================
--- 1267.patch	                        (rev 0)
+++ 1267.patch	2021-11-03 21:54:44 UTC (rev 427087)
@@ -0,0 +1,25 @@
+From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Sun, 26 Sep 2021 21:34:30 +0200
+Subject: [PATCH] neon: Allow building against neon 0.32.x
+
+No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267>
+---
+ subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/subprojects/gst-plugins-bad/ext/neon/meson.build b/subprojects/gst-plugins-bad/ext/neon/meson.build
+index bf49be9111..abd9763649 100644
+--- a/subprojects/gst-plugins-bad/ext/neon/meson.build
++++ b/subprojects/gst-plugins-bad/ext/neon/meson.build
+@@ -1,4 +1,4 @@
+-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'],
++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'],
+                       required : get_option('neon'))
+ 
+ if neon_dep.found()
+-- 
+GitLab
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-03 21:54:44 UTC (rev 427086)
+++ PKGBUILD	2021-11-03 21:54:44 UTC (rev 427087)
@@ -1,134 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gst-plugins-bad
-pkgname=(gst-plugins-bad-libs gst-plugins-bad gst-plugin-opencv gst-plugin-wpe)
-pkgver=1.18.5
-pkgrel=2
-pkgdesc="Multimedia graph framework - bad plugins"
-url="https://gstreamer.freedesktop.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(gst-plugins-base-libs orc libdrm libx11 libgudev libusb libvdpau
-         libxkbcommon-x11)
-makedepends=(mjpegtools curl chromaprint libmms faad2 libdca libdvdnav
-             libmodplug libgme nettle libkate wayland libofa openjpeg2 libwebp
-             libsrtp sbc rtmpdump libexif libdvdread wildmidi ladspa openal
-             vulkan-icd-loader libfdk-aac faac soundtouch spandsp neon
-             webrtc-audio-processing libdc1394 libmpcdec zvbi openexr libbs2b
-             libnice lcms2 bluez-libs glu srt aom x265 liblrdf libde265 zbar
-             librsvg fluidsynth lilv lv2 gst-plugins-good python git
-             gobject-introspection vulkan-headers vulkan-validation-layers
-             wayland-protocols gtk3 meson shaderc libavtp svt-hevc libmicrodns
-             zxing-cpp opencv libva wpewebkit)
-checkdepends=(xorg-server-xvfb)
-options=(!emptydirs)
-_commit=d3af58d5b31941caa26c3ded85d7a7b84a91f0cc  # tags/1.18.5^0
-source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit"
-         gst-plugins-bad-neon-0.32.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2547.patch)
-sha256sums=('SKIP'
-            'bbd9b8bcc12ad86ddb58bb93df18777675f3a390e80bf60177fefbf034faa22c')
-
-pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgbase
-  patch -p1 -i ../gst-plugins-bad-neon-0.32.patch # Accept neon 0.32
-}
-
-build() {
-  arch-meson $pkgbase build \
-    -D directfb=disabled \
-    -D doc=disabled \
-    -D flite=disabled \
-    -D gsm=disabled \
-    -D iqa=disabled \
-    -D magicleap=disabled \
-    -D msdk=disabled \
-    -D openh264=disabled \
-    -D openmpt=disabled \
-    -D openni2=disabled \
-    -D opensles=disabled \
-    -D tinyalsa=disabled \
-    -D voaacenc=disabled \
-    -D voamrwbenc=disabled \
-    -D wasapi2=disabled \
-    -D wasapi=disabled \
-    -D gobject-cast-checks=disabled \
-    -D package-name="GStreamer Bad Plugins (Arch Linux)" \
-    -D package-origin="https://www.archlinux.org/"
-  meson compile -C build
-}
-
-check() (
-  mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}"
-  export XDG_RUNTIME_DIR
-
-  # elements_dtls test hangs sometimes
-  xvfb-run -s '-nolisten local' \
-    meson test -C build --print-errorlogs || :
-)
-
-package_gst-plugins-bad-libs() {
-  pkgdesc="${pkgdesc% plugins}"
-  provides=("gst-transcoder=$pkgver")
-  conflicts=("gst-transcoder<1.18.0")
-  replaces=("gst-transcoder<1.18.0")
-
-  meson install -C build --destdir "$pkgdir"
-
-  mkdir -p ext/lib/gstreamer-1.0
-  for _x in aom assrender bs2b bz2 chromaprint closedcaption colormanagement \
-            curl dc1394 de265 dtls dtsdec faac faad fdkaac fluidsynthmidi gme \
-            hls kate ladspa lv2 mms modplug mpeg2enc mplex musepack \
-            neonhttpsrc ofa openal openexr openjpeg opusparse resindvd rsvg \
-            rtmp sbc sctp smoothstreaming sndfile soundtouch spandsp srt srtp \
-            teletext ttmlsubs vulkan waylandsink webp webrtc webrtcdsp \
-            wildmidi x265 zbar va svthevcenc avtp zxing microdns; do
-    _x="lib/gstreamer-1.0/libgst${_x}.so"
-    mv "$pkgdir/usr/$_x" "ext/$_x"
-  done
-
-  mkdir -p opencv/{lib,include/gstreamer-1.0/gst}
-  mv -t opencv/lib "$pkgdir"/usr/lib/*opencv*
-  mv -t opencv/include/gstreamer-1.0/gst \
-    "$pkgdir"/usr/include/gstreamer-1.0/gst/opencv
-
-  for _x in opencv wpe; do
-    mkdir -p "$_x/lib/gstreamer-1.0"
-    _f="lib/gstreamer-1.0/libgst${_x}.so"
-    mv "$pkgdir/usr/$_f" "$_x/$_f"
-  done
-}
-
-package_gst-plugins-bad() {
-  depends=("gst-plugins-bad-libs=$pkgver" gst-plugins-good
-           aom libass libbs2b bzip2 chromaprint pango lcms2 curl libxml2
-           libdc1394 libde265 openssl libdca faac faad2 libfdk-aac fluidsynth
-           libgme nettle libkate liblrdf lilv libmms libmodplug mjpegtools
-           libmpcdec neon libofa openal openexr openjpeg2 opus libdvdnav
-           libdvdread librsvg rtmpdump sbc libsndfile soundtouch spandsp srt
-           libsrtp zvbi vulkan-icd-loader libxcb wayland libwebp libnice
-           webrtc-audio-processing wildmidi x265 zbar libavtp svt-hevc
-           libmicrodns zxing-cpp libva)
-  optdepends=('nvidia-utils: nvcodec plugin')
-
-  mv ext "$pkgdir/usr"
-}
-
-package_gst-plugin-opencv() {
-  pkgdesc="${pkgdesc%-*}- opencv plugin"
-  depends=(gst-plugins-base-libs opencv)
-
-  mv opencv "$pkgdir/usr"
-}
-
-package_gst-plugin-wpe() {
-  pkgdesc="${pkgdesc%-*}- wpe plugin"
-  depends=(gst-plugins-base-libs wpewebkit)
-
-  mv wpe "$pkgdir/usr"
-}

Copied: gst-plugins-bad/repos/extra-x86_64/PKGBUILD (from rev 427082, gst-plugins-bad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-03 21:54:44 UTC (rev 427087)
@@ -0,0 +1,141 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gst-plugins-bad
+pkgname=(gst-plugins-bad-libs gst-plugins-bad gst-plugin-opencv gst-plugin-wpe)
+pkgver=1.18.5
+pkgrel=3
+pkgdesc="Multimedia graph framework - bad plugins"
+url="https://gstreamer.freedesktop.org/"
+arch=(x86_64)
+license=(LGPL)
+depends=(gst-plugins-base-libs orc libdrm libx11 libgudev libusb libvdpau
+         libxkbcommon-x11)
+makedepends=(mjpegtools curl chromaprint libmms faad2 libdca libdvdnav
+             libmodplug libgme nettle libkate wayland libofa openjpeg2 libwebp
+             libsrtp sbc rtmpdump libexif libdvdread wildmidi ladspa openal
+             vulkan-icd-loader libfdk-aac faac soundtouch spandsp neon
+             webrtc-audio-processing libdc1394 libmpcdec zvbi openexr libbs2b
+             libnice lcms2 bluez-libs glu srt aom x265 liblrdf libde265 zbar
+             librsvg fluidsynth lilv lv2 gst-plugins-good python git
+             gobject-introspection vulkan-headers vulkan-validation-layers
+             wayland-protocols gtk3 meson shaderc libavtp svt-hevc libmicrodns
+             zxing-cpp opencv libva wpewebkit)
+checkdepends=(xorg-server-xvfb)
+options=(!emptydirs)
+_commit=d3af58d5b31941caa26c3ded85d7a7b84a91f0cc  # tags/1.18.5^0
+source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit"
+        1267.patch wpe-1.1.diff)
+sha256sums=('SKIP'
+            '6b44a256d1ce3ed788d689a9abc5d8a2c4f992ce3c6c60f7a1efb4aa5cc3deb1'
+            '841988d7dffaf98adeff046cfeed97505a66d268c156361ac29c2b7a112cf984')
+
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgbase
+
+  # Neon 0.32.x
+  # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267
+  patch -Np3 -i ../1267.patch
+
+  # wpe-webkit-1.1 (libsoup3)
+  patch -Np1 -i ../wpe-1.1.diff
+}
+
+build() {
+  arch-meson $pkgbase build \
+    -D directfb=disabled \
+    -D doc=disabled \
+    -D flite=disabled \
+    -D gsm=disabled \
+    -D iqa=disabled \
+    -D magicleap=disabled \
+    -D msdk=disabled \
+    -D openh264=disabled \
+    -D openmpt=disabled \
+    -D openni2=disabled \
+    -D opensles=disabled \
+    -D tinyalsa=disabled \
+    -D voaacenc=disabled \
+    -D voamrwbenc=disabled \
+    -D wasapi2=disabled \
+    -D wasapi=disabled \
+    -D gobject-cast-checks=disabled \
+    -D package-name="GStreamer Bad Plugins (Arch Linux)" \
+    -D package-origin="https://www.archlinux.org/"
+  meson compile -C build
+}
+
+check() (
+  mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}"
+  export XDG_RUNTIME_DIR
+
+  # elements_dtls test hangs sometimes
+  xvfb-run -s '-nolisten local' \
+    meson test -C build --print-errorlogs || :
+)
+
+package_gst-plugins-bad-libs() {
+  pkgdesc="${pkgdesc% plugins}"
+  provides=("gst-transcoder=$pkgver")
+  conflicts=("gst-transcoder<1.18.0")
+  replaces=("gst-transcoder<1.18.0")
+
+  meson install -C build --destdir "$pkgdir"
+
+  mkdir -p ext/lib/gstreamer-1.0
+  for _x in aom assrender bs2b bz2 chromaprint closedcaption colormanagement \
+            curl dc1394 de265 dtls dtsdec faac faad fdkaac fluidsynthmidi gme \
+            hls kate ladspa lv2 mms modplug mpeg2enc mplex musepack \
+            neonhttpsrc ofa openal openexr openjpeg opusparse resindvd rsvg \
+            rtmp sbc sctp smoothstreaming sndfile soundtouch spandsp srt srtp \
+            teletext ttmlsubs vulkan waylandsink webp webrtc webrtcdsp \
+            wildmidi x265 zbar va svthevcenc avtp zxing microdns; do
+    _x="lib/gstreamer-1.0/libgst${_x}.so"
+    mv "$pkgdir/usr/$_x" "ext/$_x"
+  done
+
+  mkdir -p opencv/{lib,include/gstreamer-1.0/gst}
+  mv -t opencv/lib "$pkgdir"/usr/lib/*opencv*
+  mv -t opencv/include/gstreamer-1.0/gst \
+    "$pkgdir"/usr/include/gstreamer-1.0/gst/opencv
+
+  for _x in opencv wpe; do
+    mkdir -p "$_x/lib/gstreamer-1.0"
+    _f="lib/gstreamer-1.0/libgst${_x}.so"
+    mv "$pkgdir/usr/$_f" "$_x/$_f"
+  done
+}
+
+package_gst-plugins-bad() {
+  depends=("gst-plugins-bad-libs=$pkgver" gst-plugins-good
+           aom libass libbs2b bzip2 chromaprint pango lcms2 curl libxml2
+           libdc1394 libde265 openssl libdca faac faad2 libfdk-aac fluidsynth
+           libgme nettle libkate liblrdf lilv libmms libmodplug mjpegtools
+           libmpcdec neon libofa openal openexr openjpeg2 opus libdvdnav
+           libdvdread librsvg rtmpdump sbc libsndfile soundtouch spandsp srt
+           libsrtp zvbi vulkan-icd-loader libxcb wayland libwebp libnice
+           webrtc-audio-processing wildmidi x265 zbar libavtp svt-hevc
+           libmicrodns zxing-cpp libva)
+  optdepends=('nvidia-utils: nvcodec plugin')
+
+  mv ext "$pkgdir/usr"
+}
+
+package_gst-plugin-opencv() {
+  pkgdesc="${pkgdesc%-*}- opencv plugin"
+  depends=(gst-plugins-base-libs opencv)
+
+  mv opencv "$pkgdir/usr"
+}
+
+package_gst-plugin-wpe() {
+  pkgdesc="${pkgdesc%-*}- wpe plugin"
+  depends=(gst-plugins-base-libs wpewebkit)
+
+  mv wpe "$pkgdir/usr"
+}

Copied: gst-plugins-bad/repos/extra-x86_64/wpe-1.1.diff (from rev 427083, gst-plugins-bad/trunk/wpe-1.1.diff)
===================================================================
--- wpe-1.1.diff	                        (rev 0)
+++ wpe-1.1.diff	2021-11-03 21:54:44 UTC (rev 427087)
@@ -0,0 +1,13 @@
+diff --git i/ext/wpe/meson.build w/ext/wpe/meson.build
+index 9381e9b08..e94965c02 100644
+--- i/ext/wpe/meson.build
++++ w/ext/wpe/meson.build
+@@ -6,7 +6,7 @@ if not gstgl_dep.found()
+   subdir_done()
+ endif
+ 
+-wpe_dep = dependency('wpe-webkit-1.0', version : '>= 2.24', required : get_option('wpe'))
++wpe_dep = dependency('wpe-webkit-1.1', version : '>= 2.24', required : get_option('wpe'))
+ wpe_fdo_dep = dependency('wpebackend-fdo-1.0', required : get_option('wpe'))
+ egl_dep = dependency('egl', required : get_option('wpe'))
+ xkbcommon_dep = dependency('xkbcommon', version : '>= 0.8', required : get_option('wpe'))



More information about the arch-commits mailing list