[arch-commits] Commit in lib32-gst-plugins-good/repos/multilib-x86_64 (3 files)

Maxime Gauduin alucryd at archlinux.org
Mon Mar 11 08:46:20 UTC 2019


    Date: Monday, March 11, 2019 @ 08:46:19
  Author: alucryd
Revision: 439722

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-gst-plugins-good/repos/multilib-x86_64/0001-vpx-Fix-build-against-libvpx-1.8.patch
    (from rev 439721, lib32-gst-plugins-good/trunk/0001-vpx-Fix-build-against-libvpx-1.8.patch)
  lib32-gst-plugins-good/repos/multilib-x86_64/PKGBUILD
    (from rev 439721, lib32-gst-plugins-good/trunk/PKGBUILD)
Deleted:
  lib32-gst-plugins-good/repos/multilib-x86_64/PKGBUILD

---------------------------------------------+
 0001-vpx-Fix-build-against-libvpx-1.8.patch |   71 ++++++++++++
 PKGBUILD                                    |  150 +++++++++++++-------------
 2 files changed, 148 insertions(+), 73 deletions(-)

Copied: lib32-gst-plugins-good/repos/multilib-x86_64/0001-vpx-Fix-build-against-libvpx-1.8.patch (from rev 439721, lib32-gst-plugins-good/trunk/0001-vpx-Fix-build-against-libvpx-1.8.patch)
===================================================================
--- 0001-vpx-Fix-build-against-libvpx-1.8.patch	                        (rev 0)
+++ 0001-vpx-Fix-build-against-libvpx-1.8.patch	2019-03-11 08:46:19 UTC (rev 439722)
@@ -0,0 +1,71 @@
+From c481cb5f2209087ffc0094490bacab46eda2d06b Mon Sep 17 00:00:00 2001
+Message-Id: <c481cb5f2209087ffc0094490bacab46eda2d06b.1549401287.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 5 Feb 2019 22:14:18 +0100
+Subject: [PATCH] vpx: Fix build against libvpx 1.8
+
+The deprecated debug visualizer was removed.
+---
+ configure.ac        | 4 ++++
+ ext/vpx/gstvpxdec.c | 2 ++
+ ext/vpx/meson.build | 4 ++++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5e4cff126..8c20e5081 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [
+       AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger])
+     ], [true])
+ 
++    PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [
++      AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger])
++    ], [true])
++
+     LIBS="$OLD_LIBS"
+     CFLAGS="$OLD_CFLAGS"
+   fi
+diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
+index c3f0f625f..da4322513 100644
+--- a/ext/vpx/gstvpxdec.c
++++ b/ext/vpx/gstvpxdec.c
+@@ -62,18 +62,20 @@ gst_vpx_dec_post_processing_flags_get_type (void)
+     {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
+     {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
+     {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
++#ifndef HAVE_VPX_1_8
+     {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
+           "Print frame information",
+         "visualize-frame-info"},
+     {C_FLAGS (VP8_DEBUG_TXT_MBLK_MODES),
+           "Show macroblock mode selection overlaid on image",
+         "visualize-macroblock-modes"},
+     {C_FLAGS (VP8_DEBUG_TXT_DC_DIFF),
+           "Show dc diff for each macro block overlaid on image",
+         "visualize-dc-diff"},
+     {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
+           "Print video rate info",
+         "visualize-rate-info"},
++#endif
+     {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
+     {0, NULL, NULL}
+   };
+diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build
+index 6ed440728..0d2340b32 100644
+--- a/ext/vpx/meson.build
++++ b/ext/vpx/meson.build
+@@ -48,6 +48,10 @@ if vpx_dep.found()
+     vpx_args += '-DHAVE_VPX_1_4'
+   endif
+ 
++  if dependency('vpx', version : '>=1.8.0', required : false).found()
++    vpx_args += '-DHAVE_VPX_1_8'
++  endif
++
+   gstvpx = library('gstvpx',
+     vpx_sources,
+     c_args : gst_plugins_good_args + vpx_args,
+-- 
+2.20.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-11 08:46:11 UTC (rev 439721)
+++ PKGBUILD	2019-03-11 08:46:19 UTC (rev 439722)
@@ -1,73 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_basename=gst-plugins-good
-pkgname=lib32-gst-plugins-good
-pkgver=1.14.4
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Good Plugins (32-bit)"
-url="https://gstreamer.freedesktop.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=(lib32-libpulse lib32-jack lib32-libsoup lib32-gst-plugins-base-libs lib32-wavpack
-         lib32-aalib lib32-taglib lib32-libdv lib32-libshout lib32-libvpx lib32-gdk-pixbuf2
-         lib32-libcaca lib32-libavc1394 lib32-libiec61883 lib32-libxdamage lib32-v4l-utils
-         lib32-cairo lib32-libgudev lib32-speex lib32-flac lib32-libraw1394 lib32-mpg123
-         lib32-twolame gst-plugins-good)
-makedepends=(lib32-gstreamer aalib python autoconf-archive git)
-checkdepends=(lib32-gst-plugins-base)
-options=(!emptydirs)
-_commit=d88d1b0e43b140587f35c7c9bf390fae051e427d # tags/1.14.4^0
-source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good#commit=$_commit"
-        "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common")
-sha512sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $_basename
-  git describe --tags | sed 's/-//g'
-}
-
-prepare() {
-  cd $_basename
-
-  git submodule init
-  git config --local submodule.common.url "$srcdir/gst-common"
-  git submodule update
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $_basename
-
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --build=i686-pc-linux-gnu \
-    --libdir=/usr/lib32 \
-    --with-package-name="GStreamer Good Plugins (Arch Linux)" \
-    --with-package-origin="https://www.archlinux.org/" \
-    --enable-experimental \
-    --disable-static \
-    --disable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-# FAIL: elements/rtp-payloading
-#check() {
-# cd $_basename
-# make check
-#}
-
-package() {
-  cd $_basename
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir"/usr/share
-}

Copied: lib32-gst-plugins-good/repos/multilib-x86_64/PKGBUILD (from rev 439721, lib32-gst-plugins-good/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-11 08:46:19 UTC (rev 439722)
@@ -0,0 +1,77 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_basename=gst-plugins-good
+pkgname=lib32-gst-plugins-good
+pkgver=1.14.4
+pkgrel=2
+pkgdesc="GStreamer Multimedia Framework Good Plugins (32-bit)"
+url="https://gstreamer.freedesktop.org/"
+arch=('x86_64')
+license=('LGPL')
+depends=(lib32-libpulse lib32-jack lib32-libsoup lib32-gst-plugins-base-libs lib32-wavpack
+         lib32-aalib lib32-taglib lib32-libdv lib32-libshout lib32-libvpx lib32-gdk-pixbuf2
+         lib32-libcaca lib32-libavc1394 lib32-libiec61883 lib32-libxdamage lib32-v4l-utils
+         lib32-cairo lib32-libgudev lib32-speex lib32-flac lib32-libraw1394 lib32-mpg123
+         lib32-twolame gst-plugins-good)
+makedepends=(lib32-gstreamer aalib python autoconf-archive git)
+checkdepends=(lib32-gst-plugins-base)
+options=(!emptydirs)
+_commit=d88d1b0e43b140587f35c7c9bf390fae051e427d # tags/1.14.4^0
+source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good#commit=$_commit"
+        "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common"
+        '0001-vpx-Fix-build-against-libvpx-1.8.patch')
+sha512sums=('SKIP'
+            'SKIP'
+            'f8074fa14cc76be5e26f7d82ce94da09eca2ed20bb1bb793dcae3b507246ace54558b47269cac95a1bec11ce651ed2cb2619fb28f066b0df7db0b7a3de9485f5')
+
+pkgver() {
+  cd $_basename
+  git describe --tags | sed 's/-//g'
+}
+
+prepare() {
+  cd $_basename
+
+  patch -Np1 -i ../0001-vpx-Fix-build-against-libvpx-1.8.patch
+
+  git submodule init
+  git config --local submodule.common.url "$srcdir/gst-common"
+  git submodule update
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $_basename
+
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --build=i686-pc-linux-gnu \
+    --libdir=/usr/lib32 \
+    --with-package-name="GStreamer Good Plugins (Arch Linux)" \
+    --with-package-origin="https://www.archlinux.org/" \
+    --enable-experimental \
+    --disable-static \
+    --disable-gtk-doc
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+# FAIL: elements/rtp-payloading
+#check() {
+# cd $_basename
+# make check
+#}
+
+package() {
+  cd $_basename
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "$pkgdir"/usr/share
+}


More information about the arch-commits mailing list