diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-11-20 20:49:51 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-11-20 20:49:51 +0000 |
| commit | 944eb38072951666143a45aa5a465932e2cc1cb4 (patch) | |
| tree | da2b9dc350c8c5f7643cbb44d21d9af7369690a4 /media-video/bbtools | |
| parent | Version bump. Still patch the normal version since the autotools does not hav... (diff) | |
| download | gentoo-2-944eb38072951666143a45aa5a465932e2cc1cb4.tar.gz gentoo-2-944eb38072951666143a45aa5a465932e2cc1cb4.tar.bz2 gentoo-2-944eb38072951666143a45aa5a465932e2cc1cb4.zip | |
Update to EAPI 4 and respect LDFLAGS (bug #337942).
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
Diffstat (limited to 'media-video/bbtools')
| -rw-r--r-- | media-video/bbtools/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/bbtools/bbtools-1.9.ebuild | 19 | ||||
| -rw-r--r-- | media-video/bbtools/files/bbtools-1.9-gentoo.patch | 8 |
3 files changed, 18 insertions, 17 deletions
diff --git a/media-video/bbtools/ChangeLog b/media-video/bbtools/ChangeLog index 8fe426f2a387..81bf87e09312 100644 --- a/media-video/bbtools/ChangeLog +++ b/media-video/bbtools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/bbtools -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/ChangeLog,v 1.6 2007/12/01 10:52:20 caster Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/ChangeLog,v 1.7 2011/11/20 20:49:51 radhermit Exp $ + + 20 Nov 2011; Tim Harder <radhermit@gentoo.org> bbtools-1.9.ebuild, + files/bbtools-1.9-gentoo.patch: + Update to EAPI 4 and respect LDFLAGS (bug #337942). 01 Dec 2007; Vlastimil Babka <caster@gentoo.org> bbtools-1.9.ebuild: Add ~amd64, works here. diff --git a/media-video/bbtools/bbtools-1.9.ebuild b/media-video/bbtools/bbtools-1.9.ebuild index 6a4babbdc2ad..fc139db9650f 100644 --- a/media-video/bbtools/bbtools-1.9.ebuild +++ b/media-video/bbtools/bbtools-1.9.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2007 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/bbtools/bbtools-1.9.ebuild,v 1.5 2007/12/01 10:52:19 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/bbtools-1.9.ebuild,v 1.6 2011/11/20 20:49:51 radhermit Exp $ -inherit eutils flag-o-matic +EAPI=4 + +inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="bbdmux, bbinfo, bbvinfo and bbainfo from Brent Beyeler" HOMEPAGE="http://members.cox.net/beyeler/bbmpeg.html" @@ -14,13 +16,10 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="" DEPEND="app-arch/unzip" -RDEPEND="" S=${WORKDIR} -src_unpack() { - unpack ${A} - +src_prepare() { mv BBINFO.cpp bbinfo.cpp || die mv BITS.CPP bits.cpp || die mv BITS.H bits.h || die @@ -29,13 +28,11 @@ src_unpack() { edos2unix *.cpp *.h epatch "${FILESDIR}"/bbtools-${PV}-gentoo.patch -} -src_compile() { append-lfs-flags - emake || die "emake failed" + tc-export CXX } src_install() { - dobin bbainfo bbdmux bbinfo bbvinfo || die "dobin failed" + dobin bbainfo bbdmux bbinfo bbvinfo } diff --git a/media-video/bbtools/files/bbtools-1.9-gentoo.patch b/media-video/bbtools/files/bbtools-1.9-gentoo.patch index 2c33cae118c7..7f9ff7ab6279 100644 --- a/media-video/bbtools/files/bbtools-1.9-gentoo.patch +++ b/media-video/bbtools/files/bbtools-1.9-gentoo.patch @@ -54,16 +54,16 @@ +all: bbainfo bbdmux bbinfo bbvinfo + +bbdmux: bits.o bbdmux.o -+ $(CXX) $(CXXFLAGS) -lm -o $@ $^ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ + +bbinfo: bits.o bbinfo.o -+ $(CXX) $(CXXFLAGS) -lm -o $@ $^ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ + +bbvinfo: bits.o bbvinfo.o -+ $(CXX) $(CXXFLAGS) -lm -o $@ $^ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ + +bbainfo: bits.o bbainfo.o -+ $(CXX) $(CXXFLAGS) -lm -o $@ $^ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -lm -o $@ + +%.o: %.c + $(CXX) $(CXXFLAGS) -c -o $@ $< |