Patch to use shared libs. -amd64.

6 files changed, 128 insertions, 2 deletions

diff --git a/media-libs/aldumb/ChangeLog b/media-libs/aldumb/ChangeLog
index b87c600fb369..76c1f45a2b69 100644
--- a/media-libs/aldumb/ChangeLog
+++ b/media-libs/aldumb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/aldumb
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aldumb/ChangeLog,v 1.5 2004/06/24 22:55:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aldumb/ChangeLog,v 1.6 2004/07/06 22:35:31 eradicator Exp $
+
+*aldumb-0.9.2-r1 (06 Jul 2004)
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml,
+  +files/aldumb-0.9.2-PIC.patch, +aldumb-0.9.2-r1.ebuild:
+  Patch to use shared libs.  -amd64.
 
   19 Mar 2004; Aron Griffis <agriffis@gentoo.org> aldumb-0.9.2.ebuild:
   add ~alpha and ~ia64
diff --git a/media-libs/aldumb/Manifest b/media-libs/aldumb/Manifest
index 540f61f4232d..0123360e7e15 100644
--- a/media-libs/aldumb/Manifest
+++ b/media-libs/aldumb/Manifest
@@ -1,4 +1,7 @@
 MD5 f11a798eac1d394e65802abb96b863ed aldumb-0.9.2.ebuild 952
 MD5 d51d1db4987cd4b8c57929e1e0192862 ChangeLog 766
-MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-aldumb-0.9.2 68
+MD5 272f3736ebaa47c77a905944edf84116 aldumb-0.9.2-r1.ebuild 950
 MD5 c86b4d38a194df18a6826e03b0863d50 files/aldumb-0.9.2.Makefile.patch 664
+MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-aldumb-0.9.2 68
+MD5 06b0308865a7fa48b3f9c75937a4c9e4 files/aldumb-0.9.2-PIC.patch 2697
+MD5 74d6f31a83c47d916813fff87eb8e9cf files/digest-aldumb-0.9.2-r1 68
diff --git a/media-libs/aldumb/aldumb-0.9.2-r1.ebuild b/media-libs/aldumb/aldumb-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..c15f1bc34378
--- /dev/null
+++ b/media-libs/aldumb/aldumb-0.9.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aldumb/aldumb-0.9.2-r1.ebuild,v 1.1 2004/07/06 22:35:31 eradicator Exp $
+
+inherit eutils
+
+S="${WORKDIR}/dumb"
+DESCRIPTION="Allegro support for DUMB (an IT, XM, S3M, and MOD player library)"
+HOMEPAGE="http://dumb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dumb/dumb-${PV}-fixed.tar.gz"
+
+#-amd64: 0.9.2-r1: dumbplay killed my X session - eradicator
+KEYWORDS="~x86 ~ppc ~alpha ~ia64 -amd64"
+LICENSE="DUMB-0.9.2"
+SLOT="0"
+
+DEPEND=">=media-libs/dumb-0.9.2-r2
+	media-libs/allegro"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cat << EOF > make/config.txt
+include make/unix.inc
+ALL_TARGETS := allegro allegro-examples allegro-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"
+}
diff --git a/media-libs/aldumb/files/aldumb-0.9.2-PIC.patch b/media-libs/aldumb/files/aldumb-0.9.2-PIC.patch
new file mode 100644
index 000000000000..79a100fa22c0
--- /dev/null
+++ b/media-libs/aldumb/files/aldumb-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 $@) $^ -ldumb
diff --git a/media-libs/aldumb/files/digest-aldumb-0.9.2-r1 b/media-libs/aldumb/files/digest-aldumb-0.9.2-r1
new file mode 100644
index 000000000000..575391fbac0a
--- /dev/null
+++ b/media-libs/aldumb/files/digest-aldumb-0.9.2-r1
@@ -0,0 +1 @@
+MD5 0ce45f64934e6d5d7b82a55108596680 dumb-0.9.2-fixed.tar.gz 145722
diff --git a/media-libs/aldumb/metadata.xml b/media-libs/aldumb/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-libs/aldumb/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>