[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-75-ga47cf6d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-75-ga47cf6d
|
From: Julien B a. A. <ar...@us...> - 2012-02-22 18:14:32
|
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 a47cf6dd20c3f27375f8ae0e6280d3e68af5a40a (commit)
from fd2bd23bf85d68b76d8f87c812da0c3e125d958c (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 a47cf6dd20c3f27375f8ae0e6280d3e68af5a40a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 22 19:12:29 2012 +0100
[BUILDROOT] 2012.02: fixes some patches for new infrastructure
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2012.02/006-lcd4linux.patch | 2 +-
patches/buildroot/2012.02/040-linux-makefile.patch | 17 +++++---
.../buildroot/2012.02/043-mesa-add_packages.patch | 2 +-
.../2012.02/057-pymysql-add_package.patch | 2 +-
...x_in_a_standalone_way_after_configuration.patch | 10 ++--
.../buildroot/2012.02/081-adds_quake_package.patch | 28 ++++++-------
.../2012.02/083-pygame-armadeus_addons.patch | 43 ++++++++++++++++++++
.../buildroot/2012.02/085-adds_gpm_package.patch | 12 +++---
.../buildroot/2012.02/095-uucp-add_packages.patch | 8 ++--
.../buildroot/2012.02/097-adds_flite_package.patch | 12 +++---
.../buildroot/2012.02/107-games-add_wolf4sdl.patch | 8 ++--
.../2012.02/116-openobex-add_package.patch | 4 +-
.../2012.02/117-ussp-push-add_package.patch | 4 +-
.../buildroot/2012.02/118-snes9x-add_package.patch | 2 +-
.../buildroot/2012.02/119-fbtest-add_package.patch | 2 +-
.../buildroot/2012.02/120-cwiid-add_package.patch | 12 +++---
.../buildroot/2012.02/122-urg-add_package.patch | 6 +-
.../buildroot/2012.02/124-e-uae-add_package.patch | 6 +-
.../2012.02/130-lbreakout-add_package.patch | 10 ++--
.../2012.02/131-ltetris-add_package.patch | 8 ++--
.../buildroot/2012.02/133-qwt-add_package.patch | 2 +-
...net-fixes_tarball_name_and_update_version.patch | 20 +++++++++
22 files changed, 143 insertions(+), 77 deletions(-)
create mode 100644 patches/buildroot/2012.02/083-pygame-armadeus_addons.patch
create mode 100644 patches/buildroot/2012.02/173-sdl_net-fixes_tarball_name_and_update_version.patch
diff --git a/patches/buildroot/2012.02/006-lcd4linux.patch b/patches/buildroot/2012.02/006-lcd4linux.patch
index 4fb09d7..87c83cb 100644
--- a/patches/buildroot/2012.02/006-lcd4linux.patch
+++ b/patches/buildroot/2012.02/006-lcd4linux.patch
@@ -59,7 +59,7 @@ Index: buildroot/package/lcd4linux/lcd4linux.mk
+ touch $@
+
+$(LCD4LINUX_DIR)/.patched: $(LCD4LINUX_DIR)/.unpacked
-+ toolchain/patch-kernel.sh $(LCD4LINUX_DIR) package/lcd4linux lcd4linux\*.patch
++ support/scripts/apply-patches.sh $(LCD4LINUX_DIR) package/lcd4linux lcd4linux\*.patch
+ (if [ -d $(BUILD_DIR)/linux-2.6.12/include/asm-generic ]; then ln -sf $(BUILD_DIR)/linux-2.6.12/include/asm-generic/ $(BUILD_DIR)/staging_dir/arm-linux-uclibc/sys-include/asm-generic; fi)
+ touch $@
+
diff --git a/patches/buildroot/2012.02/040-linux-makefile.patch b/patches/buildroot/2012.02/040-linux-makefile.patch
index 37c5655..8a6c6d0 100644
--- a/patches/buildroot/2012.02/040-linux-makefile.patch
+++ b/patches/buildroot/2012.02/040-linux-makefile.patch
@@ -1,7 +1,7 @@
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-21 16:43:28.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 16:44:16.000000000 +0100
+--- buildroot.orig/linux/linux.mk 2012-02-12 23:22:29.000000000 +0100
++++ buildroot/linux/linux.mk 2012-02-21 20:57:38.000000000 +0100
@@ -44,7 +44,8 @@
# Get the real Linux version, which tells us where kernel modules are
@@ -12,17 +12,22 @@ Index: buildroot/linux/linux.mk
ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
-@@ -125,6 +126,9 @@
+@@ -124,7 +125,14 @@
+ KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
endif
- define LINUX_CONFIGURE_CMDS
+ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
++define ARMADEUS_LINUX_CONFIG_HACKS
+ (ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus)
++endef
+endif
++
+ define LINUX_CONFIGURE_CMDS
++ $(ARMADEUS_LINUX_CONFIG_HACKS)
cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-@@ -168,7 +172,7 @@
+@@ -168,7 +176,7 @@
endif
define LINUX_INSTALL_IMAGES_CMDS
@@ -31,7 +36,7 @@ Index: buildroot/linux/linux.mk
endef
define LINUX_INSTALL_TARGET_CMDS
-@@ -214,7 +218,7 @@
+@@ -214,7 +222,7 @@
# Build the kernel.
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
# Copy the kernel image to its final destination
diff --git a/patches/buildroot/2012.02/043-mesa-add_packages.patch b/patches/buildroot/2012.02/043-mesa-add_packages.patch
index e283a8a..c10c6b4 100644
--- a/patches/buildroot/2012.02/043-mesa-add_packages.patch
+++ b/patches/buildroot/2012.02/043-mesa-add_packages.patch
@@ -60,7 +60,7 @@ Index: buildroot/package/mesa/mesa.mk
+ touch $@
+
+$(MESALIB_DIR)/.patched: $(MESALIB_DIR)/.unpacked
-+ toolchain/patch-kernel.sh $(MESALIB_DIR) package/mesa $(MESALIB_PATCH)
++ support/scripts/apply-patches.sh $(MESALIB_DIR) package/mesa $(MESALIB_PATCH)
+ touch $@
+
+$(MESALIB_DIR)/.compiled: $(MESALIB_DIR)/.patched
diff --git a/patches/buildroot/2012.02/057-pymysql-add_package.patch b/patches/buildroot/2012.02/057-pymysql-add_package.patch
index 6069ea2..f9be35c 100644
--- a/patches/buildroot/2012.02/057-pymysql-add_package.patch
+++ b/patches/buildroot/2012.02/057-pymysql-add_package.patch
@@ -62,7 +62,7 @@ Index: buildroot/package/python-mysql/python-mysql.mk
+ touch $@
+
+$(PYMYSQL_DIR)/.patched: $(PYMYSQL_DIR)/.unpacked
-+ toolchain/patch-kernel.sh $(PYMYSQL_DIR) package/pymysql/ \*.patch
++ support/scripts/apply-patches.sh $(PYMYSQL_DIR) package/pymysql/ \*.patch
+ touch $@
+
+$(PYMYSQL_DIR)/.configured: $(PYMYSQL_DIR)/.patched
diff --git a/patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
index 9272ac2..4d24469 100644
--- a/patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
+++ b/patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
@@ -1,13 +1,13 @@
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2012-02-21 16:44:30.000000000 +0100
-+++ buildroot/linux/linux.mk 2012-02-21 16:44:32.000000000 +0100
+--- buildroot.orig/linux/linux.mk 2012-02-21 20:57:58.000000000 +0100
++++ buildroot/linux/linux.mk 2012-02-21 20:59:44.000000000 +0100
@@ -129,6 +129,8 @@
- define LINUX_CONFIGURE_CMDS
ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
+ define ARMADEUS_LINUX_CONFIG_HACKS
+ $(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(@D)/Makefile
+ $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(@D)/Makefile
- (ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus)
+ ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus
+ endef
endif
- cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
diff --git a/patches/buildroot/2012.02/081-adds_quake_package.patch b/patches/buildroot/2012.02/081-adds_quake_package.patch
index e907f29..46cc4b0 100644
--- a/patches/buildroot/2012.02/081-adds_quake_package.patch
+++ b/patches/buildroot/2012.02/081-adds_quake_package.patch
@@ -16,8 +16,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/sdlquake/sdlquake.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2012-02-21 16:44:35.000000000 +0100
-@@ -0,0 +1,36 @@
++++ buildroot/package/games/sdlquake/sdlquake.mk 2012-02-21 20:50:51.000000000 +0100
+@@ -0,0 +1,34 @@
+#############################################################
+#
+# Quake 1 (SDL_Port)
@@ -25,11 +25,9 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
+#############################################################
+
+SDLQUAKE_VERSION = 1.0.9
-+SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
++#SDLQUAKE_SOURCE = sdlquake-$(SDLQUAKE_VERSION).tar.gz
+SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
-+#SDLQUAKE_AUTORECONF = NO
-+SDLQUAKE_INSTALL_STAGING = NO
-+SDLQUAKE_INSTALL_TARGET = YES
++##SDLQUAKE_AUTORECONF = NO
+
+SDLQUAKE_CONF_OPT = \
+ --target=$(GNU_TARGET_NAME) \
@@ -39,14 +37,14 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
+ --prefix=/usr \
+ --sysconfdir=/etc
+
-+SDLQUAKE_DEPENDENCIES = sdl sdl_mixer SDL_net
++SDLQUAKE_DEPENDENCIES = sdl
+
-+$(eval $(call AUTOTARGETS,package/games,sdlquake))
++$(eval $(call AUTOTARGETS))
+
+NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
+$(SDLQUAKE_TARGET_PATCH):
+ $(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
-+ toolchain/patch-kernel.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
++ support/scripts/apply-patches.sh $($(PKG)_DIR) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1;
+ (cd $(SDLQUAKE_DIR); \
+ touch INSTALL NEWS README AUTHORS ChangeLog; \
+ echo "AC_PROG_CC" >> configure.in; \
@@ -57,7 +55,7 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2012-02-21 16:44:35.000000000 +0100
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2012-02-21 17:41:55.000000000 +0100
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
@@ -97,7 +95,7 @@ Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
Index: buildroot/package/games/sdlquake/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2012-02-21 16:44:35.000000000 +0100
++++ buildroot/package/games/sdlquake/Config.in 2012-02-21 17:41:55.000000000 +0100
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
@@ -112,7 +110,7 @@ Index: buildroot/package/games/sdlquake/Config.in
Index: buildroot/package/games/quake-pak/quake-pak.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/quake-pak.mk 2012-02-21 16:44:35.000000000 +0100
++++ buildroot/package/games/quake-pak/quake-pak.mk 2012-02-21 17:41:55.000000000 +0100
@@ -0,0 +1,34 @@
+#############################################################
+#
@@ -151,7 +149,7 @@ Index: buildroot/package/games/quake-pak/quake-pak.mk
Index: buildroot/package/games/quake-pak/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/Config.in 2012-02-21 16:44:35.000000000 +0100
++++ buildroot/package/games/quake-pak/Config.in 2012-02-21 17:41:55.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
@@ -162,8 +160,8 @@ Index: buildroot/package/games/quake-pak/Config.in
+ The file will be placed in the /usr/share/games/quake/ directory.
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:44:31.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:44:35.000000000 +0100
+--- buildroot.orig/package/Config.in 2012-02-21 17:41:55.000000000 +0100
++++ buildroot/package/Config.in 2012-02-21 20:50:11.000000000 +0100
@@ -93,8 +93,10 @@
menu "Games"
source "package/games/gnuchess/Config.in"
diff --git a/patches/buildroot/2012.02/083-pygame-armadeus_addons.patch b/patches/buildroot/2012.02/083-pygame-armadeus_addons.patch
new file mode 100644
index 0000000..7b9b0e6
--- /dev/null
+++ b/patches/buildroot/2012.02/083-pygame-armadeus_addons.patch
@@ -0,0 +1,43 @@
+Will be useful when smpeg and python-numeric packages will be available in BR.
+:-)
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/python-pygame/Config.in
+===================================================================
+--- buildroot.orig/package/python-pygame/Config.in 2012-02-21 17:45:22.000000000 +0100
++++ buildroot/package/python-pygame/Config.in 2012-02-21 17:47:02.000000000 +0100
+@@ -40,6 +40,33 @@
+ help
+ pygame module for controlling streamed audio
+
++config BR2_PACKAGE_PYTHON_PYGAME_SNDARRAY
++ bool "pygame.sndarray"
++ depends on BR2_PACKAGE_PYTHON_PYGAME_MIXER && BR2_PACKAGE_PYTHON_NUMERIC
++ help
++ pygame module for accessing sound sample data
++
++comment "pygame.sndarray depends on Python's Numeric extension that is not (yet) supported"
++ depends on !BR2_PACKAGE_PYTHON_PYGAME_SNDARRAY
++
++config BR2_PACKAGE_PYTHON_PYGAME_SURFARRAY
++ bool "pygame.surfarray"
++ depends on BR2_PACKAGE_PYTHON_NUMERIC
++ help
++ pygame module for accessing surface pixel data using array interfaces
++
++comment "pygame.surfarray depends on Python's Numeric extension that is not (yet) supported"
++ depends on !BR2_PACKAGE_PYTHON_PYGAME_SURFARRAY
++
++config BR2_PACKAGE_PYTHON_PYGAME_MOVIE
++ bool "pygame.movie"
++ depends on BR2_PACKAGE_SMPEG
++ help
++ pygame module for playback of mpeg video
++
++comment "pygame.movie depends on smpeg"
++ depends on !BR2_PACKAGE_PYTHON_PYGAME_MOVIE
++
+ config BR2_PACKAGE_PYTHON_PYGAME_SCRAP
+ bool "pygame.scrap"
+ depends on BR2_PACKAGE_SDL_X11
diff --git a/patches/buildroot/2012.02/085-adds_gpm_package.patch b/patches/buildroot/2012.02/085-adds_gpm_package.patch
index d63b817..4bfd6d2 100644
--- a/patches/buildroot/2012.02/085-adds_gpm_package.patch
+++ b/patches/buildroot/2012.02/085-adds_gpm_package.patch
@@ -25,13 +25,13 @@ Index: buildroot/package/gpm/gpm.mk
+#
+#############################################################
+
-+GPM_VERSION:=1.20.6
-+GPM_SOURCE:=gpm-$(GPM_VERSION).tar.bz2
-+GPM_SITE:=http://unix.schottelius.org/gpm/archives/
-+GPM_INSTALL_STAGING:=YES
-+GPM_INSTALL_TARGET:=YES
++GPM_VERSION = 1.20.6
++GPM_SOURCE = gpm-$(GPM_VERSION).tar.bz2
++GPM_SITE = http://unix.schottelius.org/gpm/archives/
++GPM_INSTALL_STAGING = YES
++GPM_INSTALL_TARGET = YES
+
-+$(eval $(call AUTOTARGETS,package,gpm))
++$(eval $(call AUTOTARGETS))
+
+$(GPM_HOOK_POST_INSTALL): $(GPM_TARGET_INSTALL_TARGET)
+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/gpm
diff --git a/patches/buildroot/2012.02/095-uucp-add_packages.patch b/patches/buildroot/2012.02/095-uucp-add_packages.patch
index d12bc54..b2034c6 100644
--- a/patches/buildroot/2012.02/095-uucp-add_packages.patch
+++ b/patches/buildroot/2012.02/095-uucp-add_packages.patch
@@ -28,9 +28,9 @@ Index: buildroot/package/uucp/uucp.mk
+#
+#############################################################
+
-+UUCP_VERSION:=1.07
-+UUCP_SOURCE:=uucp_$(UUCP_VERSION).orig.tar.gz
-+UUCP_SITE:=http://ftp.debian.org/debian/pool/main/u/uucp/
++UUCP_VERSION = 1.07
++UUCP_SOURCE = uucp_$(UUCP_VERSION).orig.tar.gz
++UUCP_SITE = http://ftp.debian.org/debian/pool/main/u/uucp/
+# or ftp://ftp.gnu.org/pub/gnu/uucp/uucp-1.07.tar.gz
+
+define UUCP_INSTALL_STRIP_FIXUP
@@ -43,7 +43,7 @@ Index: buildroot/package/uucp/uucp.mk
+UUCP_POST_CONFIGURE_HOOKS += UUCP_INSTALL_STRIP_FIXUP
+endif
+
-+$(eval $(call AUTOTARGETS,package,uucp))
++$(eval $(call AUTOTARGETS))
Index: buildroot/package/uucp/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2012.02/097-adds_flite_package.patch b/patches/buildroot/2012.02/097-adds_flite_package.patch
index fd25a19..09edf7b 100644
--- a/patches/buildroot/2012.02/097-adds_flite_package.patch
+++ b/patches/buildroot/2012.02/097-adds_flite_package.patch
@@ -41,17 +41,17 @@ Index: buildroot/package/multimedia/flite/flite.mk
+#
+#############################################################
+
-+FLITE_VERSION:=1.4
-+FLITE_SOURCE:=flite-$(FLITE_VERSION)-release.tar.bz2
-+FLITE_SITE:=http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)/
-+FLITE_INSTALL_STAGING:=YES
-+FLITE_INSTALL_TARGET:=YES
++FLITE_VERSION = 1.4
++FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2
++FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)/
++FLITE_INSTALL_STAGING = YES
++FLITE_INSTALL_TARGET = YES
+
+FLITE_CONF_OPT = --enable-shared
+FLITE_INSTALL_STAGING_OPT = INSTALLBINDIR=$(STAGING_DIR)/usr/bin INSTALLLIBDIR=$(STAGING_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
+FLITE_INSTALL_TARGET_OPT = INSTALLBINDIR=$(TARGET_DIR)/usr/bin INSTALLLIBDIR=$(TARGET_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
+
-+$(eval $(call AUTOTARGETS,package,flite))
++$(eval $(call AUTOTARGETS))
+
+# Flite (strange) archive format makes Buildroot failed to extract it (--strip-components).
+# So do it manually:
diff --git a/patches/buildroot/2012.02/107-games-add_wolf4sdl.patch b/patches/buildroot/2012.02/107-games-add_wolf4sdl.patch
index c682367..7b14b40 100644
--- a/patches/buildroot/2012.02/107-games-add_wolf4sdl.patch
+++ b/patches/buildroot/2012.02/107-games-add_wolf4sdl.patch
@@ -28,16 +28,16 @@ Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
+# Wolf4SDL
+#
+#############################################################
-+WOLF4SDL_VERSION:=1.6
++WOLF4SDL_VERSION = 1.6
+WOLF4SDL_SOURCE = Wolf4SDL-$(WOLF4SDL_VERSION)-src.zip
+WOLF4SDL_SITE = http://www.alice-dsl.net/mkroll/bins/
-+WOLF4SDL_TARGET_BIN:=/usr/local/bin/wolf3d
-+WOLF4SDL_DIR:=$(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
++WOLF4SDL_TARGET_BIN = /usr/local/bin/wolf3d
++WOLF4SDL_DIR = $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
+
+#WOLF4SDL_INSTALL_STAGING = NO
+#WOLF4SDL_INSTALL_TARGET = YES
+#WOLF4SDL_DEPENDENCIES = sdl sdl_mixer
-+#$(eval $(call AUTOTARGETS,package/games,wolf4sdl))
++#$(eval $(call AUTOTARGETS))
+
+$(DL_DIR)/$(WOLF4SDL_SOURCE):
+ $(call DOWNLOAD,$(WOLF4SDL_SITE),$(WOLF4SDL_SOURCE))
diff --git a/patches/buildroot/2012.02/116-openobex-add_package.patch b/patches/buildroot/2012.02/116-openobex-add_package.patch
index 6810db8..7c3d5cb 100644
--- a/patches/buildroot/2012.02/116-openobex-add_package.patch
+++ b/patches/buildroot/2012.02/116-openobex-add_package.patch
@@ -54,7 +54,7 @@ Index: buildroot/package/openobex/openobex.mk
+# openobex
+#
+#############################################################
-+OPENOBEX_VERSION := 1.5
++OPENOBEX_VERSION = 1.5
+OPENOBEX_SITE = http://www.kernel.org/pub/linux/bluetooth
+OPENOBEX_AUTORECONF = YES
+OPENOBEX_INSTALL_STAGING = YES
@@ -94,7 +94,7 @@ Index: buildroot/package/openobex/openobex.mk
+ $(WITH_DUMP) \
+ $(WITH_SYSLOG)
+
-+$(eval $(call AUTOTARGETS,package,openobex))
++$(eval $(call AUTOTARGETS))
+
Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
===================================================================
diff --git a/patches/buildroot/2012.02/117-ussp-push-add_package.patch b/patches/buildroot/2012.02/117-ussp-push-add_package.patch
index cb60fc2..d6da723 100644
--- a/patches/buildroot/2012.02/117-ussp-push-add_package.patch
+++ b/patches/buildroot/2012.02/117-ussp-push-add_package.patch
@@ -39,10 +39,10 @@ Index: buildroot/package/ussp-push/ussp-push.mk
+# ussp-push
+#
+#############################################################
-+USSP_PUSH_VERSION := 0.11
++USSP_PUSH_VERSION = 0.11
+USSP_PUSH_SITE = http://www.xmailserver.org
+
+USSP_PUSH_DEPENDENCIES = bluez-libs openobex
+
-+$(eval $(call AUTOTARGETS,package,ussp-push))
++$(eval $(call AUTOTARGETS))
+
diff --git a/patches/buildroot/2012.02/118-snes9x-add_package.patch b/patches/buildroot/2012.02/118-snes9x-add_package.patch
index 6fd16d5..36a51db 100644
--- a/patches/buildroot/2012.02/118-snes9x-add_package.patch
+++ b/patches/buildroot/2012.02/118-snes9x-add_package.patch
@@ -64,7 +64,7 @@ Index: buildroot/package/games/snes9x/snes9x.mk
+ touch $@
+
+$(SNES9X_DIR)/.patched: $(SNES9X_DIR)/.unpacked
-+ toolchain/patch-kernel.sh $(SNES9X_DIR) package/snes9x/ snes9x-$(SNES9X_VERSION)\*.patch
++ support/scripts/apply-patches.sh $(SNES9X_DIR) package/snes9x/ snes9x-$(SNES9X_VERSION)\*.patch
+ touch $@
+
+$(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
diff --git a/patches/buildroot/2012.02/119-fbtest-add_package.patch b/patches/buildroot/2012.02/119-fbtest-add_package.patch
index 653c9be..4364c1d 100644
--- a/patches/buildroot/2012.02/119-fbtest-add_package.patch
+++ b/patches/buildroot/2012.02/119-fbtest-add_package.patch
@@ -49,7 +49,7 @@ Index: buildroot/package/fbtest/fbtest.mk
+
+$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
+ $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/ \
++ support/scripts/apply-patches.sh $(FBTEST_DIR) package/fbtest/ \
+ fbtest-$(FBTEST_VERSION)\*.patch \
+ fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
+ touch $@
diff --git a/patches/buildroot/2012.02/120-cwiid-add_package.patch b/patches/buildroot/2012.02/120-cwiid-add_package.patch
index 5ad8f04..bcb9b8c 100644
--- a/patches/buildroot/2012.02/120-cwiid-add_package.patch
+++ b/patches/buildroot/2012.02/120-cwiid-add_package.patch
@@ -38,11 +38,11 @@ Index: buildroot/package/cwiid/cwiid.mk
+# cwiid
+#
+#############################################################
-+CWIID_VERSION:=0.6.00
-+CWIID_SOURCE:=cwiid-$(CWIID_VERSION).tgz
-+CWIID_SITE:=http://abstrakraft.org/cwiid/downloads
-+CWIID_AUTORECONF:=YES
-+CWIID_INSTALL_STAGING:=YES
++CWIID_VERSION = 0.6.00
++CWIID_SOURCE = cwiid-$(CWIID_VERSION).tgz
++CWIID_SITE = http://abstrakraft.org/cwiid/downloads
++CWIID_AUTORECONF = YES
++CWIID_INSTALL_STAGING = YES
+CWIID_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+CWIID_CONF_OPT = --disable-ldconfig
@@ -52,7 +52,7 @@ Index: buildroot/package/cwiid/cwiid.mk
+
+CWIID_DEPENDENCIES = bluez-libs
+
-+$(eval $(call AUTOTARGETS,package,cwiid))
++$(eval $(call AUTOTARGETS))
+
+$(CWIID_HOOK_POST_INSTALL):
+ $(call MESSAGE,"Post-installing")
diff --git a/patches/buildroot/2012.02/122-urg-add_package.patch b/patches/buildroot/2012.02/122-urg-add_package.patch
index 1ae7f17..154cf00 100644
--- a/patches/buildroot/2012.02/122-urg-add_package.patch
+++ b/patches/buildroot/2012.02/122-urg-add_package.patch
@@ -38,17 +38,17 @@ Index: buildroot/package/urg/urg.mk
+# urg library
+#
+#############################################################
-+URG_VERSION:=0.8.11
++URG_VERSION = 0.8.11
+URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+URG_SOURCE = urg-$(URG_VERSION).tar.gz
+URG_LIBTOOL_PATCH = NO
+URG_INSTALL_STAGING = YES
+URG_INSTALL_TARGET = YES
+
-+URG_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
++URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
+
-+$(eval $(call AUTOTARGETS,package,urg))
++$(eval $(call AUTOTARGETS))
+
+$(URG_HOOK_POST_EXTRACT):
+ @$(call MESSAGE,"Post extracting")
diff --git a/patches/buildroot/2012.02/124-e-uae-add_package.patch b/patches/buildroot/2012.02/124-e-uae-add_package.patch
index 476fffa..0d323a0 100644
--- a/patches/buildroot/2012.02/124-e-uae-add_package.patch
+++ b/patches/buildroot/2012.02/124-e-uae-add_package.patch
@@ -34,9 +34,9 @@ Index: buildroot/package/e-uae/e-uae.mk
+# e-uae
+#
+#############################################################
-+E_UAE_VERSION:=0.8.29-WIP4
++E_UAE_VERSION = 0.8.29-WIP4
+E_UAE_SITE = http://www.rcdrummond.net/uae/e-uae-$(E_UAE_VERSION)
-+E_UAE_SOURCE:=e-uae-$(E_UAE_VERSION).tar.bz2
++E_UAE_SOURCE = e-uae-$(E_UAE_VERSION).tar.bz2
+
+E_UAE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -g -DSTAT_STATFS2_BSIZE=1"
+
@@ -51,4 +51,4 @@ Index: buildroot/package/e-uae/e-uae.mk
+ --with-sdl-gfx \
+ --with-sdl-prefix=$(STAGING_DIR)/usr
+
-+$(eval $(call AUTOTARGETS,package,e-uae))
++$(eval $(call AUTOTARGETS))
diff --git a/patches/buildroot/2012.02/130-lbreakout-add_package.patch b/patches/buildroot/2012.02/130-lbreakout-add_package.patch
index d27cada..7d0dd19 100644
--- a/patches/buildroot/2012.02/130-lbreakout-add_package.patch
+++ b/patches/buildroot/2012.02/130-lbreakout-add_package.patch
@@ -56,10 +56,10 @@ 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://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lgames
++LBREAKOUT2_VERSION = 2.6.1
++LBREAKOUT2_SOURCE = lbreakout2-$(LBREAKOUT2_VERSION).tar.gz
++LBREAKOUT2_CAT = $(ZCAT)
+
+LBREAKOUT2_DEPENDENCIES = sdl
+LBREAKOUT2_CONF_OPT += --disable-nls
@@ -79,4 +79,4 @@ Index: buildroot/package/lbreakout2/lbreakout2.mk
+LBREAKOUT2_CONF_ENV = \
+ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
+
-+$(eval $(call AUTOTARGETS,package,lbreakout2))
++$(eval $(call AUTOTARGETS))
diff --git a/patches/buildroot/2012.02/131-ltetris-add_package.patch b/patches/buildroot/2012.02/131-ltetris-add_package.patch
index 6186cb5..6d1b141 100644
--- a/patches/buildroot/2012.02/131-ltetris-add_package.patch
+++ b/patches/buildroot/2012.02/131-ltetris-add_package.patch
@@ -45,9 +45,9 @@ Index: buildroot/package/ltris/ltris.mk
+#
+#############################################################
+
-+LTRIS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lgames
-+LTRIS_VERSION:=1.0.14
-+LTRIS_SOURCE:=ltris-$(LTRIS_VERSION).tar.gz
++LTRIS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lgames
++LTRIS_VERSION = 1.0.14
++LTRIS_SOURCE = ltris-$(LTRIS_VERSION).tar.gz
+LTRIS_CAT=$(ZCAT)
+
+LTRIS_DEPENDENCIES = sdl
@@ -61,7 +61,7 @@ Index: buildroot/package/ltris/ltris.mk
+LTRIS_CONF_ENV = \
+ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
+
-+$(eval $(call AUTOTARGETS,package,ltris))
++$(eval $(call AUTOTARGETS))
Index: buildroot/package/ltris/ltris-force_screen_res.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2012.02/133-qwt-add_package.patch b/patches/buildroot/2012.02/133-qwt-add_package.patch
index fb2c914..c0860ab 100644
--- a/patches/buildroot/2012.02/133-qwt-add_package.patch
+++ b/patches/buildroot/2012.02/133-qwt-add_package.patch
@@ -102,7 +102,7 @@ Index: buildroot/package/qwt/qwt.mk
+
+$(QWT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QWT_SOURCE)
+ $(QWT_UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(QWT_SOURCE)
-+ toolchain/patch-kernel.sh $(QWT_TARGET_DIR) package/qwt/ \
++ support/scripts/apply-patches.sh $(QWT_TARGET_DIR) package/qwt/ \
+ qwt-$(QWT_VERSION)-\*.patch \
+ qwt-$(QWT_VERSION)-\*.patch.$(ARCH)
+ touch $@
diff --git a/patches/buildroot/2012.02/173-sdl_net-fixes_tarball_name_and_update_version.patch b/patches/buildroot/2012.02/173-sdl_net-fixes_tarball_name_and_update_version.patch
new file mode 100644
index 0000000..7f26836
--- /dev/null
+++ b/patches/buildroot/2012.02/173-sdl_net-fixes_tarball_name_and_update_version.patch
@@ -0,0 +1,20 @@
+Sent to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/sdl_net/sdl_net.mk
+===================================================================
+--- buildroot.orig/package/sdl_net/sdl_net.mk 2012-02-21 20:50:02.000000000 +0100
++++ buildroot/package/sdl_net/sdl_net.mk 2012-02-21 21:00:51.000000000 +0100
+@@ -3,8 +3,9 @@
+ # SDL_net: network addon for SDL
+ #
+ #############################################################
+-SDL_NET_VERSION:=1.2.7
+-SDL_NET_SITE:=http://www.libsdl.org/projects/SDL_net/release
++SDL_NET_VERSION = 1.2.8
++SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
++SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz
+
+ SDL_NET_CONF_OPT = --localstatedir=/var \
+ --with-sdl-prefix=$(STAGING_DIR)/usr \
hooks/post-receive
--
armadeus
|
