From 8dddaf0be55329b14888d95e3dcc355f3f6a55a9 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 29 Dec 2007 19:56:04 +0000
Subject: Fix pthread linkage.

---
 audio/faad2/distinfo         |  4 ++--
 audio/faad2/patches/patch-ar | 12 +++++++-----
 audio/xmms-faad/Makefile     |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'audio')

diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index 517315f87fd..d83073e3318 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/12/09 10:55:30 drochner Exp $
+$NetBSD: distinfo,v 1.16 2007/12/29 19:56:04 joerg Exp $
 
 SHA1 (faad2-2.6.1.tar.gz) = b4ad33d3c4dfa6dbf3011a3da34c631926cabfad
 RMD160 (faad2-2.6.1.tar.gz) = ad559933dad6a65576a9947819190f04cb3b1c16
@@ -10,6 +10,6 @@ SHA1 (patch-ad) = 2c8c8cee7fb879565f18548a73e16f298b9640f7
 SHA1 (patch-af) = 36b2979d871e70bf6a29e3a9c17ee4c5bb2b1aa6
 SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
 SHA1 (patch-ak) = d8f47b6f738d885c5e512f9f5508290a0b146bbe
-SHA1 (patch-ar) = 4a5be13a4499518043d16f3c4dba94d30160f372
+SHA1 (patch-ar) = 0aa479669b1e2417f9a68adb0ac79ae9c6d5dfe8
 SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845
 SHA1 (patch-at) = 4e28b2150f7383674450e25db472ccb566e61cc0
diff --git a/audio/faad2/patches/patch-ar b/audio/faad2/patches/patch-ar
index 75597d4512a..143abbb1284 100644
--- a/audio/faad2/patches/patch-ar
+++ b/audio/faad2/patches/patch-ar
@@ -1,16 +1,18 @@
-$NetBSD: patch-ar,v 1.2 2007/12/09 10:55:37 drochner Exp $
+$NetBSD: patch-ar,v 1.3 2007/12/29 19:56:04 joerg Exp $
 
 --- plugins/xmms/src/Makefile.am.orig	2006-09-25 21:52:53.000000000 +0200
 +++ plugins/xmms/src/Makefile.am
-@@ -6,8 +6,9 @@ lib_LTLIBRARIES = libmp4.la
+@@ -6,9 +6,10 @@ lib_LTLIBRARIES = libmp4.la
  libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
         -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
  
 -libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
 -       $(top_builddir)/common/mp4ff/libmp4ff.la
 +libmp4_la_LIBADD = $(top_builddir)/common/mp4ff/libmp4ff.la
-+
-+LIBS = -lfaad
  
- libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
+-libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
++LIBS = -lfaad
++
++libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
+ libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index becec968cae..bba17c8125c 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/12/09 10:55:37 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2007/12/29 19:56:04 joerg Exp $
 
 DISTNAME=		faad2-2.6.1
 PKGNAME=		xmms-faad-2.6.1
@@ -44,4 +44,5 @@ pre-configure:
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3