diff options
-rw-r--r-- | audio/liba52/Makefile | 6 | ||||
-rw-r--r-- | audio/liba52/PLIST | 3 | ||||
-rw-r--r-- | audio/liba52/distinfo | 16 | ||||
-rw-r--r-- | audio/liba52/patches/patch-aa | 19 | ||||
-rw-r--r-- | audio/liba52/patches/patch-ab | 22 | ||||
-rw-r--r-- | audio/liba52/patches/patch-ac | 27 | ||||
-rw-r--r-- | audio/liba52/patches/patch-ad | 16 | ||||
-rw-r--r-- | audio/liba52/patches/patch-ae | 13 | ||||
-rw-r--r-- | audio/liba52/patches/patch-af | 13 |
9 files changed, 51 insertions, 84 deletions
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index 949a302b271..f9d70f37ff0 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2001/12/11 04:01:34 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/06/16 18:08:05 wiz Exp $ # -DISTNAME= a52dec-0.7.1b -PKGNAME= ${DISTNAME:S/a52dec/liba52/:S/1b/1.2/} +DISTNAME= a52dec-0.7.3 +PKGNAME= ${DISTNAME:S/a52dec/liba52/} CATEGORIES= audio MASTER_SITES= http://liba52.sourceforge.net/files/ diff --git a/audio/liba52/PLIST b/audio/liba52/PLIST index 8ed1e6ef165..ebb6b70b880 100644 --- a/audio/liba52/PLIST +++ b/audio/liba52/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/06/16 18:08:05 wiz Exp $ include/a52dec/a52.h +include/a52dec/attributes.h include/a52dec/audio_out.h include/a52dec/mm_accel.h lib/liba52.a diff --git a/audio/liba52/distinfo b/audio/liba52/distinfo index 231431f0aad..b45ca9f23fb 100644 --- a/audio/liba52/distinfo +++ b/audio/liba52/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.2 2002/01/21 21:31:31 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/06/16 18:08:05 wiz Exp $ -SHA1 (a52dec-0.7.1b.tar.gz) = 3c46c3acaa922d4c1a246b7390a1c7d64eec5fc0 -Size (a52dec-0.7.1b.tar.gz) = 174184 bytes -SHA1 (patch-aa) = 441e8aa547200e8e32aeabb9a437837ced602b23 -SHA1 (patch-ab) = 50c7507e8a6dd532355377b6049864345beb35fb -SHA1 (patch-ac) = 7f527572156438deac3c6a77a2e631f68f9894d5 -SHA1 (patch-ad) = cba44f6e8cfcdfd8139f33dd84363cfa1bde7a62 -SHA1 (patch-ae) = 59f4c3c666b084e016edbb7efb09a12e217298ba -SHA1 (patch-af) = 2e6ec857bb7b99eb8ea6c27cc997fbf495033575 +SHA1 (a52dec-0.7.3.tar.gz) = cb59c2499215cecd9e79de8cb20b1f3d8232fc6b +Size (a52dec-0.7.3.tar.gz) = 235944 bytes +SHA1 (patch-aa) = f31a0e354ab7f1111c03196bf1a11d7caab0f1e9 +SHA1 (patch-ab) = c51a5d3176705d773e42ceddc1d35c31f112302a +SHA1 (patch-ac) = eb8ef17e2fdb20e34a32c629415b77b123c5a625 +SHA1 (patch-ad) = 2186a4ac36cf44f021fbc1a4d8e7d31b96b71531 diff --git a/audio/liba52/patches/patch-aa b/audio/liba52/patches/patch-aa index 10fa083c0a9..2fe00371457 100644 --- a/audio/liba52/patches/patch-aa +++ b/audio/liba52/patches/patch-aa @@ -1,16 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-aa,v 1.2 2002/06/16 18:08:05 wiz Exp $ ---- configure-orig Fri Aug 31 11:39:53 2001 -+++ configure Wed Oct 10 21:18:49 2001 -@@ -2663,6 +2663,11 @@ - #define LIBAO_SOLARIS - EOF - ;; +--- libao/configure.incl.orig Sun Feb 17 10:23:15 2002 ++++ libao/configure.incl Thu Jun 13 10:27:49 2002 +@@ -19,6 +19,8 @@ + case "$host" in + *-sun-solaris*) + AC_DEFINE([LIBAO_SOLARIS],,[libao solaris support]);; + *-netbsd*) -+ cat >> confdefs.h <<\EOF -+#define LIBAO_SOLARIS -+EOF -+;; ++ AC_DEFINE([LIBAO_SOLARIS],,[libao solaris compat support]);; esac fi diff --git a/audio/liba52/patches/patch-ab b/audio/liba52/patches/patch-ab index 3acd3ba53aa..c99d442ddb5 100644 --- a/audio/liba52/patches/patch-ab +++ b/audio/liba52/patches/patch-ab @@ -1,10 +1,16 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ab,v 1.2 2002/06/16 18:08:06 wiz Exp $ ---- configure.in-orig Fri Aug 31 11:36:47 2001 -+++ configure.in Thu Oct 11 00:13:14 2001 -@@ -92,4 +92,4 @@ +--- configure.orig Thu Feb 21 08:55:21 2002 ++++ configure Thu Jun 13 10:12:43 2002 +@@ -8802,6 +8802,11 @@ + #define LIBAO_SOLARIS + EOF + ;; ++ *-netbsd*) ++cat >> confdefs.h <<\EOF ++#define LIBAO_SOLARIS ++EOF ++;; + esac + fi - AC_C_ATTRIBUTE_ALIGNED - --AC_OUTPUT(Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile) -+AC_OUTPUT(Makefile autotools/Makefile include/Makefile liba52/Makefile) diff --git a/audio/liba52/patches/patch-ac b/audio/liba52/patches/patch-ac index 8fb0affda89..03c1ab52190 100644 --- a/audio/liba52/patches/patch-ac +++ b/audio/liba52/patches/patch-ac @@ -1,22 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ac,v 1.2 2002/06/16 18:08:06 wiz Exp $ ---- configure-orig Fri Aug 31 11:39:53 2001 -+++ configure Thu Oct 11 00:13:56 2001 -@@ -2857,7 +2857,7 @@ - ac_given_srcdir=$srcdir - ac_given_INSTALL="$INSTALL" +--- Makefile.am.orig Mon Dec 17 00:23:45 2001 ++++ Makefile.am Thu Jun 13 10:04:13 2002 +@@ -1,3 +1,3 @@ +-SUBDIRS = autotools include doc liba52 libao src vc++ test ++SUBDIRS = autotools include liba52 --trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile liba52/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 - EOF - cat >> $CONFIG_STATUS <<EOF - -@@ -2967,7 +2967,7 @@ - - cat >> $CONFIG_STATUS <<EOF - --CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile"} -+CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile liba52/Makefile"} - EOF - cat >> $CONFIG_STATUS <<\EOF - for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + EXTRA_DIST = HISTORY bootstrap diff --git a/audio/liba52/patches/patch-ad b/audio/liba52/patches/patch-ad index 89a4c437aee..1a736f87683 100644 --- a/audio/liba52/patches/patch-ad +++ b/audio/liba52/patches/patch-ad @@ -1,9 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ +$NetBSD: patch-ad,v 1.2 2002/06/16 18:08:06 wiz Exp $ ---- Makefile.am-orig Wed Aug 15 20:36:52 2001 -+++ Makefile.am Thu Oct 11 00:15:31 2001 -@@ -1,3 +1,3 @@ --SUBDIRS = autotools include doc liba52 libao src test +--- Makefile.in.orig Thu Feb 21 08:58:36 2002 ++++ Makefile.in Thu Jun 13 10:03:57 2002 +@@ -76,7 +76,7 @@ + STRIP = @STRIP@ + VERSION = @VERSION@ + +-SUBDIRS = autotools include doc liba52 libao src vc++ test +SUBDIRS = autotools include liba52 - EXTRA_DIST = bootstrap + EXTRA_DIST = HISTORY bootstrap + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/liba52/patches/patch-ae b/audio/liba52/patches/patch-ae deleted file mode 100644 index aaba3f24550..00000000000 --- a/audio/liba52/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $ - ---- Makefile.in-orig Fri Aug 31 11:40:06 2001 -+++ Makefile.in Thu Oct 11 00:15:42 2001 -@@ -72,7 +72,7 @@ - RANLIB = @RANLIB@ - VERSION = @VERSION@ - --SUBDIRS = autotools include doc liba52 libao src test -+SUBDIRS = autotools include liba52 - - EXTRA_DIST = bootstrap - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/liba52/patches/patch-af b/audio/liba52/patches/patch-af deleted file mode 100644 index 2091efe30bf..00000000000 --- a/audio/liba52/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/01/21 21:31:32 wiz Exp $ - ---- liba52/bitstream.c.orig Wed Aug 15 14:36:53 2001 -+++ liba52/bitstream.c -@@ -38,7 +38,7 @@ - { - int align; - -- align = (int)buf & 3; -+ align = (long)buf & 3; - buffer_start = (uint32_t *) (buf - align); - bits_left = 0; - bitstream_get (align * 8); |