Patch to use shared libs instead of static. ~amd64.

6 files changed, 148 insertions, 2 deletions

diff --git a/media-libs/dumb/ChangeLog b/media-libs/dumb/ChangeLog
index fab0a14c429f..9a8fae56de89 100644
--- a/media-libs/dumb/ChangeLog
+++ b/media-libs/dumb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/dumb
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.8 2004/06/24 22:58:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.9 2004/07/06 22:32:24 eradicator Exp $
+
+*dumb-0.9.2-r2 (06 Jul 2004)
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml,
+  +files/dumb-0.9.2-PIC.patch, +dumb-0.9.2-r2.ebuild:
+  Patch to use shared libs instead of static.  ~amd64.
 
   19 Mar 2004; Aron Griffis <agriffis@gentoo.org> dumb-0.9.1.ebuild:
   add ~alpha and ~ia64
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 50ade5f299d7..b302efd62847 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,5 +1,8 @@
+MD5 de39862435c6db3224f31650cba5a42c dumb-0.9.2-r2.ebuild 1861
+MD5 6bbc13beafc3fffd1ceeb9f1acf69995 dumb-0.9.1.ebuild 730
 MD5 a90e9dd281ba9c733e792d4c6dddf6c8 dumb-0.9.2-r1.ebuild 1800
 MD5 1c4612a9c19115a040a8ce4950ea607b ChangeLog 1093
-MD5 6bbc13beafc3fffd1ceeb9f1acf69995 dumb-0.9.1.ebuild 730
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 e8a7336fec185fa94008e2b1599c697c files/digest-dumb-0.9.1 62
 MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-dumb-0.9.2-r1 68
+MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-dumb-0.9.2-r2 68
diff --git a/media-libs/dumb/dumb-0.9.2-r2.ebuild b/media-libs/dumb/dumb-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..97ee88117dc0
--- /dev/null
+++ b/media-libs/dumb/dumb-0.9.2-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.2-r2.ebuild,v 1.1 2004/07/06 22:32:24 eradicator Exp $
+
+IUSE=""
+
+inherit eutils
+
+S="${WORKDIR}/${PN}"
+DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters"
+HOMEPAGE="http://dumb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dumb/${P}-fixed.tar.gz"
+
+KEYWORDS="x86 ~ppc ~alpha ~ia64 ~amd64"
+LICENSE="DUMB-0.9.2"
+SLOT="0"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cat << EOF > make/config.txt
+include make/unix.inc
+ALL_TARGETS := core core-examples core-headers
+PREFIX := /usr
+EOF
+
+	epatch ${FILESDIR}/${P}-PIC.patch
+}
+
+src_compile() {
+	emake OFLAGS="${CFLAGS}" all || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/lib /usr/include /usr/bin
+	make PREFIX="${D}/usr" install || die "make install failed"
+	dodoc readme.txt release.txt docs/* || die "dodoc failed"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "DUMB's core has been installed. This will enable you to convert module"
+	einfo "files to PCM data (ready for sending to /dev/dsp, writing to a .wav"
+	einfo "file, piping through oggenc, etc.)."
+	einfo
+	einfo "If you are using Allegro, you will also want to 'emerge aldumb'. This"
+	einfo "provides you with a convenient API for playing module files through"
+	einfo "Allegro's sound system, and also enables DUMB to integrate with"
+	einfo "Allegro's datafile system so you can add modules to datafiles."
+	einfo
+	einfo "As a developer, when you distribute your game and write your docs, be"
+	einfo "aware that 'dumb' and 'aldumb' actually come from the same download."
+	einfo "People who don't use Gentoo will only have to download and install one"
+	einfo "package. See /usr/share/doc/${PF}/readme.txt.gz for details on"
+	einfo "how DUMB would be compiled manually."
+	einfo
+}
diff --git a/media-libs/dumb/files/digest-dumb-0.9.2-r2 b/media-libs/dumb/files/digest-dumb-0.9.2-r2
new file mode 100644
index 000000000000..575391fbac0a
--- /dev/null
+++ b/media-libs/dumb/files/digest-dumb-0.9.2-r2
@@ -0,0 +1 @@
+MD5 0ce45f64934e6d5d7b82a55108596680 dumb-0.9.2-fixed.tar.gz 145722
diff --git a/media-libs/dumb/files/dumb-0.9.2-PIC.patch b/media-libs/dumb/files/dumb-0.9.2-PIC.patch
new file mode 100644
index 000000000000..f10a247662b7
--- /dev/null
+++ b/media-libs/dumb/files/dumb-0.9.2-PIC.patch
@@ -0,0 +1,72 @@
+diff -Naur dumb.orig/Makefile dumb/Makefile
+--- dumb.orig/Makefile	2003-04-03 16:34:18.000000000 -0800
++++ dumb/Makefile	2004-07-06 14:43:38.158063165 -0700
+@@ -199,11 +199,11 @@
+ ALLEGRO_EXAMPLES_EXE := $(addprefix examples/, $(notdir $(patsubst %.c, %$(EXE_SUFFIX), $(ALLEGRO_EXAMPLES))))
+ 
+ 
+-CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.a
+-ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.a
++CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.so
++ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.so
+ 
+-CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.a
+-ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
++CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.so
++ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.so
+ 
+ 
+ core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
+@@ -272,22 +272,22 @@
+ 
+ OBJDIR := $(OBJDIR_BASE)/release
+ CFLAGS := $(CFLAGS_RELEASE)
+-CORE_LIB_FILE := $(LIBDIR)/libdumb.a
+-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
++CORE_LIB_FILE := $(LIBDIR)/libdumb.so
++ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.so
+ include make/Makefile.inc
+ 
+ OBJDIR := $(OBJDIR_BASE)/debug
+ CFLAGS := $(CFLAGS_DEBUG)
+-CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
+-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
++CORE_LIB_FILE := $(LIBDIR)/libdumbd.so
++ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.so
+ include make/Makefile.inc
+ 
+ 
+ $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
+-	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
++	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
+ 
+ $(ALLEGRO_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(ALLEGRO_LIB_FILE_RELEASE) $(CORE_LIB_FILE_RELEASE)
+-	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
++	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
+ 
+ $(CORE_EXAMPLES_OBJ): examples/%.o: examples/%.c include/dumb.h
+ 	$(CC) -c $< -o $@ $(CFLAGS_RELEASE)
+diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc
+--- dumb.orig/make/Makefile.inc	2003-04-03 16:34:18.000000000 -0800
++++ dumb/make/Makefile.inc	2004-07-06 14:37:13.082037585 -0700
+@@ -10,8 +10,8 @@
+ # accurately, create a local copy of the current CFLAGS variable. This is
+ # necessary because Make doesn't expand variables in commands until they are
+ # executed.
+-$(CORE_LIB_FILE): CFLAGS := $(CFLAGS)
+-$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS)
++$(CORE_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC
++$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC
+ 
+ 
+ $(OBJDIR)/%.o: src/core/%.c include/dumb.h include/internal/dumb.h
+@@ -28,7 +28,7 @@
+ 	$(CC) -c -o $@ $< $(CFLAGS) $(WFLAGS_ALLEGRO)
+ 
+ $(CORE_LIB_FILE): $(CORE_OBJECTS)
+-	$(AR) rs $@ $^
++	$(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^
+ 
+ $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS)
+-	$(AR) rs $@ $^
++	$(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^
diff --git a/media-libs/dumb/metadata.xml b/media-libs/dumb/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-libs/dumb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>