From e0fe8e2a81100b29af6733664dbc1b2e53013547 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Mon, 23 Sep 2013 01:02:56 -0700
Subject: [PATCH] Adjusted libsdl-1.2.15 and sdl_image-1.2.12, libsdl-1.2.15
 builds but files aren't showing up as expected, so sdl_image fails to detect
 SDL headers

---
 media-libs/libsdl/additional-files/sdl-config | 77 -------------------
 media-libs/libsdl/libsdl-1.2.15.recipe        | 26 +++----
 media-libs/sdl_image/sdl_image-1.2.12.recipe  | 16 ++--
 3 files changed, 15 insertions(+), 104 deletions(-)
 delete mode 100644 media-libs/libsdl/additional-files/sdl-config

diff --git a/media-libs/libsdl/additional-files/sdl-config b/media-libs/libsdl/additional-files/sdl-config
deleted file mode 100644
index 7e19ca3a8..000000000
--- a/media-libs/libsdl/additional-files/sdl-config
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-libDir=`finddir B_SYSTEM_LIB_DIRECTORY`
-
-# Determine which GCC we're running
-if [ -f "$libDir"/libsupc++.so ] ; then
-	HAIKU_GCC_VERSION=4
-else
-	HAIKU_GCC_VERSION=2
-fi
-
-SETGCC_OUTPUT=`setgcc`
-CURRENT_COMPILER=${SETGCC_OUTPUT: -1:1}
-
-if [ $CURRENT_COMPILER == $HAIKU_GCC_VERSION ] ; then
-	libdir=`finddir B_COMMON_LIB_DIRECTORY`
-else
-	libdir=`finddir B_COMMON_LIB_DIRECTORY`/gcc$CURRENT_COMPILER
-fi
-
-prefix=/boot/common
-exec_prefix=${prefix}
-exec_prefix_set=no
-
-#usage="\
-#Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
-usage="\
-Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
-
-if test $# -eq 0; then
-      echo "${usage}" 1>&2
-      exit 1
-fi
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | LC_ALL="C" sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo $prefix
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo $exec_prefix
-      ;;
-    --version)
-      echo 1.2.15
-      ;;
-    --cflags)
-      echo -I${prefix}/include/SDL -D_GNU_SOURCE=1
-      ;;
-#    --libs)
-#      echo -L$libdir  -lSDL 
-#      ;;
-#    --static-libs)
-    --libs|--static-libs)
-      echo -L$libdir  -lSDL   -liconv -lGL -lroot -lbe -lmedia -lgame -ldevice -ltextencoding
-      ;;
-    *)
-      echo "${usage}" 1>&2
-      exit 1
-      ;;
-  esac
-  shift
-done
diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index 3110135c7..1886daaeb 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -11,11 +11,12 @@ ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	cmd:sdl_config = portVersion compat >= 1.2
+	lib:libsdl = $portVersion compat >= 1.2
 	lib:libSDL = $portVersion compat >= 1.2
 	lib:libSDL_1.2 = 0.11.4 compat >= 0.11
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
 	"
 BUILD_REQUIRES="
 	lib:libpng
@@ -23,7 +24,7 @@ BUILD_REQUIRES="
 	lib:libtiff
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -32,38 +33,29 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="SDL-1.2.15"
+SOURCE_DIR="SDL-$portVersion"
 
 PATCH()
 {
 	sed -i 's/AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)/have_alsa=no/' configure.in
 	sed -i 's/AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)/have_esd=no/' configure.in
 	echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in
-	libtoolize --force --copy --install
-	aclocal -I acinclude
-	autoconf
 }
 
 BUILD()
 {
-	runConfigure ./configure
+	libtoolize --force --copy --install
+	aclocal -I acinclude
+	autoconf
+	runConfigure ./configure --includedir=$includeDir
 	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
-	
-	# devel package
 
-	mkdir -p $developDir/lib
-	cp build/.libs/libSDL.a $developDir/lib/libSDL.a
-	cp build/.libs/libSDL.la $developDir/lib/libSDL.la
-	cp build/.libs/libSDLmain.a $developDir/lib/libSDLmain.a
-	cp build/.libs/libSDLmain.la $developDir/lib/libSDLmain.la
-	
-	cp include/* $includeDir
-	
+	# devel package
 	prepareInstalledDevelLibs \
 		libSDL \
 		libSDLmain
diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe
index 16d56d46c..f92bf15ef 100644
--- a/media-libs/sdl_image/sdl_image-1.2.12.recipe
+++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe
@@ -3,22 +3,22 @@ DESCRIPTION="Simple Direct Media Layer Image Library"
 HOMEPAGE="http://www.libsdl.org/projects/SDL_image" 
 SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz"
 CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb"
-REVISION="1"
+REVISION="2"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 
-ARCHITECTURES="?x86 ?x86_gcc2"
+ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	lib:sdl_image = $portVersion compat >= 1.2
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku
+	devel:libSDL
 	"
 
 BUILD_REQUIRES="
-	devel:libsdl
 	lib:libjpeg
 	lib:libpng
 	lib:libtiff
@@ -27,7 +27,7 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -35,6 +35,7 @@ BUILD_PREREQUIRES="
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config
+	cmd:sdl_config
 	"
 
 SOURCE_DIR="SDL_image-1.2.12"
@@ -44,11 +45,6 @@ BUILD()
 	libtoolize --force --copy --install
 	aclocal --install -I acinclude
 	./autogen.sh
-	
-	echo ------------------
-	sdl-config --version
-	echo ------------------
-	
 	runConfigure ./configure \
 		--enable-bmp --enable-lbm --enable-pcx \
 		--enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \