diff options
| author | wiz <wiz@pkgsrc.org> | 2016-02-24 11:34:09 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-02-24 11:34:09 +0000 |
| commit | 91dd1611b8639475e6f71d5e3abb2e2a458d9127 (patch) | |
| tree | c74cc4c37fb90e5157532b71784f0d98f2e78240 /audio | |
| parent | fb2541fdcc979d1302bbe76dc9af2e0b886629ac (diff) | |
| download | pkgsrc-91dd1611b8639475e6f71d5e3abb2e2a458d9127.tar.gz | |
Fix build with pkgconf.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/wsoundserver/distinfo | 4 | ||||
| -rw-r--r-- | audio/wsoundserver/patches/patch-configure | 29 |
2 files changed, 19 insertions, 14 deletions
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo index 851ac5392fe..9e6bf3dbe4b 100644 --- a/audio/wsoundserver/distinfo +++ b/audio/wsoundserver/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2015/11/03 01:12:54 agc Exp $ +$NetBSD: distinfo,v 1.12 2016/02/24 11:34:09 wiz Exp $ SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4 RMD160 (WSoundServer-0.4.0.tar.gz) = ac58045fbe7f2c327b0c87514b06cb0941518b25 @@ -9,4 +9,4 @@ SHA1 (patch-ac) = 8595912bdc913dae46c82bc3a59fc96318350982 SHA1 (patch-ad) = 66d2b1d3b7157040cf6f20449c85448ed117f757 SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea SHA1 (patch-af) = c1b88824803ff293bb78c130ab9bb6ae5404a133 -SHA1 (patch-configure) = baacdec4650d0792371284a67a557064188f91ed +SHA1 (patch-configure) = 44b86d1810d8250642370ec206a48e900911a221 diff --git a/audio/wsoundserver/patches/patch-configure b/audio/wsoundserver/patches/patch-configure index 2b283eadcca..f7409d8e549 100644 --- a/audio/wsoundserver/patches/patch-configure +++ b/audio/wsoundserver/patches/patch-configure @@ -1,26 +1,31 @@ -$NetBSD: patch-configure,v 1.2 2012/02/15 23:13:32 hans Exp $ +$NetBSD: patch-configure,v 1.3 2016/02/24 11:34:09 wiz Exp $ Fix configury with libaudiofile-0.3+. Fix interpreter in get-wsound-flags. ---- configure.orig 2011-12-19 13:10:25.000000000 +0000 +--- configure.orig 2000-03-31 20:10:25.000000000 +0000 +++ configure -@@ -3252,11 +3252,11 @@ echo "configure:3248: checking for AUDIO - AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs` - AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags` - audiofile_major_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \ +@@ -3249,14 +3249,11 @@ echo "configure:3248: checking for AUDIO + if test "$AUDIOFILE_CONFIG" = "no" ; then + no_audiofile=yes + else +- AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs` +- AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags` +- audiofile_major_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\1/'` - audiofile_minor_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \ +- audiofile_minor_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\2/'` - audiofile_micro_version=`$AUDIOFILE_CONFIG $audiofile_config_args --version | \ +- audiofile_micro_version=`$AUDIOFILE_CONFIG $audiofile_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\3/'` ++ AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs audiofile` ++ AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags audiofile` ++ audiofile_major_version=0 ++ audiofile_minor_version=3 ++ audiofile_micro_version=6 if test "x$enable_audiofiletest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" -@@ -4272,7 +4272,7 @@ test "$no_create" = yes || ${CONFIG_SHEL +@@ -4272,7 +4271,7 @@ test "$no_create" = yes || ${CONFIG_SHEL cat <<EOF >get-wsound-flags |