From: Diego Elio Pettenò Date: Thu, 15 Jun 2006 15:49:36 +0000 (+0000) Subject: New revision to fix bug #136870. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb42a8a52f8f2353643298597eefedfb658107cc;p=gentoo.git New revision to fix bug #136870. Package-Manager: portage-2.1 --- diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 0c82cdfb38fa..26c3146bd6b0 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -4,10 +4,10 @@ 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-24.tar.bz2 18687 RMD160 68bf0ae79ba27e30f7b719862fd378b1871bc661 SHA1 ca49e1fc763658cbcc46d1f4e4324ae80485337d 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-50.tar.bz2 76043 RMD160 162b9264e4d13a7671097642d9a46d02032c261b SHA1 34a827ede981ccfa1ec3828a570e1495798af977 SHA256 0b3dd8cc7dce7b9970f0b4e73f6f3983c95e691fc209f51190346a2a3de8c7ce +DIST xine-lib-patches-51.tar.bz2 76202 RMD160 fb04f34c7549c25d0d9fa8deab0e66fb5976c28f SHA1 c643fb24091b295790d4d605b0eb9f03350ca102 SHA256 7f2d01f97a0f8bdaa52a59012343e4f3215167da06bf95ee4702831efeda3e4f EBUILD xine-lib-1.1.1-r3.ebuild 7196 RMD160 b10923676e1520254742b9158efce91141c77381 SHA1 f0e01ecec800aa95c602b007c87b78f12f9e9c54 SHA256 be1e6e9d1470c70171535199e3c1f4a9518695dc014bdf9a95d8b85999b433d9 MD5 c185dd05a1f94e72d4171e4ef8099f9d xine-lib-1.1.1-r3.ebuild 7196 RMD160 b10923676e1520254742b9158efce91141c77381 xine-lib-1.1.1-r3.ebuild 7196 @@ -20,14 +20,14 @@ EBUILD xine-lib-1.1.2_pre20060328-r9.ebuild 7346 RMD160 56b60a6d36b53e049014d1fa MD5 2700c687c24646f50a89e0c3d35cca53 xine-lib-1.1.2_pre20060328-r9.ebuild 7346 RMD160 56b60a6d36b53e049014d1fad88deaec641a9334 xine-lib-1.1.2_pre20060328-r9.ebuild 7346 SHA256 93ac08e72e6720121d6256fee00d55c607e3fbe4c6b51976f0d225c4690c112d xine-lib-1.1.2_pre20060328-r9.ebuild 7346 -EBUILD xine-lib-1.1.2_pre20060606-r1.ebuild 7727 RMD160 564056dc668bce13188fec0c6251b5ff3172dca7 SHA1 942288d0b130fdc0d06f8797440c9da3a4dfa425 SHA256 497620e17a0b5e8ba527c1dca99dfb7d15fc97460c7ae7e3d50c5aff7ab86212 -MD5 651265910ad49f31f03fdc6ad012f592 xine-lib-1.1.2_pre20060606-r1.ebuild 7727 -RMD160 564056dc668bce13188fec0c6251b5ff3172dca7 xine-lib-1.1.2_pre20060606-r1.ebuild 7727 -SHA256 497620e17a0b5e8ba527c1dca99dfb7d15fc97460c7ae7e3d50c5aff7ab86212 xine-lib-1.1.2_pre20060606-r1.ebuild 7727 -MISC ChangeLog 33783 RMD160 5760d0e9825e347305065d81fb703b5feb9f3078 SHA1 865f98cf1e591af3ce2ffcc4ce7468d0cc311965 SHA256 1ee46e1d69d2250057bf919e96d4e2ce2ad20e0fe461eb6495bdfbc7613dd9d9 -MD5 dd8bea102b0a942c6433983a264407c8 ChangeLog 33783 -RMD160 5760d0e9825e347305065d81fb703b5feb9f3078 ChangeLog 33783 -SHA256 1ee46e1d69d2250057bf919e96d4e2ce2ad20e0fe461eb6495bdfbc7613dd9d9 ChangeLog 33783 +EBUILD xine-lib-1.1.2_pre20060606-r2.ebuild 7727 RMD160 64226f67b9681a59f06ceddf5766f4c5f9f69088 SHA1 03bd47ec2f1ed464bca907a023640ed54aa8f34f SHA256 ca2d90dca56359641a7cbc0a62171a270469fac8e630dc56a2a5e37832e3baeb +MD5 eadc7884a0c789ece7c79fe6c54870fe xine-lib-1.1.2_pre20060606-r2.ebuild 7727 +RMD160 64226f67b9681a59f06ceddf5766f4c5f9f69088 xine-lib-1.1.2_pre20060606-r2.ebuild 7727 +SHA256 ca2d90dca56359641a7cbc0a62171a270469fac8e630dc56a2a5e37832e3baeb xine-lib-1.1.2_pre20060606-r2.ebuild 7727 +MISC ChangeLog 34000 RMD160 49f4f64def01fcd23ceaf0f1679508d23d92ed3c SHA1 24a61d7978e145bece0eca77ce13eba0fa40ff32 SHA256 d567fe5f7002c52243c7aeeba1eb51d1fc331ec8b0c3787f20ac29ea27151357 +MD5 18ae9cfadfa7d76a19b57f771a00200b ChangeLog 34000 +RMD160 49f4f64def01fcd23ceaf0f1679508d23d92ed3c ChangeLog 34000 +SHA256 d567fe5f7002c52243c7aeeba1eb51d1fc331ec8b0c3787f20ac29ea27151357 ChangeLog 34000 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330 @@ -41,13 +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 c139bfbee3607b1007519ad1179d591e files/digest-xine-lib-1.1.2_pre20060606-r1 542 -RMD160 83a8a8db88be1283d6ac990ec907921f8f4fb6ca files/digest-xine-lib-1.1.2_pre20060606-r1 542 -SHA256 418216154aedab985f4dbf002d0d76285281b52ef2d645eb68168f714d072403 files/digest-xine-lib-1.1.2_pre20060606-r1 542 +MD5 a668336dea16beb748c6d91b9e068a65 files/digest-xine-lib-1.1.2_pre20060606-r2 542 +RMD160 6e5614d0c5155dde6b396fc6fd6785a72036b2c1 files/digest-xine-lib-1.1.2_pre20060606-r2 542 +SHA256 66188db0305e351184a466f972c4d1de17f5ac30cc68692b637be6796c9bb804 files/digest-xine-lib-1.1.2_pre20060606-r2 542 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEiqv4AiZjviIA2XgRAiM/AJwO6iIhgvEEwPPbxvad6yP+1ANxAQCgyyNz -uJ7FCXXXqWjCQUcwuKOWxpo= -=RED3 +iD8DBQFEkYGJAiZjviIA2XgRAuBpAKDOquufTvedLjdGS1aW9HgVdFwpAQCgx/nJ +9qqob6PE3Vtmnpgvf8EqBbM= +=1qYx -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606-r1 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606-r1 deleted file mode 100644 index 767a8daaef5a..000000000000 --- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606-r1 +++ /dev/null @@ -1,6 +0,0 @@ -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 60b65b52d9e96067d2652c8cdb2c1e2f xine-lib-patches-50.tar.bz2 76043 -RMD160 162b9264e4d13a7671097642d9a46d02032c261b xine-lib-patches-50.tar.bz2 76043 -SHA256 0b3dd8cc7dce7b9970f0b4e73f6f3983c95e691fc209f51190346a2a3de8c7ce xine-lib-patches-50.tar.bz2 76043 diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060606-r1.ebuild deleted file mode 100644 index 7da39602410c..000000000000 --- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606-r1.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# 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-r1.ebuild,v 1.2 2006/06/10 11:24:33 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="50" - -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}" - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - if use nls && [[ -d "${WORKDIR}/patches/poupdate/" ]]; then - ebegin "Updating translation files" - cp "${WORKDIR}/patches/poupdate/"*.po "${S}/po" - find "${S}/po" -name '*.po' -exec basename {} .po \; \ - > "${S}/po/LINGUAS" - eend - fi - - # 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" - - if use nls; then - emake -j1 -C po update-po || die "update-po failed" - fi - - 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 -} - -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 -}