summaryrefslogtreecommitdiff
path: root/audio/xmms
diff options
context:
space:
mode:
authormycroft <mycroft>2001-12-24 15:13:01 +0000
committermycroft <mycroft>2001-12-24 15:13:01 +0000
commit0989556ef4adca0610fe7b2fd74c524f44c22a26 (patch)
tree3134ff5319d359d15b29f4a76d8669d18c1fbf73 /audio/xmms
parentd067a76e49d8d8c0165673ab06c479eae5908b41 (diff)
downloadpkgsrc-0989556ef4adca0610fe7b2fd74c524f44c22a26.tar.gz
XXX Make sure libgcc is entirely included for plugins.
Do not link xmms and wmxmms against libmikmod.
Diffstat (limited to 'audio/xmms')
-rw-r--r--audio/xmms/distinfo6
-rw-r--r--audio/xmms/patches/patch-ak4
-rw-r--r--audio/xmms/patches/patch-al17
3 files changed, 18 insertions, 9 deletions
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index f4d82d0c42b..57131ed4ec1 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2001/08/29 22:41:02 jlam Exp $
+$NetBSD: distinfo,v 1.8 2001/12/24 15:13:01 mycroft Exp $
SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5
Size (xmms-1.2.5.tar.gz) = 2414840 bytes
@@ -10,8 +10,8 @@ SHA1 (patch-ag) = 24a56ba54752994806518872d03709559f5ac620
SHA1 (patch-ah) = 1c83d665d2473692a3a9feae625f48c420849d6a
SHA1 (patch-ai) = d05ba576dc40dd29d59c571fbab369d83fbe0b06
SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
-SHA1 (patch-ak) = 9c89fc3014c1109b14f56c4bdaae7782f2531529
-SHA1 (patch-al) = 3150ee9972911c5152f14a0771d9e9a2cbcb107f
+SHA1 (patch-ak) = d31768078e5d35ba3a15e82a221ce6fc5f86b9ce
+SHA1 (patch-al) = 969b5ff79a80f28071517b82c57cfd9d605db863
SHA1 (patch-am) = 0de11b998fcf90f64c2e8442edc427e3bc49653c
SHA1 (patch-an) = 2a622693d825c631e36f73bc35a9639c40071564
SHA1 (patch-ao) = 428e1083a104358d752ddc483310a97764cb6979
diff --git a/audio/xmms/patches/patch-ak b/audio/xmms/patches/patch-ak
index f967fcff817..29400de2355 100644
--- a/audio/xmms/patches/patch-ak
+++ b/audio/xmms/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.3 2001/06/21 16:38:34 rh Exp $
+$NetBSD: patch-ak,v 1.4 2001/12/24 15:13:02 mycroft Exp $
--- wmxmms/Makefile.in.orig Mon Jun 18 21:56:09 2001
+++ wmxmms/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ak,v 1.3 2001/06/21 16:38:34 rh Exp $
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-+LIBS = @LIBS@ @PTHREAD_LIBS@ @LIBMIKMOD_LIBS@ @XML_LIBS@
++LIBS = @LIBS@ @PTHREAD_LIBS@ @XML_LIBS@
wmxmms_OBJECTS = getopt.o getopt1.o wmxmms.o
wmxmms_DEPENDENCIES = $(top_builddir)/libxmms/libxmms.la
wmxmms_LDFLAGS =
diff --git a/audio/xmms/patches/patch-al b/audio/xmms/patches/patch-al
index 71972617309..08fdec2a6d4 100644
--- a/audio/xmms/patches/patch-al
+++ b/audio/xmms/patches/patch-al
@@ -1,13 +1,22 @@
-$NetBSD: patch-al,v 1.3 2001/06/21 16:38:34 rh Exp $
+$NetBSD: patch-al,v 1.4 2001/12/24 15:13:03 mycroft Exp $
---- xmms/Makefile.in.orig Mon Jun 18 21:55:30 2001
-+++ xmms/Makefile.in
+--- xmms/Makefile.in.orig Mon Jun 18 19:55:30 2001
++++ xmms/Makefile.in Mon Dec 24 14:20:38 2001
+@@ -163,7 +163,7 @@
+
+ bin_PROGRAMS = xmms
+
+-xmms_LDFLAGS = -export-dynamic
++xmms_LDFLAGS = -export-dynamic -Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive
+ xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ @POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@
+
+
@@ -184,7 +184,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-+LIBS = @LIBS@ @LIBMIKMOD_LIBS@ @XML_LIBS@
++LIBS = @LIBS@ @XML_LIBS@
xmms_OBJECTS = bmp.o skin.o util.o output.o fft.o input.o effect.o \
general.o visualization.o fullscreen.o pluginenum.o playlist.o \
controlsocket.o dock.o widget.o sbutton.o pbutton.o tbutton.o textbox.o \