From 5cc1c4cf0e52d52a8cc8eaf55f7a86b60c9ffd79 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 3 Jan 2012 19:00:23 +0000 Subject: [PATCH] Version bump and syncronize ebuild(s) wrt #397515 Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- media-libs/xine-lib/ChangeLog | 10 +- media-libs/xine-lib/Manifest | 26 +- media-libs/xine-lib/metadata.xml | 24 +- media-libs/xine-lib/xine-lib-1.2.0.ebuild | 189 +++++++++++++++ media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 237 +++++++++---------- 5 files changed, 321 insertions(+), 165 deletions(-) create mode 100644 media-libs/xine-lib/xine-lib-1.2.0.ebuild diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index d2ab7aaf41bb..c8ab1f383205 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.650 2011/12/31 12:38:21 ago Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.651 2012/01/03 19:00:23 ssuominen Exp $ + +*xine-lib-1.2.0 (03 Jan 2012) + + 03 Jan 2012; Samuli Suominen +xine-lib-1.2.0.ebuild, + xine-lib-1.2.9999.ebuild: + Version bump and syncronize ebuild(s) wrt #397515 31 Dec 2011; Agostino Sarubbo xine-lib-1.1.20.ebuild: Stable for AMD64, wrt bug #396521 diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index d78084b9130a..c4d73b89fbd1 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX xine-lib-1.1.19-ffmpeg.patch 12127 RMD160 2b70139da2f4832e3577a667c352257dcd610dcf SHA1 d70f14c3dbb59b65c581575fa1fe13aeeb38f1b1 SHA256 6ca05a1fbed6eeee19e822da2d789831c3f2593cb0d430385416ae170bc3c48f AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cca8 SHA1 f78834833e3aeb05f555688ab657ae05cd0691c7 SHA256 6be3ceb8edd7626e93c617de3068374dd638e1445c7308d88b24614e9bbceaf0 @@ -7,19 +7,21 @@ AUX xine-lib-1.1.20-stat.patch 607 RMD160 3a099a94d3c1be1241e352d58ba7436431497d DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9 DIST xine-lib-1.1.20.tar.xz 5957256 RMD160 039a7d0ee4e65ce20755d4abbfbf9af6e17a37c5 SHA1 1dbd48e14113739101429391d45f65ebbf6519fc SHA256 da65da5831f5b93f02b4ec10049eaf044cf99944e2fd8e12d494dccefee124eb +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.9999.ebuild 5941 RMD160 16a31f4a9853ff43e7a1177b9bada7f7e7e013a3 SHA1 3109b570d0ac0b31618125a53eb4112ebc63ccbc SHA256 f1fae26390892cff0c555046df0c50f14257a23bc81b86f2041b021d672c7c93 -MISC ChangeLog 75691 RMD160 6eb0ca08bc446c87627fe5cb08585885670b6e28 SHA1 4e8ee11ecae053ed4cfedc716e1609e0906e4827 SHA256 a267e49491bd46db44402350cdb0696f2329950d3a30dfb5784ac8b55ab1e6c5 -MISC metadata.xml 3698 RMD160 91204976d6b0b42d4ab62970cdd8e5218a3f1bd2 SHA1 762a24b480d6eec707bc3ad88321163e3b3c1155 SHA256 2f7c7abc6568e1c624f57923e63412e67d97918d051ac82b83357db40a0c24e5 +EBUILD xine-lib-1.2.0.ebuild 4914 RMD160 1511c8f41a1118383a95369cc7496cada4bb90cd SHA1 03110e8f8c1ea569bbfcae0d625140b27bf0ee32 SHA256 d8c0affedcd5091668a9ce7878244e6f3ec7b91ae3b3e3e3adfcd4e8421e3e51 +EBUILD xine-lib-1.2.9999.ebuild 4959 RMD160 74a291a95c90f6704953f6c8f9cb1a85f525830b SHA1 6b570155b73f88d60137ce3f65f2f0883787107a SHA256 7180002746452b31e7f91156a9b52dbbbb8166fdecee1723c10d6af1f0e34d06 +MISC ChangeLog 75887 RMD160 6a0f8d3cbbf4e7b54d4c1ff43b3e49ed6002c8fb SHA1 f7e33a39be376ef7969c4af0d9469b1a11e48db6 SHA256 6fd1a3052a27eebc1369714d91a1a86e1300fbc86530025f6930bfe73a403f64 +MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO/wJCAAoJEOTDgjZ80txdbV4H/3zyfFH7vE3lN4kHywg6Vvpy -4zTvkLjqD60UFvk+H8EqyqF7jnbPBCTLQlCEksJBXWFX30VE5R0gitHgjetSA9/I -/NnZ8xOHaUftIiPCc7+buIvsGSKd2b5RB6CEocqUGHnUB0PHaRyaRe3oSpJ1TfuG -zAv9uwLlESD+XNDV76VfjDOHZ+M+DsbU2lLryq1b9CDfiC3cFyg3jicBZhCLzu9J -e0+gn7EvxYvc5y+Ro3JOi3fmZ1p/Zhj3D6mMuaqdyHZOizKsdtwNnWlPpYF28xWR -4Y/Oz2+xDeMAEsqW2dZVgkPFaQoA8uRE0M8DR0uxAKQZxc39Ei5FpSEgNbCuOow= -=5yAR +iQEcBAEBAgAGBQJPA0/YAAoJEEdUh39IaPFN6aYH/2z8/PQcsXI/HqQ9O8ZmLEFq +rKEcmjZ1HUB4SAmmLsVMPUpUQC6W7bqIpr0jOVwNXeyxfnQ11PE9uxwHa3q+FHzH +x+OPNEcQ2JgDrWxAeUKO2ECsybQfap7TJgtR7Q6DdAdWX84uMhNdMHqd/OyrzivD +jMS0PKQLmK0H6RIP9WspGykg9Ohh3Xl1CVbjFZVzWRJCIo9W1cYouoreGCAocpsj +dzatMFaHaqkre7rhyYIQFMxTVw8+cbhZgJv8tmee13DZNmikoiLEq7m9Krj5tOcQ +NVKnTgF7sbdbt/2HjmN63vhVS3fkwUOMaTkYIWzg+OGPNtlf8o2RvL0wMD53FOU= +=joAf -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml index 85b7ca045758..18bf123e4a1c 100644 --- a/media-libs/xine-lib/metadata.xml +++ b/media-libs/xine-lib/metadata.xml @@ -7,11 +7,8 @@ An open source library for media applications - - Enable anti-aliasing in OSD fonts - - - Provide support for Microsoft's advanced systems format media container + + Enable playback of Blu-ray filesystems using media-libs/libbluray Enable support for DXR3 mpeg acceleration cards. @@ -25,26 +22,12 @@ Enable support for the Fusion audio sub system - - Make use of the OpenGL Utility Toolkit (GLUT) library - - - Build the gnome-base/gnome-vfs based input plugin. This plugin is - used to access any resource that can be accessed through Nautilus's (and - others') URLs. - - - Build the gdkpixbuf-based image decoder plugin - Build the gdkpixbuf-based image decoder plugin. Build the ImageMagick-based image decoder plugin. - - Enables Libv4l Video4Linux support - Build the media-libs/libmad based mp3 decoder. This mp3 decoder has superior support compared to the one coming from FFmpeg that is used as @@ -57,9 +40,6 @@ the file's data. mmap() access should be faster, but might misbehave if the device where the file resides in is removed during playback. - - Enables support for NSF (Nintendo Entertainment System Sound Format) - Enable support for loading and using RealPlayer binary codecs on x86 and amd64 Linux. Enabling this USE flag might make the package diff --git a/media-libs/xine-lib/xine-lib-1.2.0.ebuild b/media-libs/xine-lib/xine-lib-1.2.0.ebuild new file mode 100644 index 000000000000..7db2eab495b4 --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.2.0.ebuild @@ -0,0 +1,189 @@ +# 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.ebuild,v 1.1 2012/01/03 19:00:23 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 + 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 ) + 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/speex ) + theora? ( 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 + nls? ( sys-devel/gettext ) + v4l? ( virtual/os-headers ) + X? ( + x11-libs/libXt + x11-proto/videoproto + x11-proto/xf86vidmodeproto + x11-proto/xproto + ) + xinerama? ( x11-proto/xineramaproto )" +REQUIRED_USE="speex? ( vorbis ) + theora? ( vorbis ) + 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) \ + $(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 +} 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 dac643f65617..3947de6ae562 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild @@ -1,164 +1,155 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.2 2011/10/30 15:57:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.3 2012/01/03 19:00:23 ssuominen Exp $ EAPI=4 -inherit eutils flag-o-matic toolchain-funcs autotools multilib mercurial +unset _live_inherits -: ${EHG_REPO_URI:=http://hg.debian.org/hg/xine-lib/xine-lib-1.2} +if [[ ${PV} == *9999* ]]; then + EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2" + _live_inherits="autotools mercurial" +else + KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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://hg.debian.org/hg/xine-lib/xine-lib-1.2/" -SRC_URI="" +HOMEPAGE="http://xine.sourceforge.net/" LICENSE="GPL-2" SLOT="1" -KEYWORDS="" - -IUSE="a52 aac aalib alsa altivec antialiasing asf directfb dts debug dvb dxr3 -esd fbcon flac fontconfig fusion gdk-pixbuf glu gnome imagemagick ipv6 jack -real libcaca libv4l mad mmap mng modplug musepack nls nosefart opengl oss pulseaudio -samba sdl speex static-libs theora truetype v4l vcd vdpau vdr vidix vis vorbis -wavpack win32codecs X xcb xinerama xv xvmc" - -REQUIRED_USE="fontconfig? ( truetype ) - xv? ( X ) - xinerama? ( X ) - vidix? ( || ( X fbcon ) )" - -# xinerama only used for dxr3 +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="sys-libs/zlib - dev-libs/libxdg-basedir - media-video/ffmpeg - mng? ( media-libs/libmng ) - vcd? ( dev-libs/libcdio[-minimal] media-video/vcdimager ) - speex? ( media-libs/libogg media-libs/speex ) - directfb? ( >=dev-libs/DirectFB-0.9.9 ) - vorbis? ( media-libs/libogg media-libs/libvorbis ) - theora? ( media-libs/libogg >=media-libs/libtheora-1.0_alpha6 ) - aalib? ( media-libs/aalib ) - libcaca? ( >=media-libs/libcaca-0.99_beta1 ) +RDEPEND="dev-libs/libxdg-basedir + virtual/ffmpeg + virtual/libiconv + a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) - dts? ( media-libs/libdca ) - libv4l? ( media-libs/libv4l ) - flac? ( >=media-libs/flac-1.1.2 ) - a52? ( >=media-libs/a52dec-0.7.4-r5 ) - mad? ( media-libs/libmad ) - imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) - modplug? ( media-libs/libmodplug ) - fontconfig? ( media-libs/fontconfig ) - truetype? ( media-libs/freetype:2 ) - musepack? ( media-sound/musepack-tools ) + aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) - wavpack? ( >=media-sound/wavpack-4.31 ) - dxr3? ( >=media-libs/libfame-0.9.0 ) + bluray? ( media-libs/libbluray ) + 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 ) - esd? ( media-sound/esound ) - pulseaudio? ( media-sound/pulseaudio ) + gtk? ( x11-libs/gdk-pixbuf:2 ) + imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) - samba? ( net-fs/samba[smbclient] ) + 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 ) - amd64? ( media-libs/amd64codecs ) - ) - win32codecs? ( >=media-libs/win32codecs-0.50 ) + ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl ) + speex? ( media-libs/speex ) + theora? ( 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 ) - sdl? ( >=media-libs/libsdl-1.1.5 ) - xcb? ( >=x11-libs/libxcb-1.0 ) - gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - X? ( x11-libs/libXext + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + wavpack? ( media-sound/wavpack ) + win32codecs? ( media-libs/win32codecs ) + X? ( x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - xvmc? ( x11-libs/libXvMC ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - opengl? ( virtual/opengl ) - glu? ( virtual/glu ) -" + x11-libs/libXext + ) + xcb? ( x11-libs/libxcb ) + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + xvmc? ( x11-libs/libXvMC )" DEPEND="${RDEPEND} - fbcon? ( virtual/os-headers ) - sys-devel/gettext + app-arch/xz-utils dev-util/pkgconfig - nls? ( virtual/libintl ) + >=sys-devel/libtool-2.2.6b + nls? ( sys-devel/gettext ) v4l? ( virtual/os-headers ) - oss? ( virtual/os-headers ) - - X? ( x11-proto/xproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) - ) -" + X? ( + x11-libs/libXt + x11-proto/videoproto + x11-proto/xf86vidmodeproto + x11-proto/xproto + ) + xinerama? ( x11-proto/xineramaproto )" +REQUIRED_USE="speex? ( vorbis ) + theora? ( vorbis ) + vidix? ( || ( X fbcon ) ) + xv? ( X ) + xinerama? ( X )" src_prepare() { - use vdr && sed -i src/vdr/input_vdr.c -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' + sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die - eautopoint - eautoreconf + if [[ ${PV} == *9999* ]]; then + eautopoint + eautoreconf + else + elibtoolize + fi } src_configure() { - # Disabled for testing, also there are "no" bug references... - # If that causes trouble again fix it *properly* and send patches to - # upstream please! - - #prevent quicktime crashing -# append-flags -frename-registers -ffunction-sections - - # Specific workarounds for too-few-registers arch... -# if [ "$(tc-arch)" = "x86" ]; then -# filter-flags -fforce-addr # bug 104189 -# filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x, bug 104189 -# filter-flags -fno-omit-frame-pointer # breaks per bug #149704 -# is-flag -O? || append-flags -O2 -# fi - - # Set the correct win32 dll path, bug #197236 - local win32dir - if has_multilib_profile ; then + local win32dir #197236 + if has_multilib_profile; then win32dir=/usr/$(ABI="x86" get_libdir)/win32 else win32dir=/usr/$(get_libdir)/win32 fi - # bundled: - # nosefart, vidix - econf \ - $(use_enable debug) \ $(use_enable ipv6) \ - $(use_enable antialiasing) \ $(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 glu) \ + $(use_enable opengl) $(use_enable opengl glu) \ $(use_enable vidix) \ $(use_enable xinerama) \ $(use_enable xvmc) \ $(use_enable vdpau) \ $(use_enable dvb) \ - $(use_enable gnome gnomevfs) \ + --disable-gnomevfs \ $(use_enable samba) \ --disable-v4l \ - $(use_enable v4l v4l2) \ - $(use_enable libv4l) \ + $(use_enable v4l v4l2) $(use_enable v4l libv4l) \ $(use_enable vcd) \ $(use_enable vdr) \ + $(use_enable bluray) \ $(use_enable a52 a52dec) \ - $(use_enable asf) \ - $(use_enable nosefart) \ $(use_enable aac faad) \ - $(use_enable gdk-pixbuf gdkpixbuf) \ + $(use_enable gtk gdkpixbuf) \ $(use_enable dts) \ $(use_enable mad) \ $(use_enable modplug) \ @@ -166,45 +157,33 @@ src_configure() { $(use_enable mng) \ $(use_enable real real-codecs) \ $(use_enable win32codecs w32dll) \ - $(use_enable vis) \ - $(use_with truetype freetype) \ - $(use_with fontconfig) \ + $(use_with truetype freetype) $(use_with truetype fontconfig) \ $(use_with X x) \ $(use_with alsa) \ - $(use_with esd esound) \ + --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) \ $(use_with flac libflac) \ $(use_with speex) \ $(use_with theora) \ $(use_with vorbis) \ - $(use_with wavpack) \ - --disable-optimizations \ - --with-xv-path=/usr/$(get_libdir) \ - --with-w32-path=${win32dir} \ --with-real-codecs-path=/usr/$(get_libdir)/codecs \ - --enable-fast-install \ - --disable-dependency-tracking \ - --htmldir=/usr/share/doc/${PF}/html \ - --docdir=/usr/share/doc/${PF} \ - --with-external-libxdg-basedir + --with-w32-path=${win32dir} \ + $(use_with wavpack) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - - # We don't need the License - rm -f "${D}"/usr/share/doc/${PF}/COPYING + emake \ + DESTDIR="${D}" \ + docdir="/usr/share/doc/${PF}" \ + htmldir="/usr/share/doc/${PF}/html" \ + install - # Empty files etc. - rm -rf "${D}"/usr/share/doc/${PF}/html/ - - if ! use static-libs; then - rm -f "${D}"/usr/lib*/*.la - fi + rm -f "${ED}"usr/lib*/libxine*.la } -- 2.26.2