From 2b8f679ffe5929b5a11eb71e514aa4997c36f13e Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 22 May 2004 16:47:36 +0000
Subject: Merges.

2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.

2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.

2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.

BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
---
 libsdl/libsdl-qpe_1.2.7.oe | 9 ++++-----
 libsdl/libsdl-ttf_2.0.3.oe | 2 +-
 libsdl/libsdl-x11_1.2.7.oe | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'libsdl')

diff --git a/libsdl/libsdl-qpe_1.2.7.oe b/libsdl/libsdl-qpe_1.2.7.oe
index 04aa31fef1..56144768e7 100644
--- a/libsdl/libsdl-qpe_1.2.7.oe
+++ b/libsdl/libsdl-qpe_1.2.7.oe
@@ -6,10 +6,10 @@ DEPENDS = "virtual/libqpe"
 PROVIDES = "virtual/libsdl"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-	   file://${FILESDIR}/agawa-piro-mickey.patch;patch=1 \
-	   file://${FILESDIR}/pygame.patch;patch=1 \
-	   file://${FILESDIR}/gcc34.patch;patch=1 \
-	   file://${FILESDIR}/mouse.patch;patch=1 "
+           file://agawa-piro-mickey.patch;patch=1 \
+           file://pygame.patch;patch=1 \
+           file://gcc34.patch;patch=1 \
+           file://mouse.patch;patch=1"
 S = "${WORKDIR}/SDL-${PV}"
 
 inherit autotools
@@ -45,4 +45,3 @@ do_stage() {
                        | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR}/sdl-config
         chmod a+rx ${STAGING_BINDIR}/sdl-config
 }
-
diff --git a/libsdl/libsdl-ttf_2.0.3.oe b/libsdl/libsdl-ttf_2.0.3.oe
index 510b679ca2..163fb9c0ea 100644
--- a/libsdl/libsdl-ttf_2.0.3.oe
+++ b/libsdl/libsdl-ttf_2.0.3.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 DEPENDS = "virtual/libsdl freetype"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
-           file://${FILESDIR}/new-freetype-includes.patch;patch=1"
+           file://new-freetype-includes.patch;patch=1"
 S = "${WORKDIR}/SDL_ttf-${PV}"
 
 inherit autotools
diff --git a/libsdl/libsdl-x11_1.2.7.oe b/libsdl/libsdl-x11_1.2.7.oe
index 88ec9fdabe..89fe68c7b8 100644
--- a/libsdl/libsdl-x11_1.2.7.oe
+++ b/libsdl/libsdl-x11_1.2.7.oe
@@ -6,7 +6,7 @@ DEPENDS = "x11 xext"
 PROVIDES = "virtual/libsdl"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-	   file://${FILESDIR}/extra-keys.patch;patch=1"
+	   file://extra-keys.patch;patch=1"
 S = "${WORKDIR}/SDL-${PV}"
 
 inherit autotools
-- 
cgit 1.2.3-korg