[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-437-g5b5c717
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-437-g5b5c717
|
From: Julien B a. A. <ar...@us...> - 2013-09-04 17:34:30
|
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 5b5c717382b90b993365181e75f76e259519f2ef (commit)
via a6e820f0a75456bb0ca197cfc04ab6aa1da771ef (commit)
via c23f8c5f37d6ec4e6f670beb37cbc0f89c3da9ec (commit)
via 690120f116e189faa6abdf084d041f121fee98fe (commit)
via 336969227a18604df526d82299e7d9f6c1f0720f (commit)
from ac8b3e8d43e26909eb841bf1fa5f528e2b019027 (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 5b5c717382b90b993365181e75f76e259519f2ef
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 21:25:46 2013 +0200
[BUILDROOT][2013.05] Fixes madplay build
commit a6e820f0a75456bb0ca197cfc04ab6aa1da771ef
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 18:57:37 2013 +0200
[BUILDROOT][2013.05] Fixes ltris build
commit c23f8c5f37d6ec4e6f670beb37cbc0f89c3da9ec
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 18:26:00 2013 +0200
[BUILDROOT][2013.05] Fixes lbreakout2 build
commit 690120f116e189faa6abdf084d041f121fee98fe
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 17:48:29 2013 +0200
[BUILDROOT][2013.05] Fixes opentyrian build
commit 336969227a18604df526d82299e7d9f6c1f0720f
Author: Julien Boibessot <jul...@ar...>
Date: Sun Sep 1 22:03:37 2013 +0200
[BUILDROOT] [2013.05] Fixes snes9x compilation
-----------------------------------------------------------------------
Summary of changes:
...r-add_patch_for_recent_alsa_compatibility.patch | 187 --------------------
...fixed => 118-armadeus-snes9x-add-package.patch} | 81 +++------
...d => 125-armadeus-opentyrian-add-package.patch} | 53 +++---
...d => 130-armadeus-lbreakout2-add-package.patch} | 18 +-
...ixed => 131-armadeus-ltetris-add-package.patch} | 0
...armadeus-madplay-fixes-libintl-dependency.patch | 24 +++
.../191-madplay-requires_libintl.patch.tobefixed | 29 ---
7 files changed, 90 insertions(+), 302 deletions(-)
delete mode 100644 patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
rename patches/buildroot/2013.05/{118-snes9x-add_package.patch.tobefixed => 118-armadeus-snes9x-add-package.patch} (82%)
rename patches/buildroot/2013.05/{125-opentyrian-add_package.patch.tobefixed => 125-armadeus-opentyrian-add-package.patch} (62%)
rename patches/buildroot/2013.05/{130-lbreakout-add_package.patch.tobefixed => 130-armadeus-lbreakout2-add-package.patch} (78%)
rename patches/buildroot/2013.05/{131-ltetris-add_package.patch.tobefixed => 131-armadeus-ltetris-add-package.patch} (100%)
create mode 100644 patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch
delete mode 100644 patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed
diff --git a/patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
deleted file mode 100644
index 6a37eb1..0000000
--- a/patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Can't remember where I found these changes but they are mandatory, otherwise
-you will get this when compiling:
-audio_alsa.c:(.text+0x1d8): undefined reference to `snd_pcm_hw_params_set_rate_near@ALSA_0.9'
-audio_alsa.c:(.text+0x230): undefined reference to `snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9'
-audio_alsa.c:(.text+0x258): undefined reference to `snd_pcm_hw_params_get_buffer_size@ALSA_0.9'
-audio_alsa.c:(.text+0x274): undefined reference to `snd_pcm_hw_params_set_period_time_near@ALSA_0.9'
-audio_alsa.c:(.text+0x2a4): undefined reference to `snd_pcm_hw_params_get_period_size@ALSA_0.9'
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/madplay/madplay-audio-alsa.patch 2012-02-21 16:44:48.000000000 +0100
-@@ -0,0 +1,172 @@
-+* needed for madplay to compile when ALSA is configured with
-+ --with-versioned=no option.
-+* fix allocation of buffer, buffer_size is number of frames
-+* use default 16 bit depth (some hardware has small buffers, 16/24 bit
-+ difference is very small)
-+
-+--- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
-++++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
-+@@ -28,31 +28,30 @@
-+
-+ #include <errno.h>
-+
-+-#define ALSA_PCM_OLD_HW_PARAMS_API
-+-#define ALSA_PCM_OLD_SW_PARAMS_API
-+ #include <alsa/asoundlib.h>
-+
-+ #include <mad.h>
-+
-+ #include "audio.h"
-+
-+-char *buf = NULL;
-+-int paused = 0;
-++#define BUFFER_TIME_MAX 500000
-++unsigned char *buf = NULL;
-++int paused = 0;
-++
-++unsigned int rate = 0;
-++unsigned int channels = -1;
-++unsigned int bitdepth = -1;
-++unsigned int sample_size= -1;
-+
-+-int rate = -1;
-+-int channels = -1;
-+-int bitdepth = -1;
-+-int sample_size = -1;
-+-
-+-int buffer_time = 500000;
-+-int period_time = 100000;
-++unsigned int buffer_time;
-++unsigned int period_time;
-+ char *defaultdev = "plughw:0,0";
-+
-+ snd_pcm_hw_params_t *alsa_hwparams;
-+ snd_pcm_sw_params_t *alsa_swparams;
-+
-+ snd_pcm_sframes_t buffer_size;
-+-snd_pcm_sframes_t period_size;
-++snd_pcm_uframes_t period_size;
-+
-+ snd_pcm_format_t alsa_format = -1;
-+ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-+@@ -66,7 +65,7 @@
-+ snd_pcm_hw_params_t *params,
-+ snd_pcm_access_t access)
-+ {
-+- int err, dir;
-++ int err;
-+
-+ /* choose all parameters */
-+ err = snd_pcm_hw_params_any(handle,params);
-+@@ -74,6 +73,12 @@
-+ printf("Access type not available for playback: %s\n", snd_strerror(err));
-+ return err;
-+ }
-++ /* set the access type */
-++ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
-++ if (err < 0) {
-++ printf("Sample format not available for playback: %s\n", snd_strerror(err));
-++ return err;
-++ }
-+ /* set the sample format */
-+ err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
-+ if (err < 0) {
-+@@ -87,29 +92,42 @@
-+ return err;
-+ }
-+ /* set the stream rate */
-+- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
-++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
-+ if (err < 0) {
-+ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
-+ return err;
-+ }
-+- if (err != rate) {
-++ /*if (err != rate) {
-+ printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
-+ return -EINVAL;
-++ }*/
-++ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
-++ if (err < 0) {
-++ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
-++ return err;
-+ }
-++ if (buffer_time > BUFFER_TIME_MAX)
-++ buffer_time = BUFFER_TIME_MAX;
-+ /* set buffer time */
-+- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
-++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
-+ if (err < 0) {
-+ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
-+ return err;
-+ }
-+- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
-++ if (period_time * 4 > buffer_time)
-++ period_time = buffer_time / 4;
-+ /* set period time */
-+- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
-++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
-+ if (err < 0) {
-+ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
-+ return err;
-+ }
-+- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
-++ /* retrieve buffer size */
-++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
-++ if (err < 0) {
-++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
-++ return err;
-++ }
-+ /* write the parameters to device */
-+ err = snd_pcm_hw_params(handle, params);
-+ if (err < 0) {
-+@@ -123,6 +141,7 @@
-+ int set_swparams(snd_pcm_t *handle,
-+ snd_pcm_sw_params_t *params)
-+ {
-++ unsigned int start_threshold;
-+ int err;
-+
-+ /* get current swparams */
-+@@ -136,13 +155,7 @@
-+ if (err < 0) {
-+ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
-+ return err;
-+- }
-+- /* allow transfer when at least period_size samples can be processed */
-+- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
-+- if (err < 0) {
-+- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
-+- return err;
-+- }
-++ }
-+ /* align all transfers to 1 samples */
-+ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
-+ if (err < 0) {
-+@@ -190,7 +203,7 @@
-+ rate = config->speed;
-+
-+ if ( bitdepth == 0 )
-+- config->precision = bitdepth = 32;
-++ config->precision = bitdepth = 16;
-+
-+ switch (bitdepth)
-+ {
-+@@ -241,7 +254,7 @@
-+ return -1;
-+ }
-+
-+- buf = malloc(buffer_size);
-++ buf = malloc(buffer_size * sample_size);
-+ if (buf == NULL) {
-+ audio_error="unable to allocate output buffer table";
-+ return -1;
-+@@ -279,7 +292,7 @@
-+ int play(struct audio_play *play)
-+ {
-+ int err, len;
-+- char *ptr;
-++ unsigned char *ptr;
-+
-+ ptr = buf;
-+ len = play->nsamples;
diff --git a/patches/buildroot/2013.05/118-snes9x-add_package.patch.tobefixed b/patches/buildroot/2013.05/118-armadeus-snes9x-add-package.patch
similarity index 82%
rename from patches/buildroot/2013.05/118-snes9x-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/118-armadeus-snes9x-add-package.patch
index 691d6a3..78f10ce 100644
--- a/patches/buildroot/2013.05/118-snes9x-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/118-armadeus-snes9x-add-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:03.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:06.000000000 +0100
+--- buildroot.orig/package/Config.in 2013-09-01 21:14:59.583784109 +0200
++++ buildroot/package/Config.in 2013-09-01 21:58:32.600741347 +0200
@@ -108,6 +108,7 @@
source "package/doom-wad/Config.in"
source "package/rubix/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/snes9x/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/snes9x/Config.in 2012-02-21 16:45:06.000000000 +0100
++++ buildroot/package/snes9x/Config.in 2013-09-01 21:14:59.619784268 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SNES9X
+ bool "Snes9X"
@@ -33,41 +33,26 @@ Index: buildroot/package/snes9x/Config.in
Index: buildroot/package/snes9x/snes9x.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/snes9x/snes9x.mk 2012-02-21 16:45:06.000000000 +0100
-@@ -0,0 +1,80 @@
++++ buildroot/package/snes9x/snes9x.mk 2013-09-01 21:48:26.973738208 +0200
+@@ -0,0 +1,53 @@
+#############################################################
+#
+# SNES9X SNES emulator
+#
+#############################################################
-+SNES9X_VERSION:=1.39
-+SNES9X_SOURCE:=snes9x-sdl-$(SNES9X_VERSION).tar.bz2
-+SNES9X_SITE:=http://www.vanille.de/mirror/
++
++SNES9X_VERSION = 1.39
++SNES9X_SOURCE = snes9x-sdl-$(SNES9X_VERSION).tar.bz2
++SNES9X_SITE = http://www.vanille.de/mirror/
+# roms: http://rtgamer.free.fr/index.php?pg=2&rub=sn
-+SNES9X_CAT:=bzcat
-+SNES9X_DIR:=$(BUILD_DIR)/snes9x-sdl-$(SNES9X_VERSION)
-+SNES9X_TARGET_BIN:=/usr/local/bin/snes9x
++
++SNES9X_DEPENDENCIES = sdl
+
+#SNES9X_VERSION:=1.43
+#SNES9X_SOURCE:=snes9x-$(SNES9X_VERSION)-src.tar.gz
+#SNES9X_SITE:=http://vincent.grigorieff.free.fr/snes9x/
-+#SNES9X_CAT:=$(ZCAT)
-+#SNES9X_DIR:=$(BUILD_DIR)/snes9x-$(SNES9X_VERSION)-src
-+
-+$(DL_DIR)/$(SNES9X_SOURCE):
-+ $(call DOWNLOAD,$(SNES9X_SITE),$(SNES9X_SOURCE))
-+
-+snes9x-source: $(DL_DIR)/$(SNES9X_SOURCE)
-+
-+$(SNES9X_DIR)/.unpacked: $(DL_DIR)/$(SNES9X_SOURCE)
-+ $(SNES9X_CAT) $(DL_DIR)/$(SNES9X_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(SNES9X_DIR)/.patched: $(SNES9X_DIR)/.unpacked
-+ support/scripts/apply-patches.sh $(SNES9X_DIR) package/snes9x/ snes9x-$(SNES9X_VERSION)\*.patch
-+ touch $@
+
-+$(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
++#$(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
+# For v1.49 only !!
+# (cd $(SNES9X_DIR)/snes9x; \
+# $(TARGET_CONFIGURE_OPTS) \
@@ -84,41 +69,29 @@ Index: buildroot/package/snes9x/snes9x.mk
+# --without-opengl \
+# --without-nasm \
+# --without-mmx );
-+ touch $@
++# touch $@
+
-+$(SNES9X_DIR)/snes9x: $(SNES9X_DIR)/.configured
-+# $(MAKE) -C $(SNES9X_DIR)/snes9x
-+ $(MAKE) -C $(SNES9X_DIR) \
-+ CC=$(TARGET_CC) CCC="$(TARGET_CXX) -fno-rtti -fno-exceptions" \
-+ INCLUDES="-I$(STAGING_DIR)/usr/lib/include `$(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
-+ LDLIBS="`$(STAGING_DIR)/usr/bin/sdl-config --libs`"
-+ touch $@
++define SNES9X_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" CCC="$(TARGET_CXX) -fno-rtti -fno-exceptions" \
++ INCLUDES="-I$(STAGING_DIR)/usr/lib/include `$(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LDLIBS="`$(STAGING_DIR)/usr/bin/sdl-config --libs` -lm" \
++ -C $(@D)
++endef
+
-+$(TARGET_DIR)/$(SNES9X_TARGET_BIN): $(SNES9X_DIR)/snes9x
-+ cp -f $(SNES9X_DIR)/snes9x $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
++define SNES9X_INSTALL_TARGET_CMDS
++ cp -f $(@D)/snes9x $(TARGET_DIR)/usr/local/bin/
++endef
+
-+SNES9X snes9x: sdl $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-+
-+snes9x-clean:
+# $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SNES9X_DIR) uninstall
-+ -$(MAKE) -C $(SNES9X_DIR) clean
-+
-+snes9x-dirclean:
-+ rm -rf $(SNES9X_DIR)
++define WOLF4SDL_CLEAN_CMDS
++ -$(MAKE) -C $(@D) clean
++endef
+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_SNES9X)),y)
-+TARGETS+=snes9x
-+endif
++$(eval $(generic-package))
Index: buildroot/package/snes9x/snes9x-1.39-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/snes9x/snes9x-1.39-compile.patch 2012-02-21 16:45:06.000000000 +0100
++++ buildroot/package/snes9x/snes9x-1.39-compile.patch 2013-09-01 21:14:59.619784268 +0200
@@ -0,0 +1,295 @@
+
+#
diff --git a/patches/buildroot/2013.05/125-opentyrian-add_package.patch.tobefixed b/patches/buildroot/2013.05/125-armadeus-opentyrian-add-package.patch
similarity index 62%
rename from patches/buildroot/2013.05/125-opentyrian-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/125-armadeus-opentyrian-add-package.patch
index 3044d3b..6c58187 100644
--- a/patches/buildroot/2013.05/125-opentyrian-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/125-armadeus-opentyrian-add-package.patch
@@ -1,7 +1,7 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:45.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:46.000000000 +0100
+--- buildroot.orig/package/Config.in 2013-09-01 22:12:12.080804929 +0200
++++ buildroot/package/Config.in 2013-09-02 17:46:24.214361708 +0200
@@ -104,6 +104,7 @@
menu "Games"
source "package/e-uae/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/opentyrian/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/opentyrian/Config.in 2012-02-21 16:45:46.000000000 +0100
++++ buildroot/package/opentyrian/Config.in 2013-09-01 22:12:12.100805024 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_OPENTYRIAN
+ bool "OpenTyrian"
@@ -29,41 +29,48 @@ Index: buildroot/package/opentyrian/Config.in
Index: buildroot/package/opentyrian/opentyrian.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/opentyrian/opentyrian.mk 2012-02-21 16:45:46.000000000 +0100
-@@ -0,0 +1,50 @@
++++ buildroot/package/opentyrian/opentyrian.mk 2013-09-02 17:46:46.842473913 +0200
+@@ -0,0 +1,57 @@
+#############################################################
+#
+# OpenTyrian
+#
+#############################################################
+
-+OPENTYRIAN_TRUNK:=https://opentyrian.googlecode.com/hg/
-+# Opentyrian sources should be checked out from it's main repository (they
-+# dont't provide stable versions), but this would require mercurial to be
-+# intalled on host system. So I use a custom made tar.bz2
-+OPENTYRIAN_SITE:=ftp://ftp2.armadeus.com/armadeusw/download/
-+OPENTYRIAN_VERSION:=2a8a946b62bd
-+OPENTYRIAN_NAME:=opentyrian-hg-r$(OPENTYRIAN_VERSION)
-+OPENTYRIAN_DIR:=$(BUILD_DIR)/$(OPENTYRIAN_NAME)
-+OPENTYRIAN_SOURCE:=$(OPENTYRIAN_NAME).tar.bz2
-+OPENTYRIAN_CAT=$(BZCAT)
-+OPENTYRIAN_DATA:=tyrian21.zip
-+OPENTYRIAN_DATA_SITE:=http://camanis.net/tyrian
++OPENTYRIAN_SITE = https://code.google.com/p/opentyrian/
++OPENTYRIAN_SITE_METHOD = hg
++OPENTYRIAN_VERSION = 41a46e19b054
++#OPENTYRIAN_VERSION = 2a8a946b62bd (old one)
++OPENTYRIAN_LICENSE = GPLv2
++GPM_LICENSE_FILES = COPYING
++
++OPENTYRIAN_DEPENDENCIES = sdl sdl_net
++
++OPENTYRIAN_DATA = tyrian21.zip
++OPENTYRIAN_DATA_SITE = http://sites.google.com/a/camanis.net/opentyrian/tyrian/
+
+define OPENTYRIAN_DOWNLOAD_DATA
-+ $(call DOWNLOAD,$(OPENTYRIAN_DATA_SITE),$(OPENTYRIAN_DATA))
-+ unzip $(DL_DIR)/$(OPENTYRIAN_DATA) -d $(OPENTYRIAN_DIR)
++ @$(call MESSAGE,Downloading data)
++# $(call DOWNLOAD,$(OPENTYRIAN_DATA_SITE),$(OPENTYRIAN_DATA))
++# conflict with OPENTYRIAN_SITE_METHOD ^^^
++ cd $(DL_DIR); wget -c $(OPENTYRIAN_DATA_SITE)/$(OPENTYRIAN_DATA)
++endef
++
++OPENTYRIAN_POST_DOWNLOAD_HOOKS += OPENTYRIAN_DOWNLOAD_DATA
++
++define OPENTYRIAN_EXTRACT_DATA
++ unzip $(DL_DIR)/$(OPENTYRIAN_DATA) -d $(@D)
+endef
+
-+OPENTYRIAN_POST_EXTRACT_HOOKS += OPENTYRIAN_DOWNLOAD_DATA
++OPENTYRIAN_POST_EXTRACT_HOOKS += OPENTYRIAN_EXTRACT_DATA
+
+define OPENTYRIAN_BUILD_CMDS
+ $(MAKE) PLATFORM=UNIX \
+ CC="$(TARGET_CC)" \
+ STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
-+ SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config \
-+ -C $(OPENTYRIAN_DIR) \
-+ release
++ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
++ LDFLAGS="-lm" \
++ -C $(@D) release
+endef
+
+define OPENTYRIAN_INSTALL_TARGET_CMDS
diff --git a/patches/buildroot/2013.05/130-lbreakout-add_package.patch.tobefixed b/patches/buildroot/2013.05/130-armadeus-lbreakout2-add-package.patch
similarity index 78%
rename from patches/buildroot/2013.05/130-lbreakout-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/130-armadeus-lbreakout2-add-package.patch
index 1265cb8..b8fa713 100644
--- a/patches/buildroot/2013.05/130-lbreakout-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/130-armadeus-lbreakout2-add-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:46.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:48.000000000 +0100
+--- buildroot.orig/package/Config.in 2013-09-02 17:49:40.103333069 +0200
++++ buildroot/package/Config.in 2013-09-02 18:24:40.857750147 +0200
@@ -104,6 +104,7 @@
menu "Games"
source "package/e-uae/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/lbreakout2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/Config.in 2012-02-21 16:45:48.000000000 +0100
++++ buildroot/package/lbreakout2/Config.in 2013-09-02 17:49:40.119333151 +0200
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_LBREAKOUT2
+ bool "LBreakout2"
@@ -48,7 +48,7 @@ Index: buildroot/package/lbreakout2/Config.in
Index: buildroot/package/lbreakout2/lbreakout2.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/lbreakout2.mk 2012-02-21 16:45:48.000000000 +0100
++++ buildroot/package/lbreakout2/lbreakout2.mk 2013-09-02 18:23:05.225275930 +0200
@@ -0,0 +1,30 @@
+#############################################################
+#
@@ -56,12 +56,12 @@ Index: buildroot/package/lbreakout2/lbreakout2.mk
+#
+#############################################################
+
-+LBREAKOUT2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lgames
-+LBREAKOUT2_VERSION = 2.6.1
-+LBREAKOUT2_SOURCE = lbreakout2-$(LBREAKOUT2_VERSION).tar.gz
-+LBREAKOUT2_CAT = $(ZCAT)
++LBREAKOUT2_SITE = http://sourceforge.net/projects/lgames/files/lbreakout2/2.6/
++LBREAKOUT2_VERSION = 2.6.3
++LBREAKOUT2_LICENSE = GPLv2
++LBREAKOUT2_LICENSE_FILES = COPYING
+
-+LBREAKOUT2_DEPENDENCIES = sdl
++LBREAKOUT2_DEPENDENCIES = sdl libpng
+LBREAKOUT2_CONF_OPT += --disable-nls
+
+ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y)
diff --git a/patches/buildroot/2013.05/131-ltetris-add_package.patch.tobefixed b/patches/buildroot/2013.05/131-armadeus-ltetris-add-package.patch
similarity index 100%
rename from patches/buildroot/2013.05/131-ltetris-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/131-armadeus-ltetris-add-package.patch
diff --git a/patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch b/patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch
new file mode 100644
index 0000000..dc19099
--- /dev/null
+++ b/patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch
@@ -0,0 +1,24 @@
+Otherwise compilation fails (in intl/relocatable.c):
+./relocatable.c: In function 'libintl_relocate':
+./relocatable.c:402:40: error: 'INSTALLPREFIX' undeclared (first use in this function)
+./relocatable.c:402:40: note: each undeclared identifier is reported only once for each function it appears in
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/madplay/madplay.mk
+===================================================================
+--- buildroot.orig/package/multimedia/madplay/madplay.mk 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/multimedia/madplay/madplay.mk 2013-09-02 19:18:01.433620945 +0200
+@@ -12,6 +12,12 @@
+ MADPLAY_LIBTOOL_PATCH = NO
+ MADPLAY_DEPENDENCIES = libmad libid3tag
+
++ifeq ($(BR2_PACKAGE_GETTEXT),y)
++MADPLAY_DEPENDENCIES += gettext
++else
++MADPLAY_CONF_OPT += --disable-nls
++endif
++
+ # Check if ALSA is built, then we should configure after alsa-lib so
+ # ./configure can find alsa-lib.
+ ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
diff --git a/patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed b/patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed
deleted file mode 100644
index 5d3ecdf..0000000
--- a/patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed
+++ /dev/null
@@ -1,29 +0,0 @@
-Otherwise compilation fails (in intl/relocatable.c)
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/multimedia/madplay/Config.in
-===================================================================
---- buildroot.orig/package/multimedia/madplay/Config.in 2012-08-08 09:56:30.000000000 +0200
-+++ buildroot/package/multimedia/madplay/Config.in 2012-08-08 09:57:12.000000000 +0200
-@@ -2,6 +2,7 @@
- bool "madplay"
- select BR2_PACKAGE_LIBMAD
- select BR2_PACKAGE_LIBID3TAG
-+ select BR2_PACKAGE_LIBINTL
- help
- Command-line front-end to libmad, a high-quality MPEG audio decoder.
- It currently supports MPEG-1 and the MPEG-2 extension to lower
-Index: buildroot/package/multimedia/madplay/madplay.mk
-===================================================================
---- buildroot.orig/package/multimedia/madplay/madplay.mk 2012-08-08 10:04:31.000000000 +0200
-+++ buildroot/package/multimedia/madplay/madplay.mk 2012-08-08 10:04:51.000000000 +0200
-@@ -10,7 +10,7 @@
- MADPLAY_LICENSE = GPLv2+
- MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
- MADPLAY_LIBTOOL_PATCH = NO
--MADPLAY_DEPENDENCIES = libmad libid3tag
-+MADPLAY_DEPENDENCIES = libmad libid3tag libintl
-
- # Check if ALSA is built, then we should configure after alsa-lib so
- # ./configure can find alsa-lib.
hooks/post-receive
--
armadeus
|
