From b67740428de6f20e0baa66d0b26d57718d66ff00 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 12 Feb 2015 18:47:00 +0000
Subject: [PATCH] sdl_gfx: bump version

* added a compatibility link because the soname changed though it's
compatible.
* disable mmx on gcc2
---
 .../sdl_gfx/patches/sdl_gfx-2.0.20.patch      | 24 ---------------
 media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe      | 29 -------------------
 media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe      | 29 -------------------
 media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe      | 29 -------------------
 ...fx-2.0.24.recipe => sdl_gfx-2.0.25.recipe} | 26 +++++++++--------
 5 files changed, 14 insertions(+), 123 deletions(-)
 delete mode 100644 media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch
 delete mode 100644 media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe
 delete mode 100644 media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe
 delete mode 100644 media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe
 rename media-libs/sdl_gfx/{sdl_gfx-2.0.24.recipe => sdl_gfx-2.0.25.recipe} (72%)

diff --git a/media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch b/media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch
deleted file mode 100644
index ba3f0383f..000000000
--- a/media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN SDL_gfx-2.0.20/Test/configure.in SDL_gfx-2.0.20-haiku/Test/configure.in
---- SDL_gfx-2.0.20/Test/configure.in	2009-04-21 04:47:51.000000000 +0000
-+++ SDL_gfx-2.0.20-haiku/Test/configure.in	2009-10-09 16:17:59.000000000 +0000
-@@ -44,7 +44,7 @@
-     *-*-cygwin* | *-*-mingw32*)
-         MATHLIB=""
-         ;;
--    *-*-beos*)
-+    *-*-beos* | *-*-haiku*)
-         MATHLIB=""
-         ;;
-     *-*-darwin*)
-diff -urN SDL_gfx-2.0.20/configure.in SDL_gfx-2.0.20-haiku/configure.in
---- SDL_gfx-2.0.20/configure.in	2009-09-24 02:07:16.000000000 +0000
-+++ SDL_gfx-2.0.20-haiku/configure.in	2009-10-09 15:36:08.000000000 +0000
-@@ -81,7 +81,7 @@
-     *-*-cygwin* | *-*-mingw32*)
-         MATHLIB=""
-         ;;
--    *-*-beos*)
-+    *-*-beos* | *-*-haiku*)
-         MATHLIB=""
-         ;;
-     *-*-darwin*)
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe
deleted file mode 100644
index e7c5561df..000000000
--- a/media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="SDL_gfx - SDL graphics drawing primitives and other support functions" 
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" 
-SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.20.tar.gz"
-CHECKSUM_MD5="8a787e538a8e4d80d4927535be5af083"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libsdl >= 1.2.14"
-BUILD()
-{
-	cd SDL_gfx-2.0.20
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
-	make
-}
-
-INSTALL()
-{
-	cd SDL_gfx-2.0.20
-	make install
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2009 A. Schiffler"
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe
deleted file mode 100644
index a2401bf20..000000000
--- a/media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="SDL_gfx - SDL graphics drawing primitives and other support functions" 
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" 
-SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.22.tar.gz"
-CHECKSUM_MD5="330f291f1f09a1bdf397c9b40d92ca41"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libsdl >= 1.2.14"
-BUILD()
-{
-	cd SDL_gfx-2.0.22
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
-	make
-}
-
-INSTALL()
-{
-	cd SDL_gfx-2.0.22
-	make install
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2010 A. Schiffler"
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe
deleted file mode 100644
index c5cc83e8b..000000000
--- a/media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="SDL_gfx - SDL graphics drawing primitives and other support functions" 
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" 
-SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.23.tar.gz"
-CHECKSUM_MD5="fcc3c4f2d1b4943409bf7e67dd65d03a"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libsdl >= 1.2.14"
-BUILD()
-{
-	cd SDL_gfx-2.0.23
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
-	make
-}
-
-INSTALL()
-{
-	cd SDL_gfx-2.0.23
-	make install
-}
-LICENSE="Zlib"
-COPYRIGHT="1999-2011 A. Schiffler"
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.25.recipe
similarity index 72%
rename from media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
rename to media-libs/sdl_gfx/sdl_gfx-2.0.25.recipe
index 32247eeef..bf265296f 100644
--- a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
+++ b/media-libs/sdl_gfx/sdl_gfx-2.0.25.recipe
@@ -5,24 +5,25 @@ basic drawing routines such as lines, circles or polygons and SDL_rotozoom \
 which implemented a interpolating rotozoomer for SDL_surfaces.
 "
 HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" 
-SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.24.tar.gz"
-CHECKSUM_SHA256="30ad38c3e17586e5212ce4a43955adf26463e69a24bb241f152493da28d59118"
+SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-$portVersion.tar.gz"
+CHECKSUM_SHA256="556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0"
 LICENSE="Zlib"
 COPYRIGHT="1999-2012 A. Schiffler"
 
-REVISION="2"
+REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	sdl_gfx$secondaryArchSuffix = $portVersion compat >= 2
-	lib:libSDL_gfx$secondaryArchSuffix = 14.9.1 compat >= 14
+	lib:libSDL_gfx$secondaryArchSuffix = 15.9.1 compat >= 15
 	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix
 	libsdl$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -47,12 +48,11 @@ SOURCE_DIR="SDL_gfx-$portVersion"
 
 BUILD()
 {
-	./autogen.sh
-	libtoolize --force --copy --install
-	aclocal --force --install -I acinclude
-	autoconf
-	automake
-	runConfigure ./configure
+	if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+		disableMMX="--disable-mmx"
+	fi
+	autoreconf -fi
+	runConfigure ./configure $disableMMX
 	make
 }
 
@@ -62,6 +62,8 @@ INSTALL()
 
 	prepareInstalledDevelLib libSDL_gfx
 	fixPkgconfig
+	
+	ln -s libSDL_gfx.so.15 $libDir/libSDL_gfx.so.14
 
 	packageEntries devel \
 			$developDir
@@ -69,8 +71,8 @@ INSTALL()
 
 PROVIDES_devel="
 	sdl_gfx${secondaryArchSuffix}_devel = $portVersion compat >= 2
-	devel:sdl_gfx$secondaryArchSuffix = 14.9.1 compat >= 14
-	devel:libSDL_gfx$secondaryArchSuffix = 14.9.1 compat >= 14
+	devel:sdl_gfx$secondaryArchSuffix = 15.9.1 compat >= 14
+	devel:libSDL_gfx$secondaryArchSuffix = 15.9.1 compat >= 14
 	"
 
 REQUIRES_devel="