From 7c913c66ee18cee9dd04ce15de1f5175b477b8fc Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 6 Aug 2006 10:38:42 +0000
Subject: Merge in patches from xmms-faad.

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

(limited to 'audio/faad2')

diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index 126afb60dea..f6f909b947b 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -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-am) = 7473594abc5349658a100db4a7dada5a8835468c
 SHA1 (patch-an) = 2267c3e65f820e72e0db4f2ce7b4c14f430e4cf4
 SHA1 (patch-ao) = 53739236153804fe4d9a663654f5822d44aee826
 SHA1 (patch-aq) = 145ec56e89f0533480888fd6a0bb87896d865fc1
+SHA1 (patch-ar) = 0eea09b484217e5b763b2e9ce012414dc77c95df
+SHA1 (patch-as) = f90050ba166e5a7eac7b0db5e9360eecab59dba7
diff --git a/audio/faad2/patches/patch-ar b/audio/faad2/patches/patch-ar
new file mode 100644
index 00000000000..20bea66754d
--- /dev/null
+++ b/audio/faad2/patches/patch-ar
@@ -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 --git a/audio/faad2/patches/patch-as b/audio/faad2/patches/patch-as
new file mode 100644
index 00000000000..20cf88af6a6
--- /dev/null
+++ b/audio/faad2/patches/patch-as
@@ -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>
-- 
cgit v1.2.3