From 05431d1705f9d0e0fb82974abfc16f4f9a809309 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 11 Feb 2015 08:47:16 +0100
Subject: [PATCH] SDL2_image: fix for gcc2

Only problem was use of dos line endings confusing the C preprocessor.
---
 media-libs/sdl2_image/sdl2_image-2.0.0.recipe | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
index 44f5c7105..0deee24e9 100644
--- a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
+++ b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
@@ -13,13 +13,8 @@ REVISION="3"
 LICENSE="Zlib"
 COPYRIGHT="1997-2013 Sam Lantinga"
 
-ARCHITECTURES="x86"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
+ARCHITECTURES="x86 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	sdl2_image${secondaryArchSuffix} = $portVersion
@@ -57,6 +52,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:automake
 	cmd:autoconf
+	cmd:dos2unix
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -70,7 +66,8 @@ BUILD()
 	libtoolize --copy --force --install
 	aclocal --install -I acinclude
 	autoconf
-	runConfigure ./configure --with-x=no
+	dos2unix miniz.h
+	runConfigure ./configure
 	make $jobArgs
 }
 
@@ -80,6 +77,7 @@ INSTALL()
 
 	prepareInstalledDevelLibs libSDL2_image libSDL2_image-2.0
 	fixPkgconfig
+	rm $developLibDir/*.la
 
 	packageEntries devel \
 		$developDir