summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2002-08-02 16:28:13 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2002-08-02 16:28:13 +0000
commit3c5b0bda79e897876a1c95251a8fd834ac217e45 (patch)
treef872617af671c9cb55aa799648fd70953de27752 /media-libs/xine-lib
parentUpdated ebuild to install /etc/wine/config. Closes bug #5821. (diff)
downloadhistorical-3c5b0bda79e897876a1c95251a8fd834ac217e45.tar.gz
historical-3c5b0bda79e897876a1c95251a8fd834ac217e45.tar.bz2
historical-3c5b0bda79e897876a1c95251a8fd834ac217e45.zip
Closes #5866.
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r--media-libs/xine-lib/ChangeLog6
-rw-r--r--media-libs/xine-lib/files/xine-lib-0.9.12-r2-directfb.patch14
-rw-r--r--media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild6
3 files changed, 23 insertions, 3 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 196bd509d066..f5e387e8b62c 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for media-libs/xine-lib
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.15 2002/07/31 16:13:30 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.16 2002/08/02 16:28:13 aliz Exp $
*xine-lib-0.9.12-r2 (31 Jul 2002)
+ 02 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> xne-lib-0.9.12-r2.ebuild:
+
+ Fixed directfb compilation issues. Closes #5866.
+
31 Jul 2002; Brandon Low <lostlogic@gentoo.org> xine-lib-0.9.12-r2.ebuild:
Remove the configure script mangling of -march and -mcpu.
diff --git a/media-libs/xine-lib/files/xine-lib-0.9.12-r2-directfb.patch b/media-libs/xine-lib/files/xine-lib-0.9.12-r2-directfb.patch
new file mode 100644
index 000000000000..88b99680c558
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-0.9.12-r2-directfb.patch
@@ -0,0 +1,14 @@
+--- xine/xine-lib/src/video_out/Makefile.am 2002/07/16 19:33:37 1.46
++++ xine/xine-lib/src/video_out/Makefile.am 2002/07/22 17:48:40 1.47
+@@ -2,8 +2,8 @@
+
+ VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix -I$(top_srcdir)/src/video_out/vidix
+
+-CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
+-DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
++CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) $(DIRECTFB_CFLAGS)
++DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) $(DIRECTFB_CFLAGS)
+
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
+
+
diff --git a/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild b/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild
index bc1ddec281bb..235e6f2422b8 100644
--- a/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild,v 1.1 2002/07/31 16:13:30 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild,v 1.2 2002/08/02 16:28:13 aliz Exp $
inherit libtool
@@ -23,7 +23,8 @@ DEPEND="oggvorbis? ( media-libs/libvorbis )
arts? ( kde-base/kdelibs )
alsa? ( media-libs/alsa-lib )
aalib? ( media-libs/aalib )
- directfb? ( >=dev-libs/DirectFB-0.9.9 )"
+ directfb? ( >=dev-libs/DirectFB-0.9.9
+ dev-util/pkgconfig )"
RDEPEND="${DEPEND}
nls? ( sys-devel/gettext )"
@@ -47,6 +48,7 @@ src_unpack() {
use directfb && ( \
patch -p0 < ${FILESDIR}/xineconfig.patch-${PV} || die "patch 2 failed"
+ patch -p2 < ${FILESDIR}/${P}-r2-directfb.patch || die "patch failed"
) || patch -p1 < ${FILESDIR}/xine-lib-disable-directfb.patch || die "patch 2 failed"
}