[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-599-gd676e0f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-599-gd676e0f
|
From: Julien B a. A. <ar...@us...> - 2015-02-17 11:57:42
|
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 d676e0fd7dca8d76a8a660b3236d92f71afd4283 (commit)
via a19318da6b57bcbebb247eb85b50308f763e201c (commit)
from 42af699433cf6a0e63dd50139f78f84352a621ee (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 d676e0fd7dca8d76a8a660b3236d92f71afd4283
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 17 12:56:52 2015 +0100
[TOOLS] scripts/quiltify.sh: add more info when creating cleanup_buildroot.sh
commit a19318da6b57bcbebb247eb85b50308f763e201c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 17 12:55:20 2015 +0100
[BUILDROOT] 2013.11+: add gnuboy package
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/016-armadeus-add-gnuboy-package.patch | 80 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 48 ++++++------
.../016-armadeus-add-gnuboy-package.tocheck | 80 ++++++++++++++++++++
.../016-armadeus-add-gnuboy-package.tocheck | 80 ++++++++++++++++++++
scripts/quiltify.sh | 3 +-
5 files changed, 266 insertions(+), 25 deletions(-)
create mode 100644 patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch
create mode 100644 patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
create mode 100644 patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
diff --git a/patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch b/patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch
new file mode 100644
index 0000000..b35fccf
--- /dev/null
+++ b/patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch
@@ -0,0 +1,80 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
++++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
+@@ -166,6 +166,7 @@
+ menu "Games"
+ source "package/e-uae/Config.in"
+ source "package/doom-wad/Config.in"
++source "package/gnuboy/Config.in"
+ source "package/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
+ source "package/ltris/Config.in"
+Index: buildroot/package/gnuboy/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_GNUBOY
++ bool "gnuboy"
++ help
++ gnuboy is a portable Gameboy emulator.
++
++ By default it uses Framebuffer backend but if SDL is selected it will
++ detect it.
++
++ Executable is named accordingly to chosen backend, ex: fbgnuboy or
++ sdlgnuboy.
++
++ http://code.google.com/p/gnuboy/
+Index: buildroot/package/gnuboy/gnuboy.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
+@@ -0,0 +1,46 @@
++################################################################################
++#
++# gnuboy
++#
++################################################################################
++
++GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
++GNUBOY_SITE_METHOD = svn
++GNUBOY_VERSION = 201
++GNUBOY_LICENSE = GPLv2+
++GNUBOY_LICENSE_FILES = COPYING
++
++GNUBOY_CONF_OPT += \
++ --enable-arch=$(ARCH) \
++ --disable-asm \
++ --with-fb
++
++GNUBOY_CFLAGS = $(TARGET_CFLAGS)
++
++ifeq ($(BR2_PACKAGE_SDL),y)
++GNUBOY_CONF_OPT += --with-sdl
++GNUBOY_DEPENDENCIES += sdl
++else
++GNUBOY_CONF_OPT += --without-sdl
++GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
++endif
++
++GNUBOY_CONF_ENV += \
++ CFLAGS="$(GNUBOY_CFLAGS)"
++
++define GNUBOY_FIX_CONFIGURE
++ chmod a+x $(@D)/configure
++endef
++
++GNUBOY_POST_EXTRACT_HOOKS += GNUBOY_FIX_CONFIGURE
++
++# While the configuration system uses autoconf, the Makefiles are
++# hand-written ???????? and do not use automake. Therefore, we have to hack
++# around their deficiencies by passing installation paths.
++GNUBOY_INSTALL_TARGET_OPT = \
++ INSTALL="$(INSTALL)" \
++ prefix=$(TARGET_DIR)/usr \
++ exec_prefix=$(TARGET_DIR)/usr \
++ install
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index b5743f7..cb0d861 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -8,37 +8,37 @@
# #
####################################################
-rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
-rm -rf buildroot/package/Config.in
-rm -rf buildroot/package/Config.in.host
-rm -rf buildroot/package/agg/Config.in
+rm -rf buildroot/Makefile
rm -rf buildroot/package/agg/agg.mk
+rm -rf buildroot/package/agg/Config.in
rm -rf buildroot/package/alsa-utils/alsa-utils.mk
-rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/beremiz.mk
+rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
-rm -rf buildroot/package/bluez3-libs/Config.in
-rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
-rm -rf buildroot/package/bluez3-utils/Config.in
-rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
rm -rf buildroot/package/bluez3/bluetooth.default
rm -rf buildroot/package/bluez3/bluez-pand-devup.sh
rm -rf buildroot/package/bluez3/bluez-utils-bluepin.sh
rm -rf buildroot/package/bluez3/hcid.conf
-rm -rf buildroot/package/bluez3/rfcomm-getty
+rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
+rm -rf buildroot/package/bluez3-libs/Config.in
rm -rf buildroot/package/bluez3/rfcomm.conf
+rm -rf buildroot/package/bluez3/rfcomm-getty
+rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
+rm -rf buildroot/package/bluez3-utils/Config.in
rm -rf buildroot/package/busybox/1.19.4/busybox-1.19.4-stty_add_rs485_config.patch
rm -rf buildroot/package/busybox/1.20.2/busybox-1.20.2-stty_add_rs485_config.patch
rm -rf buildroot/package/busybox/1.21.0/busybox-1.21.0-ifplugd-netlink-buffer.patch
rm -rf buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patch
-rm -rf buildroot/package/busybox/Config.in
rm -rf buildroot/package/busybox/busybox.mk
+rm -rf buildroot/package/busybox/Config.in
rm -rf buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
+rm -rf buildroot/package/Config.in
+rm -rf buildroot/package/Config.in.host
rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
rm -rf buildroot/package/cwiid/Config.in
@@ -46,28 +46,31 @@ rm -rf buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.p
rm -rf buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch
rm -rf buildroot/package/cwiid/cwiid.mk
rm -rf buildroot/package/dbus/dbus.mk
+rm -rf buildroot/package/e2fsprogs/e2fsprogs-allow-e4defrag-build-against-old-kernel-headers.patch
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
-rm -rf buildroot/package/e2fsprogs/e2fsprogs-allow-e4defrag-build-against-old-kernel-headers.patch
rm -rf buildroot/package/flite/Config.in
rm -rf buildroot/package/flite/flite.mk
rm -rf buildroot/package/freescale-imx/Config.in
rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-fixes_build_on_imx27.patch
-rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib.mk
+rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
+rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk
rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
+rm -rf buildroot/package/gnuboy/Config.in
+rm -rf buildroot/package/gnuboy/gnuboy.mk
rm -rf buildroot/package/gpm/Config.in
rm -rf buildroot/package/gpm/gpm-1.20.7-removes_obsolete_functions.patch
rm -rf buildroot/package/gpm/gpm-1.20.7-removes_strip_from_install.patch
rm -rf buildroot/package/gpm/gpm.mk
rm -rf buildroot/package/gpsd/Config.in
-rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
+rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
rm -rf buildroot/package/imagemagick/imagemagick.mk
@@ -75,11 +78,6 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
-rm -rf buildroot/package/imx-usb-loader/Config.in
-rm -rf buildroot/package/imx-usb-loader/Config.in.host
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/joe/Config.in
rm -rf buildroot/package/joe/joe-3.7-disable-j0-j1-y0-y1-math-functions.patch
rm -rf buildroot/package/joe/joe.mk
@@ -113,16 +111,15 @@ rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
rm -rf buildroot/package/pkg-generic.mk
rm -rf buildroot/package/poppler/poppler.mk
+rm -rf buildroot/package/python/Config.in
rm -rf buildroot/package/python-pygame/Config.in
+rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/python-wx/Config.in
rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
rm -rf buildroot/package/python-wx/python-wx.mk
-rm -rf buildroot/package/python/Config.in
-rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
rm -rf buildroot/package/qt/Config.in
-rm -rf buildroot/package/qt/qt.mk
rm -rf buildroot/package/qtcreator/Config.in.host
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_remote_console_open_menu.patch
@@ -130,15 +127,18 @@ rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
rm -rf buildroot/package/qtcreator/qtcreator.mk
+rm -rf buildroot/package/qt/qt.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/rtnet/Config.in
+rm -rf buildroot/package/rtnet/rtnet.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
-rm -rf buildroot/package/sdl_water/Config.in
-rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/sdlquake/Config.in
rm -rf buildroot/package/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
rm -rf buildroot/package/sdlquake/sdlquake.mk
+rm -rf buildroot/package/sdl_water/Config.in
+rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/shiboken/Config.in
rm -rf buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
diff --git a/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck b/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
new file mode 100644
index 0000000..b35fccf
--- /dev/null
+++ b/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
@@ -0,0 +1,80 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
++++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
+@@ -166,6 +166,7 @@
+ menu "Games"
+ source "package/e-uae/Config.in"
+ source "package/doom-wad/Config.in"
++source "package/gnuboy/Config.in"
+ source "package/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
+ source "package/ltris/Config.in"
+Index: buildroot/package/gnuboy/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_GNUBOY
++ bool "gnuboy"
++ help
++ gnuboy is a portable Gameboy emulator.
++
++ By default it uses Framebuffer backend but if SDL is selected it will
++ detect it.
++
++ Executable is named accordingly to chosen backend, ex: fbgnuboy or
++ sdlgnuboy.
++
++ http://code.google.com/p/gnuboy/
+Index: buildroot/package/gnuboy/gnuboy.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
+@@ -0,0 +1,46 @@
++################################################################################
++#
++# gnuboy
++#
++################################################################################
++
++GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
++GNUBOY_SITE_METHOD = svn
++GNUBOY_VERSION = 201
++GNUBOY_LICENSE = GPLv2+
++GNUBOY_LICENSE_FILES = COPYING
++
++GNUBOY_CONF_OPT += \
++ --enable-arch=$(ARCH) \
++ --disable-asm \
++ --with-fb
++
++GNUBOY_CFLAGS = $(TARGET_CFLAGS)
++
++ifeq ($(BR2_PACKAGE_SDL),y)
++GNUBOY_CONF_OPT += --with-sdl
++GNUBOY_DEPENDENCIES += sdl
++else
++GNUBOY_CONF_OPT += --without-sdl
++GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
++endif
++
++GNUBOY_CONF_ENV += \
++ CFLAGS="$(GNUBOY_CFLAGS)"
++
++define GNUBOY_FIX_CONFIGURE
++ chmod a+x $(@D)/configure
++endef
++
++GNUBOY_POST_EXTRACT_HOOKS += GNUBOY_FIX_CONFIGURE
++
++# While the configuration system uses autoconf, the Makefiles are
++# hand-written ???????? and do not use automake. Therefore, we have to hack
++# around their deficiencies by passing installation paths.
++GNUBOY_INSTALL_TARGET_OPT = \
++ INSTALL="$(INSTALL)" \
++ prefix=$(TARGET_DIR)/usr \
++ exec_prefix=$(TARGET_DIR)/usr \
++ install
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck b/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
new file mode 100644
index 0000000..b35fccf
--- /dev/null
+++ b/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
@@ -0,0 +1,80 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
++++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
+@@ -166,6 +166,7 @@
+ menu "Games"
+ source "package/e-uae/Config.in"
+ source "package/doom-wad/Config.in"
++source "package/gnuboy/Config.in"
+ source "package/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
+ source "package/ltris/Config.in"
+Index: buildroot/package/gnuboy/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_GNUBOY
++ bool "gnuboy"
++ help
++ gnuboy is a portable Gameboy emulator.
++
++ By default it uses Framebuffer backend but if SDL is selected it will
++ detect it.
++
++ Executable is named accordingly to chosen backend, ex: fbgnuboy or
++ sdlgnuboy.
++
++ http://code.google.com/p/gnuboy/
+Index: buildroot/package/gnuboy/gnuboy.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
+@@ -0,0 +1,46 @@
++################################################################################
++#
++# gnuboy
++#
++################################################################################
++
++GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
++GNUBOY_SITE_METHOD = svn
++GNUBOY_VERSION = 201
++GNUBOY_LICENSE = GPLv2+
++GNUBOY_LICENSE_FILES = COPYING
++
++GNUBOY_CONF_OPT += \
++ --enable-arch=$(ARCH) \
++ --disable-asm \
++ --with-fb
++
++GNUBOY_CFLAGS = $(TARGET_CFLAGS)
++
++ifeq ($(BR2_PACKAGE_SDL),y)
++GNUBOY_CONF_OPT += --with-sdl
++GNUBOY_DEPENDENCIES += sdl
++else
++GNUBOY_CONF_OPT += --without-sdl
++GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
++endif
++
++GNUBOY_CONF_ENV += \
++ CFLAGS="$(GNUBOY_CFLAGS)"
++
++define GNUBOY_FIX_CONFIGURE
++ chmod a+x $(@D)/configure
++endef
++
++GNUBOY_POST_EXTRACT_HOOKS += GNUBOY_FIX_CONFIGURE
++
++# While the configuration system uses autoconf, the Makefiles are
++# hand-written ???????? and do not use automake. Therefore, we have to hack
++# around their deficiencies by passing installation paths.
++GNUBOY_INSTALL_TARGET_OPT = \
++ INSTALL="$(INSTALL)" \
++ prefix=$(TARGET_DIR)/usr \
++ exec_prefix=$(TARGET_DIR)/usr \
++ install
++
++$(eval $(autotools-package))
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 5329d1f..28ebccf 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -116,7 +116,8 @@ if [ "$1" == "export" ]; then
# #
# Removes files added or modified through patches. #
# #
- # This file has been automatically generated. #
+ # This file has been automatically generated by: #
+ # scripts/quiltify.sh export #
# #
####################################################
hooks/post-receive
--
armadeus
|