From: Samuli Suominen Date: Thu, 5 Jan 2012 09:57:15 +0000 (+0000) Subject: Use external libdvdnav (instead of bundled copy) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff3b91a47adb4dc7262ac728ccc312e489ce9b63;p=gentoo.git Use external libdvdnav (instead of bundled copy) Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 1d834e467974..4eacd700e2b9 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.653 2012/01/03 22:44:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.654 2012/01/05 09:57:15 ssuominen Exp $ + +*xine-lib-1.2.0-r1 (05 Jan 2012) + + 05 Jan 2012; Samuli Suominen + +xine-lib-1.2.0-r1.ebuild, xine-lib-1.2.9999.ebuild: + Use external libdvdnav (instead of bundled copy) 03 Jan 2012; Samuli Suominen xine-lib-1.2.0.ebuild, xine-lib-1.2.9999.ebuild: diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 0b3ca00ff773..562f18e85204 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -10,18 +10,19 @@ DIST xine-lib-1.1.20.tar.xz 5957256 RMD160 039a7d0ee4e65ce20755d4abbfbf9af6e17a3 DIST xine-lib-1.2.0.tar.xz 4878972 RMD160 17b73f43e2dc440137727f65d401c673273b1265 SHA1 5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d SHA256 93dff67d07ff2230fac68e64259a72f8a007f4c3fae01b4dd580f74adea78c6f EBUILD xine-lib-1.1.19.ebuild 5675 RMD160 b34cf5a8030843ba98e7a90200e4c5e1518153e5 SHA1 d3ef71cc7ef26832f3bbe29d52416f0b22e047b6 SHA256 91daef9cfd2cd146646816e3f15eb5949ea4f8e7a5e05d639e5e621c4795c2da EBUILD xine-lib-1.1.20.ebuild 5415 RMD160 0a2a1933c159c8d16f0566ef8ef9f51e0d2d2f3a SHA1 8a31a4753a836043e61bfaab0c240a0abe595110 SHA256 3b688f1ae33b801e9fee6634cd1c009091cff575a707e79c9d99fd52072bb46d +EBUILD xine-lib-1.2.0-r1.ebuild 5145 RMD160 41f645a5b4137eac6c55252fdcaf3edec0e0b46e SHA1 a48b421f9364e648b72b40773c0d1b8818a56251 SHA256 74ebc4453fab3ab8dec52e67342633bbdf8b68cf37c9a5350b3ddf3ec46713c4 EBUILD xine-lib-1.2.0.ebuild 5097 RMD160 47e5db0516bf5aa425faa1fb88967f74fbd3b004 SHA1 4309aafdd62d1edc6e85727e635d5e1ea4427d4e SHA256 c9bf8d5ffc162f9b4facfb87fe6cfd4cc76f906d0a5701fe2f6b2cb09b6794ed -EBUILD xine-lib-1.2.9999.ebuild 5099 RMD160 5f5f85ee6e261519e93b6ad2e3c61f2b575db576 SHA1 2d2664f997853c3a71c3f7a35475eebc31640b75 SHA256 0043658d6f55588c74a1e135dafb7ee7195712b23907970cfa183f0ba4aa679f -MISC ChangeLog 76257 RMD160 5b6aa6f9a2e54333ce9ed893425982daf22591c8 SHA1 a636f74d0f440e06676ffe9afaabdb5b098b780a SHA256 fe07a37ef3286ddf689f6de16bc2d920e18b375029dcf33913a114b370e380c7 +EBUILD xine-lib-1.2.9999.ebuild 5144 RMD160 208ab960f6d0a8d7d424d5fc76de013938eb333c SHA1 b8f2b348ccba11c9d4bedde4ef41838b2fdbbd50 SHA256 22914c8ec295338265d0de5ed797caf7db5abf2ab7121ffffef6b75b8865d32a +MISC ChangeLog 76452 RMD160 8d88a60243008659730f0f0e48e5dc31998356c2 SHA1 4913ab1d12c90861bda5508406501bdd22f20774 SHA256 1e7a2b8eeef32145525e22cd9843bb1b8f4749d7662d51e6b3132050101ef5be MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPA4RkAAoJEEdUh39IaPFNyqMH+wZED6A3du+0YLj3H6NVuvj/ -L/M0JzWUFChAARZoFp9BQ+VKDur2dIYAxlg0OsPp7Z3grsd6i1FN+PbRsNBciHnS -HJo/yF1ksyW8+4H88voivphxdd1X+YcG+yXyV/jc8EByeatIbrieAMQktwd9er1q -aTrqqHFMK/aMWOymTCsE7XKdBF2Ys1vEDvuACfNNi1Wd6WYNhs09wTNanfvtJgJH -4IB/GDimuKBDZmIl6HJEoRGZSRDU0LVetLolnl1pembfEBYKUE3GqJu0LrOAyZXC -6dtjmLa6V4m82Bj2frbv4ho+bdUn7iRiVbnFvS4deOHSwCzvs2gqP7ETU25JW6w= -=PoWa +iQEcBAEBAgAGBQJPBXOBAAoJEEdUh39IaPFNeKEIAIWH+TbO5BdRQTy8smsW/Za6 +mCjQZwKchia1v7cgvHGGfHQzZZR091/+N4cthtrBqv9awecTAXTzciJDWhcIwh3N +nSjRKwZ06LorTdhkJVCE9gxD4SJdGJxcbcaR2y+eEWhTNwdolaO0z/vaoowP2BN2 +pBntnFlrciv3d+kDYDJF39VHch/Pu+IR/aOXGdgur5+gzJo3OTYLz8fT0poS9pCV +IMBcWPjXMfD0qyYN3YowhNIQGtikcWdSHviqFaYZRRoBf5i0tvrxFwsjsvzuUDoD +oWKpTaXCnPQX0IaubDbmzWL7Gb2tzhyn0tyGyqkliGYOiASFlE5nEdp4U7od4L8= +=C3+V -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/xine-lib-1.2.0-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.0-r1.ebuild new file mode 100644 index 000000000000..afeafe4ac817 --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.2.0-r1.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2012 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.0-r1.ebuild,v 1.1 2012/01/05 09:57:15 ssuominen Exp $ + +EAPI=4 + +unset _live_inherits + +if [[ ${PV} == *9999* ]]; then + EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2" + _live_inherits="autotools mercurial" +else + KEYWORDS="~amd64 ~x86 ~x86-fbsd" + SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" +fi + +inherit libtool multilib ${_live_inherits} + +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 libcaca mad +mmap mng modplug musepack nls opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc" + +RDEPEND="dev-libs/libxdg-basedir + media-libs/libdvdnav + sys-libs/zlib + virtual/ffmpeg + 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 ) + 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 ) + nls? ( virtual/libintl ) + opengl? ( + virtual/glu + virtual/opengl + ) + pulseaudio? ( media-sound/pulseaudio ) + real? ( + amd64? ( media-libs/amd64codecs ) + x86? ( media-libs/win32codecs ) + x86-fbsd? ( media-libs/win32codecs ) + ) + 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 ) + vcd? ( + >=media-video/vcdimager-0.7.23 + dev-libs/libcdio[-minimal] + ) + vdpau? ( x11-libs/libvdpau ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + wavpack? ( media-sound/wavpack ) + win32codecs? ( media-libs/win32codecs ) + 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} + app-arch/xz-utils + dev-util/pkgconfig + >=sys-devel/libtool-2.2.6b + bluray? ( !media-libs/libbluray-xine ) + nls? ( sys-devel/gettext ) + 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 + eautopoint + eautoreconf + else + elibtoolize + fi +} + +src_configure() { + local win32dir #197236 + if has_multilib_profile; then + win32dir=/usr/$(ABI="x86" get_libdir)/win32 + else + win32dir=/usr/$(get_libdir)/win32 + fi + + econf \ + $(use_enable ipv6) \ + $(use_enable nls) \ + $(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 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 dts) \ + $(use_enable mad) \ + $(use_enable modplug) \ + $(use_enable musepack) \ + $(use_enable mng) \ + $(use_enable real real-codecs) \ + $(use_enable win32codecs w32dll) \ + $(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) +} + +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 +} diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index 477148bf9364..0737bd98cf38 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.8 2012/01/03 22:44:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.9 2012/01/05 09:57:15 ssuominen Exp $ EAPI=4 @@ -24,6 +24,7 @@ SLOT="1" IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc" RDEPEND="dev-libs/libxdg-basedir + media-libs/libdvdnav sys-libs/zlib virtual/ffmpeg virtual/libiconv @@ -149,8 +150,7 @@ src_configure() { $(use_enable dvb) \ --disable-gnomevfs \ $(use_enable samba) \ - --disable-v4l \ - $(use_enable v4l v4l2) $(use_enable v4l libv4l) \ + --disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \ $(use_enable vcd) \ $(use_enable vdr) \ $(use_enable bluray) \ @@ -176,6 +176,7 @@ src_configure() { $(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) \