[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-416-gf745726

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  f745726bd0c6f562c64e8591bf45bca8b0c98e82 (commit)
       via  82baf6d02021490ca8be3067c7adb5356550a1fa (commit)
      from  c1ce665aef02f7d125874222d5035c3558b9fb1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f745726bd0c6f562c64e8591bf45bca8b0c98e82
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 28 21:22:43 2013 +0200

    [BUILDROOT][2013.05] Remove obsolete allegro patch, as we won't support this package anymore (in short term)

commit 82baf6d02021490ca8be3067c7adb5356550a1fa
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 28 21:21:21 2013 +0200

    [BUILDROOT][2013.05] Makes sdl_water package compiles again

-----------------------------------------------------------------------

Summary of changes:
 .../buildroot/2013.05/018-allegro.patch.tobefixed  |  114 --------------------
 .../021-armadeus-add-sdl_water-package.patch       |   59 ++++++++++
 .../2013.05/021-sdl-water-config.patch.tobefixed   |   99 -----------------
 3 files changed, 59 insertions(+), 213 deletions(-)
 delete mode 100644 patches/buildroot/2013.05/018-allegro.patch.tobefixed
 create mode 100644 patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch
 delete mode 100644 patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed

diff --git a/patches/buildroot/2013.05/018-allegro.patch.tobefixed b/patches/buildroot/2013.05/018-allegro.patch.tobefixed
deleted file mode 100644
index d548bf9..0000000
--- a/patches/buildroot/2013.05/018-allegro.patch.tobefixed
+++ /dev/null
@@ -1,114 +0,0 @@
-Add allegro package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -116,6 +116,7 @@
- source "package/rrdtool/Config.in"
- 
- comment "graphic libraries"
-+source "package/allegro/Config.in"
- source "package/cegui06/Config.in"
- source "package/directfb/Config.in"
- source "package/directfb-examples/Config.in"
-Index: buildroot/package/allegro/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/Config.in	2012-02-21 16:44:05.000000000 +0100
-@@ -0,0 +1,13 @@
-+config BR2_PACKAGE_ALLEGRO
-+	bool "Allegro"
-+	help
-+	  Allegro is a game programming library for C/C++ developers
-+	  distributed freely and supporting the following platforms:
-+	  DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
-+	  BeOS and MacOS X.
-+	  It provides many functions for graphics, sounds, player input
-+	  (keyboard, mouse and joystick) and timers. It also provides fixed and
-+	  floating point mathematical functions, 3d functions, file management
-+	  functions, compressed datafile and a GUI.
-+
-+	  http://alleg.sourceforge.net/
-Index: buildroot/package/allegro/allegro.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/allegro.mk	2012-02-21 16:44:05.000000000 +0100
-@@ -0,0 +1,75 @@
-+#############################################################
-+#
-+# Allegro: a game programming library
-+#
-+#############################################################
-+ALLEGRO_VERSION:=4.2.1
-+ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
-+ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg/files/allegro/4.2.1
-+ALLEGRO_CAT:=zcat
-+ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
-+
-+$(DL_DIR)/$(ALLEGRO_SOURCE):
-+	$(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
-+
-+allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
-+
-+$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
-+	$(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+	touch $@
-+
-+$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
-+	(cd $(ALLEGRO_DIR); \
-+	$(TARGET_CONFIGURE_OPTS) \
-+	CFLAGS="$(TARGET_CFLAGS)" \
-+	LDFLAGS="$(TARGET_LDFLAGS)" \
-+	CROSSCOMPILE=1 \
-+	./configure \
-+		--target=$(GNU_TARGET_NAME) \
-+		--host=$(GNU_TARGET_NAME) \
-+		--build=$(GNU_HOST_NAME) \
-+		--prefix=/usr \
-+		--without-svgalib \
-+		--enable-modules=no \
-+		--enable-static=yes \
-+		--enable-shared=no \
-+		--disable-asm \
-+		--disable-mmx \
-+		--disable-sse \
-+		--disable-color24 \
-+		--disable-color32 \
-+		--without-x );
-+	touch $@
-+# allegro doesn't seem to build as shared library
-+# 		--disable-color24 \
-+# 		--disable-color32 \
-+
-+$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
-+	$(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
-+	touch $@
-+
-+#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-+#	$(MAKE) -C $(ALLEGRO_DIR) install
-+#	touch -c $@
-+#
-+# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
-+# 	cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
-+# 	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
-+
-+ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-+
-+allegro-clean:
-+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
-+	-$(MAKE) -C $(ALLEGRO_DIR) clean
-+
-+allegro-dirclean:
-+	rm -rf $(ALLEGRO_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
-+TARGETS+=allegro
-+endif
diff --git a/patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch
new file mode 100644
index 0000000..f650048
--- /dev/null
+++ b/patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch
@@ -0,0 +1,59 @@
+Add sdlwater package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in	2013-08-28 19:15:51.163133453 +0200
++++ buildroot/package/Config.in	2013-08-28 21:16:29.159024736 +0200
+@@ -139,6 +139,8 @@
+ source "package/sdl_net/Config.in"
+ source "package/sdl_ttf/Config.in"
+ source "package/sdl_gfx/Config.in"
++comment "Demos"
++source "package/sdl_water/Config.in"
+ 
+ comment "other GUIs"
+ source "package/efl/Config.in"
+Index: buildroot/package/sdl_water/Config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl_water/Config.in	2013-08-28 19:15:51.231133799 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_SDL_WATER
++	bool "SDL_water"
++	select BR2_PACKAGE_SDL
++	help
++	  Water effect demo coded with SDL
++
++	  http://www.libsdl.org/projects/SDL_water/
+Index: buildroot/package/sdl_water/sdl_water.mk
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl_water/sdl_water.mk	2013-08-28 19:35:31.024984077 +0200
+@@ -0,0 +1,25 @@
++#############################################################
++#
++# SDL Water Demo
++#
++#############################################################
++
++SDL_WATER_VERSION = 1.0
++SDL_WATER_SOURCE = water-$(SDL_WATER_VERSION).tar.gz
++SDL_WATER_SITE = http://www.libsdl.org/projects/water/src/
++SDL_WATER_TARGET_DATA_DIR = $(TARGET_DIR)/usr/share/images/
++
++SDL_WATER_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
++		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
++
++SDL_WATER_DEPENDENCIES = sdl
++
++SDL_WATER_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
++
++define SDL_WATER_INSTALL_BMP
++	install -D -m 0644 $(@D)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
++endef
++
++SDL_WATER_POST_INSTALL_TARGET_HOOKS += SDL_WATER_INSTALL_BMP
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed b/patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed
deleted file mode 100644
index bfdf33c..0000000
--- a/patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed
+++ /dev/null
@@ -1,99 +0,0 @@
-Add sdlwater package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -140,6 +140,8 @@
- source "package/sdl_net/Config.in"
- source "package/sdl_ttf/Config.in"
- source "package/sdl_gfx/Config.in"
-+comment "Demos"
-+source "package/sdlwater/Config.in"
- 
- comment "other GUIs"
- source "package/efl/Config.in"
-Index: buildroot/package/sdlwater/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/Config.in	2012-02-21 16:44:08.000000000 +0100
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_SDL_WATER
-+	bool "SDL_water"
-+	select BR2_PACKAGE_SDL
-+	help
-+	  Water effect demo coded with SDL
-+
-+	  http://www.libsdl.org/projects/SDL_water/
-Index: buildroot/package/sdlwater/sdlwater.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/sdlwater.mk	2012-02-21 16:44:08.000000000 +0100
-@@ -0,0 +1,65 @@
-+#############################################################
-+#
-+# SDL Water Demo
-+#
-+#############################################################
-+SDL_WATER_VERSION:=1.0
-+SDL_WATER_SOURCE:=water-$(SDL_WATER_VERSION).tar.gz
-+SDL_WATER_SITE:=http://www.libsdl.org/projects/water/src/
-+SDL_WATER_CAT:=$(ZCAT)
-+SDL_WATER_DIR:=$(BUILD_DIR)/water-$(SDL_WATER_VERSION)
-+SDL_WATER_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share/images/
-+
-+$(DL_DIR)/$(SDL_WATER_SOURCE):
-+	$(call DOWNLOAD,$(SDL_WATER_SITE),$(SDL_WATER_SOURCE))
-+
-+sdl-water-source: $(DL_DIR)/$(SDL_WATER_SOURCE)
-+
-+$(SDL_WATER_DIR)/.unpacked: $(DL_DIR)/$(SDL_WATER_SOURCE)
-+	$(SDL_WATER_CAT) $(DL_DIR)/$(SDL_WATER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+	touch $@
-+
-+$(SDL_WATER_DIR)/.configured: $(SDL_WATER_DIR)/.unpacked
-+	(cd $(SDL_WATER_DIR); \
-+	$(TARGET_CONFIGURE_OPTS) \
-+	CFLAGS="$(TARGET_CFLAGS) " \
-+	./configure \
-+	--target=$(GNU_TARGET_NAME) \
-+	--host=$(GNU_TARGET_NAME) \
-+	--build=$(GNU_HOST_NAME) \
-+	--prefix=$(STAGING_DIR)/usr \
-+	--with-sdl-exec-prefix=$(STAGING_DIR)/usr/ \
-+	--disable-video-x11 );
-+	touch $@
-+
-+$(SDL_WATER_DIR)/water: $(SDL_WATER_DIR)/.configured
-+	$(MAKE) -C $(SDL_WATER_DIR)
-+
-+$(STAGING_DIR)/usr/bin/water: $(SDL_WATER_DIR)/water
-+	$(MAKE) -C $(SDL_WATER_DIR) install
-+	touch -c $@
-+
-+$(TARGET_DIR)/usr/bin/water: $(STAGING_DIR)/usr/bin/water
-+	mkdir -p $(SDL_WATER_TARGET_DATA_DIR)
-+	cp -dpf $(SDL_WATER_DIR)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/
-+	cp -dpf  $< $(TARGET_DIR)/usr/bin/
-+	-$(STRIPCMD) $@
-+
-+SDL-WATER sdl-water: uclibc sdl $(TARGET_DIR)/usr/bin/water
-+
-+sdl-water-clean:
-+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_WATER_DIR) uninstall
-+	rm $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
-+	-$(MAKE) -C $(SDL_WATER_DIR) clean
-+
-+sdl-water-dirclean:
-+	rm -rf $(SDL_WATER_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_SDL_WATER)),y)
-+TARGETS+=sdl-water
-+endif


hooks/post-receive
-- 
armadeus


