[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-514-g0b5e7db
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-514-g0b5e7db
|
From: Julien B a. A. <ar...@us...> - 2010-07-04 16:30:06
|
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 0b5e7db124792b662fd241a36b401aac18b031f5 (commit)
via 9220fcec98485f5f9cd115124bbad52aecbb049c (commit)
via 697b390371644ee5673a1161b936f4f97f80f464 (commit)
via 7003c1780e82ffd3f13c1054f8437da4c30c0916 (commit)
via ead0d3b37adff6496648e8b5275d55c9f80515aa (commit)
via 72b6b59372286401b3c98187d0530762ca635e67 (commit)
from 5d8ba1710593b2adc5d5a0290c22a1d8e7fd0b3a (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 0b5e7db124792b662fd241a36b401aac18b031f5
Merge: 9220fcec98485f5f9cd115124bbad52aecbb049c 5d8ba1710593b2adc5d5a0290c22a1d8e7fd0b3a
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 18:29:34 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 9220fcec98485f5f9cd115124bbad52aecbb049c
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 18:26:39 2010 +0200
[BUILDROOT] [2010.05] Add pywebradio, e-uae & opentyrian packages
commit 697b390371644ee5673a1161b936f4f97f80f464
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 17:49:09 2010 +0200
[LINUX] Add vivi (v4l test driver) to default apf27 configs
commit 7003c1780e82ffd3f13c1054f8437da4c30c0916
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 17:38:32 2010 +0200
[BUILDROOT] [2010.05] Reactivates ad9889, fpgaregs and imxregs in default APF27 config
commit ead0d3b37adff6496648e8b5275d55c9f80515aa
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 29 14:28:06 2010 +0200
[BUILD] Updates some envt variables for BR 2010.05
commit 72b6b59372286401b3c98187d0530762ca635e67
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 29 14:26:58 2010 +0200
[BUILDROOT] [2010.05] Makes the configurations correctly detected
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +-
Makefile.in | 6 +-
buildroot/configs/apf27_defconfig | 8 +-
.../{apf27_defconfig => apf27_webradio_defconfig} | 101 ++++++++++++++++----
buildroot/local/apf27_test/linux-2.6.29.4.config | 5 +-
.../armadeus/apf27/apf27-linux-2.6.29.config | 7 +-
.../2010.05/123-pywebradio-add_package.patch | 56 +++++++++++
.../buildroot/2010.05/124-e-uae-add_package.patch | 54 +++++++++++
.../2010.05/125-opentyrian-add_package.patch | 83 ++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 3 +
10 files changed, 298 insertions(+), 31 deletions(-)
copy buildroot/configs/{apf27_defconfig => apf27_webradio_defconfig} (91%)
create mode 100644 patches/buildroot/2010.05/123-pywebradio-add_package.patch
create mode 100644 patches/buildroot/2010.05/124-e-uae-add_package.patch
create mode 100644 patches/buildroot/2010.05/125-opentyrian-add_package.patch
diff --git a/Makefile b/Makefile
index b05addc..9c3cf13 100644
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,12 @@ ifeq ($(BUILDROOT_VERSION),)
BUILDROOT_VERSION:=20081103
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot
+ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/target/device/armadeus
else
#BUILDROOT_VERSION:=2010.05
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
+ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
endif
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
@@ -51,7 +53,7 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
echo " System not configured. Use make <board>_defconfig " >&2; \
echo " armadeus valid configurations are: " >&2; \
- echo " "$(shell find $(BUILDROOT_DIR)/target/device/armadeus -name *_defconfig|sed 's/.*\///');\
+ echo " "$(shell find $(ARMADEUS_CONFIG_DIR) -name "apf*_defconfig" | sed 's/.*\///');\
echo " "; \
echo -en "\033[0m";
@@ -146,7 +148,7 @@ linux26-clean: $(BUILDROOT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) linux26clean
%_defconfig: $(BUILDROOT_DIR)/.patched
- @if [ -e "$(BUILDROOT_DIR)/target/device/armadeus/$(patsubst %_defconfig,%,$@)/$@" ]; then \
+ @if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ]; then \
rm -f $(BUILDROOT_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $@ ; \
$(MAKE) -C $(BUILDROOT_DIR) menuconfig ; \
diff --git a/Makefile.in b/Makefile.in
index 8934896..f674b4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,11 +46,15 @@ BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_AR
BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)
BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_PROJECT_NAME)
+ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/root
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
else
BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/output/toolchain
BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/output/images
+ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_DIR)/output/target
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/rootfs.tar
endif
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
@@ -58,8 +62,6 @@ ARMADEUS_LINUX_PATCH_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-p
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
-ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/root
-ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
ARMADEUS_STAGING_DIR:=$(BUILDROOT_BUILD_DIR)/staging_dir
ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index c6494b9..7adfbc6 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 23 14:22:58 2010
+# Sun Jul 4 16:19:24 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.05"
@@ -274,12 +274,12 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_AS_DEVICES is not set
# BR2_PACKAGE_CH7024CTRL is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-# BR2_PACKAGE_FPGAREGS is not set
-# BR2_PACKAGE_IMXREGS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_webradio_defconfig
similarity index 91%
copy from buildroot/configs/apf27_defconfig
copy to buildroot/configs/apf27_webradio_defconfig
index c6494b9..6166cbd 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 23 14:22:58 2010
+# Sun Jul 4 16:19:24 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.05"
@@ -96,7 +96,7 @@ BR2_GIT="git clone"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
+BR2_DL_DIR="/local/downloads"
BR2_COPYTO=""
BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
@@ -274,12 +274,12 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_AS_DEVICES is not set
# BR2_PACKAGE_CH7024CTRL is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-# BR2_PACKAGE_FPGAREGS is not set
-# BR2_PACKAGE_IMXREGS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
@@ -288,6 +288,7 @@ BR2_PACKAGE_MAX5821CTRL=y
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
+# BR2_PACKAGE_ALSA_LIB_PYTHON is not set
#
# ALSA lib selection
@@ -330,7 +331,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# BR2_PACKAGE_LIBDVDREAD is not set
# BR2_PACKAGE_LIBDVDNAV is not set
# BR2_PACKAGE_LIBID3TAG is not set
-# BR2_PACKAGE_LIBMAD is not set
+BR2_PACKAGE_LIBMAD=y
# BR2_PACKAGE_LIBMMS is not set
# BR2_PACKAGE_LIBMPD is not set
# BR2_PACKAGE_LIBOGG is not set
@@ -339,7 +340,8 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# BR2_PACKAGE_LIBVORBIS is not set
# BR2_PACKAGE_MADPLAY is not set
# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
+BR2_PACKAGE_MPLAYER=y
+BR2_PACKAGE_PYWEBRADIO=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_SWFDEC is not set
# BR2_PACKAGE_FESTIVAL is not set
@@ -394,6 +396,7 @@ BR2_PACKAGE_STRACE=y
#
# Games
#
+# BR2_PACKAGE_E_UAE is not set
# BR2_PACKAGE_GNUCHESS is not set
# BR2_PACKAGE_PRBOOM is not set
# BR2_PACKAGE_SDLQUAKE is not set
@@ -415,7 +418,55 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_FBV is not set
# BR2_PACKAGE_IMAGEMAGICK is not set
# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
+BR2_PACKAGE_PYGAME=y
+
+#
+# pygame optional modules selection
+#
+BR2_PACKAGE_PYGAME_IMAGE=y
+
+#
+# Image formats
+#
+BR2_PACKAGE_PYGAME_IMAGE_PNG=y
+BR2_PACKAGE_PYGAME_IMAGE_JPEG=y
+BR2_PACKAGE_PYGAME_FONT=y
+BR2_PACKAGE_PYGAME_MIXER=y
+BR2_PACKAGE_PYGAME_MIXER_MUSIC=y
+
+#
+# pygame.sndarray depends on Python's Numeric extension that is not (yet) supported
+#
+
+#
+# pygame.surfarray depends on Python's Numeric extension that is not (yet) supported
+#
+# BR2_PACKAGE_PYGAME_MOVIE is not set
+BR2_PACKAGE_SDL=y
+BR2_PACKAGE_SDL_FBCON=y
+BR2_PACKAGE_SDL_IMAGE=y
+
+#
+# SDL_image file format support
+#
+BR2_PACKAGE_SDL_IMAGE_BMP=y
+BR2_PACKAGE_SDL_IMAGE_GIF=y
+BR2_PACKAGE_SDL_IMAGE_JPEG=y
+# BR2_PACKAGE_SDL_IMAGE_LBM is not set
+# BR2_PACKAGE_SDL_IMAGE_PCX is not set
+BR2_PACKAGE_SDL_IMAGE_PNG=y
+# BR2_PACKAGE_SDL_IMAGE_PNM is not set
+# BR2_PACKAGE_SDL_IMAGE_TARGA is not set
+# BR2_PACKAGE_SDL_IMAGE_TIFF is not set
+# BR2_PACKAGE_SDL_IMAGE_XCF is not set
+# BR2_PACKAGE_SDL_IMAGE_XPM is not set
+# BR2_PACKAGE_SDL_IMAGE_XV is not set
+BR2_PACKAGE_SDL_MIXER=y
+# BR2_PACKAGE_SDL_SOUND is not set
+BR2_PACKAGE_SDL_NET=y
+BR2_PACKAGE_SDL_TTF=y
+# BR2_PACKAGE_SDL_GFX is not set
+# BR2_PACKAGE_SLIDESHOW is not set
#
# Demos
@@ -448,10 +499,7 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_CWIID is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
+# BR2_PACKAGE_DBUS is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
# BR2_PACKAGE_E2FSPROGS is not set
@@ -526,6 +574,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SQUASHFS is not set
# BR2_PACKAGE_SYSSTAT is not set
+BR2_PACKAGE_URG=y
# BR2_PACKAGE_USB_MODESWITCH is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
@@ -540,7 +589,25 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_LUA is not set
# BR2_PACKAGE_MICROPERL is not set
# BR2_PACKAGE_PHP is not set
-# BR2_PACKAGE_PYTHON is not set
+BR2_PACKAGE_PYTHON=y
+# BR2_PACKAGE_PYTHON_DEV is not set
+BR2_PACKAGE_PYTHON_PY_ONLY=y
+# BR2_PACKAGE_PYTHON_PYC_ONLY is not set
+# BR2_PACKAGE_PYTHON_PY_PYC is not set
+
+#
+# The following modules are unusual or require extra libraries
+#
+# BR2_PACKAGE_PYTHON_BSDDB is not set
+BR2_PACKAGE_PYTHON_CODECSCJK=y
+# BR2_PACKAGE_PYTHON_CURSES is not set
+BR2_PACKAGE_PYTHON_PYEXPAT=y
+# BR2_PACKAGE_PYTHON_READLINE is not set
+# BR2_PACKAGE_PYTHON_SSL is not set
+# BR2_PACKAGE_PYTHON_TKINTER is not set
+BR2_PACKAGE_PYTHON_UNICODEDATA=y
+# BR2_PACKAGE_PYSERIAL is not set
+# BR2_PACKAGE_PYMYSQL is not set
# BR2_PACKAGE_RUBY is not set
# BR2_PACKAGE_TCL is not set
@@ -586,10 +653,10 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_ATK is not set
# BR2_PACKAGE_CAIRO is not set
# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-# BR2_PACKAGE_JPEG is not set
+BR2_PACKAGE_FREETYPE=y
+BR2_PACKAGE_JPEG=y
# BR2_PACKAGE_LIBART is not set
-# BR2_PACKAGE_LIBPNG is not set
+BR2_PACKAGE_LIBPNG=y
# BR2_PACKAGE_LIBUNGIF is not set
# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PANGO is not set
@@ -658,7 +725,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
#
# XML
#
-# BR2_PACKAGE_EXPAT is not set
+BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_EZXML is not set
# BR2_PACKAGE_LIBXML_PARSER_PERL is not set
# BR2_PACKAGE_LIBXML2 is not set
diff --git a/buildroot/local/apf27_test/linux-2.6.29.4.config b/buildroot/local/apf27_test/linux-2.6.29.4.config
index cd0fe9b..e897f72 100644
--- a/buildroot/local/apf27_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf27_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Jun 23 08:59:05 2010
+# Wed Jun 30 15:23:25 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1065,6 +1065,7 @@ CONFIG_MEDIA_TUNER_CUSTOMIZE=y
# CONFIG_MEDIA_TUNER_MXL5007T is not set
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
@@ -1125,7 +1126,7 @@ CONFIG_VIDEO_AD9889=m
#
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_VIVI is not set
+CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 321519a..d2b1a6a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Jun 23 08:59:05 2010
+# Wed Jun 30 15:23:25 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1062,6 +1062,7 @@ CONFIG_MEDIA_TUNER_CUSTOMIZE=y
# CONFIG_MEDIA_TUNER_MXL5007T is not set
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
@@ -1122,7 +1123,7 @@ CONFIG_VIDEO_AD9889=m
#
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_VIVI is not set
+CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
@@ -1191,10 +1192,8 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_HX5116 is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_P0340WQL is not set
# CONFIG_LCD_PLATFORM is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
diff --git a/patches/buildroot/2010.05/123-pywebradio-add_package.patch b/patches/buildroot/2010.05/123-pywebradio-add_package.patch
new file mode 100644
index 0000000..ff919e7
--- /dev/null
+++ b/patches/buildroot/2010.05/123-pywebradio-add_package.patch
@@ -0,0 +1,56 @@
+Index: buildroot/package/multimedia/Config.in
+===================================================================
+--- buildroot.orig/package/multimedia/Config.in 2010-06-27 18:58:38.000000000 +0200
++++ buildroot/package/multimedia/Config.in 2010-06-29 09:30:18.000000000 +0200
+@@ -23,6 +23,7 @@
+ source "package/multimedia/madplay/Config.in"
+ source "package/multimedia/mpg123/Config.in"
+ source "package/multimedia/mplayer/Config.in"
++source "package/pywebradio/Config.in"
+ source "package/multimedia/speex/Config.in"
+ source "package/multimedia/swfdec/Config.in"
+ source "package/multimedia/festival/Config.in"
+Index: buildroot/package/pywebradio/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pywebradio/Config.in 2010-06-29 09:30:18.000000000 +0200
+@@ -0,0 +1,6 @@
++config BR2_PACKAGE_PYWEBRADIO
++ bool "pywebradio"
++ help
++ Play web radios
++
++ http://www.pystream.info/
+Index: buildroot/package/pywebradio/pywebradio.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pywebradio/pywebradio.mk 2010-07-04 18:13:38.000000000 +0200
+@@ -0,0 +1,28 @@
++#############################################################
++#
++# pywebradio
++#
++#############################################################
++
++PYWEBRADIO_TRUNK:=http://forge.doumenc.org/svn/pyqtradio/trunk
++PYWEBRADIO_SITE:=
++PYWEBRADIO_VERSION:=381
++PYWEBRADIO_NAME:=pywebradio-svn-r$(PYWEBRADIO_VERSION)
++PYWEBRADIO_DIR:=$(BUILD_DIR)/$(PYWEBRADIO_NAME)
++PYWEBRADIO_SOURCE:=$(PYWEBRADIO_NAME).tar.bz2
++
++# GENTARGETS do not allow to get sources from SVN ??
++#$(DL_DIR)/$(PYWEBRADIO_SOURCE):
++# $(SVN_CO) -r $(PYWEBRADIO_VERSION) $(PYWEBRADIO_TRUNK) $(PYWEBRADIO_DIR)
++# tar -cv -C $(BUILD_DIR) $(PYWEBRADIO_NAME) | bzip2 - -c > $@
++
++define PYWEBRADIO_INSTALL_TARGET_CMDS
++ cd $(@D); \
++ python install.py -v -i pygame \
++ -s /usr/share/radio \
++ -c /etc/radio \
++ -e /usr/bin \
++ -p $(TARGET_DIR)
++endef
++
++$(eval $(call GENTARGETS,package,pywebradio))
diff --git a/patches/buildroot/2010.05/124-e-uae-add_package.patch b/patches/buildroot/2010.05/124-e-uae-add_package.patch
new file mode 100644
index 0000000..88515ef
--- /dev/null
+++ b/patches/buildroot/2010.05/124-e-uae-add_package.patch
@@ -0,0 +1,54 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-29 11:20:37.000000000 +0200
++++ buildroot/package/Config.in 2010-07-04 18:03:11.000000000 +0200
+@@ -79,6 +79,7 @@
+ menu "Games"
+ source "package/games/ace_of_penguins/Config.in"
+ source "package/games/doom-wad/Config.in"
++source "package/e-uae/Config.in"
+ source "package/games/gnuchess/Config.in"
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
+Index: buildroot/package/e-uae/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/e-uae/Config.in 2010-07-04 18:05:06.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_E_UAE
++ bool "e-uae"
++ select BR2_PACKAGE_SDL
++ help
++ This is a version of UAE, the Ubiquitous Amiga Emulator, with an
++ emulation core largely based on WinUAE. It attempts to bring many of
++ the great features of WinUAE to non-Windows platforms.
++
++ http://www.rcdrummond.net/uae/
+Index: buildroot/package/e-uae/e-uae.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/e-uae/e-uae.mk 2010-07-04 18:06:43.000000000 +0200
+@@ -0,0 +1,23 @@
++#############################################################
++#
++# e-uae
++#
++#############################################################
++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_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -g -DSTAT_STATFS2_BSIZE=1"
++
++E_UAE_CONF_OPT = \
++ --with-hostcc=gcc \
++ --disable-ui \
++ --without-x \
++ --without-gtk \
++ --with-zlib=$(STAGING_DIR) \
++ --with-sdl \
++ --with-sdl-sound \
++ --with-sdl-gfx \
++ --with-sdl-prefix=$(STAGING_DIR)/usr
++
++$(eval $(call AUTOTARGETS,package,e-uae))
diff --git a/patches/buildroot/2010.05/125-opentyrian-add_package.patch b/patches/buildroot/2010.05/125-opentyrian-add_package.patch
new file mode 100644
index 0000000..632f007
--- /dev/null
+++ b/patches/buildroot/2010.05/125-opentyrian-add_package.patch
@@ -0,0 +1,83 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-29 11:21:25.000000000 +0200
++++ buildroot/package/Config.in 2010-06-29 11:21:25.000000000 +0200
+@@ -83,6 +83,7 @@
+ source "package/games/gnuchess/Config.in"
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
++source "package/opentyrian/Config.in"
+ source "package/games/prboom/Config.in"
+ source "package/games/quake-pak/Config.in"
+ source "package/games/rubix/Config.in"
+Index: buildroot/package/opentyrian/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/opentyrian/Config.in 2010-06-29 11:21:25.000000000 +0200
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_OPENTYRIAN
++ bool "OpenTyrian"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_NET
++ help
++ OpenTyrian is a port of the DOS shoot-em-up Tyrian. Jason Emery
++ generously gave the OpenTyrian developers a copy of the Tyrian 2.1
++ source code, which has since been ported from Turbo Pascal to C.
++ The port uses SDL, making it easily cross-platform.
++
++ http://code.google.com/p/opentyrian/
+Index: buildroot/package/opentyrian/opentyrian.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/opentyrian/opentyrian.mk 2010-07-04 18:03:01.000000000 +0200
+@@ -0,0 +1,50 @@
++#############################################################
++#
++# 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
++
++define OPENTYRIAN_DOWNLOAD_DATA
++ $(call DOWNLOAD,$(OPENTYRIAN_DATA_SITE),$(OPENTYRIAN_DATA))
++ unzip $(DL_DIR)/$(OPENTYRIAN_DATA) -d $(OPENTYRIAN_DIR)
++endef
++
++OPENTYRIAN_POST_EXTRACT_HOOKS += OPENTYRIAN_DOWNLOAD_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
++endef
++
++define OPENTYRIAN_INSTALL_TARGET_CMDS
++ mkdir -p $(TARGET_DIR)/usr/games
++ cp $(@D)/opentyrian $(TARGET_DIR)/usr/games/
++ mkdir -p $(TARGET_DIR)/usr/share/opentyrian/data/
++ cp $(@D)/tyrian21/* $(TARGET_DIR)/usr/share/opentyrian/data/
++ rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.doc
++ rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.exe
++endef
++
++define OPENTYRIAN_UNINSTALL_TARGET_CMDS
++ rm -rf $(TARGET_DIR)/usr/share/opentyrian
++ rm -f $(TARGET_DIR)/usr/games/opentyrian
++endef
++
++$(eval $(call GENTARGETS,package,opentyrian))
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index d84d381..7b23b5b 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -41,3 +41,6 @@ rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
rm -rf buildroot/package/urg/
+rm -rf buildroot/package/pywebradio/
+rm -rf buildroot/package/e-uae/
+rm -rf buildroot/package/opentyrian/
hooks/post-receive
--
armadeus
|
