From: Diego Elio Pettenò Date: Sat, 17 Jun 2006 15:27:26 +0000 (+0000) Subject: Add revbump to fix strict-aliasing rules. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03995338a6e7bc7d8dafbed36ab39b6b36af2f51;p=gentoo.git Add revbump to fix strict-aliasing rules. Package-Manager: portage-2.1.1_pre1 --- diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 902bc79ebb5e..e6533a1b229e 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -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.368 2006/06/15 15:49:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.369 2006/06/17 15:27:26 flameeyes Exp $ + +*xine-lib-1.1.2_pre20060606-r3 (17 Jun 2006) + + 17 Jun 2006; Diego Pettenò + +xine-lib-1.1.2_pre20060606-r3.ebuild: + Add revbump to fix strict-aliasing rules. *xine-lib-1.1.2_pre20060606-r2 (15 Jun 2006) diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 26c3146bd6b0..bfee83ad157c 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -8,6 +8,7 @@ DIST xine-lib-patches-24.tar.bz2 18687 RMD160 68bf0ae79ba27e30f7b719862fd378b187 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-51.tar.bz2 76202 RMD160 fb04f34c7549c25d0d9fa8deab0e66fb5976c28f SHA1 c643fb24091b295790d4d605b0eb9f03350ca102 SHA256 7f2d01f97a0f8bdaa52a59012343e4f3215167da06bf95ee4702831efeda3e4f +DIST xine-lib-patches-52.tar.bz2 78594 RMD160 057925780aa5651f9e819dde7764e9033b4e7e81 SHA1 a050f299dae71b4d0a94b4d2e9a9e0e65bbeb327 SHA256 f2fb9dc2b126e46d8aee5f54ceafccf35aef261a70e264d77f4172c59510e949 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 @@ -24,10 +25,14 @@ EBUILD xine-lib-1.1.2_pre20060606-r2.ebuild 7727 RMD160 64226f67b9681a59f06ceddf 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 +EBUILD xine-lib-1.1.2_pre20060606-r3.ebuild 7727 RMD160 91b0c84c009fceb0aaac6f94c2f55091d373a1a5 SHA1 8c6ce118e86c0e045750ff742ed014e43c18f0a1 SHA256 8a1dc5dd73e3504cf44f3c583b5bfaad2fc9efc918cb8f229f5da5459416a41a +MD5 976b3c0f70a314d06c5c8b01bdb56cd9 xine-lib-1.1.2_pre20060606-r3.ebuild 7727 +RMD160 91b0c84c009fceb0aaac6f94c2f55091d373a1a5 xine-lib-1.1.2_pre20060606-r3.ebuild 7727 +SHA256 8a1dc5dd73e3504cf44f3c583b5bfaad2fc9efc918cb8f229f5da5459416a41a xine-lib-1.1.2_pre20060606-r3.ebuild 7727 +MISC ChangeLog 34185 RMD160 eab23c2206c98db8d93325a3526dbd88cdb31878 SHA1 6f8f93091a2325fe118f8ef4c927163d90bbf4cd SHA256 97cb8c30acbafa65e822026e87079310e206f96982591fe120f830ab5aab6603 +MD5 812913e063b457d606300a0110066457 ChangeLog 34185 +RMD160 eab23c2206c98db8d93325a3526dbd88cdb31878 ChangeLog 34185 +SHA256 97cb8c30acbafa65e822026e87079310e206f96982591fe120f830ab5aab6603 ChangeLog 34185 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330 @@ -44,10 +49,13 @@ SHA256 fa56204f68229db6ab2e26b3c62f9951eea925a8299c363112cdcd4059a6b003 files/di 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 +MD5 b4a38fc26ea475d416e2e87996e79a83 files/digest-xine-lib-1.1.2_pre20060606-r3 542 +RMD160 35d3f48f3ed0436c7712d0d1fb8133210464b7fb files/digest-xine-lib-1.1.2_pre20060606-r3 542 +SHA256 ebafba3d5657ac4de94ea64b3660f70389dc91bb13aa5c628c0ea5311a9769ba files/digest-xine-lib-1.1.2_pre20060606-r3 542 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEkYGJAiZjviIA2XgRAuBpAKDOquufTvedLjdGS1aW9HgVdFwpAQCgx/nJ -9qqob6PE3Vtmnpgvf8EqBbM= -=1qYx +iD8DBQFElB9mAiZjviIA2XgRApQxAJ9G/OUc+Bj+2XboCPC4Yp/J2F5eZwCg8W5g +ifE17Y3Wg63o2O5QzSPh+F4= +=qbuQ -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606-r3 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606-r3 new file mode 100644 index 000000000000..2410a34062d3 --- /dev/null +++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606-r3 @@ -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 7cb8011b3ddb69faef2f1f1a85b0d766 xine-lib-patches-52.tar.bz2 78594 +RMD160 057925780aa5651f9e819dde7764e9033b4e7e81 xine-lib-patches-52.tar.bz2 78594 +SHA256 f2fb9dc2b126e46d8aee5f54ceafccf35aef261a70e264d77f4172c59510e949 xine-lib-patches-52.tar.bz2 78594 diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606-r3.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060606-r3.ebuild new file mode 100644 index 000000000000..9ae9a83bf917 --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060606-r3.ebuild @@ -0,0 +1,269 @@ +# 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-r3.ebuild,v 1.1 2006/06/17 15:27:26 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="52" + +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 +}