diff options
author | jlam <jlam@pkgsrc.org> | 2002-10-07 00:36:34 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-10-07 00:36:34 +0000 |
commit | 60786e567cffba33c0f6cf4eee13780c039b7ba6 (patch) | |
tree | e2f4ad88ae0d6d4b2ec17ef17376b639a2db4451 /audio | |
parent | 9e04fbd4b51f763244ca5d4edbce6eb69b00e851 (diff) | |
download | pkgsrc-60786e567cffba33c0f6cf4eee13780c039b7ba6.tar.gz |
Make this package work with audio/oss if USE_OSS is defined.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/kdemultimedia3/Makefile | 9 | ||||
-rw-r--r-- | audio/kdemultimedia3/distinfo | 4 | ||||
-rw-r--r-- | audio/kdemultimedia3/patches/patch-aa | 33 |
3 files changed, 31 insertions, 15 deletions
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index 38519c8a46e..5091233ee93 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/10/03 11:21:28 markd Exp $ +# $NetBSD: Makefile,v 1.7 2002/10/07 00:36:34 jlam Exp $ DISTNAME= kdemultimedia-3.0.3 CATEGORIES= audio @@ -10,6 +10,11 @@ DEPENDS+= xanim>=2.80.0:../../graphics/xanim USE_BUILDLINK2= YES +.include "../../mk/bsd.prefs.mk" +.if defined(USE_OSS) +CONFIGURE_ARGS+= --enable-audio=oss +.endif + # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} @@ -19,4 +24,6 @@ PTHREAD_OPT+= require .include "../../x11/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo index 6cbd4d36758..1604c0cbf01 100644 --- a/audio/kdemultimedia3/distinfo +++ b/audio/kdemultimedia3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2002/10/03 11:21:28 markd Exp $ +$NetBSD: distinfo,v 1.7 2002/10/07 00:36:34 jlam Exp $ SHA1 (kdemultimedia-3.0.3.tar.bz2) = 72c046f2656c01c5ece06228154912382885b9b7 Size (kdemultimedia-3.0.3.tar.bz2) = 5791102 bytes -SHA1 (patch-aa) = e7b1587d8efb48c48484ca90ed9c7d8fe8d7bc94 +SHA1 (patch-aa) = ee1ba5de96f584dc14c762d785be22a5662d2c0a SHA1 (patch-ab) = 85b8216b50ab22435835b07e068d326563d0e217 SHA1 (patch-ac) = ffc738496170c34c8c3ee84544ec1eeac27992ec SHA1 (patch-ad) = 7821e0466fb29f7ca9692df817fcdd833a12b791 diff --git a/audio/kdemultimedia3/patches/patch-aa b/audio/kdemultimedia3/patches/patch-aa index 06812a8922a..3b78dacca3d 100644 --- a/audio/kdemultimedia3/patches/patch-aa +++ b/audio/kdemultimedia3/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ +$NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ ---- configure.orig Tue May 14 01:53:41 2002 +--- configure.orig Wed Aug 7 11:02:50 2002 +++ configure -@@ -22016,6 +22016,40 @@ +@@ -22016,6 +22016,40 @@ if { (eval echo "$as_me:22007: \"$ac_lin echo "$as_me:22016: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "ac_cv_lib_vm='-lXxf86dga -lXxf86vm'" @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -@@ -22767,7 +22801,7 @@ +@@ -22767,7 +22801,7 @@ if test "x$au_enable_default" = xyes; th au_enable_sun=yes ;; *-*-netbsd*) @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ ;; *-*-openbsd*) au_enable_sun=yes -@@ -22788,7 +22822,7 @@ +@@ -22788,7 +22822,7 @@ if test "x$au_enable_oss" = xyes; then echo "${ECHO_T}yes - <sys/soundcard.h>" >&6 else case "$target" in @@ -61,7 +61,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ echo "$as_me:22792: result: yes" >&5 echo "${ECHO_T}yes" >&6 ;; -@@ -26625,6 +26659,7 @@ +@@ -26278,7 +26312,7 @@ fi + echo "$as_me:26278: result: $ac_cv_lib_ossaudio_main" >&5 + echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6 + if test $ac_cv_lib_ossaudio_main = yes; then +- LIBOSSAUDIO="-lossaudio" ++ LIBOSSAUDIO="${LIBOSSAUDIO}" + fi + + echo "$as_me:26284: checking for main in -lasound" >&5 +@@ -26625,6 +26659,7 @@ case "$host" in *-*-*bsdi*) kscd_compile=yes;; *-*-*freebsd*) kscd_compile=yes;; *-*-*openbsd*) kscd_compile=yes;; @@ -69,7 +78,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ *-*-*bsd*) kscd_compile=no;; *) kscd_compile=yes;; esac -@@ -26688,7 +26723,7 @@ +@@ -26688,7 +26723,7 @@ EOF fi done @@ -78,7 +87,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:26694: checking for $ac_header" >&5 -@@ -27007,7 +27042,22 @@ +@@ -27007,7 +27042,22 @@ if { (eval echo "$as_me:26998: \"$ac_com echo "$as_me:27007: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -101,7 +110,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ else echo "$as_me: failed program was:" >&5 -@@ -27056,7 +27106,22 @@ +@@ -27056,7 +27106,22 @@ if { (eval echo "$as_me:27047: \"$ac_com echo "$as_me:27056: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -124,7 +133,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ else echo "$as_me: failed program was:" >&5 -@@ -27105,7 +27170,22 @@ +@@ -27105,7 +27170,22 @@ if { (eval echo "$as_me:27096: \"$ac_com echo "$as_me:27105: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -147,7 +156,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ else echo "$as_me: failed program was:" >&5 -@@ -27381,6 +27461,9 @@ +@@ -27381,6 +27461,9 @@ esac kde_mpeglib_compiles=no case "$OS_TYPE" in @@ -157,7 +166,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $ FreeBSD) kde_mpeglib_compiles=yes ;; -@@ -27647,9 +27730,10 @@ +@@ -27647,9 +27730,10 @@ EOF ;; NetBSD) |