diff options
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/xine-lib/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/digest-xine-lib-1_rc2 | 1 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc2 | 23 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1_rc2.ebuild | 141 |
5 files changed, 175 insertions, 3 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 1dde21667d25..5f63469c01bc 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/xine-lib # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.73 2003/10/21 16:08:43 tseng Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.74 2003/10/26 19:38:28 mholzer Exp $ + +*xine-lib-1_rc2 (26 Oct 2003) + + 26 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-lib-1_rc2.ebuild, + files/protect-CFLAGS.patch-1_rc2: + Version bumped. 21 Oct 2003; Brandon Hale <tseng@gentoo.org> xine-lib-1_rc1.ebuild: Add -mno-sse2 in case of p4 opts, fixes build errors diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 06702d4f9083..adca8296c72f 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,11 +1,11 @@ -MD5 110b6f125e6b38d744ba080d88e63905 ChangeLog 14310 +MD5 988865af042e5cbe7bd5504b3ffbd3d5 ChangeLog 14471 MD5 ae4bc626a0e60a274f0edcd798d9ad7f metadata.xml 252 MD5 e5f3c44f7623ca8935cfb036f659d60c xine-lib-0.9.13-r3.ebuild 3656 MD5 512b8ccb65630b7d1401a20066d9b25d xine-lib-1_beta12-r1.ebuild 4168 MD5 7f49f48a39c11bd0858b9ce75d5069e0 xine-lib-1_beta12.ebuild 3734 MD5 5f685f685db7b1ad3bd3c4e4c03bfec7 xine-lib-1_rc0-r3.ebuild 4206 MD5 995b1b6e63c221206a37d86b9aaf8fbe xine-lib-1_rc1.ebuild 4361 -MD5 995b1b6e63c221206a37d86b9aaf8fbe xine-lib-1_rc2.ebuild 4361 +MD5 1943a4772c8630772e72056e6254ae01 xine-lib-1_rc2.ebuild 4375 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68 MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12 70 MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12-r1 70 @@ -22,3 +22,4 @@ MD5 6e79367c32da81354d36e68fd1a24ae2 files/xineconfig.patch 699 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.12 601 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67 +MD5 31ab44d87982996031a1074d289fb9f6 files/protect-CFLAGS.patch-1_rc2 691 diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc2 b/media-libs/xine-lib/files/digest-xine-lib-1_rc2 new file mode 100644 index 000000000000..5abe115e284a --- /dev/null +++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc2 @@ -0,0 +1 @@ +MD5 06ee51beaf77b4b9238f2bcc5b093860 xine-lib-1-rc2.tar.gz 5246419 diff --git a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc2 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc2 new file mode 100644 index 000000000000..86b494cdc7db --- /dev/null +++ b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc2 @@ -0,0 +1,23 @@ +diff -ru xine-lib-1-rc2.orig/configure xine-lib-1-rc2/configure +--- xine-lib-1-rc2.orig/configure 2003-10-05 09:10:26.000000000 -0400 ++++ xine-lib-1-rc2/configure 2003-10-12 13:32:27.000000000 -0400 +@@ -33439,7 +33439,7 @@ + k7cpu="i686" + fi + +- CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS" ++ CFLAGS="$CFLAGS" + + DEBUG_CFLAGS="-O $DEBUG_CFLAGS" + +@@ -33491,10 +33491,6 @@ + ;; + + esac +- if test x"$archopt_val" != x; then +- CFLAGS="$sarchopt=$archopt_val $CFLAGS" +- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" +- fi + + fi + else diff --git a/media-libs/xine-lib/xine-lib-1_rc2.ebuild b/media-libs/xine-lib/xine-lib-1_rc2.ebuild new file mode 100644 index 000000000000..1eae72d01c79 --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1_rc2.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc2.ebuild,v 1.1 2003/10/26 19:38:28 mholzer Exp $ + +inherit eutils flag-o-matic + +# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc +# Commenting this out in this ebuild, because CFLAGS and CXXFLAGS are unset +# at make time any way. +# Brandon Low (29 Apr 2003) +# inherit flag-o-matic +# filter-flags "-maltivec -mabi=altivec" +# replace-flags k6-3 i686 +# replace-flags k6-2 i686 +# replace-flags k6 i686 + +#fix build errors with -march/mcpu=pentium4 +if [ "$COMPILER" == "gcc3" ]; then + if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then + append-flags -mno-sse2 + fi +fi + +#13 Jul 2003: drobbins: build failure using -j5 on a dual Xeon in 1_beta12 +MAKEOPTS="$MAKEOPTS -j1" + +# This should normally be empty string, unless a release has a suffix. +MY_PKG_SUFFIX="" + +DESCRIPTION="Core libraries for Xine movie player" +HOMEPAGE="http://xine.sourceforge.net/" +SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz" +RESTRICT="nomirror" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64" +IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl" + +RDEPEND="oggvorbis? ( media-libs/libvorbis ) + X? ( virtual/x11 ) + avi? ( x86? ( >=media-libs/win32codecs-0.50 + media-libs/divx4linux ) ) + 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 + dev-util/pkgconfig ) + gnome? ( >=gnome-base/gnome-vfs-2.0 + dev-util/pkgconfig ) + >=media-libs/flac-1.0.4 + sdl? ( >=media-libs/libsdl-1.1.5 ) + >=media-libs/libfame-0.9.0 + >=media-libs/xvid-0.9.0 + media-libs/speex" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +#sys-devel/gcc-3.2 fixes -march=pentium4 compile issue + +S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX} + +src_unpack() { + + unpack ${A} + + # gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534 + #epatch ${FILESDIR}/${P}-gcc2_fix.patch + # preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time + patch -p0 < ${FILESDIR}/protect-CFLAGS.patch-${PV} || die +} + +src_compile() { + # Make sure that the older libraries are not installed (bug #15081). + if [ -f /usr/lib/libxine.so.0 ] + then + einfo "Please uninstall older xine libraries."; + einfo "The compilation cannot proceed."; + die + fi + + # Use the built-in dvdnav plugin. + local myconf="--with-included-dvdnav" + + # Most of these are not working currently, but are here for completeness + # don't use the --disable-XXXtest because that defaults to ON not OFF + use X \ + || myconf="${myconf} --disable-x11" # --disable-xv" + use esd \ + || myconf="${myconf} --disable-esd" # --disable-esdtest" + use nls \ + || myconf="${myconf} --disable-nls" + use alsa \ + || myconf="${myconf} --disable-alsa" # --disable-alsatest" + use arts \ + || myconf="${myconf} --disable-arts" # --disable-artstest" + use aalib \ + || myconf="${myconf} --disable-aalib" # --disable-aalibtest" + use oggvorbis \ + || myconf="${myconf} --disable-ogg --disable-vorbis" + #--disable-oggtest --disable-vorbistest" + use avi \ + && myconf="${myconf} --with-w32-path=/usr/lib/win32" \ + || myconf="${myconf} --disable-asf" + use sdl \ + || myconf="${myconf} --with-sdl-prefix=/null" # disable sdl check + + econf ${myconf} || die "Configure failed" + + emake || die "Parallel make failed" +} + +src_install() { + einstall || die "Install failed" + + # Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112). + dodir /usr/share/xine/libxine1/fonts + mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/ + + dodoc AUTHORS COPYING ChangeLog INSTALL README TODO + cd ${S}/doc + dodoc dataflow.dia README* +} + +pkg_postinst() { + einfo + einfo "Please note, a new version of xine-lib has been installed," + einfo "for library consistency you need to unmerge old versions" + einfo "of xine-lib before merging xine-ui." + einfo + einfo "This library version 1 is incompatible with the plugins," + einfo "designed for the prior library versions (such as xine-d4d," + einfo "xine-d5d, xine-dmd, and xine-dvdnav." + einfo + einfo "Also make sure to remove your ~/.xine if upgrading from" + einfo "a previous version." + einfo +} |