[Armadeus-commitlog] SF.net SVN: armadeus: [681] trunk

[<ar...@us...>]

Revision: 681
          http://armadeus.svn.sourceforge.net/armadeus/?rev=681&view=rev
Author:   artemys
Date:     2007-11-15 11:44:53 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
[BUILDROOT] Makes SDL_xxx extensions compiles successfully

Modified Paths:
--------------
    trunk/buildroot/package/sdl/sdl_image.mk

Added Paths:
-----------
    trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff

Modified: trunk/buildroot/package/sdl/sdl_image.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl_image.mk	2007-11-14 08:59:13 UTC (rev 680)
+++ trunk/buildroot/package/sdl/sdl_image.mk	2007-11-15 19:44:53 UTC (rev 681)
@@ -3,10 +3,10 @@
 # SDL_image addon for SDL
 #
 #############################################################
-SDL_IMAGE_VERSION:=1.2.5
+SDL_IMAGE_VERSION:=1.2.6
 SDL_IMAGE_SOURCE:=SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 SDL_IMAGE_SITE:=http://www.libsdl.org/projects/SDL_image/release
-SDL_IMAGE_CAT:=zcat
+SDL_IMAGE_CAT:=$(ZCAT)
 SDL_IMAGE_DIR:=$(BUILD_DIR)/SDL_image-$(SDL_IMAGE_VERSION)
 
 $(DL_DIR)/$(SDL_IMAGE_SOURCE):
@@ -16,13 +16,13 @@
 
 $(SDL_IMAGE_DIR)/.unpacked: $(DL_DIR)/$(SDL_IMAGE_SOURCE)
 	$(SDL_IMAGE_CAT) $(DL_DIR)/$(SDL_IMAGE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(CONFIG_UPDATE) $(SDL_IMAGE_DIR)
 	touch $@
 
 $(SDL_IMAGE_DIR)/.configured: $(SDL_IMAGE_DIR)/.unpacked
-	(cd $(SDL_IMAGE_DIR); \
+	(cd $(SDL_IMAGE_DIR); rm -rf config.cache; \
 	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) " \
-	LDFLAGS="-Wl,-rpath=$(STAGING_DIR)/lib/" \
+	$(TARGET_CONFIGURE_ARGS) \
 	./configure \
 	--target=$(GNU_TARGET_NAME) \
 	--host=$(GNU_TARGET_NAME) \

Added: trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff
===================================================================
--- trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff	                        (rev 0)
+++ trunk/patches/033-buildroot-make-sdl-config-generated-as-needed-for-sdl_image.diff	2007-11-15 19:44:53 UTC (rev 681)
@@ -0,0 +1,11 @@
+--- buildrootref/package/sdl/sdl.mk	2007-11-15 20:35:15.000000000 +0100
++++ buildroot/package/sdl/sdl.mk	2007-11-15 20:35:05.000000000 +0100
+@@ -40,7 +40,7 @@
+ 		--sysconfdir=/etc \
+ 		--datadir=/share \
+ 		--localstatedir=/var \
+-		--includedir=/include \
++		--includedir=$(STAGING_DIR)/include \
+ 		--mandir=/man \
+ 		--infodir=/info \
+ 		--disable-arts \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.