diff options
author | jperkin <jperkin@pkgsrc.org> | 2012-09-26 12:55:11 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2012-09-26 12:55:11 +0000 |
commit | 8b884bec61d9f187f5c9fb06ea8493232e29094f (patch) | |
tree | b7e78a70e533dce2525c23681a90c6c38119a8fb /audio | |
parent | f9bfb87718b6a9d46390024817ab0d35f4b46c54 (diff) | |
download | pkgsrc-8b884bec61d9f187f5c9fb06ea8493232e29094f.tar.gz |
Disable hand-rolled assembly on Solaris, the style is incompatible with
the Solaris linker, and -mimpure-text is no longer an option with GCC.
Fixes build on Solaris/GCC.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/bmp/Makefile | 6 | ||||
-rw-r--r-- | audio/bmp/distinfo | 5 | ||||
-rw-r--r-- | audio/bmp/patches/patch-an | 17 | ||||
-rw-r--r-- | audio/bmp/patches/patch-at | 13 | ||||
-rw-r--r-- | audio/libmpg123/Makefile | 7 | ||||
-rw-r--r-- | audio/libmpg123/distinfo | 3 | ||||
-rw-r--r-- | audio/libmpg123/mpg123-options.mk | 5 | ||||
-rw-r--r-- | audio/libmpg123/patches/patch-ae | 13 | ||||
-rw-r--r-- | audio/mpg123/Makefile | 6 | ||||
-rw-r--r-- | audio/mpg123/distinfo | 3 | ||||
-rw-r--r-- | audio/mpg123/options.mk | 5 | ||||
-rw-r--r-- | audio/mpg123/patches/patch-ai | 22 |
12 files changed, 26 insertions, 79 deletions
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile index 9ae6905894a..75c86d17f66 100644 --- a/audio/bmp/Makefile +++ b/audio/bmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2012/09/15 10:03:32 obache Exp $ +# $NetBSD: Makefile,v 1.48 2012/09/26 12:55:11 jperkin Exp $ # BMP_ENABLE_ENCODERS= yes @@ -21,10 +21,6 @@ PRINT_PLIST_AWK+= /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next } USE_LANGUAGES= c c++ LDFLAGS.NetBSD+= -lstdc++ -lm -.if ${OPSYS} == "SunOS" -MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text" -.endif - .include "../../audio/id3lib/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo index d6abddba250..ff49d78c406 100644 --- a/audio/bmp/distinfo +++ b/audio/bmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2011/09/14 15:45:30 hans Exp $ +$NetBSD: distinfo,v 1.14 2012/09/26 12:55:11 jperkin Exp $ SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77 RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5 @@ -7,10 +7,9 @@ SHA1 (bmp-0.9.7.1.tar.gz) = ab6444b9a35a8bb8e920a781e72d963a3fb60547 RMD160 (bmp-0.9.7.1.tar.gz) = 9288083918913ca97ab8883d616159055931ade7 Size (bmp-0.9.7.1.tar.gz) = 2056564 bytes SHA1 (patch-aa) = fbaa61ef68857c12b4506180a9d8d290dbf6615f -SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f +SHA1 (patch-an) = dca39915d93f99ead493bc6913469e791f2d0c79 SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2 SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67 SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604 -SHA1 (patch-at) = a643d4bc95d84424226f742675abc87c18834af5 diff --git a/audio/bmp/patches/patch-an b/audio/bmp/patches/patch-an index 9ff8775b3c5..dec10e8f544 100644 --- a/audio/bmp/patches/patch-an +++ b/audio/bmp/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1 2004/05/15 09:34:53 jmmv Exp $ +$NetBSD: patch-an,v 1.2 2012/09/26 12:55:12 jperkin Exp $ ---- configure.orig 2003-12-24 20:16:01.000000000 +0100 -+++ configure -@@ -30074,7 +30074,7 @@ fi +--- configure.orig Sat Oct 22 10:45:08 2005 ++++ configure Wed Sep 26 12:31:51 2012 +@@ -28454,7 +28454,7 @@ done @@ -11,3 +11,12 @@ $NetBSD: patch-an,v 1.1 2004/05/15 09:34:53 jmmv Exp $ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -28804,7 +28804,7 @@ + i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*) + arch_type=ix86 + case "$host" in +- *-*-netbsd* | *-*openbsd*) ++ *-*-netbsd* | *-*openbsd* | *-solaris*) + ;; + *) + ARCH_DEFINES="-DI386_ASSEM" diff --git a/audio/bmp/patches/patch-at b/audio/bmp/patches/patch-at deleted file mode 100644 index 3b300573106..00000000000 --- a/audio/bmp/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.1 2011/09/14 15:45:30 hans Exp $ - ---- Input/mpg123/Makefile.in.orig 2011-09-13 15:02:57.309943222 +0200 -+++ Input/mpg123/Makefile.in 2011-09-13 15:15:51.386590197 +0200 -@@ -113,7 +113,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ - CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) - LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ - $(CCASFLAGS) diff --git a/audio/libmpg123/Makefile b/audio/libmpg123/Makefile index 5043618bcfd..4f9914e6d97 100644 --- a/audio/libmpg123/Makefile +++ b/audio/libmpg123/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/09/12 00:24:43 asau Exp $ +# $NetBSD: Makefile,v 1.7 2012/09/26 13:20:11 jperkin Exp $ # .include "../../audio/libmpg123/Makefile.common" @@ -23,9 +23,4 @@ post-install: .include "mpg123-options.mk" -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text" -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/audio/libmpg123/distinfo b/audio/libmpg123/distinfo index f68d634dc36..e30a03c3041 100644 --- a/audio/libmpg123/distinfo +++ b/audio/libmpg123/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2011/09/14 15:46:01 hans Exp $ +$NetBSD: distinfo,v 1.3 2012/09/26 13:20:12 jperkin Exp $ SHA1 (mpg123-1.5.1.tar.bz2) = 4e85388294c5c432bd899bb910694dd259e76679 RMD160 (mpg123-1.5.1.tar.bz2) = aeaf5ab770eeb66826d81ba3d840492709b2c7a5 @@ -7,4 +7,3 @@ SHA1 (patch-aa) = faf686e1b47bc53ef5155129da2fd0b81632c2f9 SHA1 (patch-ab) = 7d1d36cf5ea4a3e3d0a43da351ac7e3c97c636bf SHA1 (patch-ac) = 751f52278354413e11f857c53e954e2fd56ba06b SHA1 (patch-ad) = 2b888b710499308216a90d48036c1d00327033e3 -SHA1 (patch-ae) = e9b9b661b85fa66e2c16fa2f6466ea82f7e945e2 diff --git a/audio/libmpg123/mpg123-options.mk b/audio/libmpg123/mpg123-options.mk index 7c9be137922..71a7202ab33 100644 --- a/audio/libmpg123/mpg123-options.mk +++ b/audio/libmpg123/mpg123-options.mk @@ -1,4 +1,4 @@ -# $NetBSD: mpg123-options.mk,v 1.2 2012/06/12 15:45:54 wiz Exp $ +# $NetBSD: mpg123-options.mk,v 1.3 2012/09/26 13:20:12 jperkin Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123 @@ -7,7 +7,8 @@ PKG_SUGGESTED_OPTIONS= inet6 .include "../../mk/bsd.fast.prefs.mk" -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "powerpc" || \ + (${MACHINE_ARCH} == "i386" && ${OPSYS} != "SunOS") PKG_SUPPORTED_OPTIONS+= simd .elif !empty(MACHINE_ARCH:Marm*) PKG_SUPPORTED_OPTIONS+= mpg123-arm-fixed64 diff --git a/audio/libmpg123/patches/patch-ae b/audio/libmpg123/patches/patch-ae deleted file mode 100644 index 293e3dffdf1..00000000000 --- a/audio/libmpg123/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2011/09/14 15:46:02 hans Exp $ - ---- src/libmpg123/Makefile.in.orig 2008-08-29 08:48:07.000000000 +0200 -+++ src/libmpg123/Makefile.in 2011-09-13 15:21:13.667526892 +0200 -@@ -79,7 +79,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ - SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ - testcpu.c - DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 51c88aa53be..757a54b6953 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2011/10/17 19:45:55 shattered Exp $ +# $NetBSD: Makefile,v 1.52 2012/09/26 13:06:17 jperkin Exp $ PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//} PKGREVISION= 1 @@ -37,10 +37,6 @@ CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\"" .endif -.if ${OPSYS} == "SunOS" -MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text" -.endif - # MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers .include "Makefile.common" diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo index a73bd47f480..09fe5a29030 100644 --- a/audio/mpg123/distinfo +++ b/audio/mpg123/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2011/10/17 19:45:55 shattered Exp $ +$NetBSD: distinfo,v 1.35 2012/09/26 13:06:18 jperkin Exp $ SHA1 (mpg123-1.12.5.tar.bz2) = 476cb47a9b6570684b5af536beedf2026522e5f8 RMD160 (mpg123-1.12.5.tar.bz2) = a59b0f7506b004c6e7d048ebef57090e1eb857af @@ -7,5 +7,4 @@ SHA1 (patch-aa) = 9700187dc38af7d4b7f4f3332d76556d2cb7f418 SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0 SHA1 (patch-ah) = 86754993466714cb2208a9291b72e8e03dde19c7 -SHA1 (patch-ai) = 9ce00cfa1dac387ea7b5df19fa4b1483b598748f SHA1 (patch-aj) = ab7e4b9ae33d8cabce4d381c6e07157cfb48e0b1 diff --git a/audio/mpg123/options.mk b/audio/mpg123/options.mk index 903d037b8b4..2007caadf44 100644 --- a/audio/mpg123/options.mk +++ b/audio/mpg123/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2012/06/17 07:17:57 tron Exp $ +# $NetBSD: options.mk,v 1.3 2012/09/26 13:06:18 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123 PKG_OPTIONS_OPTIONAL_GROUPS= fpu @@ -8,7 +8,8 @@ PKG_SUGGESTED_OPTIONS+= mpg123-fifo .include "../../mk/bsd.fast.prefs.mk" .if (${MACHINE_ARCH} == "i386") -. if empty(MACHINE_PLATFORM:MDarwin-11.*-i386) +. if empty(MACHINE_PLATFORM:MDarwin-11.*-i386) && \ + empty(MACHINE_PLATFORM:MSunOS-*) PKG_OPTIONS_GROUP.fpu= mpg123-x86-dither mpg123-with-fpu PKG_SUGGESTED_OPTIONS+= mpg123-x86-dither . else diff --git a/audio/mpg123/patches/patch-ai b/audio/mpg123/patches/patch-ai deleted file mode 100644 index 69e6c42c600..00000000000 --- a/audio/mpg123/patches/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ai,v 1.7 2011/09/14 15:46:49 hans Exp $ - ---- src/libmpg123/Makefile.in.orig 2010-10-04 08:34:18.000000000 +0200 -+++ src/libmpg123/Makefile.in 2011-09-13 15:28:48.954583152 +0200 -@@ -79,7 +79,7 @@ am_libmpg123_la_OBJECTS = compat.lo pars - libmpg123_la_OBJECTS = $(am_libmpg123_la_OBJECTS) - libmpg123_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libmpg123_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(libmpg123_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ - testcpu_SOURCES = testcpu.c - testcpu_OBJECTS = testcpu.$(OBJEXT) - testcpu_DEPENDENCIES = getcpuflags.$(OBJEXT) -@@ -100,7 +100,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+ $(LDFLAGS) $(SunOS_LDFLAGS) -o $@ - SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ - testcpu.c - DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \ |