Version bump.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 01ca71afe885b6d40a72fd2f40331cec279b3fc2..360f09080710a99407109e54e34cb17341dffde8 100644 (file)
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.647 2011/10/30 15:57:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.648 2011/11/16 20:10:42 ssuominen Exp $
+
+*xine-lib-1.1.20 (16 Nov 2011)
+
+  16 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> +xine-lib-1.1.20.ebuild:
+  Version bump.
 
   30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.9999.ebuild:
   Rename obsolete USE="v4l2" to USE="v4l" wrt #385241

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 630f555e2c7057adedb880a1f65ff5eea64fd85a..5f17185d4f62305b8539c3c3489a73be5b308b45 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,18 +5,20 @@ AUX xine-lib-1.1.19-ffmpeg.patch 12127 RMD160 2b70139da2f4832e3577a667c352257dcd
 AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cca8 SHA1 f78834833e3aeb05f555688ab657ae05cd0691c7 SHA256 6be3ceb8edd7626e93c617de3068374dd638e1445c7308d88b24614e9bbceaf0
 DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
 DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
+DIST xine-lib-1.1.20.tar.xz 5957256 RMD160 039a7d0ee4e65ce20755d4abbfbf9af6e17a37c5 SHA1 1dbd48e14113739101429391d45f65ebbf6519fc SHA256 da65da5831f5b93f02b4ec10049eaf044cf99944e2fd8e12d494dccefee124eb
 EBUILD xine-lib-1.1.19.ebuild 5675 RMD160 b34cf5a8030843ba98e7a90200e4c5e1518153e5 SHA1 d3ef71cc7ef26832f3bbe29d52416f0b22e047b6 SHA256 91daef9cfd2cd146646816e3f15eb5949ea4f8e7a5e05d639e5e621c4795c2da
+EBUILD xine-lib-1.1.20.ebuild 5358 RMD160 89ef2795565e5d05a28652023675adbbd8befe30 SHA1 a312da1b82392363c3b911ca9587b80cbdcfc028 SHA256 3e8dd42124b929076ac9905864720a5d87b20b40c12eeda3e1954405c6a33c21
 EBUILD xine-lib-1.2.9999.ebuild 5941 RMD160 16a31f4a9853ff43e7a1177b9bada7f7e7e013a3 SHA1 3109b570d0ac0b31618125a53eb4112ebc63ccbc SHA256 f1fae26390892cff0c555046df0c50f14257a23bc81b86f2041b021d672c7c93
-MISC ChangeLog 75298 RMD160 c6da40b45660b93a7f9dc918ae2d5c2483b9ce4e SHA1 a94a168da098a1dd53eb49e1ee12aa794bc81c3e SHA256 832e1cf74c7dfa02caf6812096f298f59912f97ab807d295dc9655923f3a5481
+MISC ChangeLog 75426 RMD160 ac409fb1e92790c521329400e6c1a81740d691ab SHA1 bb7125d57ccdeef5a14fd9a8ecb4fbbb87a02408 SHA256 a7e2321daa9b612830f2a56eaf02da64251468792b506e516b028614ecfbb4b6
 MISC metadata.xml 3698 RMD160 91204976d6b0b42d4ab62970cdd8e5218a3f1bd2 SHA1 762a24b480d6eec707bc3ad88321163e3b3c1155 SHA256 2f7c7abc6568e1c624f57923e63412e67d97918d051ac82b83357db40a0c24e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOrXQBAAoJEEdUh39IaPFNxncH/Aj0vWSpltSfGD0NbX9BNo+t
