Introduce USE=libav to control the preferred implementation. Add subslot op to force...
authorMichał Górny <mgorny@gentoo.org>
Sun, 1 Feb 2015 22:53:35 +0000 (22:53 +0000)
committerMichał Górny <mgorny@gentoo.org>
Sun, 1 Feb 2015 22:53:35 +0000 (22:53 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

media-libs/xine-lib/ChangeLog
media-libs/xine-lib/Manifest
media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild [new file with mode: 0644]
media-libs/xine-lib/xine-lib-1.2.9999.ebuild

index b4058d5dc368e025695be7cd99f96c3d1cbabc13..d72ef0d96af0aa988ff8ad5ab26cc515f3b25ada 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/xine-lib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.713 2014/12/12 09:27:57 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.714 2015/02/01 22:53:32 mgorny Exp $
+
+*xine-lib-1.2.6-r1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +xine-lib-1.2.6-r1.ebuild,
+  xine-lib-1.2.9999.ebuild:
+  Introduce USE=libav to control the preferred implementation. Add subslot op to
+  force rebuilds on ABI change.
 
   12 Dec 2014; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   USE='vaapi' is now global, removing it's description from metadata
index b1bd709ae5aef8605fc019ceefadf5f2f87d6b50..0d61727d00ace899488773a771f025742dc14daf 100644 (file)
@@ -5,18 +5,27 @@ AUX accel_vaapi.h 4077 SHA256 0e4c485595fbe59cfebdfab8758df9c9dc78a79ab1fe49fb22
 DIST xine-lib-1.2.3.tar.xz 4905356 SHA256 e06a9e01d2632530e694d4a96bba71810e2f447f9ac036d2a150c43baa27852a SHA512 1abbced7c67fe04492bb28ada9d847e82be4bbcc426378dae1056dd6b01e22b8fa78218f5a96a0947ff1e9f70ebc1ee4bb06c330b0e17ca8d7c4d9be49982887 WHIRLPOOL 0e6bfb61ce77d14fbd0a807499b2a0b3f04ac976e8b7c06a5b34be06cbecb822339451031b80c4dc8faa5265adb1883861d96d0e7dc43a0b3ebe7040b619fb65
 DIST xine-lib-1.2.6.tar.xz 5020964 SHA256 bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 SHA512 ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd WHIRLPOOL 66d85e75e28598ce3790f08c69ccd912aac115c8071f1795abd51d43b1e35fbc08827ae93fc9ce113cc0c0565b409714103cfeb14aa7acefe6bdb2fdf46ee307
 EBUILD xine-lib-1.2.3.ebuild 5506 SHA256 af3e95c991d8191009b9f3ee4c68d881447e1e1e2260190761e3614dbdab8811 SHA512 5ab354f142a9994e5283146b1b5dce119cbdf608964a45eccd6375af780196868721fc9366fc07c63a7de0fae2a00baa06cc07585cb77bdc7ffc2eb1a6c489b9 WHIRLPOOL 32811e2ea08b42f2dbc5fb41766683ecde54fb358f364330fd0d3f8a64ce38c128cf6c99e1674393b76108c345dc23f7e5db4ddf1fe97dddfeb2da6c24c45790
+EBUILD xine-lib-1.2.6-r1.ebuild 5741 SHA256 5b28a145fa622096e8583a792f1d8334c03ac3d325ddee3d23840ad634159b4f SHA512 d4edf70902494b535e2526d3703788855a23998e4f0aab73ccca7175ff44e433667f8fdd1fe08f29ef265f62f0c634d52bb691ab93eb245a3422db4eb96f219c WHIRLPOOL 87b0dad995f8ec2a66eda6ae235b01d7fde3de855cc17c6c920642967cfe165ed4488b0a07b922014f470f94e5d9e93defc4745596887e439be524fc0fe8c632
 EBUILD xine-lib-1.2.6.ebuild 5714 SHA256 bcc441e011db6343b590b42e6ae33839a2b705f43bb1ae04b9f5df4c55f55e9c SHA512 f7ef97106b677586c83aeaf13787ec09953c34c05e7d8d50b387dfb1d59413d120d2fe59b29e3571aeb9b268e6f7d2d6b85b86c9800d0209e76b0d8812941204 WHIRLPOOL db4168982a3da1b83185f4c46fd465fecb7a73a481392fb974b817f68dd5a2f47911e12565dd1840837464296d14b9fcf65460ca0e10bf0939f5e3dd24a2e2d7
-EBUILD xine-lib-1.2.9999.ebuild 5721 SHA256 c6b15370c8f4592bb0e9f37801b10d1eff1544d338a145c56ebe5ce605316fdb SHA512 bd06be5f69e97ee9a7cb011b0ec228736492dbec5efa7c5b1247ef08fa757d374695411c86f46869d3079b5dfa234e7389e61d8bc3cb65eeb77fd0fe4d3d627d WHIRLPOOL 23b13d9b7ac96e08696f656f9ded5dc20404c2bc507274d6f3518441cc0208ec45f17e295adc7eaf027619043a76de55cd132628f2e3b6e5f7c8d547aa900a52
-MISC ChangeLog 85006 SHA256 2b3fad841bb4539f298d3c93df656cd9d6d5c5c10989660b520e7390fb3a6da0 SHA512 deda2f86450dd554db288c665caa70837a2200c0b7c587adcffb155baba97b8818070e56f125f055dd7e0efae2cdb5c4a8e57bf1b9defd32b8629218fe24197f WHIRLPOOL 97ab36911d3b79a767f0602e663b13f18a5122eb345e521ffaf8c544dcf917582a207f762afa210dc26e4961fd6f258212b4d0eb6d87fe2988edad1ce106aa49
+EBUILD xine-lib-1.2.9999.ebuild 5742 SHA256 b4337f38a49ddb5c0d79b7f8508e538837e1acdb15b118e2852f03c5d694d445 SHA512 641490a7048c1164de6ff67093f544e7ead1ae50f40f69433d1b77de62b299a9b6fbc20e0d2e16a3b4d3115df4cc30de9c69394e830bfb18fe87722480544d80 WHIRLPOOL 549a5b8ac82d8dfbcdb40ecfe8d47a22067a5988ec8a5d988b1209d148d13e5f504d1c824f6a52afdb77f630672580d1695b966af7c2a9d3a996f67c09d30d4b
+MISC ChangeLog 85257 SHA256 d3d1366bdc6494dd25e24cffb8649412c80afb6ec988ff76fc8c5de6d7198730 SHA512 2404e9070fb852dd4bd967023433ae7260b6110a37974bbc425880f46bdf66b441e2101a10cba58f8c789151149834f49d522abee1a5222603f946f5735bd6d0 WHIRLPOOL 23aae262c4d107155b7f4312ef5cd258636d46733bd8cb086f59cec6d341a05c3c0d59e67b982dbb1c24053c114449e78e05586494f7121bf55357596edaf4b1
 MISC metadata.xml 2594 SHA256 a1acb4b7f5110d82b502f3c1cc095ae50d82e543564f2dacdb3b225379ec7c13 SHA512 392efccbd4989b8cf6d26019f2671f44807def1b45d747dbddb68d0af01027a24e9c8a29ff54c72bbe25d6911d2cd092e6e905f8171992fac6b4e43dc87ed111 WHIRLPOOL 72a1a3195f89893d6087af073e850018c3a35c47e102267a6b95713cd859a74704d561bc75c8122cf6c0b1d30ff972609735a839d1e4bbe33d6a86920dd5d7fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUirUdAAoJECo/aRed9267UwQH/jRlufnSK7N19mtiSHvO0eMs
-W6KdguIoQsPcVxmpoSAmkgS/OoIcdoueEp9tgA1vMADrGEMkQH6OWZSmdWofDkDA
-1U0jqwXJjlIykXh/xIR0DRYPrcRcIA314CZGxBs5Ik0pJtltNTjx5QkmyjcfStHr
-L0QCO8sFGWx1NpL0T7hOA3363XzJgTugUt0EMAgW441FMfrTkrLB5OuNmOSxyQns
-6CaMK+yKBas5ChKqt1wdgrnuhlFr+xEc3Q0DW2XDqL0wHnOmsETnH1I+sVXUQfb8
-UFtStiq+Eh9ef/S8MCo5fl1YLx9hPF5XaLln7JRTtyGwxBin8ieeDVOuyUukrrU=
-=kgNt
+iQJ8BAEBCABmBQJUzq5uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFDQQAMgM0+09nf0Y7jckRIkL7Pp8
+rvCPr6mSc+t449Zf0negkLXTTQHxY5Un7r+DaX/EEl7YMbZ81OrwYaCOaJ7uhNR+
+Zsu68cSB6lG6wDIw/hOdPLWhHZy3P4YYtJ9kjLzWYfiv/BkC+16pTYFjeYOpbNDD
+9s2ojcM2MoaCefPghU23LRFGG6SkQxAv2eUKA3UhsxZDY8pXVbMpmt9IB4ZkE6OZ
+Vto9FLgB83+nbB8xw1C0HtS10rRhsKtg12dDwC/B5zf15MLNR7OdKHzUOU9nfCvf
+cirjA9KSrc7q0KEllEEM32Mn3M2P5Qf0pc/t/Eu2PyU727W9qHBe1hXyHrtdRakb
+0I6y2BFYdhrTMhiqMwDx/rGObNsaH8ITseRHORNWaQZivka/xcLXUk6nMWF2cfDJ
+jKfSULHb1JkqhZs0oR+YNfmYHkBFen8wdP8a4X/XYITxyqG2FUfgfzVH02PvBkF1
+nAr2xkfoDvNysoxBgW00jV0btoOQWwSIkkOicYTbemD3eHhN6pClpbRJQ8S7A5+Q
+/4A8XVcz22CmF6LMKu2H/H+xgF346bOnMHPbI3neWte6h56k8Tn1Mx96tB7aoUXQ
+K4Oj3dqqFTgGmMr3kixapA4NuEkRiWkS2erX/gAVTosPQHZKB/X0d6NKojhcK5Ul
+bbGB1Mg+tPWW0xk4P+UT
+=gxTj
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
new file mode 100644 (file)
index 0000000..5199427
--- /dev/null
@@ -0,0 +1,226 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild,v 1.1 2015/02/01 22:53:32 mgorny Exp $
+
+EAPI=5
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+       EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+       inherit autotools mercurial eutils
+       unset NLS_IUSE
+       NLS_DEPEND="sys-devel/gettext"
+       NLS_RDEPEND="virtual/libintl"
+else
+       KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+       SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+       NLS_IUSE="nls"
+       NLS_DEPEND="nls? ( sys-devel/gettext )"
+       NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+       dev-libs/libxdg-basedir
+       media-libs/libdvdnav
+       sys-libs/zlib
+       !libav? ( media-video/ffmpeg:0= )
+       libav? (
+               media-libs/libpostproc:0=
+               media-video/libav:0=
+       )
+       virtual/libiconv
+       a52? ( media-libs/a52dec )
+       aac? ( media-libs/faad2 )
+       aalib? ( media-libs/aalib )
+       alsa? ( media-libs/alsa-lib )
+       bluray? ( >=media-libs/libbluray-0.2.1 )
+       css? ( >=media-libs/libdvdcss-1.2.10 )
+       directfb? ( dev-libs/DirectFB )
+       dts? ( media-libs/libdca )
+       dxr3? ( media-libs/libfame )
+       flac? ( media-libs/flac )
+       fusion? ( media-libs/FusionSound )
+       gtk? ( x11-libs/gdk-pixbuf:2 )
+       imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+       jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+       jpeg? ( virtual/jpeg:0 )
+       libcaca? ( media-libs/libcaca )
+       mad? ( media-libs/libmad )
+       mng? ( media-libs/libmng )
+       modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+       musepack? ( >=media-sound/musepack-tools-444 )
+       opengl? (
+               virtual/glu
+               virtual/opengl
+               )
+       pulseaudio? ( media-sound/pulseaudio )
+       samba? ( net-fs/samba )
+       sdl? ( media-libs/libsdl )
+       speex? (
+               media-libs/libogg
+               media-libs/speex
+               )
+       theora? (
+               media-libs/libogg
+               media-libs/libtheora
+               )
+       truetype? (
+               media-libs/fontconfig
+               media-libs/freetype:2
+               )
+       v4l? ( media-libs/libv4l )
+       vaapi? ( x11-libs/libva )
+       vcd? (
+               >=media-video/vcdimager-0.7.23
+               dev-libs/libcdio[-minimal]
+               )
+       vdpau? ( x11-libs/libvdpau )
+       vorbis? (
+               media-libs/libogg
+               media-libs/libvorbis
+               )
+       vpx? ( media-libs/libvpx )
+       wavpack? ( media-sound/wavpack )
+       X? (
+               x11-libs/libX11
+               x11-libs/libXext
+               )
+       xcb? ( x11-libs/libxcb )
+       xinerama? ( x11-libs/libXinerama )
+       xv? ( x11-libs/libXv )
+       xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+       ${NLS_DEPEND}
+       app-arch/xz-utils
+       virtual/pkgconfig
+       >=sys-devel/libtool-2.2.6b
+       oss? ( virtual/os-headers )
+       v4l? ( virtual/os-headers )
+       X? (
+               x11-libs/libXt
+               x11-proto/xf86vidmodeproto
+               x11-proto/xproto
+               )
+       xv? ( x11-proto/videoproto )
+       xvmc? ( x11-proto/videoproto )
+       xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+       xv? ( X )
+       xinerama? ( X )"
+
+src_prepare() {
+       sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+       if [[ ${PV} == *9999* ]]; then
+               epatch_user
+               eautoreconf
+       else
+               elibtoolize
+       fi
+
+       local x
+       for x in 0 1 2 3; do
+               sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+       done
+}
+
+src_configure() {
+       [[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+       local win32dir #197236
+       if has_multilib_profile; then
+               win32dir=/usr/$(ABI="x86" get_libdir)/win32
+       else
+               win32dir=/usr/$(get_libdir)/win32
+       fi
+
+       local myconf=()
+       [[ ${PV} == *9999* ]] || myconf=( $(use_enable nls) )
+
+       if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
+               myconf+=( --enable-avformat ) #507474
+       fi
+
+       econf \
+               $(use_enable ipv6) \
+               $(use_enable altivec) \
+               $(use_enable vis) \
+               --disable-optimizations \
+               $(use_enable mmap) \
+               $(use_enable oss) \
+               $(use_enable aalib) \
+               $(use_enable directfb) \
+               $(use_enable dxr3) \
+               $(use_enable fbcon fb) \
+               $(use_enable opengl) $(use_enable opengl glu) \
+               $(use_enable vidix) \
+               $(use_enable xinerama) \
+               $(use_enable xvmc) \
+               $(use_enable vdpau) \
+               $(use_enable vaapi) \
+               $(use_enable dvb) \
+               --disable-gnomevfs \
+               $(use_enable samba) \
+               --disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \
+               $(use_enable vcd) \
+               $(use_enable vdr) \
+               $(use_enable bluray) \
+               $(use_enable a52 a52dec) \
+               $(use_enable aac faad) \
+               $(use_enable gtk gdkpixbuf) \
+               $(use_enable jpeg libjpeg) \
+               $(use_enable dts) \
+               $(use_enable mad) \
+               $(use_enable modplug) \
+               $(use_enable musepack) \
+               $(use_enable mng) \
+               --disable-real-codecs \
+               --disable-w32dll \
+               $(use_enable vpx) \
+               $(use_with truetype freetype) $(use_with truetype fontconfig) \
+               $(use_with X x) \
+               $(use_with alsa) \
+               --without-esound \
+               $(use_with fusion fusionsound) \
+               $(use_with jack) \
+               $(use_with pulseaudio) \
+               $(use_with libcaca caca) \
+               $(use_with sdl) \
+               $(use_with xcb) \
+               --with-xv-path=/usr/$(get_libdir) \
+               $(use_with imagemagick) \
+               --with-external-dvdnav \
+               $(use_with flac libflac) \
+               $(use_with speex) \
+               $(use_with theora) \
+               $(use_with vorbis) \
+               --with-real-codecs-path=/usr/$(get_libdir)/codecs \
+               --with-w32-path=${win32dir} \
+               $(use_with wavpack) \
+               "${myconf[@]}"
+}
+
+src_compile() {
+       # enable verbose building, bug #448140
+       emake V=1
+}
+
+src_install() {
+       emake \
+               DESTDIR="${D}" \
+               docdir="/usr/share/doc/${PF}" \
+               htmldir="/usr/share/doc/${PF}/html" \
+               install
+
+       rm -f \
+               "${ED}"usr/lib*/libxine*.la \
+               "${ED}"usr/share/doc/${PF}/COPYING
+}
index 6b10f1fbe28aa8bd80b0869c5d1a8fcb87b95bf9..b0de66c29f54f2e03969479d6548fe2504cf07bf 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.28 2014/07/10 13:39:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.29 2015/02/01 22:53:32 mgorny Exp $
 
 EAPI=5
 
@@ -25,14 +25,17 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
        dev-libs/libxdg-basedir
        media-libs/libdvdnav
        sys-libs/zlib
-       || ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 )
-       virtual/ffmpeg
+       !libav? ( media-video/ffmpeg:0= )
+       libav? (
+               media-libs/libpostproc:0=
+               media-video/libav:0=
+       )
        virtual/libiconv
        a52? ( media-libs/a52dec )
        aac? ( media-libs/faad2 )
@@ -142,7 +145,7 @@ src_configure() {
        local myconf=()
        [[ ${PV} == *9999* ]] || myconf=( $(use_enable nls) )
 
-       if has_version '>=media-video/ffmpeg-2.2:0'; then
+       if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
                myconf+=( --enable-avformat ) #507474
        fi