From 1085ac064e56d3a1f0ea780e3ab1dcc4a1182eca Mon Sep 17 00:00:00 2001 From: Chris White Date: Mon, 27 Dec 2004 04:05:33 +0000 Subject: [PATCH] Bumping to version 1.0 final. Thanks to the great work by Diego Petteno in bug #72185. --- media-libs/xine-lib/ChangeLog | 8 +- media-libs/xine-lib/Manifest | 50 ++-- media-libs/xine-lib/files/digest-xine-lib-1.0 | 1 + media-libs/xine-lib/xine-lib-1.0.ebuild | 233 ++++++++++++++++++ 4 files changed, 267 insertions(+), 25 deletions(-) create mode 100644 media-libs/xine-lib/files/digest-xine-lib-1.0 create mode 100644 media-libs/xine-lib/xine-lib-1.0.ebuild diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 6b983d944717..c16e4809ece1 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-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.169 2004/12/26 22:23:12 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.170 2004/12/27 04:05:33 chriswhite Exp $ + +*xine-lib-1.0 (27 Dec 2004) + + 27 Dec 2004; Chris White +xine-lib-1.0.ebuild: + Bumping to version 1.0 final. Thanks to the great work by Diego Petteno in bug + #72185. 26 Dec 2004; Jeremy Huddleston xine-lib-1_rc8-r1.ebuild: diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 5d0ae805a3c8..53add89c955f 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,26 +1,38 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 60a8ddde743317c160dfa2e127562fbf ChangeLog 28767 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304 -MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327 -MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380 -MD5 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265 -MD5 7217a5907cd4d614a9151c8ce335e3dc ChangeLog 28573 MD5 b25152bddc933afdf390149b07f2ff43 xine-lib-1_rc5-r3.ebuild 5473 MD5 a53b6f55661ef41e343932ceb7108cc3 xine-lib-1_rc6.ebuild 5358 +MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327 +MD5 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265 +MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380 +MD5 f6f43d20a9588c6e2b4983e23890e81e xine-lib-1.0.ebuild 6875 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221 -MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391 -MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655 -MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67 -MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67 -MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587 +MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68 +MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67 +MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67 +MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67 +MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597 +MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316 +MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746 MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587 +MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754 +MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587 +MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279 +MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391 +MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655 +MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594 +MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587 MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391 MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655 MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331 @@ -28,23 +40,13 @@ MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169 MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423 -MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 -MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316 -MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559 -MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587 -MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754 -MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68 -MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316 -MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594 -MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587 -MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279 -MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67 -MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703 +MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601 +MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBzzngArHZZzCEUG0RAmVTAJoCT35WRAUCeGjdoz2HVhBkrPYMYQCfWmud -+9W8zmPug1l+4Qxir0fSVRk= -=sGDx +iD8DBQFBz4obFdQwWVoAgN4RAtu/AJ486j+Lgifm+UGkSsugvq0mke3xfwCcDfoe +6vtDGDgtPur+i7L2JfAVfyg= +=kbp9 -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.0 b/media-libs/xine-lib/files/digest-xine-lib-1.0 new file mode 100644 index 000000000000..0b3d186d000d --- /dev/null +++ b/media-libs/xine-lib/files/digest-xine-lib-1.0 @@ -0,0 +1 @@ +MD5 96e5195c366064e7778af44c3e71f43a xine-lib-1.0.tar.gz 7384258 diff --git a/media-libs/xine-lib/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild new file mode 100644 index 000000000000..c30da2d43bba --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.0.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2004 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.0.ebuild,v 1.1 2004/12/27 04:05:33 chriswhite Exp $ + +inherit eutils flag-o-matic gcc libtool + +# This should normally be empty string, unless a release has a suffix. +MY_PKG_SUFFIX="" +MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX} + +DESCRIPTION="Core libraries for Xine movie player" +HOMEPAGE="http://xine.sourceforge.net/" +SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex + theora ipv6 altivec opengl aac pic fb xvmc nvidia i8x0 libcaca + samba dxr3 vidix png mng" + +RDEPEND="oggvorbis? ( media-libs/libvorbis ) + !amd64? ( X? ( virtual/x11 ) ) + amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) ) + avi? ( x86? ( >=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 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 + theora? ( media-libs/libtheora ) + speex? ( media-libs/speex ) + libcaca? ( media-libs/libcaca ) + samba? ( net-fs/samba ) + png? ( media-libs/libpng ) + mng? ( media-libs/libmng )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + # Make sure that the older libraries are not installed (bug #15081). + if [ `has_version =media-libs/xine-lib-0.9.13*` ] + then + eerror "Please uninstall older xine libraries."; + eerror "The compilation cannot proceed."; + die + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + + # plasmaroo: Kernel 2.6 headers patch + epatch ${FILESDIR}/${PN}-1_rc7-2.6.patch + + # force 32 bit userland + [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${PN}-1_rc8-configure-sparc.patch + + # fixes bad X11 directories + epatch ${FILESDIR}/${PN}-x11.patch + + # Bad version included... may drop .so + #libtoolize --copy --force + + # bug #40317 + elibtoolize + + # Fix building on amd64, #49569 + #use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch + + use pic && epatch ${FILESDIR}/${PN}-1_rc7-pic.patch + + # Fix detection of hppa2.0 and hppa1.1 CHOST + use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure +} + +src_compile() { + + #filter dangerous compile CFLAGS + strip-flags + + #prevent quicktime crashing + append-flags -frename-registers + + if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then + append-flags -fno-web #49509 + filter-flags -fno-unit-at-a-time #55202 + append-flags -funit-at-a-time #55202 + fi + + is-flag -O? || append-flags -O1 #31243 + + # fix build errors with sse2 #49482 + if use x86 ; then + if [ `gcc-major-version` -eq 3 ] ; then + append-flags -mno-sse2 `test_flag -mno-sse3` + filter-mfpmath sse + fi + fi + + local myconf + + # the win32 codec path should ignore $(get_libdir) and always use lib + use avi && use x86 \ + && myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \ + || myconf="${myconf} --disable-asf" + + use sparc \ + && myconf="${myconf} --build=${CHOST}" + + # enable/disable appropiate optimizations on sparc + [ "${PROFILE_ARCH}" == "sparc64" ] \ + && myconf="${myconf} --enable-vis" + [ "${PROFILE_ARCH}" == "sparc" ] \ + && myconf="${myconf} --disable-vis" + + # Fix compilation-errors on PowerPC #45393 & #55460 & #68251 + if use ppc || use ppc64 ; then + append-flags -U__ALTIVEC__ + myconf="${myconf} `use_enable altivec`" + fi + + # The default CFLAGS (-O) is the only thing working on hppa. + if use hppa && [ "`gcc-version`" != "3.4" ] ; then + unset CFLAGS + else + append-flags -ffunction-sections + fi + + # These use-flags hasn't a configure option, so we must export these by hand + use !sdl && export ac_cv_path_SDL_CONFIG=no + use !samba && export ac_cv_lib_smbclient_smbc_init=no + use !png && export ac_cv_lib_png_png_create_read_struct=no + use !mng && export ac_cv_header_libmng_h=no + + # quite a dirt hack but it should work as expected + if ! use libcaca; then + myconf="${myconf} --with-caca-prefix=/tmp/non-existant" + fi + + use nvidia \ + && xvmclib="XvMCNVIDIA" + use i8x0 \ + && xvmclib="I810XvMC" + + use xvmc \ + && myconf="${myconf} --with-xvmc-path=/usr/X11R6/$(get_libdir) + --with-xxmc-path=/usr/X11R6/$(get_libdir) --with-xvmc-lib=$xvmclib + --with-xxmc-lib=$xvmclib" + + ( use xvmc && use nvidia && use i8x0 ) \ + && { + eerror "Invalid combination of USE flags" + eerror "When building support for xvmc, you may only" + eerror "include support for one video card:" + eerror " nvidia, i8x0" + eerror "" + eerror "Emerge again with different USE flags" + + exit 1 + } + + ( use xvmc && ! use nvidia && ! use i8x0 ) && { + ewarn "You tried to build with xvmc support." + ewarn "No supported graphics hardware was specified." + ewarn "" + ewarn "No xvmc support will be included." + ewarn "Please one appropriate USE flag and re-emerge:" + ewarn " nvidia or i8x0" + } + + econf \ + $(use_enable nls) \ + $(use_enable X x11) $(use_with X x) \ + $(use_enable vidix) \ + $(use_enable dxr3) \ + $(use_with esd) --disable-esdtest \ + $(use_enable alsa) --disable-alsatest \ + $(use_with arts) --disable-artstest \ + $(use_with aalib) \ + $(use_with oggvorbis ogg) $(use_with oggvorbis vorbis) \ + $(use_enable ipv6) \ + $(use_enable directfb) $(use_enable fb) \ + $(use_enable macos macosx-video) $(use_enable macos coreaudio) \ + $(use_enable opengl) \ + $(use_enable aac faad) \ + #$(use_with ffmpeg external-ffmpeg) \ + #$(use_with dvdnav external-dvdnav) \ + ${myconf} \ + --libdir=/usr/$(get_libdir) \ + --with-xv-path=/usr/X11R6/$(get_libdir) \ + --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/$(get_libdir) \ + --disable-sdltest || die "Configure failed" + + emake -j1 || die "Parallel make failed" +} + +src_install() { + # portage 2.0.50's einstall is broken for handling libdir + make DESTDIR=${D} install || 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 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 +} -- 2.26.2