Revision: 2605
Author: lilrc
Date: 2013-03-29 12:17:12 +0100 (Fri, 29 Mar 2013)
Log Message:
-----------
media-libs/gmerlin-avdecoder: EAPI 5 and autotools-utils, fix USE flags,
keyword for ~x86, fix doc installation, cleanup
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/ChangeLog
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/Manifest
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-1.2.0.ebuild
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/metadata.xml
Removed Paths:
-------------
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-0.1.8.ebuild
Modified: trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/ChangeLog
2013-03-29 09:50:33 UTC (rev 2604)
+++ trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/ChangeLog
2013-03-29 11:17:12 UTC (rev 2605)
@@ -1,7 +1,18 @@
# ChangeLog for media-libs/gmerlin-avdecoder
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Mar 2013; Karl Linden (lilrc) <li...@users.sourceforge.net>
+ -gmerlin-avdecoder-0.1.8.ebuild, gmerlin-avdecoder-1.2.0.ebuild,
+ metadata.xml:
+ Move to EAPI 5 and autotools-utils.
+ Add new and rename USE flags.
+ Keyword for ~x86.
+ Install doc properly.
+ Remove no-herd from metadata.
+ Add USE flag descriptions.
+ Remove old ebuild.
+
*gmerlin-avdecoder-1.2.0 (22 Jun 2012)
22 Jun 2012; Frieder Buerzele <everm...@tuxfamily.org>
Modified: trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/Manifest
2013-03-29 09:50:33 UTC (rev 2604)
+++ trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/Manifest
2013-03-29 11:17:12 UTC (rev 2605)
@@ -1,7 +1,5 @@
-AUX gmerlin-avdecoder-cflags.patch 297 RMD160
581685285d3f65ad3d740b5d33c83c7a03de75c9 SHA1
261fee39d06f91d905f7b1e44333ebf2b7dd9939 SHA256
c5274c8af069274c7d5e046125fff3e7e93a862be55a814b0c35604640dd7460
-DIST gmerlin-avdecoder-0.1.8.tar.gz 1345582 RMD160
4c15c9d9306453130a4610aa06ad411dd7c65745 SHA1
bebb25094a984638de90a8520d83f26dd72aa6ef SHA256
2f561f792d26d9829e7a0fec54c5d05f6e733e864e7354c14232a6e93b0e024f
-DIST gmerlin-avdecoder-1.2.0.tar.gz 1496378 RMD160
2956cbcf34c5103d50eaf938e61c096d73d91c17 SHA1
3754d4e6bac24c09e3d335100ba01f231e440dc5 SHA256
8e727fe0c9db6875bd71f3f4cac8e8feaca62d0ef1b26a86678241ecbed59afa
-EBUILD gmerlin-avdecoder-0.1.8.ebuild 2463 RMD160
6abb7152d639b77d87f9d04ffb5af937fd7fa121 SHA1
540a5ab2e2bc2a7670015c5c8af78bd8f4389c12 SHA256
e3ccd0891fe906cc1b8b7e610d21daa811b007c91f1b9360e20b210001d6007e
-EBUILD gmerlin-avdecoder-1.2.0.ebuild 2426 RMD160
64e0a807e30dd81312bb67099388c333cff54bea SHA1
2bd365a89fd502286a8c52d9462e98f1e9423d93 SHA256
9d9ec29758e1d41ef3abefb4d93a3fbf27218e5733a19221f593a73a1ce05224
-MISC ChangeLog 867 RMD160 146ea94bd0e944834f57da520fcd51e5266c40f4 SHA1
52b288ba69f2cbab713382fe74193e46dcd57c8e SHA256
769a9fb5b597c3e3024ee11823737687f7e5dc4f10b391fb1e047bed4fc165c2
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX gmerlin-avdecoder-cflags.patch 297 SHA256
c5274c8af069274c7d5e046125fff3e7e93a862be55a814b0c35604640dd7460 SHA512
fecf7c27c25d673982ac765bec8cc8f2dd5ce129e1ecd71c5641d2c20de466379cfa3cfbbca5d6ab62d72810aee862ade3f3965daa3c9c35dd4336b206a0dff3
WHIRLPOOL
c623d5a119c2450faa47e6e349b2ccce06abe464660ecef1b3206ed79ff360070d6fdef6a477dd96f5ccbb2b6e4ee6d1e84f548891466daaaa1e72a15a196b8d
+DIST gmerlin-avdecoder-1.2.0.tar.gz 1496378 SHA256
8e727fe0c9db6875bd71f3f4cac8e8feaca62d0ef1b26a86678241ecbed59afa SHA512
aed4c138d8879417528decc6969946f4eb9fbc57cedb5c7158adfa191d121fc87c9d5ea4a2ac2bc91e3bebc94ca9536419e11bd5cfecc8555d88a1c223ec4649
WHIRLPOOL
c67fe98afaa272bd4dda72abae67568876aeb2d4e7b14c6a9fa9a46054f29e100c48afd47d9a71262a8856f0843dbec4f2c0ba6c432a2522975c9d4813b1f443
+EBUILD gmerlin-avdecoder-1.2.0.ebuild 2840 SHA256
4d0965ef608f2ee90e3bd38f5db428b6df021bdfbe2e262fda247c3022e020c8 SHA512
1fc7498250c06385b1273b4c238310ba88df2684a0c5fa14eaa93c39070921c7eadfd0e128aeaa99dd9290ad9979559dafa89c2ddc2fe8daba6307f4a2465193
WHIRLPOOL
c2a4204af5a3a5bca5d17d9766800181b49c3ec81221344d14d9be27e8aad0957e6521ecab747cdc2784f4f1368e35bacdd713b345ef6017ff8cbbf7c5fb198b
+MISC ChangeLog 1212 SHA256
6b4bac910a4a221c310165342f50b6248b36ff148e6d85031b3e4ee82908aec5 SHA512
16b6a2f13c84e524927d79f7d6221d9ced6eb686e9f77ac47cf8cd544051c9a0e8ce363d83d692c01131c823a5f8bd438e5bb7f19a52313bb688a90e78eadbb5
WHIRLPOOL
18cae4bed9baf62717c5670e3f76e24743a3bc89c63472ac5454b730262328bd18b18d157eef6b7e55c410d92b6ad6ca537018f1850d38b7cbf1f840b22337b5
+MISC metadata.xml 507 SHA256
a1a88b98848c86cde51c8fec7e1ee5336ffb5966051c53efc1b7a6dcca96aec2 SHA512
6960fef4f9b56545ab174e2e490e9fd3707d3a36ee80dd7047094c7be7b0dff6a598cb012ef6a680f1ef36a14cb0ba45e5dd2e1db375757cbee664436d82ece8
WHIRLPOOL
3cc9bf9ce87005ca25266533be1bb8ece9ea4a5a5c5630ccfcba26a15b4ba5ef2b3b2d27b4a068d8d1e0240be243c182d553140dfd47122cd80ea928ba40a0e9
Deleted:
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-0.1.8.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-0.1.8.ebuild
2013-03-29 09:50:33 UTC (rev 2604)
+++
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-0.1.8.ebuild
2013-03-29 11:17:12 UTC (rev 2605)
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils
-
-DESCRIPTION="Gmerlin A/V decoder library"
-HOMEPAGE="http://gmerlin.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN%%-*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="a52 aac cdio debug doc dts ffmpeg flac mad mjpeg mpeg musepack nls
plugins png samba speex theora tiff vorbis"
-
-DEPEND=">=media-libs/gavl-1.0.0
- a52? ( media-libs/a52dec )
- aac? ( media-libs/faad2 )
- cdio? ( dev-libs/libcdio )
- doc? ( app-doc/doxygen )
- dts? ( media-libs/libdca )
- dvd? ( media-libs/libdvdread )
- ffmpeg? ( media-video/ffmpeg )
- flac? ( media-libs/flac )
- mad? ( media-libs/libmad )
- mjpeg? ( media-video/mjpegtools )
- mpeg? ( media-libs/libmpeg2 )
- musepack? ( media-libs/libmpcdec )
- plugins? ( >=media-libs/gmerlin-0.3.8 )
- png? ( media-libs/libpng )
- samba? ( net-fs/samba )
- speex? ( media-libs/speex )
- theora? ( media-libs/libtheora )
- tiff? ( media-libs/tiff )
- vorbis? ( media-libs/libvorbis )
- "
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # new ffmpeg-API
- sed -i -e 's|->bits_per_sample|->bits_per_coded_sample|g' \
- lib/demux_ffmpeg.c lib/audio_ffmpeg.c lib/video_ffmpeg.c
- # Patch for >=ffmpeg-0.4.9_pre20081003
- if has_version ">=media-video/ffmpeg-0.4.9_pre20081003"; then
- sed -i -e 's|offset_t|int64_t|g' lib/demux_ffmpeg.c
- fi
-
- epatch "${FILESDIR}"/${PN}-cflags.patch
- eautoreconf
-}
-
-src_compile() {
- econf \
- --without-cpuflags \
- --disable-dependency-tracking \
- --docdir=/usr/share/doc/${PF}/html \
- $(use_enable a52 liba52) \
- $(use_enable aac faad2) \
- $(use_enable cdio libcdio) \
- $(use_enable debug) \
- $(use_with doc doxygen) \
- $(use_enable dts libdca) \
- $(use_enable dvd dvdread) \
- $(use_enable ffmpeg libavcodec) \
- $(use_enable ffmpeg libpostproc) \
- $(use_enable ffmpeg libswscale) \
- $(use_enable ffmpeg libavformat) \
- $(use_enable flac) \
- $(use_enable mad) \
- $(use_enable mjpeg mjpegtools) \
- $(use_enable mpeg libmpeg2) \
- $(use_enable musepack) \
- $(use_enable plugins gmerlin) \
- $(use_enable png libpng) \
- $(use_enable samba) \
- $(use_enable speex) \
- $(use_enable theora) \
- $(use_enable tiff libtiff) \
- $(use_enable vorbis) \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS NEWS README INSTALL
-}
Modified:
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-1.2.0.ebuild
===================================================================
---
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-1.2.0.ebuild
2013-03-29 09:50:33 UTC (rev 2604)
+++
trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/gmerlin-avdecoder-1.2.0.ebuild
2013-03-29 11:17:12 UTC (rev 2605)
@@ -1,44 +1,51 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit autotools eutils
+EAPI="5"
+inherit autotools-utils eutils
+
DESCRIPTION="Gmerlin A/V decoder library"
HOMEPAGE="http://gmerlin.sourceforge.net/";
SRC_URI="mirror://sourceforge/${PN%%-*}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
-IUSE="a52 aac cdio debug doc dts dvd ffmpeg flac mad mjpeg mpeg musepack
plugins png samba speex theora tiff vorbis"
+KEYWORDS="~x86 ~amd64"
+IUSE="a52 aac cdda debug doc dts dvd ffmpeg flac mad mjpeg mpeg musepack nls
+ogg jpeg2k plugins png samba schroedinger speex theora tiff vdpau vorbis X"
-DEPEND=">=media-libs/gavl-1.4.0
+RDEPEND=">=media-libs/gavl-1.4.0
a52? ( media-libs/a52dec )
aac? ( media-libs/faad2 )
- cdio? ( dev-libs/libcdio )
- doc? ( app-doc/doxygen )
+ cdda? ( dev-libs/libcdio )
dts? ( media-libs/libdca )
dvd? ( media-libs/libdvdread )
ffmpeg? ( media-video/ffmpeg )
flac? ( media-libs/flac )
+ jpeg2k? ( media-libs/openjpeg )
mad? ( media-libs/libmad )
mjpeg? ( media-video/mjpegtools )
mpeg? ( media-libs/libmpeg2 )
+ nls? ( sys-devel/gettext )
+ ogg? ( media-libs/libogg )
plugins? ( >=media-libs/gmerlin-0.3.8 )
png? ( media-libs/libpng )
samba? ( net-fs/samba )
+ schroedinger? ( media-libs/schroedinger )
speex? ( media-libs/speex )
theora? ( media-libs/libtheora )
tiff? ( media-libs/tiff )
- vorbis? ( media-libs/libvorbis )
- "
-RDEPEND="${DEPEND}"
+ vdpau? ( x11-libs/libvdpau )
+ vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+PATCHES=( "${FILESDIR}/${PN}-cflags.patch" )
+AUTOTOOLS_AUTORECONF="1"
+src_prepare() {
# new ffmpeg-API
sed -i -e 's|->bits_per_sample|->bits_per_coded_sample|g' \
lib/demux_ffmpeg.c lib/audio_ffmpeg.c lib/video_ffmpeg.c
@@ -47,43 +54,60 @@
sed -i -e 's|offset_t|int64_t|g' lib/demux_ffmpeg.c
fi
- epatch "${FILESDIR}"/${PN}-cflags.patch
- eautoreconf
+ autotools-utils_src_prepare
}
+src_configure() {
+ local myeconfargs=(
+ $(use_enable a52 liba52)
+ $(use_enable aac faad2)
+ $(use_enable cdda libcdio)
+ $(use_enable debug)
+ $(use_with doc doxygen)
+ $(use_enable dts libdca)
+ $(use_enable dvd dvdread)
+ $(use_enable ffmpeg libavcodec)
+ $(use_enable ffmpeg libpostproc)
+ $(use_enable ffmpeg libswscale)
+ $(use_enable ffmpeg libavformat)
+ $(use_enable flac
+ $(use_enable jpeg2k openjpeg))
+ $(use_enable mad)
+ $(use_enable mjpeg mjpegtools)
+ $(use_enable mpeg libmpeg2)
+ $(use_enable musepack)
+ $(use_enable nls)
+ $(use_enable ogg)
+ $(use_enable plugins gmerlin)
+ $(use_enable png libpng)
+ $(use_enable samba)
+ $(use_enable schroedinger)
+ $(use_enable speex)
+ $(use_enable theora theoradec)
+ $(use_enable tiff libtiff)
+ $(use_enable vdpau)
+ $(use_enable vorbis)
+ $(use_with X x)
+ --without-cpuflags
+ --disable-dependency-tracking
+ )
+ autotools-utils_src_configure
+}
+
src_compile() {
- econf \
- --without-cpuflags \
- --disable-dependency-tracking \
- --docdir=/usr/share/doc/${PF}/html \
- $(use_enable a52 liba52) \
- $(use_enable aac faad2) \
- $(use_enable cdio libcdio) \
- $(use_enable debug) \
- $(use_with doc doxygen) \
- $(use_enable dts libdca) \
- $(use_enable dvd dvdread) \
- $(use_enable ffmpeg libavcodec) \
- $(use_enable ffmpeg libpostproc) \
- $(use_enable ffmpeg libswscale) \
- $(use_enable ffmpeg libavformat) \
- $(use_enable flac) \
- $(use_enable mad) \
- $(use_enable mjpeg mjpegtools) \
- $(use_enable mpeg libmpeg2) \
- $(use_enable musepack) \
- $(use_enable plugins gmerlin) \
- $(use_enable png libpng) \
- $(use_enable samba) \
- $(use_enable speex) \
- $(use_enable theora) \
- $(use_enable tiff libtiff) \
- $(use_enable vorbis) \
- || die "econf failed"
- emake || die "emake failed"
+ autotools-utils_src_compile
+
+ if use doc; then
+ cd "${BUILD_DIR}/doc"
+ emake
+ fi
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS NEWS README INSTALL
+ autotools-utils_src_install
+
+ if use doc; then
+ cd "${BUILD_DIR}/doc"
+ emake DESTDIR="${D}" install
+ fi
}
Modified: trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/metadata.xml
2013-03-29 09:50:33 UTC (rev 2604)
+++ trunk/overlays/proaudio/media-libs/gmerlin-avdecoder/metadata.xml
2013-03-29 11:17:12 UTC (rev 2605)
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>no-herd</herd>
<maintainer>
<email>proau...@tuxfamily.org</email>
<name>pro-audio overlay team</name>
</maintainer>
+ <use>
+ <flag name="mjpeg">Support for
<pkg>media-video/mjpegtools</pkg></flag>
+ <flag name="plugins">Build plugins for
<pkg>media-libs/gmerlin</pkg></flag>
+ <flag name="schroedinger">Dirac video support via
<pkg>media-libs/schroedinger</pkg></flag>
+ </use>
</pkgmetadata>
