Add new snapshot with new patchset (reduced).
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Tue, 6 Jun 2006 19:21:25 +0000 (19:21 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Tue, 6 Jun 2006 19:21:25 +0000 (19:21 +0000)
Package-Manager: portage-2.1_rc4-r3

media-libs/xine-lib/ChangeLog
media-libs/xine-lib/Manifest
media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606 [new file with mode: 0644]
media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild [new file with mode: 0644]

index 50a4b4cf4bf4bff2d5e893f8edc8eefb8a28a721..bea28ae7fec8dbc082791ac14dba5162b684e0a7 100644 (file)
@@ -1,6 +1,12 @@
 # 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.359 2006/06/06 18:21:43 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.360 2006/06/06 19:21:25 flameeyes Exp $
+
+*xine-lib-1.1.2_pre20060606 (06 Jun 2006)
+
+  06 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.2_pre20060606.ebuild:
+  Add new snapshot with new patchset (reduced).
 
   06 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   xine-lib-1.1.2_pre20060328-r11.ebuild:
index 8b117d5168f9bd82b8647b79740de48af1aea969..0cbcde78d08f811d421eed41343e200d2603c870 100644 (file)
@@ -1,8 +1,13 @@
-DIST xine-lib-1.1.1.tar.gz 7990031 RMD160 5b7ba57c675414e84649701b3f356404ec7c9f0a SHA256 8d37d556a0496b9df421dc3c01ce7457b88e8b2762720a577b5bbdb5374d1505
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST xine-lib-1.1.1.tar.gz 7990031 RMD160 5b7ba57c675414e84649701b3f356404ec7c9f0a SHA1 c06aa67ad4d161434fc629232d742b5c7fd3cb4c SHA256 8d37d556a0496b9df421dc3c01ce7457b88e8b2762720a577b5bbdb5374d1505
 DIST xine-lib-1.1.2cvs20060328.tar.gz 7996045 RMD160 4e561e02b7cd9a10797925386ae7416a932c8431 SHA1 88a3bfd552c8ffba9e60ca418126cc51a70555da SHA256 fd95811d123e4a82c815674f3722faf3a769e3ba3760d5a4da8630c83f7c7e38
+DIST xine-lib-1.1.2cvs20060606.tar.bz2 6509453 RMD160 a53a32bc5df800ad2072973224fe8c426caaefa7 SHA1 d1518396fd17bfe2e64b20b027f5566eacb8d4da SHA256 c00e378c87e669c60936b71aaaa6eb320dcf202835f7d7fca168efc026bcfb94
 DIST xine-lib-patches-24.tar.bz2 18687 RMD160 68bf0ae79ba27e30f7b719862fd378b1871bc661 SHA256 86367ba64e81cf75f4f877c348777c791cf372aff29043fcf838d5f23cc3175f
 DIST xine-lib-patches-43.tar.bz2 36962 RMD160 b53a603b141bfee5121809e19bf4ad618cc50412 SHA1 82a7f58d76c8685df98773c75ec4fe21c890d20b SHA256 0cb9545171e4024a8ce1b6b1e2211b06c51adfe4650b2423862355331dd3650b
 DIST xine-lib-patches-45.tar.bz2 40494 RMD160 bffb9c08ba2386fb9c33ee15cec01436c9804612 SHA1 aaca1ea745e2f8f5c886555a74479a7a62a21f4a SHA256 97cbbc99ac9999d78640bd57d24c6839c57d3761ba9124b75df41222fb3cf34b
+DIST xine-lib-patches-46.tar.bz2 29276 RMD160 bd35b4c8234cbe865817b1722c569d2e22491224 SHA1 b907b79cac75b40b0fab4188f68a02897518a042 SHA256 6dfd5d0a28b7c6a2e7ed68e8f5432b2f35880df3d590e65d4439d47e4be7bb84
 EBUILD xine-lib-1.1.1-r3.ebuild 7232 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd SHA1 92c83023f1f2cf42accb15ea9a6463ca1eba2f81 SHA256 1a281ed1ce771661ae909ecfe5de3e83e8fe5be6b93ed1ebc07b59227301cc25
 MD5 578712f99de216da48aefcc69567dcf1 xine-lib-1.1.1-r3.ebuild 7232
 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd xine-lib-1.1.1-r3.ebuild 7232
@@ -15,10 +20,14 @@ EBUILD xine-lib-1.1.2_pre20060328-r9.ebuild 7502 RMD160 cf572d30f76ef1983ca897c5
 MD5 849b7d65293423f35b1425bd0ef17da8 xine-lib-1.1.2_pre20060328-r9.ebuild 7502
 RMD160 cf572d30f76ef1983ca897c577873536036dc953 xine-lib-1.1.2_pre20060328-r9.ebuild 7502
 SHA256 b919c3f684971b4241f149399590cc2df1cfb4ea55dd76609e6fc5b6199e8721 xine-lib-1.1.2_pre20060328-r9.ebuild 7502
-MISC ChangeLog 32199 RMD160 074f4071a498feea6f341e2d3962d8dfa9c91960 SHA1 2682e20f9cba4f23d6f3fedbd5b9fb4d81e863be SHA256 9e9d366338153fce63340c08116bddf9984003ed647d2fabb86f3c4bda4e8d30
-MD5 6a22e5925173ecab80e4a2a3d07bedc2 ChangeLog 32199
-RMD160 074f4071a498feea6f341e2d3962d8dfa9c91960 ChangeLog 32199
-SHA256 9e9d366338153fce63340c08116bddf9984003ed647d2fabb86f3c4bda4e8d30 ChangeLog 32199
+EBUILD xine-lib-1.1.2_pre20060606.ebuild 7500 RMD160 ce77963e318f083746a8c9420e24b627deb4461b SHA1 95d9e30ddea3638050d7b622644e4d2d9bcff369 SHA256 624d814c24835ca2f7660b87eda0a69b299823e78c836adc3814eca5d2e255d8
+MD5 1507e301c7b95531672a711e905b043d xine-lib-1.1.2_pre20060606.ebuild 7500
+RMD160 ce77963e318f083746a8c9420e24b627deb4461b xine-lib-1.1.2_pre20060606.ebuild 7500
+SHA256 624d814c24835ca2f7660b87eda0a69b299823e78c836adc3814eca5d2e255d8 xine-lib-1.1.2_pre20060606.ebuild 7500
+MISC ChangeLog 32381 RMD160 0f0146031926c79041730ec8ef435827c0f0dd89 SHA1 9ab38a8ba3563a281dd0e7684e5736550e744a74 SHA256 bf90e9f1cdd16872a57c8ee98afe8df535a31f6566f0deab70e9160b5e8d95ef
+MD5 5929b18c75c1e4b2702e4ab722ae5955 ChangeLog 32381
+RMD160 0f0146031926c79041730ec8ef435827c0f0dd89 ChangeLog 32381
+SHA256 bf90e9f1cdd16872a57c8ee98afe8df535a31f6566f0deab70e9160b5e8d95ef ChangeLog 32381
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -32,3 +41,13 @@ SHA256 fbc356822d9d60ecf6bb0c32bd753695b8bb78374fe40211a192b4f2f28b30cf files/di
 MD5 95279f3962ea45c87765c2a43af06b76 files/digest-xine-lib-1.1.2_pre20060328-r9 539
 RMD160 401f695b1d0d33bbe37a83da7107c4cc0a77299d files/digest-xine-lib-1.1.2_pre20060328-r9 539
 SHA256 fa56204f68229db6ab2e26b3c62f9951eea925a8299c363112cdcd4059a6b003 files/digest-xine-lib-1.1.2_pre20060328-r9 539
+MD5 bf7cc4bedf1f07aa6ebdb47df5793fb4 files/digest-xine-lib-1.1.2_pre20060606 542
+RMD160 452cbb600c6dd4af6173e1f1bd1d10d3c3c36483 files/digest-xine-lib-1.1.2_pre20060606 542
+SHA256 a8b0d4e47083e6f3f08a057909278d0adc0a2a0e2a6820eb2e87523623be47ad files/digest-xine-lib-1.1.2_pre20060606 542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEhdW9AiZjviIA2XgRAieqAJ40523CwtxdnkyX5s1kwfxDz7YqVACg1QXQ
+5AQXRfEAM+1SICMMRkjMLZ4=
+=DHLc
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606
new file mode 100644 (file)
index 0000000..9def419
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 04248860a422a7fd2a050bf3333f5954 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
+RMD160 a53a32bc5df800ad2072973224fe8c426caaefa7 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
+SHA256 c00e378c87e669c60936b71aaaa6eb320dcf202835f7d7fca168efc026bcfb94 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
+MD5 77c3baa2b0742db77a3662a27c38bef0 xine-lib-patches-46.tar.bz2 29276
+RMD160 bd35b4c8234cbe865817b1722c569d2e22491224 xine-lib-patches-46.tar.bz2 29276
+SHA256 6dfd5d0a28b7c6a2e7ed68e8f5432b2f35880df3d590e65d4439d47e4be7bb84 xine-lib-patches-46.tar.bz2 29276
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild
new file mode 100644 (file)
index 0000000..a5ed17d
--- /dev/null
@@ -0,0 +1,259 @@
+# 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.2_pre20060606.ebuild,v 1.1 2006/06/06 19:21:25 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
+       MY_PKG_SUFFIX=""
+       MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
+       S="${WORKDIR}/${MY_P}"
+
+       SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz"
+else
+       MY_P="${PN}-${PV/_pre/cvs}"
+       S="${WORKDIR}/${MY_P}"
+
+       SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+fi
+
+PATCHLEVEL="46"
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via video_cards_i810"
+
+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 asf
+ffmpeg debug modplug ${IUSE_VIDEO_CARDS}"
+
+RDEPEND="vorbis? ( media-libs/libvorbis )
+       X? ( || ( (
+                       x11-libs/libXext
+                       x11-libs/libX11 )
+               virtual/x11 ) )
+       xv? ( || ( x11-libs/libXv virtual/x11 ) )
+       xvmc? (
+               || ( x11-libs/libXvMC virtual/x11 )
+               video_cards_nvidia? ( media-video/nvidia-glx )
+               video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
+               video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
+       )
+       xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+       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.0.4 )
+       sdl? ( >=media-libs/libsdl-1.1.5 )
+       dxr3? ( >=media-libs/libfame-0.9.0 )
+       theora? ( media-libs/libtheora )
+       speex? ( media-libs/speex )
+       libcaca? ( media-libs/libcaca )
+       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 )
+       ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051120 )
+       modplug? ( media-libs/libmodplug )
+       nls? ( virtual/libintl )
+       virtual/libiconv
+       !=media-libs/xine-lib-0.9.13*"
+
+DEPEND="${RDEPEND}
+       X? ( || ( (
+                       x11-base/xorg-server
+                       x11-libs/libXt
+                       x11-proto/xextproto
+                       x11-proto/xproto
+                       x11-proto/videoproto
+                       x11-proto/xf86vidmodeproto
+                       xinerama? ( x11-proto/xineramaproto ) )
+               virtual/x11 )
+               )
+       v4l? ( virtual/os-headers )
+       dev-util/pkgconfig
+       nls? ( sys-devel/gettext )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       [[ -z $(test-flags -fvisibility=hidden) ]] && export EPATCH_EXCLUDE="237_all_visibility.patch"
+
+       EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches
+
+       # ffmpeg doesn'g use libtool, so the condition for PIC code
+       # is __PIC__, not PIC.
+       sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
+               src/libffmpeg/libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
+               src/libffmpeg/libavcodec/msmpeg4.c \
+               || die "sed failed (__PIC__)"
+
+       AT_M4DIR="m4" eautoreconf
+}
+
+# check for the X11 path for a given library
+get_x11_dir() {
+       if [[ -f "${ROOT}/usr/$(get_libdir)/$1" ]]; then
+               echo "${ROOT}/usr/$(get_libdir)"
+       elif [[ -f "${ROOT}/usr/$(get_libdir)/xorg/$1" ]]; then
+               echo "${ROOT}/usr/$(get_libdir)/xorg"
+       elif [[ -f "${ROOT}/usr/X11R6/$(get_libdir)/$1" ]]; then
+               echo "${ROOT}/usr/X11R6/$(get_libdir)"
+       fi
+}
+
+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 -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
+
+       if ! use xvmc; then
+               myconf="${myconf} --disable-xvmc"
+       else
+               count="0"
+               if use video_cards_nvidia; then
+                       count="`expr ${count} + 1`"
+                       xvmclib="XvMCNVIDIA"
+               fi
+
+               if use video_cards_i810; then
+                       count="`expr ${count} + 1`"
+                       xvmclib="I810XvMC"
+               fi
+
+               if use video_cards_via; then
+                       count="`expr ${count} + 1`"
+                       xvmclib="viaXvMC"
+               fi
+
+               if [[ "${count}" -gt "1" ]]; then
+                       eerror "Invalid combination of USE flags"
+                       eerror "When building support for xvmc, you may only include support"
+                       eerror "for none or one of the following VIDEO_CARDS:"
+                       eerror ""
+                       eerror "nvidia i810 via"
+                       eerror ""
+                       eerror "XvMC support will try to link against libXvMCW."
+               elif [[ -n "${xvmclib}" ]]; then
+                       xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
+                       xvmcdir=$(get_x11_dir libXvMC.so)
+
+                       [[ -z ${xvmcdir} ]] && die "Unable to find libXvMC.so."
+
+                       myconf="${myconf} ${xvmcconf} --with-xvmc-path=${xvmcdir} --with-xxmc-path=${xvmcdir}"
+               fi
+       fi
+
+       if use xv; then
+               xvdir=$(get_x11_dir libXv.so)
+
+               [[ -z ${xvdir} ]] && die "Unable to find libXv.so. Did you set USE=\"xv\" when you emerged xorg-x11?"
+
+               myconf="${myconf} --with-xv-path=${xvdir}"
+       fi
+
+       econf \
+               $(use_enable gnome) \
+               $(use_enable nls) \
+               $(use_enable ipv6) \
+               $(use_enable samba) \
+               $(use_enable altivec) \
+               $(use_enable v4l) \
+               \
+               $(use_enable mng) \
+               $(use_enable imagemagick) \
+               \
+               $(use_enable aac faad) \
+               $(use_enable flac) \
+               $(use_with vorbis ogg) $(use_with vorbis) \
+               $(use_enable speex) \
+               $(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_enable libcaca caca) \
+               $(use_enable sdl) \
+               \
+               $(use_enable oss) \
+               $(use_enable alsa) \
+               $(use_enable arts) \
+               $(use_enable esd) \
+               $(use_enable vcd) --without-internal-vcdlibs \
+               \
+               $(use_enable asf) \
+               $(use_enable win32codecs w32dll) \
+               $(use_enable modplug) \
+               $(use_with ffmpeg external-ffmpeg) \
+               --disable-polypaudio \
+               --disable-optimizations \
+               ${myconf} \
+               --with-w32-path=/usr/lib/win32 \
+               --enable-fast-install \
+               --disable-dependency-tracking || die "econf failed"
+
+       emake || die "emake failed"
+}
+
+src_install() {
+       make 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
+}
+
+pkg_postinst() {
+       if use win32codecs && ! use asf; then
+               einfo "You choose to build win32codecs support but disabled ASF"
+               einfo "demuxer. This way you'll have support for win32codecs in"
+               einfo "formats like AVI or Matroska, but not in WMV/WMA files."
+               einfo ""
+               einfo "To be able to play WMV/WMA files, please add asf useflag."
+       fi
+}