summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2003-12-02 08:00:07 +0000
committerSeemant Kulleen <seemant@gentoo.org>2003-12-02 08:00:07 +0000
commit7b79429597fac14e2045952fe6ab19da337232ff (patch)
tree4a313f8ac07aa747c39585fedcc655519c42d2ba /media-libs/libsdl
parentversion bump for do_brk vuln (diff)
downloadgentoo-2-7b79429597fac14e2045952fe6ab19da337232ff.tar.gz
gentoo-2-7b79429597fac14e2045952fe6ab19da337232ff.tar.bz2
gentoo-2-7b79429597fac14e2045952fe6ab19da337232ff.zip
no epatch
Diffstat (limited to 'media-libs/libsdl')
-rw-r--r--media-libs/libsdl/ChangeLog5
-rw-r--r--media-libs/libsdl/Manifest8
-rw-r--r--media-libs/libsdl/libsdl-1.2.6-r2.ebuild11
3 files changed, 15 insertions, 9 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 9483b4abc99d..565ad8e30e7e 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libsdl
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.33 2003/11/03 21:58:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.34 2003/12/02 08:00:05 seemant Exp $
+
+ 01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> libsdl-1.2.6-r2.ebuild:
+ epatch doesn't work
03 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> libsdl-1.2.6-r2.ebuild:
mark stable on x86
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index a711492e0404..96cd7c11d6b9 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,10 +1,10 @@
+MD5 ccd5a78b507c0444d9cef7fec354b717 libsdl-1.2.5-r1.ebuild 3153
+MD5 4c11af6d1d91e76571bfe5a7fb766530 libsdl-1.2.6-r2.ebuild 2756
+MD5 90cad4748a286778f1272a881acc13a3 ChangeLog 5849
+MD5 562d3f7139a98c1f9919dbe7243f5620 libsdl-1.2.5-r2.ebuild 3338
MD5 2468dd594bc1f3ad3b47bcf69ba5ded2 files/libsdl_gcc33_fix.diff 395
MD5 a6a048e6f85defb2e0ce9f0df743dad0 files/libsdl-1.2.6-fullscreen.patch 4902
MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r1 62
MD5 ec07d8e05e12f4447f76d065ffa22475 files/digest-libsdl-1.2.5-r2 62
MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r2 62
MD5 139a7f80f999ec4caafeac89523308a5 files/libsdl-1.2.5-xfree-4.3.patch 5422
-MD5 ccd5a78b507c0444d9cef7fec354b717 libsdl-1.2.5-r1.ebuild 3153
-MD5 eb0dc213b990c2b5a6c53b8d74ce85b9 libsdl-1.2.6-r2.ebuild 2611
-MD5 18543487dc4424db3562ef8bc739b542 ChangeLog 5752
-MD5 562d3f7139a98c1f9919dbe7243f5620 libsdl-1.2.5-r2.ebuild 3338
diff --git a/media-libs/libsdl/libsdl-1.2.6-r2.ebuild b/media-libs/libsdl/libsdl-1.2.6-r2.ebuild
index 1d83cb9ddd03..277a89654e79 100644
--- a/media-libs/libsdl/libsdl-1.2.6-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.6-r2.ebuild
@@ -1,8 +1,6 @@
# Copyright 1999-2003 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-r2.ebuild,v 1.6 2003/12/01 21:23:05 vapier Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.6-r2.ebuild,v 1.7 2003/12/02 08:00:05 seemant Exp $
DESCRIPTION="Simple Direct Media Layer"
HOMEPAGE="http://www.libsdl.org/"
@@ -36,7 +34,12 @@ src_unpack() {
unpack ${A}
cd ${S}
# this should fix Bug 31235
- epatch ${FILESDIR}/${P}-fullscreen.patch
+ # Cannot use epatch as this patch fails on the dry-run -- perhaps the
+ # patch needs to be regenerated?
+ ebegin "applying ${P}-fullscreen.patch..."
+ patch -p1 -s< ${FILESDIR}/${P}-fullscreen.patch || die
+ eend 0
+
sed -i \
-e 's:head -1:head -n 1:' configure || \
die "sed configure failed"