diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-25 16:15:38 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-25 16:15:38 +0000 |
| commit | 7bf3827b978e85c2e60c356451581cf130d49824 (patch) | |
| tree | 20a4bbb5b4ceb8ac02d1a48b4126fde8a51a3237 /media-video/subtitleripper | |
| parent | Adjust 1.8.4 deps for gtk-sharp-2.12.6 (diff) | |
| download | gentoo-2-7bf3827b978e85c2e60c356451581cf130d49824.tar.gz gentoo-2-7bf3827b978e85c2e60c356451581cf130d49824.tar.bz2 gentoo-2-7bf3827b978e85c2e60c356451581cf130d49824.zip | |
Add patch to fix linking order, closes bug #246862.
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64)
Diffstat (limited to 'media-video/subtitleripper')
3 files changed, 38 insertions, 3 deletions
diff --git a/media-video/subtitleripper/ChangeLog b/media-video/subtitleripper/ChangeLog index 7d86731fd0fd..14a827c06334 100644 --- a/media-video/subtitleripper/ChangeLog +++ b/media-video/subtitleripper/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/subtitleripper # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.14 2008/04/11 19:18:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.15 2008/11/25 16:15:38 flameeyes Exp $ + + 25 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> + +files/subtitleripper-0.3.4-linkingorder.patch, + subtitleripper-0.3.4-r3.ebuild: + Add patch to fix linking order, closes bug #246862. 11 Apr 2008; Ben de Groot <yngwin@gentoo.org> subtitleripper-0.3.4-r3.ebuild: diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch new file mode 100644 index 000000000000..7efe223460fc --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild index f1a6e82e20b8..2a85b2302b16 100644 --- a/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild +++ b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild,v 1.2 2008/04/11 19:18:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild,v 1.3 2008/11/25 16:15:38 flameeyes Exp $ -inherit versionator +inherit versionator eutils MY_PV="$(replace_version_separator 2 "-")" @@ -30,6 +30,8 @@ src_unpack() { sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" spudec.c subtitle2pgm.c # we will install the gocrfilters into /usr/share/subtitleripper sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt + + epatch "${FILESDIR}/${P}-linkingorder.patch" } src_install () { |