-brrhydTpYG+m58N2y44XgwEoL/9FbROrJIoGAcgBpY73wCuRJ96ps6o5pxJdVz/l
-bzGi52Io06Blq/pMoDYLYOPxibKKaNYUZzmiYiHkbNKdFC87JrQHaJcFTxP6VwhN
-2cKMBZLxakWt9bl/Fut5hkhJ5cK7IgORn1YeegmMoKA9UEZYMMz2rZi6MhUXbhMx
-kDcC/WjJbRX5wadNmCL55R+qLKhzZ3tMxSz14n93kxlLK31Q5yITSLoJxhZ2JE+q
-dKuOASEUIY3I9E3T4lav2udY95orEK/Oqv+tHDidKLlSowXRvZpP24ZHQq2HAQo=
-=baYm
+iQEcBAEBAgAGBQJOxBhtAAoJEEdUh39IaPFN0SIH/1W0EqGXbgcIauulhA1C5AnO
+zmztdcrBcZ/IgZOUWnrNr4NhRJmJkeBY77nuCsoJJmBO2w3zUDPjVJI4hPRejX/e
+fR4kZYwllZy5J8boIGKcJEpztYsiFTiS0+H603eqF6VsHNrhdxl64efwHOLQacXV
+9I0FIdxPSTeUUqaQHtZrqZWscRR4ax8HlH7QWWh7iBJU3flHvyq7EUViKoq0rxEV
+7SyhHq/gONbinrc9GMxnFJOMxvibDyLIQMINiKWekIDZ0J09EDL0fPAyLgKqNMWH
+fDx2YMGwOzoGR+zLg/fLqTVhcon67SPoyplLXNNO5NQ47jZxAUkncPLV4UGJGlk=
+=7z4R
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/xine-lib-1.1.20.ebuild b/media-libs/xine-lib/xine-lib-1.1.20.ebuild
new file mode 100644 (file)
index 0000000..5ff1b35
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.20.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 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.20.ebuild,v 1.1 2011/11/16 20:10:42 ssuominen Exp $
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs multilib
+
+# This should normally be empty string, unless a release has a suffix.
+if [[ "${P/_pre/}" != "${P}" ]]; then
+       SRC_URI="mirror://gentoo/${P}.tar.xz"
+else
+       MY_PKG_SUFFIX=""
+       MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
+       S="${WORKDIR}/${MY_P}"
+
+       SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="aalib libcaca win32codecs nls +css +X directfb +vorbis +alsa sdl speex +theora ipv6 altivec opengl aac fbcon +xv xvmc samba dxr3 vidix mng flac oss +v4l xinerama vcd +a52 +mad imagemagick +dts +modplug gtk pulseaudio mmap truetype wavpack +musepack +xcb jack real +vis"
+
+RDEPEND="X? ( x11-libs/libXext
+       x11-libs/libX11 )
+       xv? ( x11-libs/libXv )
+       xvmc? ( x11-libs/libXvMC )
+       xinerama? ( x11-libs/libXinerama )
+       win32codecs? ( >=media-libs/win32codecs-0.50 )
+       css? ( >=media-libs/libdvdcss-1.2.7 )
+       alsa? ( media-libs/alsa-lib )
+       aalib? ( media-libs/aalib )
+       directfb? ( >=dev-libs/DirectFB-0.9.9 )
+       flac? ( >=media-libs/flac-1.1.2 )
+       sdl? ( >=media-libs/libsdl-1.1.5 )
+       dxr3? ( >=media-libs/libfame-0.9.0 )
+       vorbis? ( media-libs/libogg media-libs/libvorbis )
+       theora? ( media-libs/libogg media-libs/libvorbis >=media-libs/libtheora-1.0_alpha6 )
+       speex? ( media-libs/libogg media-libs/libvorbis media-libs/speex )
+       libcaca? ( >=media-libs/libcaca-0.99_beta14 )
+       samba? ( net-fs/samba )
+       mng? ( media-libs/libmng )
+       vcd? ( media-video/vcdimager
+               dev-libs/libcdio[-minimal] )
+       a52? ( >=media-libs/a52dec-0.7.4-r5 )
+       mad? ( media-libs/libmad )
+       imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+       dts? ( media-libs/libdca )
+       aac? ( >=media-libs/faad2-2.6.1 )
+       virtual/ffmpeg
+       modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+       nls? ( virtual/libintl )
+       gtk? ( x11-libs/gtk+:2 )
+       pulseaudio? ( media-sound/pulseaudio )
+       truetype? ( media-libs/freetype:2 media-libs/fontconfig )
+       virtual/libiconv
+       wavpack? ( >=media-sound/wavpack-4.31 )
+       musepack? ( >=media-sound/musepack-tools-444 )
+       xcb? ( >=x11-libs/libxcb-1.0 )
+       jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+       real? (
+               x86? ( media-libs/win32codecs )
+               x86-fbsd? ( media-libs/win32codecs )
+               amd64? ( media-libs/amd64codecs ) )
+       v4l? ( media-libs/libv4l )"
+DEPEND="${RDEPEND}
+       app-arch/xz-utils
+       X? ( x11-libs/libXt
+                x11-proto/xproto
+                x11-proto/videoproto
+                x11-proto/xf86vidmodeproto
+                xinerama? ( x11-proto/xineramaproto ) )
+       v4l? ( virtual/os-headers )
+       dev-util/pkgconfig
+       sys-devel/libtool
+       nls? ( sys-devel/gettext )"
+
+src_configure() {
+       #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
+               filter-flags -fno-omit-frame-pointer #breaks per bug #149704
+               is-flag -O? || append-flags -O2
+       fi
+
+       # Set the correct win32 dll path, bug #197236
+       local win32dir
+       if has_multilib_profile ; then
+               win32dir=/usr/$(ABI="x86" get_libdir)/win32
+       else
+               win32dir=/usr/$(get_libdir)/win32
+       fi
+
+       # Too many file names are the same (xine_decoder.c), change the builddir
+       # So that the relative path is used to identify them.
+       mkdir "${WORKDIR}"/build
+
+       ECONF_SOURCE=${S} econf \
+               --disable-gnomevfs \
+               $(use_enable nls) \
+               $(use_enable ipv6) \
+               $(use_enable samba) \
+               $(use_enable altivec) \
+               $(use_enable v4l) \
+               $(use_enable v4l libv4l) \
+               $(use_enable mng) \
+               $(use_with imagemagick) \
+               $(use_enable gtk gdkpixbuf) \
+               $(use_enable aac faad) --with-external-libfaad \
+               $(use_with flac libflac) \
+               $(use_with vorbis) \
+               $(use_with speex) \
+               $(use_with theora) \
+               $(use_with wavpack) \
+               $(use_enable modplug) \
+               $(use_enable a52 a52dec) --with-external-a52dec \
+               $(use_enable mad) --with-external-libmad \
+               $(use_enable dts) --with-external-libdts \
+               $(use_enable musepack) --with-external-libmpcdec \
+               $(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_with libcaca caca) \
+               $(use_with sdl) \
+               $(use_enable xvmc) \
+               $(use_with xcb) \
+               $(use_enable oss) \
+               $(use_with alsa) \
+               --without-arts \
+               --without-esound \
+               $(use_with pulseaudio) \
+               $(use_with jack) \
+               $(use_enable vcd) --without-internal-vcdlibs \
+               $(use_enable win32codecs w32dll) \
+               $(use_enable real real-codecs) \
+               $(use_enable mmap) \
+               $(use_with truetype freetype) $(use_with truetype fontconfig) \
+               $(use_enable vis) \
+               --enable-asf \
+               --with-external-ffmpeg \
+               --disable-optimizations \
+               --disable-syncfb \
+               --with-xv-path=/usr/$(get_libdir) \
+               --with-w32-path=${win32dir} \
+               --with-real-codecs-path=/usr/$(get_libdir)/codecs \
+               --enable-fast-install
+}
+
+src_install() {
+       emake \
+               DESTDIR="${D}" \
+               docdir="/usr/share/doc/${PF}" \
+               htmldir="/usr/share/doc/${PF}/html" \
+               install
+
+       dodoc ChangeLog
+
+       rm -f "${D}"usr/lib*/libxine.la
+}