diff options
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch | 20 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch | 23 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.1.11.1.ebuild | 193 |
4 files changed, 244 insertions, 1 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 1c5ff3175cc7..2a42becfedda 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.529 2008/04/07 17:58:06 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.530 2008/04/07 19:42:39 aballier Exp $ + +*xine-lib-1.1.11.1 (07 Apr 2008) + + 07 Apr 2008; Alexis Ballier <aballier@gentoo.org> + +files/xine-lib-1.1.11.1-mkv.patch, +files/xine-lib-1.1.11.1-qtniso.patch, + +xine-lib-1.1.11.1.ebuild: + version bump 07 Apr 2008; Alexis Ballier <aballier@gentoo.org> -files/xine-lib-1.1.10.1-off-by-one.patch, -xine-lib-1.1.10.ebuild, diff --git a/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch b/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch new file mode 100644 index 000000000000..18a4fdbf35a8 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch @@ -0,0 +1,20 @@ +# HG changeset patch +# User Darren Salt <linux@youmustbejoking.demon.co.uk> +# Date 1207353205 -3600 +# Node ID ff20b8db74eabc74b7b95da4c1b44fc5d7f2ec8c +# Parent 05ebc886fd30158b59a26e03cf2f6f3a52114b24 +Fix a regression in the Matroska demuxer. +One '&'... + +diff -r 05ebc886fd30 -r ff20b8db74ea src/demuxers/ebml.c +--- a/src/demuxers/ebml.c Fri Apr 04 18:35:33 2008 +0100 ++++ b/src/demuxers/ebml.c Sat Apr 05 00:53:25 2008 +0100 +@@ -327,7 +327,7 @@ + if (text) + { + text[elem->len] = '\0'; +- if (ebml_read_ascii (ebml, &elem, text)) ++ if (ebml_read_ascii (ebml, elem, text)) + return text; + free (text); + } diff --git a/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch b/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch new file mode 100644 index 000000000000..54a9c6774541 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch @@ -0,0 +1,23 @@ + +# HG changeset patch +# User Darren Salt <linux@youmustbejoking.demon.co.uk> +# Date 1206976103 -3600 +# Node ID d8e1305c13820b82d896f7bc77d196b9c9645dd6 +# Parent 2cc583bdc498fd6c95b8a21c10e81a0cef4d63c6 +Revert a change which broke Quicktime atom parsing. + +--- a/src/demuxers/demux_qt.c Sun Mar 30 19:48:58 2008 +0100 ++++ b/src/demuxers/demux_qt.c Mon Mar 31 16:08:23 2008 +0100 +@@ -895,11 +895,6 @@ static qt_error parse_trak_atom (qt_trak + for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) { + current_atom_size = _X_BE_32(&trak_atom[i - 4]); + current_atom = _X_BE_32(&trak_atom[i]); +- +- if (current_atom_size > trak_atom_size - i) { +- last_error = QT_NOT_A_VALID_FILE; +- goto free_trak; +- } + + if (current_atom == TKHD_ATOM) { + trak->flags = _X_BE_16(&trak_atom[i + 6]); + diff --git a/media-libs/xine-lib/xine-lib-1.1.11.1.ebuild b/media-libs/xine-lib/xine-lib-1.1.11.1.ebuild new file mode 100644 index 000000000000..aaa38a334386 --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.1.11.1.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.11.1.ebuild,v 1.1 2008/04/07 19:42:39 aballier Exp $ + +EAPI=1 + +inherit eutils flag-o-matic toolchain-funcs libtool + +# 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" + +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 ) + >=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}-qtniso.patch" + epatch "${FILESDIR}/${P}-mkv.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 + + 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 + + # 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) \ + $(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) \ + --enable-asf \ + --with-external-ffmpeg \ + --disable-optimizations \ + --disable-syncfb \ + ${myconf} \ + --with-xv-path=/usr/$(get_libdir) \ + --with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \ + --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 +} |