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

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

Revision: 695
          http://armadeus.svn.sourceforge.net/armadeus/?rev=695&view=rev
Author:   artemys
Date:     2007-11-17 13:07:57 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
[BUILDROOT] Add slideshow to menuconfig

Modified Paths:
--------------
    trunk/buildroot/package/slideshow/slideshow.mk

Added Paths:
-----------
    trunk/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
    trunk/patches/034-buildroot-slideshow.diff

Added: trunk/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch	                        (rev 0)
+++ trunk/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch	2007-11-17 21:07:57 UTC (rev 695)
@@ -0,0 +1,13 @@
+--- slideshow.org/SDLFont.cpp	2007-11-17 19:25:02.000000000 +0100
++++ slideshow/SDLFont.cpp	2007-11-17 20:06:20.000000000 +0100
+@@ -84,8 +84,8 @@
+ 
+     Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
+     Uint8 *pChar, *pScreen;
+-    char c;
+-    int i, j;
++    //char c;
++    int i, j, c;
+ 
+     for(const char *p = text; *p != '\0'; p++)
+     {

Modified: trunk/buildroot/package/slideshow/slideshow.mk
===================================================================
--- trunk/buildroot/package/slideshow/slideshow.mk	2007-11-17 19:16:45 UTC (rev 694)
+++ trunk/buildroot/package/slideshow/slideshow.mk	2007-11-17 21:07:57 UTC (rev 695)
@@ -24,7 +24,7 @@
 	touch $@
 
 $(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
-	export PATH=$(STAGING_DIR)/bin::$$PATH; $(MAKE) -C $(SLIDESHOW_DIR) ARCH=arm
+	export PATH=$(STAGING_DIR)/bin::$$PATH; export STAGING_DIR=$(STAGING_DIR); $(MAKE) -C $(SLIDESHOW_DIR) ARCH=arm
 
 $(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
 	cp -dpf $< $(TARGET_DIR)/usr/bin

Added: trunk/patches/034-buildroot-slideshow.diff
===================================================================
--- trunk/patches/034-buildroot-slideshow.diff	                        (rev 0)
+++ trunk/patches/034-buildroot-slideshow.diff	2007-11-17 21:07:57 UTC (rev 695)
@@ -0,0 +1,12 @@
+--- buildroot.org/package/Config.in	2007-11-17 20:17:10.000000000 +0100
++++ buildroot/package/Config.in	2007-11-17 20:18:58.000000000 +0100
+@@ -387,6 +387,9 @@
+ 
+ comment "Games"
+ source "package/prboom/Config.in"
++
++comment "Misc"
++source "package/slideshow/Config.in"
+ endif
+ 
+ menuconfig BR2_COMPRESSOR_SUPPORT


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