diff options
-rw-r--r-- | multimedia/smpeg/Makefile | 6 | ||||
-rw-r--r-- | multimedia/smpeg/distinfo | 4 | ||||
-rw-r--r-- | multimedia/smpeg/patches/patch-ab | 17 |
3 files changed, 20 insertions, 7 deletions
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index 3681e47ae5c..04af72e7446 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2011/04/22 14:40:44 obache Exp $ +# $NetBSD: Makefile,v 1.25 2011/09/14 17:24:13 hans Exp $ # DISTNAME= smpeg-0.4.4 @@ -36,6 +36,10 @@ post-wrapper: CONFIGURE_ARGS+= --enable-mmx .endif +.if ${OPSYS} == "SunOS" +MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text" +.endif + .include "options.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/smpeg/distinfo b/multimedia/smpeg/distinfo index 01af6e5d2e4..4e66ef713a7 100644 --- a/multimedia/smpeg/distinfo +++ b/multimedia/smpeg/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2010/08/10 06:20:59 tsutsui Exp $ +$NetBSD: distinfo,v 1.7 2011/09/14 17:24:13 hans Exp $ SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259 RMD160 (smpeg-0.4.4.tar.gz) = d55249ad53417fa0df3d925aed0e83d2204e28b7 Size (smpeg-0.4.4.tar.gz) = 315054 bytes SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0 -SHA1 (patch-ab) = f0c168dc631149f14c92d2cd6cb5462af9869461 +SHA1 (patch-ab) = 8b4ef487dc7176dd0ef21e9a6d90e72e26d68c73 SHA1 (patch-ac) = 6f0cdeb9864db4db6730c8137287a073172a09ab SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa SHA1 (patch-ae) = 0c7646ec3ce331b6991d59d96efa1ba07fbb91e5 diff --git a/multimedia/smpeg/patches/patch-ab b/multimedia/smpeg/patches/patch-ab index 7d5a0fd5c2e..3a4140e052e 100644 --- a/multimedia/smpeg/patches/patch-ab +++ b/multimedia/smpeg/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2005/09/04 05:20:05 xtraeme Exp $ +$NetBSD: patch-ab,v 1.3 2011/09/14 17:24:14 hans Exp $ --- Makefile.in.orig 2001-06-18 22:59:14.000000000 +0200 -+++ Makefile.in 2005-09-04 07:16:04.000000000 +0200 -@@ -120,7 +120,7 @@ ++++ Makefile.in 2011-09-08 19:08:45.100951557 +0200 +@@ -120,7 +120,7 @@ EXTRA_DIST = CHANGES COPYING TODO bin_PROGRAMS = plaympeg $(GTK_PLAYER) $(OPENGL_PLAYER) # Sources for plaympeg @@ -11,7 +11,16 @@ $NetBSD: patch-ab,v 1.2 2005/09/04 05:20:05 xtraeme Exp $ plaympeg_SOURCES = plaympeg.c plaympeg_LDADD = libsmpeg.la -@@ -310,15 +310,15 @@ +@@ -281,7 +281,7 @@ distclean-libtool: + maintainer-clean-libtool: + + libsmpeg.la: $(libsmpeg_la_OBJECTS) $(libsmpeg_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(libdir) $(libsmpeg_la_LDFLAGS) $(libsmpeg_la_OBJECTS) $(libsmpeg_la_LIBADD) $(LIBS) ++ $(CXXLINK) -rpath $(libdir) $(SunOS_LDFLAGS) $(libsmpeg_la_LDFLAGS) $(libsmpeg_la_OBJECTS) $(libsmpeg_la_LIBADD) $(LIBS) + + mostlyclean-binPROGRAMS: + +@@ -310,15 +310,15 @@ uninstall-binPROGRAMS: plaympeg: $(plaympeg_OBJECTS) $(plaympeg_DEPENDENCIES) @rm -f plaympeg |