We have moved to Git. This repository is only provided for compatibility with old installations. Learn how to migrate your installation here.

changeset 28:26528c819f30

merged heads
author gsnerf <gsnerf@gsnerf.de>
date Thu, 11 Oct 2012 17:18:39 +0200
parents c2d6bf39f6d8 (current diff) abab9b79caf9 (diff)
children 7cd0e52691e0
files
diffstat 5 files changed, 250 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/xine-lib/Manifest	Thu Oct 11 17:18:39 2012 +0200
@@ -0,0 +1,4 @@
+AUX xine-lib-1.1.20-stat.patch 607 SHA256 cfeb7d18ed8893644cc4aa717adcd163c328df2e86e7e66060e2d71823ee9ae5 SHA512 65d159c47b5707125cf47c8d1525ab1177e93c33035ad511bc5a2d955095f5cc94b959589f44525379d72f053d3dc2b8899a0015551fd29e02d42a5fe1435470 WHIRLPOOL d873553d6e8bfa1b913b578a1fe9c9a33b337aec16d6591d069dfca90473f07f6243b80c8049291b61d80e8b01d45a928aea9a8dd4f91980d3e0bb7a76fea3e2
+AUX xine-lib-1.1.20-zlib-1.2.5.2.patch 1155 SHA256 ca6e325684ba93cb4edc983b39a4fd3ab8f6b8cd856ead92cdea2c359af2ea63 SHA512 be4176352bc2414bb827b182a5f1d80150b4eafa1bfddac6ec41f54bd02af100302eec0321fcad6789d55126b3ed3daf381ad24d3169fde87375bbe879dbfa9d WHIRLPOOL 7e40f4f10ba859810c4ef5f04710f8465dab53bd1a643806dbc75e649f4201033502b4e1759b4be288c5f1d46b1580132df37a127ec41ea890a42b6405e6fb37
+DIST xine-lib-1.1.20.tar.xz 5957256 SHA256 da65da5831f5b93f02b4ec10049eaf044cf99944e2fd8e12d494dccefee124eb SHA512 3b004657c70b414f29ed3cf2b11bc27582fd73793582b9aa0c91339c871a69e7f2bbc1253a26a198ca65609ec782b1a90618e28a29b13cfbc73ee4726e927c73 WHIRLPOOL 2c7fe63a8b86ebaf894bd226a850c13585c742d32b16eeaf178e3c76311b54496b3252ad718cee925b7e0b710e7328fa6ec124a22f9199393a61c7a7105fb5b2
+EBUILD xine-lib-1.1.20.ebuild 5606 SHA256 134735e1f25b388c2c5c3c0a7d0ad7ba01dddff3048737d01b7842d31ea69457 SHA512 c5410c740c85ffe7f831b0f2604152536739295ef20a5cb12a95df39061aea30fa38e44dc8b52967d545ecb82a670838e8640a65f81c9ebee7ac768f537b0ce4 WHIRLPOOL 9f81b4e824d8ac70d3ba7c5e5e4165ad80fc9aefb04b776e5f4f73689fef46af434eef8c75bb29d7034ead5bff97d1f4caa21ff3034b7d91fc378c58de2d2329
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/xine-lib/files/xine-lib-1.1.20-stat.patch	Thu Oct 11 17:18:39 2012 +0200
@@ -0,0 +1,18 @@
+# HG changeset patch
+# User Brad Smith <brad@comstyle.com>
+# Date 1321165080 0
+# Node ID 2dfa82f9ff3526e7c22dc4c316af9b1c49f67851
+# Parent  1ba56a221c164082c69180aa41e5a6b88d520f72
+Need sys/stat.h for file audio output code to build on OpenBSD
+
+diff -r 1ba56a221c16 -r 2dfa82f9ff35 src/audio_out/audio_file_out.c
+--- a/src/audio_out/audio_file_out.c	Sun Nov 13 01:52:30 2011 +0000
++++ b/src/audio_out/audio_file_out.c	Sun Nov 13 06:18:00 2011 +0000
+@@ -30,6 +30,7 @@
+ #include <math.h>
+ #include <unistd.h>
+ #include <inttypes.h>
++#include <sys/stat.h>
+ 
+ #include "xine_internal.h"
+ #include "xineutils.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/xine-lib/files/xine-lib-1.1.20-zlib-1.2.5.2.patch	Thu Oct 11 17:18:39 2012 +0200
@@ -0,0 +1,43 @@
+1.2.0 patch applied to 1.1.20
+https://bugs.gentoo.org/show_bug.cgi?id=401449
+
+--- xine-lib-1.1.20-orig/src/xine-engine/osd.c
++++ xine-lib-1.1.20/src/xine-engine/osd.c
+@@ -650,7 +650,7 @@
+   osd->display_y = y;
+ }
+ 
+-static uint16_t gzread_i16(gzFile *fp) {
++static uint16_t gzread_i16(gzFile fp) {
+   uint16_t ret;
+   ret = gzgetc(fp);
+   ret |= (gzgetc(fp)<<8);
+@@ -663,7 +663,7 @@
+ 
+ static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
+ 
+-  gzFile      *fp;
++  gzFile       fp;
+   osd_font_t  *font = NULL;
+   int          i, ret = 0;
+ 
+--- xine-lib-1.1.20-orig/misc/xine-fontconv.c
++++ xine-lib-1.1.20/misc/xine-fontconv.c
+@@ -109,7 +109,7 @@
+ osd_font_t     font;
+ 
+ 
+-static int gzwrite_i16(gzFile *fp, uint16_t number) {
++static int gzwrite_i16(gzFile fp, uint16_t number) {
+   return gzputc(fp, number & 0xFF) != -1 &&
+          gzputc(fp, (number >> 8) & 0xFF) != -1;
+ }
+@@ -341,7 +341,7 @@
+ 
+   char                filename[1024];
+   FT_Bitmap          *out_bitmap;
+-  gzFile             *fp;
++  gzFile              fp;
+   int                 error;
+   int                 error_counter;
+   int                 glyph_index;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/xine-lib/xine-lib-1.1.20.ebuild	Thu Oct 11 17:18:39 2012 +0200
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/Attic/xine-lib-1.1.20.ebuild,v 1.8 2012/04/17 08:54:54 ssuominen dead $
+
+# modified by gentoo-overlay.megacoffee.net:
+#  - applied patch for zlib 1.2.5.2 (https://bugs.gentoo.org/show_bug.cgi?id=401449)
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs multilib eutils
+
+# 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_prepare() {
+	epatch "${FILESDIR}/${P}-stat.patch"
+	epatch "${FILESDIR}/${P}-zlib-1.2.5.2.patch"
+}
+
+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
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/profiles/package.mask	Thu Oct 11 17:18:39 2012 +0200
@@ -0,0 +1,5 @@
+# Daniel Neugebauer <dneuge@energiequant.de> (11 Oct 2012)
+# for gentoo-overlay.megacoffee.net
+# ebuild was restored from official portage tree after deletion and should
+# only be used as a last resort
+=media-libs/xine-lib-1.1.20