diff options
| -rw-r--r-- | community/gst-plugins-good/APKBUILD | 90 | ||||
| -rw-r--r-- | community/gst-plugins-good/libvpx-1.8.patch | 62 |
2 files changed, 23 insertions, 129 deletions
diff --git a/community/gst-plugins-good/APKBUILD b/community/gst-plugins-good/APKBUILD index f7fa7c8caa..ed0e8d6983 100644 --- a/community/gst-plugins-good/APKBUILD +++ b/community/gst-plugins-good/APKBUILD @@ -1,54 +1,22 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-good -pkgver=1.14.4 -pkgrel=2 -pkgdesc="GStreamer Multimedia Framework Good Plugins" +pkgver=1.16.0 +pkgrel=0 +pkgdesc="GStreamer streaming media framework good plug-ins" url="https://gstreamer.freedesktop.org" arch="all" license="GPL-2.0-or-later LGPL-2.0-or-later" -subpackages="$pkgname-lang $pkgname-doc $pkgname-qt $pkgname-gtk" +subpackages="$pkgname-lang $pkgname-qt $pkgname-gtk" replaces="gst-plugins-good1" -makedepends=" - libtool automake autoconf - gstreamer-dev - gst-plugins-base-dev - flac-dev - gdk-pixbuf-dev - glib-dev - jack-dev - libavc1394-dev - libdv-dev - libgudev-dev - libice-dev - libiec61883-dev - libjpeg-turbo-dev - libogg-dev - libpng-dev - libshout-dev - libsm-dev - libsoup-dev - libvpx-dev - libxdamage-dev - libxext-dev - libxv-dev - linux-headers - orc-dev - taglib-dev - v4l-utils-dev - wavpack-dev - zlib-dev - mpg123-dev - lame-dev - gtk+3.0-dev - qt5-qtdeclarative-dev - qt5-qtx11extras-dev - libcaca-dev - cairo-dev - orc-compiler - " +makedepends="cairo-dev flac-dev gdk-pixbuf-dev glib-dev gst-plugins-base-dev + gstreamer-dev gtk+3.0-dev jack-dev lame-dev libavc1394-dev libcaca-dev + libdv-dev libgudev-dev libice-dev libiec61883-dev libjpeg-turbo-dev + libogg-dev libpng-dev libshout-dev libsm-dev libsoup-dev libvpx-dev + libxdamage-dev libxext-dev libxv-dev linux-headers meson mpg123-dev + orc-compiler orc-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev + taglib-dev v4l-utils-dev wavpack-dev zlib-dev" ldpath="/usr/lib/gstreamer-1.0" -source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz - libvpx-1.8.patch" +source="https://gstreamer.freedesktop.org/src/gst-plugins-good/$pkgname-$pkgver.tar.xz" options="!check" # elements/souphttpsrc fails # secfixes: @@ -64,31 +32,25 @@ options="!check" # elements/souphttpsrc fails # - CVE-2016-10199 build() { - cd "$builddir" - autoreconf -vif - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson \ --prefix=/usr \ --sysconfdir=/etc \ + --mandir=/usr/share/man \ --localstatedir=/var \ - --disable-static \ - --enable-experimental \ - --disable-fatal-warnings \ - --with-package-name="GStreamer Good Plugins (Alpine Linux)" \ - --with-package-origin="http://alpinelinux.org/" - make + --buildtype=release \ + -Dpackage-origin="https://alpinelinux.org" \ + -Dpackage-name="GStreamer good plug-ins (Alpine Linux)" \ + . output + ninja -C output } check() { - cd "$builddir" make check } package() { - cd "$builddir" export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C output install } _mv() { @@ -97,7 +59,7 @@ _mv() { } qt() { - pkgdesc="Gstreamer Qt plugin." + pkgdesc="Gstreamer Qt plug-in" for i in $(find "$pkgdir" -type f ); do if ldd $i 2>/dev/null | grep -q "libQt"; then _mv "$i" || return 1 @@ -106,7 +68,7 @@ qt() { } gtk() { - pkgdesc="Gstreamer gtk-3 plugin." + pkgdesc="Gstreamer gtk-3 plug-in" for i in $(find "$pkgdir" -type f ); do if ldd $i 2>/dev/null | grep -q "libgtk-3"; then _mv "$i" || return 1 @@ -114,10 +76,4 @@ gtk() { done } -doc() { - default_doc - replaces="${pkgname}1-doc" -} - -sha512sums="30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504 gst-plugins-good-1.14.4.tar.xz -e0bcc742ae1a42e4423e5cd7d509508c45b699d1625eb5666a8248825c7a69d557e288060bc5e44b195358b660e4cc5afe8ca66ef22f0ae6f6268f6475143d1a libvpx-1.8.patch" +sha512sums="01ae64426d62500c12eb98073fcdf4bbbb7df69b5d30a153491a6e3bcd9bfa6e6a3a7fdedd7b7293ce9405e909a4a57c691f293a58525f21281136deac7c0a7c gst-plugins-good-1.16.0.tar.xz" diff --git a/community/gst-plugins-good/libvpx-1.8.patch b/community/gst-plugins-good/libvpx-1.8.patch deleted file mode 100644 index 9cd3a9329d..0000000000 --- a/community/gst-plugins-good/libvpx-1.8.patch +++ /dev/null @@ -1,62 +0,0 @@ -From b6e6f1ae73375ef66a5748069843aaed1a83e6a6 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@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,6 +62,7 @@ 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"}, -@@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) - {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, |