summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-08-22 14:35:22 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-08-22 14:35:22 +0000
commitc41439590aa61ee4bb835755b0206f4f2ceaed54 (patch)
treec69e6357fb9577020ca5757cc0692463d9b20f76 /media-libs/xine-lib
parentVersion bump (diff)
downloadhistorical-c41439590aa61ee4bb835755b0206f4f2ceaed54.tar.gz
historical-c41439590aa61ee4bb835755b0206f4f2ceaed54.tar.bz2
historical-c41439590aa61ee4bb835755b0206f4f2ceaed54.zip
Import a fix from upstream to fix build of some kde applications, bug #234926.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r--media-libs/xine-lib/ChangeLog9
-rw-r--r--media-libs/xine-lib/Manifest14
-rw-r--r--media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch13
-rw-r--r--media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild193
4 files changed, 227 insertions, 2 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index ffbd52455f83..0a4cd6ef559b 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/xine-lib
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.563 2008/08/19 21:08:02 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.564 2008/08/22 14:35:21 aballier Exp $
+
+*xine-lib-1.1.15-r1 (22 Aug 2008)
+
+ 22 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+ +files/xine-lib-1.1.15-buffer_h_ansi.patch, +xine-lib-1.1.15-r1.ebuild:
+ Import a fix from upstream to fix build of some kde applications, bug
+ #234926.
19 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
xine-lib-1.1.15.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index dab141768ff6..a1fce30b4f51 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX xine-lib-1.1.14-metadata-bugfix.patch 580 RMD160 540a5fef4f449c4510368ae2c1379bf619dccbad SHA1 0a9ded68eac8773ae3b008d733ae93d60996363f SHA256 d8dbb93a6f4d4cc99896fd0c945189b897928c999efb5efa6d7ba0ad7e6f708a
+AUX xine-lib-1.1.15-buffer_h_ansi.patch 556 RMD160 d6607e3319a1fe0d6f88a40dd775d3064ce8fb5e SHA1 f96f76c22267d3a814caf6db080f81df5070bd5d SHA256 d5aa882549203e56f9f15225e051f2aabc06302396f07aa2a2306cba62451d9b
AUX xine-lib-1.1.15-libmpeg2-vis.patch 405 RMD160 896298250884a9e3a1b168fe7140835a7112bc53 SHA1 3a3212a629c630e52327f25b3df3c5ecef5b5bbb SHA256 90af2c9a50db6dc358df59c9ab3e4aaed4bc8a8686f2b512e1dffa97b64825fe
AUX xine-lib-1.1.8-dxr3.patch 543 RMD160 4fc1c9ae238c416f097e85b47a8ba4e04fb1c14f SHA1 d5d1ad4ad4a88dda30207d67f3e5e2b6b174fabd SHA256 d6cd3a848de564ccaa82f92e32983ce3a444db357c56b9312be226eac7a81aff
DIST xine-lib-1.1.13.tar.bz2 7444294 RMD160 a2ffcb43890ec525115e62f796dec6e835ceb4d5 SHA1 d1f4cf0511067a554dbe243468311ebeb3bbdce4 SHA256 ad8c5ba0715c023676a8bff9355865949a63a8505e356e6f21fbff099968991a
@@ -7,7 +11,15 @@ DIST xine-lib-1.1.15.tar.bz2 7478750 RMD160 5c64dd51c05a6e17cb6dfcbb8a9009ba8571
DIST xine-lib-1.1.8.tar.bz2 7284933 RMD160 b926caa13d5b3f3c74eee681aa6c47c6083c1349 SHA1 48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf SHA256 6c9f11bdec714f8df36b5140a7c8cc6ec81dd8a7673f4756e940cee4f4833c0e
EBUILD xine-lib-1.1.13.ebuild 5580 RMD160 51ae99e239c308482d9f68e233f42d40189e0fa0 SHA1 9fdceca9596ac5631bb8721b5ec384e6d2b4d94a SHA256 e1e3afa8060266ae151defd3fcc5cc3b23ad0ebb7011a09ba5ed2ba70281d596
EBUILD xine-lib-1.1.14-r1.ebuild 5678 RMD160 7d7baf747b56bcd6c472751a91f532016c95768a SHA1 74f0e97f181aeb3f0a899167dbf1f487de3f1886 SHA256 aca6c8a415b2f6dc28a17ab26b891ccbd5c0b849d6c3483a9513f1cca84f62a4
+EBUILD xine-lib-1.1.15-r1.ebuild 5668 RMD160 3ce4979f5fb87cd0c5e4024bfe8dee9279da6cf1 SHA1 e1ec66b6239c081821aa9f43db6fa19b4a1d00b4 SHA256 87968968355b81667cff6f2ffc734d7d54b6baad7de8bffca48605d0d3ad4ded
EBUILD xine-lib-1.1.15.ebuild 5615 RMD160 ae02ccc64e718c1b8c8a3e73b64a8e6fd8c086dd SHA1 057a25aa2fb39dc68245f717015bb9d6efebf2be SHA256 076dfd13ed380dca5a32201f9ef2fcd6fd324940d03905fb452577862ddfbb13
EBUILD xine-lib-1.1.8.ebuild 5632 RMD160 81524b906917dda749ffdfdf9c0247169671a4d0 SHA1 7887cca7aaca9bb011a218e824082c26f00e9c0e SHA256 383ddc76254be422550559fe8b5495ba9768e188e1bddcba55806edf0756989e
-MISC ChangeLog 63765 RMD160 667fdb7ad0e2fb9846415eb31638474b8be690a2 SHA1 8146c5d1a2338568408e9d23543766891fa1ea19 SHA256 9f0639f3e78363f2a9e8a53a6a3151ff21ef6fd9e55f9f708b75da5d71429d50
+MISC ChangeLog 64008 RMD160 ea57a88d558153c9c06872cc6e2a11873978610c SHA1 8eb1749eed1c2bd2b1debc30e5f23dcf1ed6729a SHA256 2a00e4a28b6f43fc04b16e3bd407c3a92ed36be119847c62d9a28b1682a454d2
MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiuzrAACgkQvFcC4BYPU0r26gCcDWq+dix5WVqhjqmOrHDcI8dv
+yvcAoLfeGe53zfWwN1V0buWxo7RuMNCD
+=cZ7u
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch
new file mode 100644
index 000000000000..e3e411f363e3
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch
@@ -0,0 +1,13 @@
+Index: xine-lib-1.1.15/src/xine-engine/buffer.h
+===================================================================
+--- xine-lib-1.1.15.orig/src/xine-engine/buffer.h
++++ xine-lib-1.1.15/src/xine-engine/buffer.h
+@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader
+ /* convert xine_waveformatex struct from little endian */
+ void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
+
+-static inline _x_is_fourcc(void *ptr, void *tag) {
++static __inline int _x_is_fourcc(void *ptr, void *tag) {
+ return memcmp(ptr, tag, 4) == 0;
+ }
+
diff --git a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
new file mode 100644
index 000000000000..ceeb3f058d0e
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2008 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.15-r1.ebuild,v 1.1 2008/08/22 14:35:21 aballier Exp $
+
+EAPI=1
+
+inherit eutils flag-o-matic toolchain-funcs libtool multilib
+
+# This should normally be empty string, unless a release has a suffix.
+if [[ "${P/_pre/}" != "${P}" ]]; then
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else
+ MY_PKG_SUFFIX=""
+ MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
+ S="${WORKDIR}/${MY_P}"
+
+ SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
+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 -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
+-debug +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 )
+ 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.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_beta1 )
+ 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/libdca )
+ aac? ( >=media-libs/faad2-2.6.1 )
+ >=media-video/ffmpeg-0.4.9_p20070129
+ modplug? ( media-libs/libmodplug )
+ 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-libs/libmpcdec )
+ 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 ) )"
+
+DEPEND="${RDEPEND}
+ 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_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "$FILESDIR"/${P}-libmpeg2-vis.patch
+ epatch "$FILESDIR"/${P}-buffer_h_ansi.patch
+}
+
+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
+ 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"
+
+ elibtoolize
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable gnome gnomevfs) \
+ $(use_enable nls) \
+ $(use_enable ipv6) \
+ $(use_enable samba) \
+ $(use_enable altivec) \
+ $(use_enable v4l) \
+ \
+ $(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) \
+ $(use_with arts) \
+ $(use_with esd 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 debug) \
+ $(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 \
+ --disable-dependency-tracking || die "econf failed."
+
+ emake || die "emake failed."
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ docdir="/usr/share/doc/${PF}" htmldir="/usr/share/doc/${PF}/html" \
+ install || die "emake install failed."
+
+ dodoc ChangeLog
+}