From edb919320074f0ebd83aced6c4077fe4aa075fc8 Mon Sep 17 00:00:00 2001 From: Christian Birchinger Date: Thu, 14 Jan 2010 06:47:42 +0000 Subject: Copy over the dumb PIC+as-needed patch. Package-Manager: portage-2.1.6.13/cvs/Linux x86_64 --- media-libs/aldumb/ChangeLog | 10 ++- media-libs/aldumb/Manifest | 6 +- media-libs/aldumb/aldumb-0.9.3.ebuild | 20 +++--- media-libs/aldumb/files/aldumb-0.9.2-PIC.patch | 72 ---------------------- .../aldumb/files/aldumb-0.9.3-PIC-as-needed.patch | 72 ++++++++++++++++++++++ 5 files changed, 93 insertions(+), 87 deletions(-) delete mode 100644 media-libs/aldumb/files/aldumb-0.9.2-PIC.patch create mode 100644 media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.patch diff --git a/media-libs/aldumb/ChangeLog b/media-libs/aldumb/ChangeLog index a7473c61fdb5..f5e00224b1d0 100644 --- a/media-libs/aldumb/ChangeLog +++ b/media-libs/aldumb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/aldumb -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/aldumb/ChangeLog,v 1.22 2009/10/24 11:33:27 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/aldumb/ChangeLog,v 1.23 2010/01/14 06:47:41 joker Exp $ + + 14 Jan 2010; Christian Birchinger + files/aldumb-0.9.2-PIC.patch, aldumb-0.9.3.ebuild, + +files/aldumb-0.9.3-as-needed.patch: + Added the as-needed patch from media-libs/dumb since it shares the same + source archive. 24 Oct 2009; nixnut aldumb-0.9.3.ebuild: ppc stable #282232 diff --git a/media-libs/aldumb/Manifest b/media-libs/aldumb/Manifest index fecfd13e26c6..586a03e14ad8 100644 --- a/media-libs/aldumb/Manifest +++ b/media-libs/aldumb/Manifest @@ -1,6 +1,6 @@ -AUX aldumb-0.9.2-PIC.patch 2704 RMD160 6e5fd16b02f769b3d620695fa0aca48b2c888d44 SHA1 e022d1dfdebaa6f291e214233db9990b67274786 SHA256 44ecac4f081446d6bf0c1561e9cba2f73b25aa6c85df58ef5f3ff50436723898 +AUX aldumb-0.9.3-PIC-as-needed.patch 2708 RMD160 7babd044efa9dd73153e125d9b850f8aa7740f5f SHA1 e28f2a30664955611fc0f4c94a87f3014dddb5e7 SHA256 b8a950ddfe55d09ad69796d3720c7423b566ffa07a415f46bc7274dc2e77694d AUX aldumb-0.9.3_CVE-2006-3668.patch 637 RMD160 09c8de5a1ca5f2f45b7e1a8b245006f4f8b85dc8 SHA1 facf6c974bc436369de73367670943a23877d29a SHA256 9f6785435757db725bc73b1c4874b91e80b9277c6fdd2b56e47dae1cfbc968e6 DIST dumb-0.9.3.tar.gz 167379 RMD160 53c7931fec71dd4e67e19c4acf38c0f9202e5698 SHA1 4764bd59f5895eb5035a5139454cef7a53a76bb8 SHA256 8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33 -EBUILD aldumb-0.9.3.ebuild 1140 RMD160 cfcb9bc54b9762f8ff824406f6aba2e65c27a1c0 SHA1 f6092598a4f462b3a3490af6e2474845a44b8759 SHA256 408bd759451ee919970e20f22ee3b7397d8ef6af44d032c7d3759491e5f39586 -MISC ChangeLog 2741 RMD160 f9f0b6f6624f934a17ba2f6e1eadcfc185b3958c SHA1 8df66a187a6ea4069df7074f87241374b6109fdd SHA256 6032dd4719dee9fd3c992e21a230122cf845d23ce0747a5a533ddf91019a5203 +EBUILD aldumb-0.9.3.ebuild 1149 RMD160 30c93dba043143ff2c49b11944f50d2e7f527e17 SHA1 cbbb4af2a498e4c8834ea39bf3e383f6f45ebe04 SHA256 8a1f91f071da708490502bddb986159c32714f8c3f1a3fb37b8f4cbaf4a36b82 +MISC ChangeLog 2980 RMD160 84b726d5fba3fc6200d813066aef3da06b45954d SHA1 ab820ca203a23f4570ab0b46950d0af9d4e57f15 SHA256 cc9e9e39c656df0ac4975bcf0baf8e8d91284f988a985ea6270412298994254c MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b diff --git a/media-libs/aldumb/aldumb-0.9.3.ebuild b/media-libs/aldumb/aldumb-0.9.3.ebuild index e2dc19692d0f..ec0118487209 100644 --- a/media-libs/aldumb/aldumb-0.9.3.ebuild +++ b/media-libs/aldumb/aldumb-0.9.3.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/aldumb/aldumb-0.9.3.ebuild,v 1.5 2009/10/24 11:33:27 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/aldumb/aldumb-0.9.3.ebuild,v 1.6 2010/01/14 06:47:41 joker Exp $ +EAPI=2 inherit eutils -IUSE="debug" - 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}.tar.gz" @@ -13,24 +12,25 @@ SRC_URI="mirror://sourceforge/dumb/dumb-${PV}.tar.gz" LICENSE="DUMB-0.9.2" SLOT="0" KEYWORDS="alpha amd64 ia64 ppc x86" +IUSE="debug" DEPEND=">=media-libs/dumb-0.9.3 media-libs/allegro" +RDEPEND="${DEPEND}" + S="${WORKDIR}/${P/aldumb/dumb}" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { cat << EOF > make/config.txt include make/unix.inc ALL_TARGETS := allegro allegro-examples allegro-headers PREFIX := /usr EOF - epatch "${FILESDIR}/${PN}-0.9.2-PIC.patch" - epatch "${FILESDIR}/${P}_CVE-2006-3668.patch" + epatch "${FILESDIR}"/${P}-PIC-as-needed.patch + epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch sed -i '/= -s/d' Makefile || die "sed failed" - cp Makefile Makefile.rdy + cp -f Makefile Makefile.rdy } src_compile() { diff --git a/media-libs/aldumb/files/aldumb-0.9.2-PIC.patch b/media-libs/aldumb/files/aldumb-0.9.2-PIC.patch deleted file mode 100644 index 79a100fa22c0..000000000000 --- a/media-libs/aldumb/files/aldumb-0.9.2-PIC.patch +++ /dev/null @@ -1,72 +0,0 @@ -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/aldumb-0.9.3-PIC-as-needed.patch b/media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.patch new file mode 100644 index 000000000000..f44e8fb6c526 --- /dev/null +++ b/media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.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 $@) $^ -lm + + $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) +- $(AR) rs $@ $^ ++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb -- cgit v1.2.3-65-gdbad