commit: eb8abfeb1f0ef1893d249dfe7f84edad00454995 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon Dec 12 23:16:24 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 12 23:16:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8abfeb
media-video/oxine: Fix building with GCC 5 Gentoo-bug: 590946 * EAPI=6 Package-Manager: portage-2.3.3 media-video/oxine/oxine-0.7.1-r1.ebuild | 67 --------------------------- media-video/oxine/oxine-0.7.1-r2.ebuild | 82 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 67 deletions(-) diff --git a/media-video/oxine/oxine-0.7.1-r1.ebuild b/media-video/oxine/oxine-0.7.1-r1.ebuild deleted file mode 100644 index 5682433..00000000 --- a/media-video/oxine/oxine-0.7.1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -WANT_AUTOMAKE="1.9" -inherit eutils - -DESCRIPTION="OSD frontend for Xine" -HOMEPAGE="http://oxine.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~ppc64 x86" -SLOT="0" -IUSE="X curl debug dvb exif joystick jpeg lirc nls png v4l" - -COMMON_DEPEND="media-libs/xine-lib[v4l?,X,imagemagick] - dvb? ( media-libs/xine-lib[v4l] ) - dev-libs/libcdio - curl? ( net-misc/curl ) - joystick? ( media-libs/libjsw ) - jpeg? ( media-gfx/imagemagick - media-libs/netpbm[jpeg,zlib] - media-video/mjpegtools ) - lirc? ( app-misc/lirc ) - nls? ( virtual/libintl - sys-devel/gettext ) - png? ( media-gfx/imagemagick - media-libs/netpbm[png,zlib] - media-video/mjpegtools ) - X? ( x11-libs/libXext - x11-libs/libX11 )" -RDEPEND="${COMMON_DEPEND} - virtual/eject" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -src_configure() { - # Note on images: Image support will be automatically disabled if - # netpbm, imagemagick or mjpegtools is not installed, irregardless - # of what the USE flags are set to. - - # If one of the image USE flags is unset, disable image support - if use !png && use !jpeg ; then - myconf="${myconf} --disable-images" - fi - - econf ${myconf} \ - $( use_with X x ) \ - $( use_with curl ) \ - $( use_enable debug ) \ - $( use_enable dvb ) \ - $( use_enable exif ) \ - --disable-hal \ - $( use_enable joystick ) \ - $( use_enable lirc ) \ - $( use_enable nls ) \ - $( use_enable v4l ) \ - --disable-extractor \ - --disable-rpath || die "econf died" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install died" - dodoc AUTHORS ChangeLog NEWS README TODO - dohtml doc/README.html doc/keymapping.pdf -} diff --git a/media-video/oxine/oxine-0.7.1-r2.ebuild b/media-video/oxine/oxine-0.7.1-r2.ebuild new file mode 100644 index 00000000..b9ed6a6 --- /dev/null +++ b/media-video/oxine/oxine-0.7.1-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic + +DESCRIPTION="OSD frontend for Xine" +HOMEPAGE="http://oxine.sourceforge.net/"; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +SLOT="0" +IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X" + +COMMON_DEPEND=" + dev-libs/libcdio + media-libs/xine-lib[v4l?,X,imagemagick] + curl? ( net-misc/curl ) + dvb? ( media-libs/xine-lib[v4l] ) + joystick? ( media-libs/libjsw ) + jpeg? ( + media-gfx/imagemagick + media-libs/netpbm[jpeg,zlib] + media-video/mjpegtools + ) + lirc? ( app-misc/lirc ) + nls? ( + virtual/libintl + sys-devel/gettext + ) + png? ( + media-gfx/imagemagick + media-libs/netpbm[png,zlib] + media-video/mjpegtools + ) + X? ( + x11-libs/libXext + x11-libs/libX11 + )" +RDEPEND="${COMMON_DEPEND} + virtual/eject" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +HTML_DOCS=( doc/README.html ) + +src_configure() { + # Fix underlinking by falling back to + # GNU89 inline semantics, bug 590946 + append-cflags -std=gnu89 + + # Note on images: Image support will be automatically disabled if + # netpbm, imagemagick or mjpegtools is not installed, regardless + # of what the USE flags are set to. + # If one of the image USE flags is unset, disable image support + local myconf=() + if use !png || use !jpeg; then + myconf+=( --disable-images ) + fi + + econf \ + --disable-hal \ + --disable-rpath \ + --disable-extractor \ + $(use_with curl) \ + $(use_enable debug) \ + $(use_enable dvb) \ + $(use_enable exif) \ + $(use_enable joystick) \ + $(use_enable lirc) \ + $(use_enable nls) \ + $(use_enable v4l) \ + $(use_with X x) \ + "${myconf[@]}" +} + +src_install() { + default + dodoc doc/keymapping.pdf +}
