diff options
| author |   Christian Birchinger <joker@gentoo.org> | 2010-01-14 06:41:30 +0000 |
|---|---|---|
| committer | Christian Birchinger <joker@gentoo.org> | 2010-01-14 06:41:30 +0000 |
| commit | cfd877ae93c43c30de90a47cb86903ca45762469 (patch) | |
| tree | 89b50ea680172f48da32634449cfdf318fd2c61d /media-libs/dumb | |
| parent | Added an as-needed patch from bug #300515. (diff) | |
| download | gentoo-2-cfd877ae93c43c30de90a47cb86903ca45762469.tar.gz gentoo-2-cfd877ae93c43c30de90a47cb86903ca45762469.tar.bz2 gentoo-2-cfd877ae93c43c30de90a47cb86903ca45762469.zip | |
Unified PIC and as-needed patches to make maintenance easier.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/dumb')
| -rw-r--r-- | media-libs/dumb/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/dumb/dumb-0.9.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch (renamed from media-libs/dumb/files/dumb-0.9.2-PIC.patch) | 4 | ||||
| -rw-r--r-- | media-libs/dumb/files/dumb-0.9.3-as-needed.patch | 12 |
4 files changed, 10 insertions, 18 deletions
diff --git a/media-libs/dumb/ChangeLog b/media-libs/dumb/ChangeLog index bddbcb186c8f..298c01605efa 100644 --- a/media-libs/dumb/ChangeLog +++ b/media-libs/dumb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/dumb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.36 2010/01/14 05:48:08 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.37 2010/01/14 06:41:30 joker Exp $ + + 14 Jan 2010; Christian Birchinger <joker@gentoo.org> + -files/dumb-0.9.2-PIC.patch, dumb-0.9.3-r1.ebuild, + +files/dumb-0.9.3-PIC-as-needed.patch, -files/dumb-0.9.3-as-needed.patch: + Unified PIC and as-needed patches to make maintenance easier. 14 Jan 2010; Christian Birchinger <joker@gentoo.org> dumb-0.9.3-r1.ebuild, +files/dumb-0.9.3-as-needed.patch: diff --git a/media-libs/dumb/dumb-0.9.3-r1.ebuild b/media-libs/dumb/dumb-0.9.3-r1.ebuild index 8aa7c71d4841..e038c034a27d 100644 --- a/media-libs/dumb/dumb-0.9.3-r1.ebuild +++ b/media-libs/dumb/dumb-0.9.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.3-r1.ebuild,v 1.11 2010/01/14 05:48:08 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.3-r1.ebuild,v 1.12 2010/01/14 06:41:30 joker Exp $ EAPI=2 inherit eutils @@ -24,9 +24,8 @@ ALL_TARGETS := core core-examples core-headers PREFIX := /usr EOF - epatch "${FILESDIR}"/${PN}-0.9.2-PIC.patch + epatch "${FILESDIR}"/${P}-PIC-as-needed.patch epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch - epatch "${FILESDIR}"/${P}-as-needed.patch sed -i '/= -s/d' Makefile || die "sed failed" cp -f Makefile Makefile.rdy } diff --git a/media-libs/dumb/files/dumb-0.9.2-PIC.patch b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch index dc3009310b77..f44e8fb6c526 100644 --- a/media-libs/dumb/files/dumb-0.9.2-PIC.patch +++ b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch @@ -65,8 +65,8 @@ 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 $@) -lm $^ ++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -lm $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) - $(AR) rs $@ $^ -+ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^ ++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb diff --git a/media-libs/dumb/files/dumb-0.9.3-as-needed.patch b/media-libs/dumb/files/dumb-0.9.3-as-needed.patch deleted file mode 100644 index 6426544e60f6..000000000000 --- a/media-libs/dumb/files/dumb-0.9.3-as-needed.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- dumb-0.9.3.orig/make/Makefile.inc 2010-01-11 13:47:27.426643138 +0100 -+++ dumb-0.9.3/make/Makefile.inc 2010-01-11 13:50:42.488400053 +0100 -@@ -33,7 +33,7 @@ - $(CC) $(CFLAGS) $(WFLAGS_ALLEGRO) -c -o $@ $< - - $(CORE_LIB_FILE): $(CORE_OBJECTS) -- $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^ -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm - - $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) -- $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^ -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm |