pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/sox Add an option to turn on OSS support (instea...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3a8f6cd669f7
branches: trunk
changeset: 531772:3a8f6cd669f7
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Aug 06 05:28:36 2007 +0000
description:
Add an option to turn on OSS support (instead of turning it off
unconditionally), for DragonFly.
Based on a patch provided by Steve O'Hara-Smith on pkgsrc-users.
While here, split off options handling into an options.mk file.
diffstat:
audio/sox/Makefile | 14 +++-----------
audio/sox/distinfo | 4 ++--
audio/sox/options.mk | 16 ++++++++++++++++
audio/sox/patches/patch-aa | 18 ++++++++++++++----
4 files changed, 35 insertions(+), 17 deletions(-)
diffs (103 lines):
diff -r 2dc372103e80 -r 3a8f6cd669f7 audio/sox/Makefile
--- a/audio/sox/Makefile Mon Aug 06 04:53:23 2007 +0000
+++ b/audio/sox/Makefile Mon Aug 06 05:28:36 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/06/04 05:44:09 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/08/06 05:28:36 wiz Exp $
DISTNAME= sox-13.0.0
PKGREVISION= 1
@@ -14,12 +14,6 @@
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
-PKG_OPTIONS_VAR= PKG_OPTIONS.sox
-PKG_SUPPORTED_OPTIONS= lame
-# lame has LICENSE= issues and thus should not be SUGGESTED.
-PKG_SUGGESTED_OPTIONS=
-.include "../../mk/bsd.options.mk"
-
SUBST_CLASSES+= lrf
SUBST_FILES.lrf= src/libst-config.in
SUBST_SED.lrf= -e "s!@LRF@!"${LINKER_RPATH_FLAG}"!"
@@ -30,13 +24,11 @@
SUBST_SED.gsm= -e "s!gsm/gsm.h!gsm.h!"
SUBST_STAGE.gsm= pre-configure
+.include "options.mk"
+
# needs obsolete FLAC API
#.include "../../audio/flac/buildlink3.mk"
.include "../../audio/gsm/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mlame)
-# This is an option due to LICENSE= issues.
-.include "../../audio/lame/buildlink3.mk"
-.endif
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
diff -r 2dc372103e80 -r 3a8f6cd669f7 audio/sox/distinfo
--- a/audio/sox/distinfo Mon Aug 06 04:53:23 2007 +0000
+++ b/audio/sox/distinfo Mon Aug 06 05:28:36 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2007/02/22 23:34:42 wiz Exp $
+$NetBSD: distinfo,v 1.17 2007/08/06 05:28:36 wiz Exp $
SHA1 (sox-13.0.0.tar.gz) = db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4
RMD160 (sox-13.0.0.tar.gz) = 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2
Size (sox-13.0.0.tar.gz) = 725259 bytes
-SHA1 (patch-aa) = c21bd9f1b9ba2440abd47b4aacc9721d0a2a6589
+SHA1 (patch-aa) = 46421ae6d228132b9719df6129b49bdb78174a42
SHA1 (patch-ab) = 3973227e19b0a1128b8faa4ab88074dcf51e100d
SHA1 (patch-ac) = 53aee94b525c7856c49c8c948377c88973f2e651
SHA1 (patch-ad) = efe2df76606544754a2c6d44bd9488e359a8caa8
diff -r 2dc372103e80 -r 3a8f6cd669f7 audio/sox/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sox/options.mk Mon Aug 06 05:28:36 2007 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2007/08/06 05:28:37 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.sox
+PKG_SUPPORTED_OPTIONS= lame oss
+# lame has LICENSE= issues and thus should not be SUGGESTED.
+PKG_SUGGESTED_OPTIONS=
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlame)
+# This is an option due to LICENSE= issues.
+.include "../../audio/lame/buildlink3.mk"
+.endif
+
+.if empty(PKG_OPTIONS:Moss)
+CONFIGURE_ARGS+= --without-oss
+.endif
diff -r 2dc372103e80 -r 3a8f6cd669f7 audio/sox/patches/patch-aa
--- a/audio/sox/patches/patch-aa Mon Aug 06 04:53:23 2007 +0000
+++ b/audio/sox/patches/patch-aa Mon Aug 06 05:28:36 2007 +0000
@@ -1,12 +1,22 @@
-$NetBSD: patch-aa,v 1.10 2007/02/22 23:23:04 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2007/08/06 05:28:37 wiz Exp $
---- configure.orig 2007-02-22 22:45:00.000000000 +0000
+--- configure.orig 2007-02-11 19:48:36.000000000 +0000
+++ configure
-@@ -20972,6 +20972,7 @@ fi
+@@ -20671,6 +20671,8 @@ _ACEOF
+
+ fi
+
++if test "$with_oss" != no; then
++
+ with_oss=no
+
+ for ac_header in sys/soundcard.h
+@@ -20972,6 +20974,8 @@ fi
done
-+with_oss=no
++fi
++
if test "$with_oss" = yes; then
cat >>confdefs.h <<\_ACEOF
Home |
Main Index |
Thread Index |
Old Index