diff options
| author |   Christian Birchinger <joker@gentoo.org> | 2010-01-14 06:47:42 +0000 |
|---|---|---|
| committer | Christian Birchinger <joker@gentoo.org> | 2010-01-14 06:47:42 +0000 |
| commit | b3f383a9a93d4e4ac2f485c5b198ff00b05d5fad (patch) | |
| tree | 77943cafe2520510ef391b5b775f54d8845b1d80 /media-libs/aldumb | |
| parent | Unified PIC and as-needed patches to make maintenance easier. (diff) | |
| download | gentoo-2-b3f383a9a93d4e4ac2f485c5b198ff00b05d5fad.tar.gz gentoo-2-b3f383a9a93d4e4ac2f485c5b198ff00b05d5fad.tar.bz2 gentoo-2-b3f383a9a93d4e4ac2f485c5b198ff00b05d5fad.zip | |
Copy over the dumb PIC+as-needed patch.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/aldumb')
| -rw-r--r-- | media-libs/aldumb/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/aldumb/aldumb-0.9.3.ebuild | 20 | ||||
| -rw-r--r-- | media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.patch (renamed from media-libs/aldumb/files/aldumb-0.9.2-PIC.patch) | 2 |
3 files changed, 19 insertions, 13 deletions
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 <joker@gentoo.org> + 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 <nixnut@gentoo.org> aldumb-0.9.3.ebuild: ppc stable #282232 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.3-PIC-as-needed.patch index 79a100fa22c0..f44e8fb6c526 100644 --- a/media-libs/aldumb/files/aldumb-0.9.2-PIC.patch +++ b/media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.patch @@ -65,7 +65,7 @@ diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc $(CORE_LIB_FILE): $(CORE_OBJECTS) - $(AR) rs $@ $^ -+ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ ++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -lm $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) - $(AR) rs $@ $^ |