From: Diego Elio Pettenò Date: Fri, 9 Feb 2007 04:46:07 +0000 (+0000) Subject: Add xine-lib with a patch (not yet committed in upstream CVS, but it's going to be... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6609b0108f6ab8ab120e5b1bf428144ab34b9ad4;p=gentoo.git Add xine-lib with a patch (not yet committed in upstream CVS, but it's going to be) to use XCB rather than libX11 for xv/xshm output plugins, allowing xine to be used inside frontends that embed themselves in other programs (like Kaffeine with Konqueror or GwenView). The only frontend supporting this right now is Kaffeine, but more will probably come. Package-Manager: portage-2.1.2-r9 --- diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index b4ace1a52011..ae025f8ba59b 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.453 2007/02/07 02:23:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.454 2007/02/09 04:46:07 flameeyes Exp $ + +*xine-lib-1.1.4-r1 (09 Feb 2007) + + 09 Feb 2007; Diego Pettenò + +xine-lib-1.1.4-r1.ebuild: + Add xine-lib with a patch (not yet committed in upstream CVS, but it's going + to be) to use XCB rather than libX11 for xv/xshm output plugins, allowing + xine to be used inside frontends that embed themselves in other programs + (like Kaffeine with Konqueror or GwenView). The only frontend supporting + this right now is Kaffeine, but more will probably come. 06 Feb 2007; Raúl Porcel xine-lib-1.1.3.ebuild, xine-lib-1.1.4.ebuild: diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 197155054206..dccc49bd08a1 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226 DIST xine-lib-1.1.3.tar.gz 8508884 RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 SHA1 c0886910ddb1afa1a72572decf12c0251bba40bf SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0 +DIST xine-lib-1.1.4-xcb.patch.bz2 22346 RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 SHA1 51fb50edec0b3d66ef4b18667d332a885c5a8983 SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb DIST xine-lib-1.1.4.tar.bz2 6997816 RMD160 c77de004c9c3b74dca3de08aea0feb27db70a4c2 SHA1 ee3496a3de8d9935ca23ff1fae3677a61ce1cb21 SHA256 e5515631b46a74be462a6076194d136d1c49adfd817f97e3a5e6dba88eab6c23 DIST xine-lib-patches-61.tar.bz2 9701 RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac SHA1 0d749e3c46ea58e961d48f86aca997b16e72803b SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2 DIST xine-lib-patches-63.tar.bz2 22862 RMD160 1aa3c0541e9d739968f6f62c09567caa2a646414 SHA1 ac1a6a40c8b783c40d823905e8db69f5139784d4 SHA256 7e7a137a27605addad5c4e96c46984293c5febdfa08eec976600be8b206448f6 @@ -19,14 +20,18 @@ EBUILD xine-lib-1.1.3.ebuild 5532 RMD160 5dc1a727198b38185de724b3cd72882b7cce939 MD5 a72d159bd89110faa06ef7efa4b01994 xine-lib-1.1.3.ebuild 5532 RMD160 5dc1a727198b38185de724b3cd72882b7cce9396 xine-lib-1.1.3.ebuild 5532 SHA256 5efc3f71c2cb953f9866376af792bc4ea192240175658a4b38b9fae93cec65c7 xine-lib-1.1.3.ebuild 5532 +EBUILD xine-lib-1.1.4-r1.ebuild 5552 RMD160 fbad09efb39b89f805aff5389952af9b7a6f9314 SHA1 1c34212845bcfb2bfa9fb843b42387a7b29179a9 SHA256 627667c59c1c4817ec526160ccc4e52f1d2f0fa79d8338fe65bf803f5b08e7e6 +MD5 3913d2415c30923f4b832d47a062d515 xine-lib-1.1.4-r1.ebuild 5552 +RMD160 fbad09efb39b89f805aff5389952af9b7a6f9314 xine-lib-1.1.4-r1.ebuild 5552 +SHA256 627667c59c1c4817ec526160ccc4e52f1d2f0fa79d8338fe65bf803f5b08e7e6 xine-lib-1.1.4-r1.ebuild 5552 EBUILD xine-lib-1.1.4.ebuild 5318 RMD160 7af0795d3c6f32c248c31926d4370d8cef4b5840 SHA1 2a2e4c4ca43c1e22832cec0d90c2379732c4fad0 SHA256 ca3550b53b700a3d8dc48dfe97c87ffe550299783e44eae41be41da6bafc77eb MD5 3b6b716101c2fcd780dfd3dc77a28bfe xine-lib-1.1.4.ebuild 5318 RMD160 7af0795d3c6f32c248c31926d4370d8cef4b5840 xine-lib-1.1.4.ebuild 5318 SHA256 ca3550b53b700a3d8dc48dfe97c87ffe550299783e44eae41be41da6bafc77eb xine-lib-1.1.4.ebuild 5318 -MISC ChangeLog 49267 RMD160 30653fd2942068cab333d223e6a1e1157650d255 SHA1 2de3d090c3efc1bfa6008c43138adda57776947e SHA256 4fec1a141e699fc652b7dfc443a4f804f9ffc7b95029d4cac1588eb2ec0090c8 -MD5 dbd30184b86e1de9c97192a90768407c ChangeLog 49267 -RMD160 30653fd2942068cab333d223e6a1e1157650d255 ChangeLog 49267 -SHA256 4fec1a141e699fc652b7dfc443a4f804f9ffc7b95029d4cac1588eb2ec0090c8 ChangeLog 49267 +MISC ChangeLog 49748 RMD160 e5a3a4b3965b3bce51a8c6aaf40e930b363576a4 SHA1 7a0b3711887eb47840f651ac619df5775d4518b2 SHA256 49e8a68bdedd834ba77855819ca4375039e51943e2faf4700793afa4af40225f +MD5 2489408b40fe5462e3b6855a456dd4e7 ChangeLog 49748 +RMD160 e5a3a4b3965b3bce51a8c6aaf40e930b363576a4 ChangeLog 49748 +SHA256 49e8a68bdedd834ba77855819ca4375039e51943e2faf4700793afa4af40225f ChangeLog 49748 MISC metadata.xml 397 RMD160 b88553ca0be291c99ad5e0680b9b87229564b5bd SHA1 8deb857c22a0f3a950a15edf392ea03fdd208679 SHA256 740944b87d288894f7c2590a9bbb11cfa9b1832279c6aa14ee90c73af8465451 MD5 6514291baeb95b56d8f8d38e27002b93 metadata.xml 397 RMD160 b88553ca0be291c99ad5e0680b9b87229564b5bd metadata.xml 397 @@ -43,10 +48,13 @@ SHA256 83dd50e3811d24cf06b3a85449f7f5b4380f86470951d88252920da09f930b4b files/di MD5 82a523731d4e2f52406295b1024ec0d3 files/digest-xine-lib-1.1.4 250 RMD160 929a1fc2b018d2b5d15c7a9d5b42f027ba855c3c files/digest-xine-lib-1.1.4 250 SHA256 2c851ff178e5e69a5ddc75012718ae0bafa6f752658a337202db7e3747e994bc files/digest-xine-lib-1.1.4 250 +MD5 a772cb8123385cb3185e9b3f19b5906a files/digest-xine-lib-1.1.4-r1 512 +RMD160 180e6a88dda4bf1ef40d2edad8567aed17b43383 files/digest-xine-lib-1.1.4-r1 512 +SHA256 360727ef64b680578258f7c715c18cd8084ab53bc5ceb3973f8ad63bd6083a4c files/digest-xine-lib-1.1.4-r1 512 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFyTglAiZjviIA2XgRAoAeAKCvhEXWS3AWUlEqzaPiA82rjBDqCwCfQXnb -GphTzk8Tm8MbnafGi7GZVwI= -=aMgw +iD8DBQFFy/yWAiZjviIA2XgRAt5AAKCsdyN2lYjViFBIol9u5nEnOW9B7QCg5EiM +0qwiM9jnJYtFe2N0GZ1+fUw= +=rldx -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.4-r1 b/media-libs/xine-lib/files/digest-xine-lib-1.1.4-r1 new file mode 100644 index 000000000000..5395bbf6633b --- /dev/null +++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.4-r1 @@ -0,0 +1,6 @@ +MD5 7de81738932d414bff6b90b347449c9b xine-lib-1.1.4-xcb.patch.bz2 22346 +RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 xine-lib-1.1.4-xcb.patch.bz2 22346 +SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb xine-lib-1.1.4-xcb.patch.bz2 22346 +MD5 e8ecc022457d8ffc9fec91681c5fff2b xine-lib-1.1.4.tar.bz2 6997816 +RMD160 c77de004c9c3b74dca3de08aea0feb27db70a4c2 xine-lib-1.1.4.tar.bz2 6997816 +SHA256 e5515631b46a74be462a6076194d136d1c49adfd817f97e3a5e6dba88eab6c23 xine-lib-1.1.4.tar.bz2 6997816 diff --git a/media-libs/xine-lib/xine-lib-1.1.4-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.4-r1.ebuild new file mode 100644 index 000000000000..f3a59d22638f --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.1.4-r1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2007 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.1.4-r1.ebuild,v 1.1 2007/02/09 04:46:07 flameeyes Exp $ + +inherit eutils flag-o-matic toolchain-funcs libtool autotools + +# This should normally be empty string, unless a release has a suffix. +if [[ "${P/_pre/}" != "${P}" ]]; then + SRC_URI="mirror://gentoo/${P}.tar.bz2" +else + MY_PKG_SUFFIX="" + MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}" + S="${WORKDIR}/${MY_P}" + + SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2" +fi + +SRC_URI="${SRC_URI} + mirror://gentoo/${P}-xcb.patch.bz2" + +DESCRIPTION="Core libraries for Xine movie player" +HOMEPAGE="http://xine.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa +gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc +samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts +debug modplug gtk pulseaudio mmap truetype wavpack musepack xcb" + +RDEPEND=" + X? ( x11-libs/libXext + x11-libs/libX11 ) + xv? ( x11-libs/libXv ) + xvmc? ( x11-libs/libXvMC ) + xinerama? ( x11-libs/libXinerama ) + win32codecs? ( >=media-libs/win32codecs-0.50 ) + esd? ( media-sound/esound ) + dvd? ( >=media-libs/libdvdcss-1.2.7 ) + arts? ( kde-base/arts ) + alsa? ( media-libs/alsa-lib ) + aalib? ( media-libs/aalib ) + directfb? ( >=dev-libs/DirectFB-0.9.9 ) + gnome? ( >=gnome-base/gnome-vfs-2.0 ) + flac? ( >=media-libs/flac-1.1.2 ) + sdl? ( >=media-libs/libsdl-1.1.5 ) + dxr3? ( >=media-libs/libfame-0.9.0 ) + vorbis? ( media-libs/libogg media-libs/libvorbis ) + theora? ( media-libs/libogg media-libs/libvorbis >=media-libs/libtheora-1.0_alpha6 ) + speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex ) + libcaca? ( >=media-libs/libcaca-0.99_beta1 ) + samba? ( net-fs/samba ) + mng? ( media-libs/libmng ) + vcd? ( media-video/vcdimager ) + a52? ( >=media-libs/a52dec-0.7.4-r5 ) + mad? ( media-libs/libmad ) + imagemagick? ( media-gfx/imagemagick ) + dts? ( media-libs/libdts ) + >=media-video/ffmpeg-0.4.9_p20070129 + modplug? ( media-libs/libmodplug ) + nls? ( virtual/libintl ) + gtk? ( =x11-libs/gtk+-2* ) + pulseaudio? ( media-sound/pulseaudio ) + truetype? ( =media-libs/freetype-2* media-libs/fontconfig ) + virtual/libiconv + wavpack? ( >=media-sound/wavpack-4.31 ) + musepack? ( media-libs/libmpcdec ) + xcb? ( >=x11-libs/libxcb-1.0 ) + !=media-libs/xine-lib-0.9.13*" + +DEPEND="${RDEPEND} + X? ( x11-libs/libXt + x11-proto/xproto + x11-proto/videoproto + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto ) ) + v4l? ( virtual/os-headers ) + dev-util/pkgconfig + sys-devel/libtool + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${WORKDIR}/${P}-xcb.patch" + + AT_M4DIR="m4" eautoreconf +} + +src_compile() { + #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 + filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x + filter-flags -fno-omit-frame-pointer #breaks per bug #149704 + is-flag -O? || append-flags -O2 + fi + + # debug useflag used to emulate debug make targets. See bug #112980 and the + # xine maintainers guide. + use debug && append-flags -UNDEBUG -DDEBUG + + local myconf + + # enable/disable appropiate optimizations on sparc + [[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis" + [[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis" + + # The default CFLAGS (-O) is the only thing working on hppa. + use hppa && unset CFLAGS + + # Too many file names are the same (xine_decoder.c), change the builddir + # So that the relative path is used to identify them. + mkdir "${WORKDIR}/build" + + elibtoolize + ECONF_SOURCE="${S}" econf \ + $(use_enable gnome gnomevfs) \ + $(use_enable nls) \ + $(use_enable ipv6) \ + $(use_enable samba) \ + $(use_enable altivec) \ + $(use_enable v4l) \ + \ + $(use_enable mng) \ + $(use_with imagemagick) \ + $(use_enable gtk gdkpixbuf) \ + \ + $(use_enable aac faad) \ + $(use_with flac libflac) \ + $(use_with vorbis) \ + $(use_with speex) \ + $(use_with theora) \ + $(use_with wavpack) \ + $(use_enable modplug) \ + $(use_enable a52) --with-external-a52dec \ + $(use_enable mad) --with-external-libmad \ + $(use_enable dts) --with-external-libdts \ + $(use_enable musepack) --with-external-libmpcdec \ + \ + $(use_with X x) \ + $(use_enable xinerama) \ + $(use_enable vidix) \ + $(use_enable dxr3) \ + $(use_enable directfb) \ + $(use_enable fbcon fb) \ + $(use_enable opengl) \ + $(use_enable aalib) \ + $(use_with libcaca caca) \ + $(use_with sdl) \ + $(use_enable xvmc) \ + $(use_with xcb) \ + \ + $(use_enable oss) \ + $(use_with alsa) \ + $(use_with arts) \ + $(use_with esd esound) \ + $(use_with pulseaudio) \ + $(use_enable vcd) --without-internal-vcdlibs \ + \ + $(use_enable win32codecs w32dll) \ + \ + $(use_enable mmap) \ + $(use_with truetype freetype) $(use_with truetype fontconfig) \ + --enable-asf \ + --with-external-ffmpeg \ + --disable-optimizations \ + --disable-syncfb \ + ${myconf} \ + --with-xv-path=/usr/$(get_libdir) \ + --with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \ + --enable-fast-install \ + --disable-dependency-tracking || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + emake -j1 DESTDIR="${D}" \ + docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \ + install || die "Install failed" +}