Add CVS snapshot to test AAC support for who still has troubles with 1.1.1-r5.
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Tue, 28 Mar 2006 19:22:44 +0000 (19:22 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Tue, 28 Mar 2006 19:22:44 +0000 (19:22 +0000)
Package-Manager: portage-2.1_pre7-r2

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

index 067d669f8a90d16bd54315fd99e56baf5133c0c1..61d2f631ec3559b1aa836aa76dfe7534f97f431b 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.314 2006/03/28 16:21:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.315 2006/03/28 19:22:44 flameeyes Exp $
+
+*xine-lib-1.1.2_pre20060328 (28 Mar 2006)
+
+  28 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.2_pre20060328.ebuild:
+  Add CVS snapshot to test AAC support for who still has troubles with 1.1.1-r5.
 
   28 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.1-r5.ebuild:
index 83c80bac4139bae721e099736119a78b904f99a4..fce217cd8a79b09329b11b26b7f6aa7fdeb947db 100644 (file)
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5506407d9d4a5ba6fc342516eaf58590 ChangeLog 24395
-RMD160 d945971ab6368124be46d0f64a49aeb8a89522eb ChangeLog 24395
-SHA256 317fa4ad083cb68bf62ae682cfef7cbf27f38bb7e8b88f6e6f70e63aaf7310df ChangeLog 24395
+MD5 25545017241c77cf4024c199c94423fa ChangeLog 24611
+RMD160 6ad152f0abe9b1b16a0b2ed78240551808781b9b ChangeLog 24611
+SHA256 f64ad479757d14d034951fff96b29bf9108da181260d46e07479c593b4864ad2 ChangeLog 24611
 MD5 4a70a1198dbbc1b64b20071aacdee503 files/digest-xine-lib-1.1.1-r3 138
 RMD160 58a9ed42c2a8800b52a54810e73472fad33f23d2 files/digest-xine-lib-1.1.1-r3 138
 SHA256 c7e3bb0f349b3ce5f05541400a85c74ad5c66107d357719146061c344ae98e88 files/digest-xine-lib-1.1.1-r3 138
@@ -13,6 +13,9 @@ SHA256 5396a29885361d99f3148cd9780c90816b6f5ef35b96a1c4ec3dc96ad424b137 files/di
 MD5 03b781772b1a9204d5a65e742838f80d files/digest-xine-lib-1.1.1-r5 506
 RMD160 0fa83a2e75dd0f5f52df71232fe55bf45936c18d files/digest-xine-lib-1.1.1-r5 506
 SHA256 b7c311a183763850128a63d14436887a4be4e11f3d4966e00ba8bbdaeb312528 files/digest-xine-lib-1.1.1-r5 506
+MD5 ed495f2519c8928388ab9c74e22972bb files/digest-xine-lib-1.1.2_pre20060328 539
+RMD160 77d2f0f0c7e857fef52f94f1fb9e285b941c6461 files/digest-xine-lib-1.1.2_pre20060328 539
+SHA256 26fd50a4700e45be0051c2f5afaed808647f0e0f5d7a79186214e2ebcaf6670c files/digest-xine-lib-1.1.2_pre20060328 539
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 metadata.xml 330
@@ -25,10 +28,13 @@ SHA256 8350fcbb3d782685176f654f93bc3b9a62acca1230c63ef01d5abc384d38af10 xine-lib
 MD5 c4567440b1131012db6797fd68722c2e xine-lib-1.1.1-r5.ebuild 7632
 RMD160 3ad57ec3c2c536ea0209e02aca9b6b1cc46068f7 xine-lib-1.1.1-r5.ebuild 7632
 SHA256 81a3c5c3e7100befc2b76affc51705e20f874fac0f0e850f5854b0efa303d730 xine-lib-1.1.1-r5.ebuild 7632
+MD5 48d90bdc166e46d66a57e1d506db6324 xine-lib-1.1.2_pre20060328.ebuild 8125
+RMD160 7a958b4e3267c71dd4b327f67d1aeb24539349b1 xine-lib-1.1.2_pre20060328.ebuild 8125
+SHA256 d4123e8a8dc6f0146e7007355d3452b7afaab5c8d510218d94fbb539d0a758b5 xine-lib-1.1.2_pre20060328.ebuild 8125
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEKWKJAiZjviIA2XgRApZNAJ4vRAcpj9tOhD4FdtT/pOncTYXrmwCgsvQY
-FDwNiuHe2GBUqpLOkBc/Gko=
-=xASH
+iD8DBQFEKY0WAiZjviIA2XgRAvdJAKDkZqax0i8cHczY1bxcchJ44GWdbQCfe/CP
+A22haU4Oe32XVKKK9Yj/F28=
+=0/LD
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328
new file mode 100644 (file)
index 0000000..cef9b4c
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 1b98ffb4087025c7c38bae883ada8735 xine-lib-1.1.2cvs20060328.tar.gz 7996045
+RMD160 4e561e02b7cd9a10797925386ae7416a932c8431 xine-lib-1.1.2cvs20060328.tar.gz 7996045
+SHA256 fd95811d123e4a82c815674f3722faf3a769e3ba3760d5a4da8630c83f7c7e38 xine-lib-1.1.2cvs20060328.tar.gz 7996045
+MD5 b6bbcd2780bde2d0d953fd5d5a267a65 xine-lib-patches-29.tar.bz2 12106
+RMD160 3513ce5f995dfd9e825e4fa7c6e95c3185001fb8 xine-lib-patches-29.tar.bz2 12106
+SHA256 acf61ef5806c260a54e72d50ea32778a6414f6d0998e70203b066b83c45f5eb0 xine-lib-patches-29.tar.bz2 12106
diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328.ebuild
new file mode 100644 (file)
index 0000000..fc93c2d
--- /dev/null
@@ -0,0 +1,274 @@
+# 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_pre20060328.ebuild,v 1.1 2006/03/28 19:22:44 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/cvs*/cvs}"
+
+       SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+fi
+
+PATCHLEVEL="29"
+
+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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+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 )
+       !=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 )
+               virtual/x11 )
+               )
+       xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+       v4l? ( virtual/os-headers )
+       dev-util/pkgconfig
+       nls? ( sys-devel/gettext )"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       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
+               append-flags -UHAVE_MMX
+               filter-flags -fforce-addr  # breaks ffmpeg module
+               filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
+               append-flags -mno-sse -fomit-frame-pointer
+               is-flag -O? || append-flags -O2
+
+               ewarn ""
+               ewarn "Debug information will be almost useless as the frame pointer is omitted."
+               ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+               ewarn "difficult to fix. Please have that in mind."
+               ewarn ""
+       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 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 \
+               --disable-dependency-tracking || die "econf failed"
+
+               #$(use_with dvdnav external-dvdnav) \
+               #$(use_enable macos macosx-video) $(use_enable macos coreaudio) \
+               # This will be added when polypaudio will be added to portage.
+               # $(use_enable polypaudio)
+
+       emake -j1 || 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
+
+       if ! use mad; then
+               einfo "MAD decoding library is disabled."
+               einfo "This mean that playing mp3 will not be possible with xine-lib"
+               einfo "based players. amaroK will crash trying to."
+               einfo ""
+               einfo "To be able to play mp3 files, please add mad useflag."
+       fi
+}