user/a52dec: bump { 0.7.4 --> 0.8.0 }. fixes #793.

4 files changed, 19 insertions, 55 deletions

diff --git a/user/a52dec/APKBUILD b/user/a52dec/APKBUILD
index 73419f6c7..8d552e47d 100644
--- a/user/a52dec/APKBUILD
+++ b/user/a52dec/APKBUILD
@@ -1,26 +1,18 @@
-# Maintainer: 
+# Maintainer: Zach van Rijn <me@zv.io>
 pkgname=a52dec
-pkgver=0.7.4
-pkgrel=8
+pkgver=0.8.0
+pkgrel=0
 pkgdesc="Library for decoding ATSC A/52 streams"
-url="http://liba52.sourceforge.net/"
+url="https://git.adelielinux.org/community/a52dec/-/wikis/home"
 arch="all"
 license="GPL-2.0+"
 depends=""
 makedepends="autoconf automake libtool linux-headers"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz
-	automake.patch
-	$pkgname-$pkgver-build.patch
+source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.gz
+	fix-globals-test-x86-pie.patch
 	"
 
-prepare() {
-	default_prepare
-	update_config_sub
-	libtoolize --force && \
-		aclocal && autoconf && automake --add-missing
-}
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -39,6 +31,5 @@ package() {
 	install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/
 }
 
-sha512sums="4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848  a52dec-0.7.4.tar.gz
-4a832b7e13e19ba00b1fcf5ddbdcca416ee71818f2fd77f19114d7f98fb41dbd04f906eb78f403dc27324d7e8bd8ec4e0b670139a27b49a7acdb2e3cf88d8d12  automake.patch
-eee40a2871c00fc704fa49d3192a41ceadc4cf7e80d7d7cf368aa2a3e7ebb786f39ef835bdffca5685bf054316a9bacf87556b9a0c90868dbf29e7269873806e  a52dec-0.7.4-build.patch"
+sha512sums="dbabc293ac5554b13ebbe43ca56278cb81478c5cc98b04c6805f5fc517a1484b0b7d23f5d6a64580d781f2976ff79e0646d9a1ebd48ab14005aa8d4128ecfeeb  a52dec-0.8.0.tar.gz
+b8dbcdc817531bc737ee689a1a8fc76ba40462397ca95286fe834795a09df04cd68010ca6105c8e56392328bec00c838372ab28324c5428421d44824109ea6ec  fix-globals-test-x86-pie.patch"
diff --git a/user/a52dec/a52dec-0.7.4-build.patch b/user/a52dec/a52dec-0.7.4-build.patch
deleted file mode 100644
index f3a29f303..000000000
--- a/user/a52dec/a52dec-0.7.4-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
---- a52dec-0.7.4.orig/liba52/Makefile.am	2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/Makefile.am	2004-11-05 01:10:21.317401872 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
- 
- lib_LTLIBRARIES = liba52.la
- 
-diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
---- a52dec-0.7.4.orig/liba52/configure.incl	2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/configure.incl	2004-11-05 01:11:38.172672216 -0800
-@@ -2,7 +2,6 @@
- AC_SUBST([LIBA52_LIBS])
- 
- dnl avoid -fPIC when possible
--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
- 
- AC_ARG_ENABLE([double],
-     [  --enable-double         use double-precision samples])
-diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
---- a52dec-0.7.4.orig/src/Makefile.am	2002-06-22 18:51:57.000000000 -0700
-+++ a52dec-0.7.4/src/Makefile.am	2004-11-05 01:10:21.320401375 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @A52DEC_CFLAGS@
- 
- bin_PROGRAMS = a52dec extract_a52
- a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
diff --git a/user/a52dec/automake.patch b/user/a52dec/automake.patch
deleted file mode 100644
index 42231e040..000000000
--- a/user/a52dec/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig	2013-04-23 12:43:16.258733686 +0000
-+++ ./configure.in	2013-04-23 12:43:32.922233281 +0000
-@@ -6,7 +6,7 @@
- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
-     doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
- AM_INIT_AUTOMAKE([a52dec],[0.7.4])
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADERS(include/config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
- 
diff --git a/user/a52dec/fix-globals-test-x86-pie.patch b/user/a52dec/fix-globals-test-x86-pie.patch
new file mode 100644
index 000000000..da227a139
--- /dev/null
+++ b/user/a52dec/fix-globals-test-x86-pie.patch
@@ -0,0 +1,11 @@
+--- a52dec-0.7.4.orig/test/globals
++++ a52dec-0.7.4/test/globals
+@@ -13,7 +13,7 @@
+ builddir=`cd $builddir;pwd`
+ 
+ bad_globals=`nm -g --defined-only $builddir/../liba52/*.o|\
+-    awk '{if ($3) print $3}'|grep -v '^_\?a52_'`
++    awk '{if ($3) print $3}'|grep -v '^_\?a52_'`|grep -v '^__x86.get_pc_thunk.'
+ 
+ if test x"$bad_globals" != x""; then
+     echo BAD GLOBAL SYMBOLS: