summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2005-05-15 00:28:06 +0000
committerMark Loeser <halcy0n@gentoo.org>2005-05-15 00:28:06 +0000
commit66d95d130b6d2dd01463a5021b09970b681015a3 (patch)
tree5c268b40e2136cfdb426bce6c7d34392e0ae5b48 /media-libs/libsdl
parent1.8.1 x86 stable (diff)
downloadhistorical-66d95d130b6d2dd01463a5021b09970b681015a3.tar.gz
historical-66d95d130b6d2dd01463a5021b09970b681015a3.tar.bz2
historical-66d95d130b6d2dd01463a5021b09970b681015a3.zip
fix compilation with >-O0 with gcc4; bug #87809
Package-Manager: portage-2.0.51.21-r1
Diffstat (limited to 'media-libs/libsdl')
-rw-r--r--media-libs/libsdl/Manifest36
-rw-r--r--media-libs/libsdl/libsdl-1.2.8-r1.ebuild9
2 files changed, 25 insertions, 20 deletions
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 9c08c1da1d30..abf2c6c1f57a 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,36 +1,36 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 cbbab78f5125f834ffb0f83be4957736 libsdl-1.2.6-r3.ebuild 3013
MD5 3b4836a77e8f6df045028f84e89dd9b8 ChangeLog 12012
-MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
-MD5 dc422953436a92690bd6f7b0f0c2d4d5 libsdl-1.2.8-r1.ebuild 4550
+MD5 cbbab78f5125f834ffb0f83be4957736 libsdl-1.2.6-r3.ebuild 3013
MD5 7f079469132865bdd25780277639f098 libsdl-1.2.7-r3.ebuild 3960
+MD5 0d0cfc8859df5d9ff742e6041ff141c1 libsdl-1.2.8-r1.ebuild 4660
+MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
+MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568
-MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
-MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
-MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
-MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
-MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8-r1 62
+MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
-MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
-MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557
-MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743
+MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317
MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196
+MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266
+MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568
MD5 5d1fcf4587b0ce9cd723aa69f9ef7dba files/1.2.8-amd64-endian.patch 651
-MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017
-MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62
-MD5 88437c556d9b4571f08de4a4e2d9323a files/1.2.8-libcaca.patch 23278
-MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568
MD5 e6471a33cb0d62a807640ef3eccffb5f files/1.2.8-direct-8bit-color.patch 7414
MD5 4e92be33d24fa96149b0e68eb916e259 files/1.2.8-gcc4.patch 6875
+MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743
MD5 60ecfde6cc7b734ef03b93357c537674 files/1.2.8-keyrepeat.patch 598
+MD5 88437c556d9b4571f08de4a4e2d9323a files/1.2.8-libcaca.patch 23278
MD5 e0c6c6ffc15475282fc864b8f52f0abf files/1.2.8-linux26.patch 1268
+MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568
+MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62
+MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62
+MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8-r1 62
+MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094
MD5 358c3d6380bf0b6ba3e78ce47c5ec578 files/libsdl-1.2.8-gcc2.patch.bz2 2639
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCbER41ZcsMnZjRyIRAmYgAKC3foEVpA1rNVQSKfru6cJspnUyCgCgidCm
-iNmoBtu/3ObdQRaTEbo0pPQ=
-=Gju3
+iD8DBQFChpejCRZPokWLroQRAlytAJ9mj32JmHVPAalyu2sJUz44ueM7PQCZAV1h
+PaUYHOjYAmf+3mxd4hP5CrY=
+=5CZJ
-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
index 45fe55b2b6be..b1786f3889e8 100644
--- a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.9 2005/04/25 01:10:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.10 2005/05/15 00:28:06 halcy0n Exp $
inherit flag-o-matic toolchain-funcs eutils gnuconfig
@@ -49,7 +49,12 @@ src_unpack() {
epatch "${FILESDIR}"/${PV}-nobuggy-X.patch #30089
epatch "${FILESDIR}"/${PV}-libcaca.patch #40224
epatch "${FILESDIR}"/${PV}-gcc2.patch #75392
- epatch "${FILESDIR}"/${P}-gcc2.patch.bz2 #86481
+
+ # This patch breaks compiling >-O0 on gcc4 ; bug #87809
+ if [ "`gcc-major-version`" -lt "4" ]
+ then
+ epatch "${FILESDIR}"/${P}-gcc2.patch.bz2 #86481
+ fi
epatch "${FILESDIR}"/${PV}-keyrepeat.patch #76448
epatch "${FILESDIR}"/${PV}-linux26.patch #74608
#epatch "${FILESDIR}"/${PV}-direct-8bit-color.patch #76946