diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-11-21 21:06:11 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-11-21 21:06:11 +0000 |
| commit | 49e3313188f1c6c5c1b52f6412278eefd7341ebc (patch) | |
| tree | ca8506055bc68b1489d902f34f50da133335242b /media-video/chaplin | |
| parent | Depend on the old output style of ifconfig, and simplify build flags a bit. (diff) | |
| download | gentoo-2-49e3313188f1c6c5c1b52f6412278eefd7341ebc.tar.gz gentoo-2-49e3313188f1c6c5c1b52f6412278eefd7341ebc.tar.bz2 gentoo-2-49e3313188f1c6c5c1b52f6412278eefd7341ebc.zip | |
Update to EAPI 4, add rdep on mjpegtools, add optional rdep on graphicsmagick (bug #314329), and respect LDFLAGS, CFLAGS, and CC (bug #335538).
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'media-video/chaplin')
| -rw-r--r-- | media-video/chaplin/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/chaplin/chaplin-1.10-r1.ebuild | 20 | ||||
| -rw-r--r-- | media-video/chaplin/files/chaplin-1.10-asneeded.patch | 4 |
3 files changed, 22 insertions, 11 deletions
diff --git a/media-video/chaplin/ChangeLog b/media-video/chaplin/ChangeLog index 840817964d24..687684ac3ef8 100644 --- a/media-video/chaplin/ChangeLog +++ b/media-video/chaplin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/chaplin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.11 2009/12/19 21:59:26 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.12 2011/11/21 21:06:11 radhermit Exp $ + + 21 Nov 2011; Tim Harder <radhermit@gentoo.org> chaplin-1.10-r1.ebuild, + files/chaplin-1.10-asneeded.patch: + Update to EAPI 4, add rdep on mjpegtools, add optional rdep on graphicsmagick + (bug #314329), and respect LDFLAGS, CFLAGS, and CC (bug #335538). 19 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> chaplin-1.10-r1.ebuild, +files/chaplin-1.10-asneeded.patch: diff --git a/media-video/chaplin/chaplin-1.10-r1.ebuild b/media-video/chaplin/chaplin-1.10-r1.ebuild index 6d743ed90770..d022be24345e 100644 --- a/media-video/chaplin/chaplin-1.10-r1.ebuild +++ b/media-video/chaplin/chaplin-1.10-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.6 2009/12/19 21:59:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.7 2011/11/21 21:06:11 radhermit Exp $ -EAPI=2 -inherit eutils +EAPI=4 +inherit eutils toolchain-funcs DESCRIPTION="This is a program to raw copy chapters from a dvd using libdvdread" HOMEPAGE="http://www.lallafa.de/bp/chaplin.html" @@ -14,8 +14,10 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="transcode vcd" -DEPEND=">=media-libs/libdvdread-0.9.4 - >=media-gfx/imagemagick-5.5.7.14 +DEPEND=">=media-libs/libdvdread-0.9.4" +RDEPEND="${DEPEND} + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) + media-video/mjpegtools transcode? ( >=media-video/transcode-0.6.2 ) vcd? ( >=media-video/vcdimager-0.7.2 )" @@ -26,6 +28,10 @@ src_prepare() { "${FILESDIR}"/${P}-asneeded.patch } +src_compile() { + emake CC="$(tc-getCC)" +} + src_install() { - dobin chaplin chaplin-genmenu || die + dobin chaplin chaplin-genmenu } diff --git a/media-video/chaplin/files/chaplin-1.10-asneeded.patch b/media-video/chaplin/files/chaplin-1.10-asneeded.patch index 46acde6666cb..f7cb499407a8 100644 --- a/media-video/chaplin/files/chaplin-1.10-asneeded.patch +++ b/media-video/chaplin/files/chaplin-1.10-asneeded.patch @@ -5,11 +5,11 @@ build: - gcc -DNDEBUG -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm -+ gcc -DNDEBUG -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm ++ $(CC) $(CFLAGS) $(LDFLAGS) -DNDEBUG -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm debug: - gcc -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm -+ gcc -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm dist: cd .. ; tar cvfz chaplin.tgz chaplin/Makefile chaplin/chaplin.c chaplin/chaplin-genmenu chaplin/chaplin |