diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-31 15:26:40 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-31 15:26:40 +0000 |
commit | 0602bd6d4abb40c3d1f53f2b1f823580ab46a414 (patch) | |
tree | 155b719603af5c26b7390687494623c1b62deb15 /media-libs | |
parent | Patchset bump to fix the buffer overflow reported in bug #134951. Also disabl... (diff) | |
download | historical-0602bd6d4abb40c3d1f53f2b1f823580ab46a414.tar.gz historical-0602bd6d4abb40c3d1f53f2b1f823580ab46a414.tar.bz2 historical-0602bd6d4abb40c3d1f53f2b1f823580ab46a414.zip |
Patchset bump to fix the buffer overflow reported in bug #134951. Also disable the visibility patch if the compiler does not support -fvisibility=hidden.
Package-Manager: portage-2.1_rc3-r2
Diffstat (limited to 'media-libs')
7 files changed, 15 insertions, 821 deletions
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 113216b72675..89a411a48279 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -5,9 +5,7 @@ DIST xine-lib-1.1.1.tar.gz 7990031 RMD160 5b7ba57c675414e84649701b3f356404ec7c9f DIST xine-lib-1.1.2cvs20060328.tar.gz 7996045 RMD160 4e561e02b7cd9a10797925386ae7416a932c8431 SHA1 88a3bfd552c8ffba9e60ca418126cc51a70555da SHA256 fd95811d123e4a82c815674f3722faf3a769e3ba3760d5a4da8630c83f7c7e38 DIST xine-lib-patches-24.tar.bz2 18687 DIST xine-lib-patches-32.tar.bz2 13224 RMD160 a2d8d23a9fb64f1f2df4f48e111295308154453c SHA1 1141aeee7cbd62a4c4b82ced793347ba49a630f6 SHA256 09c87125d862b2ceab974042b03c99b0b12197a1643551d2ab2390792d40452b -DIST xine-lib-patches-40.tar.bz2 35802 RMD160 b148d91408bb524efb6cb4fa5a25eb709447743a SHA1 00d15fa32046c08d62deb985bb832d34d2ee5fe8 SHA256 21e1c1519a0abed296affd6c8a397c1e1ca601a06f3000e6be59f670fd97b28f -DIST xine-lib-patches-41.tar.bz2 36059 RMD160 e221160312b7f1d74e315b04a7c258a2553f7c8e SHA1 a1c4327bb096a98133550afbe25e6edd36c19aff SHA256 c3cdac7d3d0fe9519da8514e30da78cb6d6e0336750aa649fbfa48827c48e0c3 -DIST xine-lib-patches-42.tar.bz2 36792 RMD160 728fcd22307601a4233a27858e57a76a343271b2 SHA1 b58d04ed040e3302dd835702059459ff89118f0f SHA256 0b6735c4baeefccc06bae3cd5f1b3c710441517ff7cab175c2a18728b3d967bd +DIST xine-lib-patches-43.tar.bz2 36962 RMD160 b53a603b141bfee5121809e19bf4ad618cc50412 SHA1 82a7f58d76c8685df98773c75ec4fe21c890d20b SHA256 0cb9545171e4024a8ce1b6b1e2211b06c51adfe4650b2423862355331dd3650b EBUILD xine-lib-1.1.1-r3.ebuild 7232 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd SHA1 92c83023f1f2cf42accb15ea9a6463ca1eba2f81 SHA256 1a281ed1ce771661ae909ecfe5de3e83e8fe5be6b93ed1ebc07b59227301cc25 MD5 578712f99de216da48aefcc69567dcf1 xine-lib-1.1.1-r3.ebuild 7232 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd xine-lib-1.1.1-r3.ebuild 7232 @@ -16,22 +14,14 @@ EBUILD xine-lib-1.1.2_pre20060328-r1.ebuild 7888 RMD160 678cbc37fc06318f3cbc2194 MD5 e783f276cd50b4e8e91c3b4c94a3e7ec xine-lib-1.1.2_pre20060328-r1.ebuild 7888 RMD160 678cbc37fc06318f3cbc2194c1631ab093d3ff3e xine-lib-1.1.2_pre20060328-r1.ebuild 7888 SHA256 188ac7a6f443d8aae25d6ea673a7ad5df96128b52b25f5afc550e97555efae5a xine-lib-1.1.2_pre20060328-r1.ebuild 7888 -EBUILD xine-lib-1.1.2_pre20060328-r6.ebuild 7465 RMD160 fe157b2941617c936425162077c9cf6d27db4adb SHA1 ee008389857e6a0ad92dce0cdc23ec2942c0ff6d SHA256 b169d0e8bd75d038a23100492103015b9c8818c89dcf14245f3beea10b1835be -MD5 49edef4056c70a4f21d76f34c713d71b xine-lib-1.1.2_pre20060328-r6.ebuild 7465 -RMD160 fe157b2941617c936425162077c9cf6d27db4adb xine-lib-1.1.2_pre20060328-r6.ebuild 7465 -SHA256 b169d0e8bd75d038a23100492103015b9c8818c89dcf14245f3beea10b1835be xine-lib-1.1.2_pre20060328-r6.ebuild 7465 -EBUILD xine-lib-1.1.2_pre20060328-r7.ebuild 7412 RMD160 182216f795c7ef9a84e0448b21034c9fd7ef058c SHA1 83f844e6265bfa081d90caa14ca1e96123f2dd99 SHA256 f982b19d611cdcc4c6de1020a85561fafd68f2eb7e4eec04fa01a9beb6bffe8c -MD5 373efd0013fd5cc0c6677341a720bc47 xine-lib-1.1.2_pre20060328-r7.ebuild 7412 -RMD160 182216f795c7ef9a84e0448b21034c9fd7ef058c xine-lib-1.1.2_pre20060328-r7.ebuild 7412 -SHA256 f982b19d611cdcc4c6de1020a85561fafd68f2eb7e4eec04fa01a9beb6bffe8c xine-lib-1.1.2_pre20060328-r7.ebuild 7412 -EBUILD xine-lib-1.1.2_pre20060328-r8.ebuild 7412 RMD160 4dc469306568e82ffb10f1deb312989b9965da59 SHA1 d6f32feee65a6996ca9ece3c33dcf0d713e31afa SHA256 252fe5efac2997c50d9d6e523cbc0f478ad00604d91accd5575e35cb335c3b29 -MD5 99d5686d4a588d3566807c4883ff6739 xine-lib-1.1.2_pre20060328-r8.ebuild 7412 -RMD160 4dc469306568e82ffb10f1deb312989b9965da59 xine-lib-1.1.2_pre20060328-r8.ebuild 7412 -SHA256 252fe5efac2997c50d9d6e523cbc0f478ad00604d91accd5575e35cb335c3b29 xine-lib-1.1.2_pre20060328-r8.ebuild 7412 -MISC ChangeLog 30114 RMD160 cb40bdafc9a64e378e22925b0fc481dd4c555d83 SHA1 d6db71db27cd8c049e93124d8bcbe781affd11c1 SHA256 fd6f4be744c33476c688646261512592cf6e8c6d4a78ca35fe92714a10f4bdeb -MD5 031285932ab8df494623d735a4ff81c2 ChangeLog 30114 -RMD160 cb40bdafc9a64e378e22925b0fc481dd4c555d83 ChangeLog 30114 -SHA256 fd6f4be744c33476c688646261512592cf6e8c6d4a78ca35fe92714a10f4bdeb ChangeLog 30114 +EBUILD xine-lib-1.1.2_pre20060328-r9.ebuild 7511 RMD160 7acbfc3c4e10bb8d18f3dfa8cdb37fd2cb25511e SHA1 6bf05fa8abd45b43f6a033423ee44f85f0fd604d SHA256 784c1e7c4833a788ee78f8086bd0bcefc44eb963eda749afc23e369d966c36f3 +MD5 5f884bd5f8377a3e185b5235bc897487 xine-lib-1.1.2_pre20060328-r9.ebuild 7511 +RMD160 7acbfc3c4e10bb8d18f3dfa8cdb37fd2cb25511e xine-lib-1.1.2_pre20060328-r9.ebuild 7511 +SHA256 784c1e7c4833a788ee78f8086bd0bcefc44eb963eda749afc23e369d966c36f3 xine-lib-1.1.2_pre20060328-r9.ebuild 7511 +MISC ChangeLog 30538 RMD160 bcd5109eb73917e70990ae00f228b73174fd2065 SHA1 facdbdf1f2253ae54550cc4820b9a730e4e678cd SHA256 3b274eff1986984afe803512094cb3b3f397c7f5a6ab051d8a900471179cadcb +MD5 2178f53a8cea420b53b4bf491a2b950e ChangeLog 30538 +RMD160 bcd5109eb73917e70990ae00f228b73174fd2065 ChangeLog 30538 +SHA256 3b274eff1986984afe803512094cb3b3f397c7f5a6ab051d8a900471179cadcb ChangeLog 30538 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330 @@ -42,19 +32,13 @@ SHA256 7f34a2c62e490267ace928ac8d8fea0cadd2a180b9f57ccba00ac30ba1ca6b2a files/di MD5 550f8063d46fecf33e569bf54acf1997 files/digest-xine-lib-1.1.2_pre20060328-r1 539 RMD160 66d2c38830cd4b02db2d856d10826959319b480d files/digest-xine-lib-1.1.2_pre20060328-r1 539 SHA256 78728c79fc77cab9a6f7c21f7a2eed2214a3621b408500fdd31a47535e33f65a files/digest-xine-lib-1.1.2_pre20060328-r1 539 -MD5 7eaa13462b605e609be5fb2da5a1a38b files/digest-xine-lib-1.1.2_pre20060328-r6 539 -RMD160 ff75b2a46f86861cc3884d06354ebbe405342176 files/digest-xine-lib-1.1.2_pre20060328-r6 539 -SHA256 6747736ea10115bfe18e538b41dbce7e7ba905ca07bbc14ac6b05ebc8ba40229 files/digest-xine-lib-1.1.2_pre20060328-r6 539 -MD5 92c2955da0ccc654badb68480ca6d986 files/digest-xine-lib-1.1.2_pre20060328-r7 539 -RMD160 e074db8eea7b4a6cc69949fbab4df3e36c1dc207 files/digest-xine-lib-1.1.2_pre20060328-r7 539 -SHA256 0986c93ab210ff31c9fc4719653b8ac05b0b7dc118d80895bff34246de5cf959 files/digest-xine-lib-1.1.2_pre20060328-r7 539 -MD5 7094b71fc1ce0afe07ba160ecab566ee files/digest-xine-lib-1.1.2_pre20060328-r8 539 -RMD160 951de4633ddee8cd688b41efdab227fad59637b0 files/digest-xine-lib-1.1.2_pre20060328-r8 539 -SHA256 0bd6c7ea14909994cd7f3256702ac0011427a37002a62e8929ef46b781f3bb75 files/digest-xine-lib-1.1.2_pre20060328-r8 539 +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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEeiAQAiZjviIA2XgRAiRqAJ9ag7sYUV+b42CTcy3EJpc5Ln9xHgCgqBX7 -cHLzWYEWzJVvi88Wqmc14y0= -=S9AG +iD8DBQFEfbWrAiZjviIA2XgRApJqAJ9tUrKi7nMX7O4rVKpdFaSzhFmIUACaAiJe +78Pz8KWBBk1JlOSl0uJV0wY= +=lBBc -----END PGP SIGNATURE----- diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r6 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r6 deleted file mode 100644 index 3382f9eb8cbb..000000000000 --- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r6 +++ /dev/null @@ -1,6 +0,0 @@ -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 b1a76a1513dbab5eee3c8d8640f647d7 xine-lib-patches-40.tar.bz2 35802 -RMD160 b148d91408bb524efb6cb4fa5a25eb709447743a xine-lib-patches-40.tar.bz2 35802 -SHA256 21e1c1519a0abed296affd6c8a397c1e1ca601a06f3000e6be59f670fd97b28f xine-lib-patches-40.tar.bz2 35802 diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r7 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r7 deleted file mode 100644 index 5dae2a175993..000000000000 --- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r7 +++ /dev/null @@ -1,6 +0,0 @@ -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 9824effb49493a0d8c2d71d32fe93c08 xine-lib-patches-41.tar.bz2 36059 -RMD160 e221160312b7f1d74e315b04a7c258a2553f7c8e xine-lib-patches-41.tar.bz2 36059 -SHA256 c3cdac7d3d0fe9519da8514e30da78cb6d6e0336750aa649fbfa48827c48e0c3 xine-lib-patches-41.tar.bz2 36059 diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r8 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r8 deleted file mode 100644 index e33bb12093a5..000000000000 --- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060328-r8 +++ /dev/null @@ -1,6 +0,0 @@ -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 3792f047402d47fa9e314e09f3d1bec6 xine-lib-patches-42.tar.bz2 36792 -RMD160 728fcd22307601a4233a27858e57a76a343271b2 xine-lib-patches-42.tar.bz2 36792 -SHA256 0b6735c4baeefccc06bae3cd5f1b3c710441517ff7cab175c2a18728b3d967bd xine-lib-patches-42.tar.bz2 36792 diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r6.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r6.ebuild deleted file mode 100644 index 65b0a12fa5d4..000000000000 --- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r6.ebuild +++ /dev/null @@ -1,258 +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_pre20060328-r6.ebuild,v 1.2 2006/05/14 00:54:05 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="40" - -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" - -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_EXCLUDE="patches/240_all_faad-interposing.patch" \ - 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 - 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" - - 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 -} diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r7.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r7.ebuild deleted file mode 100644 index 763da3176ae1..000000000000 --- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r7.ebuild +++ /dev/null @@ -1,257 +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_pre20060328-r7.ebuild,v 1.3 2006/05/26 16:30:43 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="41" - -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 - - # 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" - - emake || 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 -} diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r8.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r8.ebuild deleted file mode 100644 index 323d50108001..000000000000 --- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r8.ebuild +++ /dev/null @@ -1,257 +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_pre20060328-r8.ebuild,v 1.1 2006/05/28 22:11:14 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="42" - -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 - - # 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" - - emake || 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 -} |