summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-02-10 03:21:26 +0000
committerMike Frysinger <vapier@gentoo.org>2004-02-10 03:21:26 +0000
commit5c419443df5ba0ba04f0d680e9a2da7d1c5051d4 (patch)
tree06fbc4c8059a4e4a2d39fa10c172c7ec22da9081 /media-libs/libsdl
parentRemove the setting of QMAKESPEC for amd64 and ia64 as it uses /lib64 and we d... (diff)
downloadgentoo-2-5c419443df5ba0ba04f0d680e9a2da7d1c5051d4.tar.gz
gentoo-2-5c419443df5ba0ba04f0d680e9a2da7d1c5051d4.tar.bz2
gentoo-2-5c419443df5ba0ba04f0d680e9a2da7d1c5051d4.zip
ppc stable
Diffstat (limited to 'media-libs/libsdl')
-rw-r--r--media-libs/libsdl/ChangeLog5
-rw-r--r--media-libs/libsdl/files/1.2.6-nobuggy-X.patch13
-rw-r--r--media-libs/libsdl/libsdl-1.2.6-r3.ebuild6
3 files changed, 20 insertions, 4 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 5ff036f92238..dc664a221fa5 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libsdl
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.39 2004/01/26 21:27:05 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.40 2004/02/10 03:21:25 vapier Exp $
+
+ 09 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+ Make ppc stable with the no-more-buggy-x patch #30089 by Ernst Persson.
26 Jan 2004; <augustus@gentoo.org> libsdl-1.2.5-r2.ebuild,
libsdl-1.2.6-r3.ebuild:
diff --git a/media-libs/libsdl/files/1.2.6-nobuggy-X.patch b/media-libs/libsdl/files/1.2.6-nobuggy-X.patch
new file mode 100644
index 000000000000..50f1297590a4
--- /dev/null
+++ b/media-libs/libsdl/files/1.2.6-nobuggy-X.patch
@@ -0,0 +1,13 @@
+--- SDL-1.2.6.orig/src/video/x11/SDL_x11modes.c 2003-12-16 05:00:33.000000000 +0100
++++ SDL-1.2.6/src/video/x11/SDL_x11modes.c 2003-12-16 05:01:42.000000000 +0100
+@@ -323,10 +323,6 @@
+ fclose(metro_fp);
+ }
+ }
+-#if defined(__alpha__) || defined(__sparc64__) || defined(__powerpc__)
+- /* The alpha, sparc64 and PPC XFree86 servers are also buggy */
+- buggy_X11 = 1;
+-#endif
+ /* Enumerate the available fullscreen modes */
+ if ( ! buggy_X11 ) {
+ if ( SDL_NAME(XF86VidModeQueryExtension)(SDL_Display, &vm_event, &vm_error) &&
diff --git a/media-libs/libsdl/libsdl-1.2.6-r3.ebuild b/media-libs/libsdl/libsdl-1.2.6-r3.ebuild
index 017c57b667b0..e99d6b71fb16 100644
--- a/media-libs/libsdl/libsdl-1.2.6-r3.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.6-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.6-r3.ebuild,v 1.4 2004/01/26 21:27:05 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.6-r3.ebuild,v 1.5 2004/02/10 03:21:25 vapier Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="x86 alpha ~ppc ~sparc hppa amd64 ia64"
+KEYWORDS="x86 ppc ~sparc alpha hppa amd64 ia64"
IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl noaudio novideo nojoystick"
# if you disable audio/video/joystick and something breaks, you pick up the pieces
@@ -37,6 +37,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-fullscreen.patch #31235
epatch ${FILESDIR}/${PV}-alsa-1.0.0.patch #35049
+ epatch ${FILESDIR}/${PV}-nobuggy-X.patch #30089
sed -i \
-e 's:head -1:head -n 1:' configure \
@@ -50,7 +51,6 @@ src_unpack() {
}
src_compile() {
-
local myconf=""
[ `use noaudio` ] && myconf="${myconf} --disable-audio"
[ `use novideo` ] \