Mon Feb 6 02:40:29 2012 UTC ()
Fix build of devrplay.so on Linux.

1) define _GNU_SOURCE before including any system headers
2) libtoolize the buildling of devrplay.so
3) Add PLIST.Linux with devrplay.la in it.


(sbd)
diff -r0 -r1.1 pkgsrc/audio/rplay/PLIST.Linux
diff -r1.15 -r1.16 pkgsrc/audio/rplay/distinfo
diff -r0 -r1.1 pkgsrc/audio/rplay/patches/patch-devrplay_Makefile.in
diff -r0 -r1.1 pkgsrc/audio/rplay/patches/patch-devrplay_devrplay.c
File Added: pkgsrc/audio/rplay/Attic/PLIST.Linux
@comment $NetBSD: PLIST.Linux,v 1.1 2012/02/06 02:40:29 sbd Exp $
lib/devrplay.la
cvs diff -r1.15 -r1.16 pkgsrc/audio/rplay/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/rplay/Attic/distinfo 2009/10/06 17:27:51 1.15
+++ pkgsrc/audio/rplay/Attic/distinfo 2012/02/06 02:40:29 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.15 2009/10/06 17:27:51 joerg Exp $ 1$NetBSD: distinfo,v 1.16 2012/02/06 02:40:29 sbd Exp $
2 2
3SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662 3SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
4RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861 4RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
5Size (rplay-3.3.2.tar.gz) = 480015 bytes 5Size (rplay-3.3.2.tar.gz) = 480015 bytes
6SHA1 (patch-aa) = d90e20abbca433740b7d53ba66e89f9dd80f8286 6SHA1 (patch-aa) = d90e20abbca433740b7d53ba66e89f9dd80f8286
7SHA1 (patch-ab) = 6dccfb19d0e0024c12daf1604fba73aa74c37fe2 7SHA1 (patch-ab) = 6dccfb19d0e0024c12daf1604fba73aa74c37fe2
8SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2 8SHA1 (patch-ac) = 89ccb3b33b245710b5349899c6539c004c9bade2
9SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b 9SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b
10SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee 10SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee
11SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d 11SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d
12SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506 12SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506
13SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933 13SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933
14SHA1 (patch-aj) = 3839a4c729f7e82296e0d0b629485692cc604336 14SHA1 (patch-aj) = 3839a4c729f7e82296e0d0b629485692cc604336
@@ -24,13 +24,15 @@ SHA1 (patch-as) = 64d31c1bc4d1659a18e9bf @@ -24,13 +24,15 @@ SHA1 (patch-as) = 64d31c1bc4d1659a18e9bf
24SHA1 (patch-at) = d3f20f7693c0d4401c393a1bbcb766dee722a1d0 24SHA1 (patch-at) = d3f20f7693c0d4401c393a1bbcb766dee722a1d0
25SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc 25SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc
26SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a 26SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a
27SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73 27SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73
28SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58 28SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58
29SHA1 (patch-ay) = eabf297f65a66174ce032bf7498bf6f324fe0d13 29SHA1 (patch-ay) = eabf297f65a66174ce032bf7498bf6f324fe0d13
30SHA1 (patch-az) = 8a55e0097ce509e169be02a127efb3db18aa395f 30SHA1 (patch-az) = 8a55e0097ce509e169be02a127efb3db18aa395f
31SHA1 (patch-ba) = 394dfa920f36a5e0f7e919de016fefac2a447322 31SHA1 (patch-ba) = 394dfa920f36a5e0f7e919de016fefac2a447322
32SHA1 (patch-bb) = 6829e94a21eee04b58021e2d848a624b0c037b00 32SHA1 (patch-bb) = 6829e94a21eee04b58021e2d848a624b0c037b00
33SHA1 (patch-bc) = ea0d5d00cf71263f6f6cf2e54a8dd8b730aba8e8 33SHA1 (patch-bc) = ea0d5d00cf71263f6f6cf2e54a8dd8b730aba8e8
34SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8 34SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8
35SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8 35SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8
36SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce 36SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
 37SHA1 (patch-devrplay_Makefile.in) = 0e158606fefa128cfcd798cd7919fe589ba04144
 38SHA1 (patch-devrplay_devrplay.c) = b9a5434a8060347217e5a683cfc84d9bf73d9572
File Added: pkgsrc/audio/rplay/patches/Attic/patch-devrplay_Makefile.in
$NetBSD: patch-devrplay_Makefile.in,v 1.1 2012/02/06 02:40:29 sbd Exp $

--- devrplay/Makefile.in.orig	1999-03-23 02:36:30.000000000 +0000
+++ devrplay/Makefile.in
@@ -10,29 +10,30 @@ MKINSTALLDIRS= @srcdir@/../mkinstalldirs
 
 CPPFLAGS=	$(CC_OPTIONS) -fPIC -I. -I../include -I@srcdir@/../include @DEFS@
 
-.c.o:
-		$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+.SUFFIXES: .lo
+.c.lo:
+		$(LIBTOOL) --mode=compile $(CC) -shared -c $(CPPFLAGS) $(CFLAGS) $<
 
-LDFLAGS=	$(LD_OPTIONS) -shared @LDFLAGS@ @LIBS@ -L../librplay -lrplay -ldl
+LDFLAGS=	$(LD_OPTIONS) @LDFLAGS@ @LIBS@ -L../librplay -lrplay -ldl -rpath $(libdir)
 
-TARGET=		devrplay.so
+TARGET=		devrplay.la
 SRCS=		devrplay.c 
-OBJS=		devrplay.o
+OBJS=		devrplay.lo
 
 all:		$(TARGET)
 
 #$(TARGET):	$(OBJS) ../librplay/librplay.so
 #		$(CC) -o $@ $(OBJS) ../librplay/rplay.lo ../librplay/rptp.lo $(LDFLAGS)
 
-$(TARGET):	$(OBJS) ../librplay/librplay.so
-		$(CC) -o $@ $(OBJS) $(LDFLAGS)
+$(TARGET):	$(OBJS) ../librplay/librplay.la
+		$(LIBTOOL) --mode=link $(CC) -module -shared  -avoid-version -o $@ $(OBJS) $(LDFLAGS)
 
-../librplay/librplay.so:
-		(cd ../librplay; $(MAKE) $(MFLAGS) librplay.so)
+../librplay/librplay.la:
+		(cd ../librplay; $(MAKE) $(MFLAGS) librplay.la)
 
 install:	all
 		$(MKINSTALLDIRS) $(libdir)
-		$(INSTALL_DATA) $(TARGET) $(libdir)
+		$(LIBTOOL) --mode=install $(INSTALL_DATA) $(TARGET) $(libdir)
 
 uninstall:
 		$(RM) $(libdir)/$(TARGET)
File Added: pkgsrc/audio/rplay/patches/Attic/patch-devrplay_devrplay.c
$NetBSD: patch-devrplay_devrplay.c,v 1.1 2012/02/06 02:40:29 sbd Exp $

--- devrplay/devrplay.c.orig	1999-03-21 00:44:48.000000000 +0000
+++ devrplay/devrplay.c
@@ -26,6 +26,8 @@
  * Copyright (C) 1998, 1999 Manish Singh <yosh@gimp.org>
  */
 
+#define _GNU_SOURCE 1
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif