diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2019-02-26 21:55:05 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-02-26 22:03:13 +0000 |
commit | 031bb937ffb8677ff0038b2c8faf3ed3a56c4a73 (patch) | |
tree | c5f78ef994888cf68e19a61acd5db6e634a96987 | |
parent | f227c87fc085437b2d1973463cf68e37583232fc (diff) | |
download | alpine_aports-031bb937ffb8677ff0038b2c8faf3ed3a56c4a73.tar.bz2 alpine_aports-031bb937ffb8677ff0038b2c8faf3ed3a56c4a73.tar.xz alpine_aports-031bb937ffb8677ff0038b2c8faf3ed3a56c4a73.zip |
community/gst-plugins-good: fix build against libvpx 1.8
-rw-r--r-- | community/gst-plugins-good/APKBUILD | 10 | ||||
-rw-r--r-- | community/gst-plugins-good/libvpx-1.8.patch | 62 |
2 files changed, 69 insertions, 3 deletions
diff --git a/community/gst-plugins-good/APKBUILD b/community/gst-plugins-good/APKBUILD index 6de4e9f70e..f7fa7c8caa 100644 --- a/community/gst-plugins-good/APKBUILD +++ b/community/gst-plugins-good/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gst-plugins-good | 2 | pkgname=gst-plugins-good |
3 | pkgver=1.14.4 | 3 | pkgver=1.14.4 |
4 | pkgrel=1 | 4 | pkgrel=2 |
5 | pkgdesc="GStreamer Multimedia Framework Good Plugins" | 5 | pkgdesc="GStreamer Multimedia Framework Good Plugins" |
6 | url="https://gstreamer.freedesktop.org" | 6 | url="https://gstreamer.freedesktop.org" |
7 | arch="all" | 7 | arch="all" |
@@ -9,6 +9,7 @@ license="GPL-2.0-or-later LGPL-2.0-or-later" | |||
9 | subpackages="$pkgname-lang $pkgname-doc $pkgname-qt $pkgname-gtk" | 9 | subpackages="$pkgname-lang $pkgname-doc $pkgname-qt $pkgname-gtk" |
10 | replaces="gst-plugins-good1" | 10 | replaces="gst-plugins-good1" |
11 | makedepends=" | 11 | makedepends=" |
12 | libtool automake autoconf | ||
12 | gstreamer-dev | 13 | gstreamer-dev |
13 | gst-plugins-base-dev | 14 | gst-plugins-base-dev |
14 | flac-dev | 15 | flac-dev |
@@ -46,7 +47,8 @@ makedepends=" | |||
46 | orc-compiler | 47 | orc-compiler |
47 | " | 48 | " |
48 | ldpath="/usr/lib/gstreamer-1.0" | 49 | ldpath="/usr/lib/gstreamer-1.0" |
49 | source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz" | 50 | source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz |
51 | libvpx-1.8.patch" | ||
50 | options="!check" # elements/souphttpsrc fails | 52 | options="!check" # elements/souphttpsrc fails |
51 | 53 | ||
52 | # secfixes: | 54 | # secfixes: |
@@ -63,6 +65,7 @@ options="!check" # elements/souphttpsrc fails | |||
63 | 65 | ||
64 | build() { | 66 | build() { |
65 | cd "$builddir" | 67 | cd "$builddir" |
68 | autoreconf -vif | ||
66 | ./configure \ | 69 | ./configure \ |
67 | --build=$CBUILD \ | 70 | --build=$CBUILD \ |
68 | --host=$CHOST \ | 71 | --host=$CHOST \ |
@@ -116,4 +119,5 @@ doc() { | |||
116 | replaces="${pkgname}1-doc" | 119 | replaces="${pkgname}1-doc" |
117 | } | 120 | } |
118 | 121 | ||
119 | sha512sums="30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504 gst-plugins-good-1.14.4.tar.xz" | 122 | sha512sums="30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504 gst-plugins-good-1.14.4.tar.xz |
123 | e0bcc742ae1a42e4423e5cd7d509508c45b699d1625eb5666a8248825c7a69d557e288060bc5e44b195358b660e4cc5afe8ca66ef22f0ae6f6268f6475143d1a libvpx-1.8.patch" | ||
diff --git a/community/gst-plugins-good/libvpx-1.8.patch b/community/gst-plugins-good/libvpx-1.8.patch new file mode 100644 index 0000000000..9cd3a9329d --- /dev/null +++ b/community/gst-plugins-good/libvpx-1.8.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From b6e6f1ae73375ef66a5748069843aaed1a83e6a6 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> | ||
3 | Date: Tue, 5 Feb 2019 22:14:18 +0100 | ||
4 | Subject: [PATCH] vpx: Fix build against libvpx 1.8 | ||
5 | |||
6 | The deprecated debug visualizer was removed. | ||
7 | --- | ||
8 | configure.ac | 4 ++++ | ||
9 | ext/vpx/gstvpxdec.c | 2 ++ | ||
10 | ext/vpx/meson.build | 4 ++++ | ||
11 | 3 files changed, 10 insertions(+) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 5e4cff126..8c20e5081 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [ | ||
18 | AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger]) | ||
19 | ], [true]) | ||
20 | |||
21 | + PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [ | ||
22 | + AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger]) | ||
23 | + ], [true]) | ||
24 | + | ||
25 | LIBS="$OLD_LIBS" | ||
26 | CFLAGS="$OLD_CFLAGS" | ||
27 | fi | ||
28 | diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c | ||
29 | index c3f0f625f..da4322513 100644 | ||
30 | --- a/ext/vpx/gstvpxdec.c | ||
31 | +++ b/ext/vpx/gstvpxdec.c | ||
32 | @@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) | ||
33 | {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, | ||
34 | {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, | ||
35 | {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, | ||
36 | +#ifndef HAVE_VPX_1_8 | ||
37 | {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), | ||
38 | "Print frame information", | ||
39 | "visualize-frame-info"}, | ||
40 | @@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) | ||
41 | {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), | ||
42 | "Print video rate info", | ||
43 | "visualize-rate-info"}, | ||
44 | +#endif | ||
45 | {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, | ||
46 | {0, NULL, NULL} | ||
47 | }; | ||
48 | diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build | ||
49 | index 6ed440728..0d2340b32 100644 | ||
50 | --- a/ext/vpx/meson.build | ||
51 | +++ b/ext/vpx/meson.build | ||
52 | @@ -48,6 +48,10 @@ if vpx_dep.found() | ||
53 | vpx_args += '-DHAVE_VPX_1_4' | ||
54 | endif | ||
55 | |||
56 | + if dependency('vpx', version : '>=1.8.0', required : false).found() | ||
57 | + vpx_args += '-DHAVE_VPX_1_8' | ||
58 | + endif | ||
59 | + | ||
60 | gstvpx = library('gstvpx', | ||
61 | vpx_sources, | ||
62 | c_args : gst_plugins_good_args + vpx_args, | ||