[pkgsrc/trunk]: pkgsrc/audio/faad2 Merge in patches from xmms-faad.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfdd20989313
branches:  trunk
changeset: 517191:bfdd20989313
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Aug 06 10:38:42 2006 +0000

description:
Merge in patches from xmms-faad.

diffstat:

 audio/faad2/distinfo         |   4 +++-
 audio/faad2/patches/patch-ar |  17 +++++++++++++++++
 audio/faad2/patches/patch-as |  15 +++++++++++++++
 3 files changed, 35 insertions(+), 1 deletions(-)

diffs (55 lines):

diff -r d371da710c53 -r bfdd20989313 audio/faad2/distinfo
--- a/audio/faad2/distinfo      Sun Aug 06 10:37:40 2006 +0000
+++ b/audio/faad2/distinfo      Sun Aug 06 10:38:42 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/07/27 17:27:29 wiz Exp $
+$NetBSD: distinfo,v 1.13 2006/08/06 10:38:42 wiz Exp $
 
 SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
 RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90
@@ -19,3 +19,5 @@
 SHA1 (patch-an) = 2267c3e65f820e72e0db4f2ce7b4c14f430e4cf4
 SHA1 (patch-ao) = 53739236153804fe4d9a663654f5822d44aee826
 SHA1 (patch-aq) = 145ec56e89f0533480888fd6a0bb87896d865fc1
+SHA1 (patch-ar) = 0eea09b484217e5b763b2e9ce012414dc77c95df
+SHA1 (patch-as) = f90050ba166e5a7eac7b0db5e9360eecab59dba7
diff -r d371da710c53 -r bfdd20989313 audio/faad2/patches/patch-ar
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faad2/patches/patch-ar      Sun Aug 06 10:38:42 2006 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ar,v 1.1 2006/08/06 10:38:42 wiz Exp $
+
+--- plugins/xmms/src/Makefile.am.orig  2004-02-07 03:05:07.000000000 +1100
++++ plugins/xmms/src/Makefile.am
+@@ -5,9 +5,9 @@ libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cfl
+        `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
+ 
+-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+-       $(top_builddir)/common/mp4v2/libmp4v2.la
++LIBS = -lfaad -lmp4v2
++CFLAGS = `$(XMMS_CONFIG) --cflags` `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1
+ 
+ libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
+-       `$(GTK_CONFIG) --libs` -lpthread -lstdc++
++       `$(GTK_CONFIG) --libs` -lstdc++ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
diff -r d371da710c53 -r bfdd20989313 audio/faad2/patches/patch-as
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faad2/patches/patch-as      Sun Aug 06 10:38:42 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-as,v 1.1 2006/08/06 10:38:42 wiz Exp $
+
+--- plugins/xmms/src/libmp4.c.orig     2003-12-04 05:37:56.000000000 +1100
++++ plugins/xmms/src/libmp4.c
+@@ -8,8 +8,8 @@
+ 
+ #include <pthread.h>
+ #include <gtk/gtk.h>
+-#include "faad.h"
+-#include "mp4.h"
++#include <faad.h>
++#include <mp4.h>
+ 
+ #include <xmms/plugin.h>
+ #include <xmms/util.h>