From: Diego Elio Pettenò Date: Sun, 12 Nov 2006 16:49:32 +0000 (+0000) Subject: New snapshot from current CVS, fixed a few bugs with FLAC files, improved freetype... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4b7baa35e6243046e8da8d4cace951a2a3bd0c9;p=gentoo.git New snapshot from current CVS, fixed a few bugs with FLAC files, improved freetype/fontconfig support, and now uses pkg-config to search for Xorg libraries rather than linking tests. Package-Manager: portage-2.1.2_rc1-r5 --- diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 477496804082..1a8ecdcb603a 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.411 2006/10/30 11:39:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.412 2006/11/12 16:49:31 flameeyes Exp $ + +*xine-lib-1.1.3_pre20061112 (12 Nov 2006) + + 12 Nov 2006; Diego Pettenò + +xine-lib-1.1.3_pre20061112.ebuild: + New snapshot from current CVS, fixed a few bugs with FLAC files, improved + freetype/fontconfig support, and now uses pkg-config to search for Xorg + libraries rather than linking tests. 30 Oct 2006; Diego Pettenò xine-lib-1.1.2-r2.ebuild: diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 2b2103617b7c..bcc64921bae9 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_pre20060929.tar.bz2 6668440 RMD160 f82a57ac8e5cd6addf8d3263a16468156f216bdb SHA1 511e948d5e0f2e12836097d78bc065c8fd8061f5 SHA256 36fff223b1dd3765efe35e9afa201faba8b8b092c595d8949255b3f2a93619dc +DIST xine-lib-1.1.3_pre20061112.tar.bz2 6667706 RMD160 9534d252cadac2d7b67892802245aff2be05446f SHA1 92a69115d3e5f5dd44071432cc2724538a43bd46 SHA256 083c27a638f1d13b4cf9b37cb1744057b0b1757c909385c30938c41e50dcfe46 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 EBUILD xine-lib-1.1.2-r2.ebuild 7179 RMD160 209e9efc0812378f7ec800cf3c625d433f46cc71 SHA1 02c7b26171626667741dd3a72fd9eac8457c5ace SHA256 b00c968bc3fecace431cdac9887e5fcb702c9312d7d7d0047fd98ffe4f8ef223 @@ -13,10 +14,14 @@ EBUILD xine-lib-1.1.3_pre20060929.ebuild 5253 RMD160 ca3bd4d9e8e55dd2015dc68885d MD5 80c0c11bb8f7a18de9b036300bfbf0c2 xine-lib-1.1.3_pre20060929.ebuild 5253 RMD160 ca3bd4d9e8e55dd2015dc68885d7906cca952a76 xine-lib-1.1.3_pre20060929.ebuild 5253 SHA256 f104bd499e50553a02a019ccf30c0f57e7018010205c842d11a0fb1212b4fddf xine-lib-1.1.3_pre20060929.ebuild 5253 -MISC ChangeLog 42087 RMD160 520fa887f5a3e77e05e6321539a49b20d6e03b1f SHA1 484c2d22d3ab5eed6f2da39eacdc010ff5701180 SHA256 8bff0acd152429fc0b0ffb2beeb0a57f4278db1f01d88cfb108d08e759a4db49 -MD5 6c1e343b4922c565e100d84ebe0b5312 ChangeLog 42087 -RMD160 520fa887f5a3e77e05e6321539a49b20d6e03b1f ChangeLog 42087 -SHA256 8bff0acd152429fc0b0ffb2beeb0a57f4278db1f01d88cfb108d08e759a4db49 ChangeLog 42087 +EBUILD xine-lib-1.1.3_pre20061112.ebuild 5371 RMD160 7d9efe7ab223879a514a59bede88e6fdc919d6ea SHA1 77c1d25ea02b0042237fca14f259904cdadae2be SHA256 53492ec15796b63c969fc882f0cb13390cb4dfde486cca60b1b25ebdbc93b265 +MD5 e6f6c5da406cb841878c46cbaf183f42 xine-lib-1.1.3_pre20061112.ebuild 5371 +RMD160 7d9efe7ab223879a514a59bede88e6fdc919d6ea xine-lib-1.1.3_pre20061112.ebuild 5371 +SHA256 53492ec15796b63c969fc882f0cb13390cb4dfde486cca60b1b25ebdbc93b265 xine-lib-1.1.3_pre20061112.ebuild 5371 +MISC ChangeLog 42411 RMD160 a335c214789da4b7bc6c47dfc2b2832d3014589a SHA1 d0d66ae2df56216412cb0b18d83cea644de590c9 SHA256 7cb033e5929c7a9b90a74998fae498b246a67644e8aaef18c84abf3ebbdff2f9 +MD5 6c68833b1c7e1695862c80f8cf37c047 ChangeLog 42411 +RMD160 a335c214789da4b7bc6c47dfc2b2832d3014589a ChangeLog 42411 +SHA256 7cb033e5929c7a9b90a74998fae498b246a67644e8aaef18c84abf3ebbdff2f9 ChangeLog 42411 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330 @@ -27,10 +32,13 @@ SHA256 9c987dc9ad1a1fa5fbaf02ce0e17493f4f77aa500ab3881dc62736325de62acb files/di MD5 d80e0f43b9d3a24bee79009bc2e91b9c files/digest-xine-lib-1.1.3_pre20060929 542 RMD160 02dfa3f6798e169415891bf3c777531e2e9930d3 files/digest-xine-lib-1.1.3_pre20060929 542 SHA256 011a7df7ee4b32600cfa1a995303c24fb296a5db02d154ce9b7f16e6798d3aee files/digest-xine-lib-1.1.3_pre20060929 542 +MD5 c5f930d383df75295753ae5fe3cfa603 files/digest-xine-lib-1.1.3_pre20061112 542 +RMD160 7da306b42e6bf2b676f68ac1ec519de6ac9f9e59 files/digest-xine-lib-1.1.3_pre20061112 542 +SHA256 ff3e9d497ff59732ea4ec18e641877e8533b68faee054ff4e5901ce0b333d696 files/digest-xine-lib-1.1.3_pre20061112 542 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFReSaAiZjviIA2XgRAkdFAJ9C0SJybjgWGuLpkZJEGNu9bvZwrACghsvO -iIK/hplKMtmUYdQ/BzKsVBM= -=ro6c +iD8DBQFFV1CsAiZjviIA2XgRAqVrAKCU4dTC45UGTanabay8Ok6TpVVNBQCg3sgE +IzeLR/koTs8wiSeepVDBt0E= +=W4dZ -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061112 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061112 new file mode 100644 index 000000000000..83a3149b20d2 --- /dev/null +++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20061112 @@ -0,0 +1,6 @@ +MD5 bdba7b9e7fa1b8434a9a46ffb0f22ad0 xine-lib-1.1.3_pre20061112.tar.bz2 6667706 +RMD160 9534d252cadac2d7b67892802245aff2be05446f xine-lib-1.1.3_pre20061112.tar.bz2 6667706 +SHA256 083c27a638f1d13b4cf9b37cb1744057b0b1757c909385c30938c41e50dcfe46 xine-lib-1.1.3_pre20061112.tar.bz2 6667706 +MD5 ae3f09d77faf7e31ca78e9ebc79463ce xine-lib-patches-61.tar.bz2 9701 +RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac xine-lib-patches-61.tar.bz2 9701 +SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2 xine-lib-patches-61.tar.bz2 9701 diff --git a/media-libs/xine-lib/xine-lib-1.1.3_pre20061112.ebuild b/media-libs/xine-lib/xine-lib-1.1.3_pre20061112.ebuild new file mode 100644 index 000000000000..46505cae02be --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.1.3_pre20061112.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2006 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.3_pre20061112.ebuild,v 1.1 2006/11/12 16:49:32 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 + +PATCHLEVEL="61" + +DESCRIPTION="Core libraries for Xine movie player" +HOMEPAGE="http://xine.sourceforge.net/" +SRC_URI="${SRC_URI} + mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~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" + +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 ) + 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_p20060816 + 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 + !=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 + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + epatch "${WORKDIR}/patches/120"* + + # 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 + 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" + + 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 gdkpxibuf) \ + \ + $(use_enable aac faad) \ + $(use_enable flac) \ + $(use_with vorbis) \ + $(use_with speex) \ + $(use_with theora) \ + $(use_enable a52) --with-external-a52dec \ + $(use_enable mad) --with-external-libmad \ + $(use_enable dts) --with-external-libdts \ + \ + $(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_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 modplug) \ + \ + $(use_enable mmap) \ + $(use_enable truetype freetype) $(use_enable truetype fontconfig ) \ + --enable-asf \ + --with-external-ffmpeg \ + --disable-optimizations \ + ${myconf} \ + --with-xv-path=/usr/$(get_libdir) \ + --with-w32-path=/usr/lib/win32 \ + --enable-fast-install \ + --disable-dependency-tracking || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt + dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png + + rm -rf "${D}/usr/share/doc/xine" +}