diff options
| author | obache <obache> | 2011-12-19 11:26:59 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-12-19 11:26:59 +0000 |
| commit | bd0dee1d75f694074ebd04191a8945911f0009af (patch) | |
| tree | c42593a8ae2033e6d7438c2ccd2c56704515cad9 | |
| parent | 0e92f0301931eb0285383151aee5ad0daf06be51 (diff) | |
| download | pkgsrc-bd0dee1d75f694074ebd04191a8945911f0009af.tar.gz | |
Fixes build of oss plugin for the case that ossaudio library is not required.
| -rw-r--r-- | lang/squeak-vm/Makefile | 11 | ||||
| -rw-r--r-- | lang/squeak-vm/distinfo | 4 | ||||
| -rw-r--r-- | lang/squeak-vm/patches/patch-ab | 18 |
3 files changed, 19 insertions, 14 deletions
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile index be58534b038..56a354910af 100644 --- a/lang/squeak-vm/Makefile +++ b/lang/squeak-vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/12/17 12:45:17 marino Exp $ +# $NetBSD: Makefile,v 1.10 2011/12/19 11:26:59 obache Exp $ # SQUEAK_VERSION= 3.11.3.2135 @@ -44,11 +44,6 @@ PLIST_SUBST= SQUEAK_VERSION=${SQUEAK_VERSION} PLIST_VARS+= oss -.if $(OPSYS) != "DragonFly" -PLIST.oss= yes -CMAKE_ARGS+= -DLIBOSSAUDIO=${LIBOSSAUDIO} -.endif - pre-configure: ${MKDIR} ${CONFIGURE_DIRS} @@ -65,4 +60,8 @@ pre-configure: .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" +.if $(OSS_TYPE) != "none" +PLIST.oss= yes +CMAKE_ARGS+= -DLIBOSSAUDIO=${LIBOSSAUDIO:S/-l//} +.endif .include "../../mk/bsd.pkg.mk" diff --git a/lang/squeak-vm/distinfo b/lang/squeak-vm/distinfo index 9cad828c2ed..671169874f6 100644 --- a/lang/squeak-vm/distinfo +++ b/lang/squeak-vm/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2011/01/18 15:28:13 asau Exp $ +$NetBSD: distinfo,v 1.4 2011/12/19 11:26:59 obache Exp $ SHA1 (squeak/Squeak-3.11.3.2135-src.tar.gz) = cdc033b14e56ea05aa62bcb1686bb73f4347e29f RMD160 (squeak/Squeak-3.11.3.2135-src.tar.gz) = abb7dbde7e79f18161842d1451959ad09e7ef3ad Size (squeak/Squeak-3.11.3.2135-src.tar.gz) = 3585556 bytes SHA1 (patch-aa) = dfdb3be82288e8bd7658832e8dd91d242d2b97b2 -SHA1 (patch-ab) = 8f5e72383e4cdc1554e225e9ddafb1c4c17f9ccf +SHA1 (patch-ab) = 019a6b1bc50e3abc500902a45edcd960b7708bf2 SHA1 (patch-ac) = bad06ae257766407c90a62f5927a53c97ee8072a SHA1 (patch-ad) = e426d1de4b496704be08c67d2d2ab61a24735017 SHA1 (patch-ae) = 73c358e42d153c9e6fe605fa1c77360ad48c6ec3 diff --git a/lang/squeak-vm/patches/patch-ab b/lang/squeak-vm/patches/patch-ab index aaa0a44eb6e..f8bce0c402b 100644 --- a/lang/squeak-vm/patches/patch-ab +++ b/lang/squeak-vm/patches/patch-ab @@ -1,12 +1,18 @@ -$NetBSD: patch-ab,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $ +$NetBSD: patch-ab,v 1.2 2011/12/19 11:26:59 obache Exp $ Use proper OSS library. Use proper audio device. ---- unix/vm-sound-OSS/config.cmake.orig 2009-08-26 22:44:21.000000000 +0400 -+++ unix/vm-sound-OSS/config.cmake 2010-01-24 06:10:44.000000000 +0300 -@@ -1,2 +1,2 @@ +--- unix/vm-sound-OSS/config.cmake.orig 2009-08-26 18:44:21 +0000 ++++ unix/vm-sound-OSS/config.cmake +@@ -1,2 +1,8 @@ -PLUGIN_REQUIRE_INCLUDE (ALSA_SOUNDLIB alsa/asoundlib.h) -PLUGIN_REQUIRE_LIBRARY (ASOUND asound) -+PLUGIN_REQUIRE_LIBRARY (ASOUND ossaudio) -+PLUGIN_DEFINITIONS (-DDEVOSSAUDIO=\"${DEVOSSAUDIO}\") ++IF (DEFINED LIBOSSAUDIO) ++ IF (LIBOSSAUDIO) ++ PLUGIN_FIND_LIBRARY (ASOUND ${LIBOSSAUDIO}) ++ ENDIF () ++ PLUGIN_DEFINITIONS (-DDEVOSSAUDIO=\"${DEVOSSAUDIO}\") ++ELSE () ++ PLUGIN_DISABLE () ++ENDIF () |