diff options
author | Peter Alfredsen <loki_val@gentoo.org> | 2008-12-17 21:10:04 +0000 |
---|---|---|
committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-12-17 21:10:04 +0000 |
commit | 0fc66c5f1a078845cd247ef1f175f780a12d4fbb (patch) | |
tree | 4efe31358b7c1c2e3fbddfa74ae52ae630faae6f /media-video/videotrans | |
parent | amd64/x86 stable, bug #251139 (diff) | |
download | gentoo-2-0fc66c5f1a078845cd247ef1f175f780a12d4fbb.tar.gz gentoo-2-0fc66c5f1a078845cd247ef1f175f780a12d4fbb.tar.bz2 gentoo-2-0fc66c5f1a078845cd247ef1f175f780a12d4fbb.zip |
Fix forced-as-needed
(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)
Diffstat (limited to 'media-video/videotrans')
-rw-r--r-- | media-video/videotrans/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch | 41 | ||||
-rw-r--r-- | media-video/videotrans/videotrans-1.6.0.ebuild | 6 |
3 files changed, 50 insertions, 3 deletions
diff --git a/media-video/videotrans/ChangeLog b/media-video/videotrans/ChangeLog index e08a5fe40548..87b166c57072 100644 --- a/media-video/videotrans/ChangeLog +++ b/media-video/videotrans/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/videotrans # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/videotrans/ChangeLog,v 1.6 2008/02/04 00:58:17 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/videotrans/ChangeLog,v 1.7 2008/12/17 21:10:04 loki_val Exp $ + + 17 Dec 2008; Peter Alfredsen <loki_val@gentoo.org> + +files/videotrans-1.6.0-forced-as-needed.patch, videotrans-1.6.0.ebuild: + Fix forced-as-needed *videotrans-1.6.0 (04 Feb 2008) diff --git a/media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch b/media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch new file mode 100644 index 000000000000..4dca7482ed1a --- /dev/null +++ b/media-video/videotrans/files/videotrans-1.6.0-forced-as-needed.patch @@ -0,0 +1,41 @@ +diff -NrU5 videotrans-1.6.0.orig/src/Makefile.in videotrans-1.6.0/src/Makefile.in +--- videotrans-1.6.0.orig/src/Makefile.in 2008-12-17 21:58:32.000000000 +0100 ++++ videotrans-1.6.0/src/Makefile.in 2008-12-17 22:02:36.000000000 +0100 +@@ -1,9 +1,9 @@ + # This "Makefile.in" file is converted into "Makefile" by "configure". + + CFLAGS = @CFLAGS@ @DEFINES@ +-LDFLAGS = -g @LIBS@ ++LIBS = @LIBS@ + CC = @CC@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -14,23 +14,23 @@ + MANDIR = $(DESTDIR)/@mandir@ + + all: zoomcalc fakewavspeed progress + + zoomcalc: zoomcalc.o +- $(CC) -o zoomcalc $(LDFLAGS) zoomcalc.o ++ $(CC) $(LDFLAGS) zoomcalc.o $(LIBS) -o zoomcalc + + zoomcalc.o: zoomcalc.c + $(CC) $(CFLAGS) -o zoomcalc.o -c zoomcalc.c + + fakewavspeed: fakewavspeed.o +- $(CC) -o fakewavspeed $(LDFLAGS) fakewavspeed.o ++ $(CC) $(LDFLAGS) fakewavspeed.o $(LIBS) -o fakewavspeed + + fakewavspeed.o: fakewavspeed.c + $(CC) $(CFLAGS) -o fakewavspeed.o -c fakewavspeed.c + + progress: progress.o +- $(CC) -o progress $(LDFLAGS) progress.o ++ $(CC) $(LDFLAGS) progress.o $(LIBS) -o progress + + progress.o: progress.c + $(CC) $(CFLAGS) -o progress.o -c progress.c + + install: all diff --git a/media-video/videotrans/videotrans-1.6.0.ebuild b/media-video/videotrans/videotrans-1.6.0.ebuild index 34a34b3a9c3d..3dd83ad2286c 100644 --- a/media-video/videotrans/videotrans-1.6.0.ebuild +++ b/media-video/videotrans/videotrans-1.6.0.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/videotrans/videotrans-1.6.0.ebuild,v 1.1 2008/02/04 00:58:17 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/videotrans/videotrans-1.6.0.ebuild,v 1.2 2008/12/17 21:10:04 loki_val Exp $ -inherit eutils +inherit base eutils DESCRIPTION="A package to convert movies to DVD format and to build DVDs with." HOMEPAGE="http://videotrans.sourceforge.net/" @@ -26,6 +26,8 @@ RDEPEND="${DEPEND} app-shells/bash sys-devel/bc" +PATCHES=( "${FILESDIR}/${P}-forced-as-needed.patch" ) + pkg_setup() { if ! built_with_use media-video/mjpegtools png; then eerror "Please emerge media-video/mjpegtools with useflag 'png'." |