[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2678-g192b7f6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2678-g192b7f6
|
From: Julien B a. A. <ar...@us...> - 2012-01-12 20:37:53
|
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 192b7f682141417e0f7f4dc8f573838b7cbcece0 (commit)
via 9c0e1fa40c5e36a8e93967837bc5761444bc0f74 (commit)
from 8c3329cb82dad286bec60ef71bff5aeebfa0a3dd (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 192b7f682141417e0f7f4dc8f573838b7cbcece0
Merge: 9c0e1fa 8c3329c
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 12 21:37:14 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 9c0e1fa40c5e36a8e93967837bc5761444bc0f74
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 12 21:36:24 2012 +0100
[BUILDROOT] Updates pygame package with latest BR mainline commit
-----------------------------------------------------------------------
Summary of changes:
.../2011.05/083-adds_pygame_package.patch | 196 ++++++++++----------
patches/buildroot/2011.05/cleanup_buildroot.sh | 2 +-
2 files changed, 100 insertions(+), 98 deletions(-)
diff --git a/patches/buildroot/2011.05/083-adds_pygame_package.patch b/patches/buildroot/2011.05/083-adds_pygame_package.patch
index a9f6fc7..e98c47e 100644
--- a/patches/buildroot/2011.05/083-adds_pygame_package.patch
+++ b/patches/buildroot/2011.05/083-adds_pygame_package.patch
@@ -6,16 +6,16 @@ and Scrap needs X11.
numeric*array modules requires Numeric or numpy Python package which is not
in BR yet.
-Inspired by a patch from Jean Schurger and the work of the OpenEmbedded team.
+Commited in BR.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: buildroot/package/pygame/Config.in
+Index: buildroot/package/python-pygame/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in 2012-01-05 15:13:40.000000000 +0100
-@@ -0,0 +1,85 @@
-+config BR2_PACKAGE_PYGAME
++++ buildroot/package/python-pygame/Config.in 2012-01-12 21:20:18.000000000 +0100
+@@ -0,0 +1,76 @@
++config BR2_PACKAGE_PYTHON_PYGAME
+ bool "pygame"
+ depends on BR2_PACKAGE_PYTHON
+ select BR2_PACKAGE_SDL
@@ -27,193 +27,195 @@ Index: buildroot/package/pygame/Config.in
+
+ http://www.pygame.org/
+
-+menu "pygame optional modules selection"
-+ depends on BR2_PACKAGE_PYGAME
-+
-+config BR2_PACKAGE_PYGAME_IMAGE
++if BR2_PACKAGE_PYTHON_PYGAME
++config BR2_PACKAGE_PYTHON_PYGAME_IMAGE
+ bool "pygame.image"
-+ default y
-+ depends on BR2_PACKAGE_SDL_IMAGE
-+ depends on BR2_PACKAGE_SDL_IMAGE_PNG
-+ depends on BR2_PACKAGE_SDL_IMAGE_JPEG
++ select BR2_PACKAGE_SDL_IMAGE
++ select BR2_PACKAGE_SDL_IMAGE_PNG
++ select BR2_PACKAGE_SDL_IMAGE_JPEG
+ help
-+ pygame module for loading, saving and transfering images
-+
-+comment "pygame.image requires sdl_image with png and jpeg support"
-+ depends on !BR2_PACKAGE_PYGAME_IMAGE
++ pygame module for loading, saving and transfering images.
++ Will autoselect sdl_image with png and jpeg support.
+
-+config BR2_PACKAGE_PYGAME_FONT
++config BR2_PACKAGE_PYTHON_PYGAME_FONT
+ bool "pygame.font"
-+ depends on BR2_PACKAGE_SDL_TTF
++ select BR2_PACKAGE_SDL_TTF
+ help
-+ pygame module for loading and rendering fonts
-+
-+comment "pygame.font requires sdl_ttf"
-+ depends on !BR2_PACKAGE_PYGAME_FONT
++ pygame module for loading and rendering fonts.
++ Will autoselect sdl_ttf.
+
-+config BR2_PACKAGE_PYGAME_MIXER
++config BR2_PACKAGE_PYTHON_PYGAME_MIXER
+ bool "pygame.mixer"
-+ depends on BR2_PACKAGE_SDL_MIXER
++ select BR2_PACKAGE_SDL_MIXER
+ help
-+ pygame module for loading and playing sounds
++ pygame module for loading and playing sounds.
++ Will autoselect sdl_mixer.
+
-+comment "pygame.mixer requires sdl_mixer"
-+ depends on !BR2_PACKAGE_PYGAME_MIXER
-+
-+config BR2_PACKAGE_PYGAME_MIXER_MUSIC
++config BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC
+ bool "pygame.mixer.music"
-+ depends on BR2_PACKAGE_PYGAME_MIXER
++ depends on BR2_PACKAGE_PYTHON_PYGAME_MIXER
+ help
+ pygame module for controlling streamed audio
+
-+config BR2_PACKAGE_PYGAME_SNDARRAY
++config BR2_PACKAGE_PYTHON_PYGAME_SNDARRAY
+ bool "pygame.sndarray"
-+ depends on BR2_PACKAGE_PYGAME_MIXER && BR2_PACKAGE_PYTHON_NUMERIC
++ 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_PYGAME_SNDARRAY
++ depends on !BR2_PACKAGE_PYTHON_PYGAME_SNDARRAY
+
-+config BR2_PACKAGE_PYGAME_SURFARRAY
++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_PYGAME_SURFARRAY
++ depends on !BR2_PACKAGE_PYTHON_PYGAME_SURFARRAY
+
-+config BR2_PACKAGE_PYGAME_MOVIE
++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_PYGAME_MOVIE
++ depends on !BR2_PACKAGE_PYTHON_PYGAME_MOVIE
+
-+config BR2_PACKAGE_PYGAME_SCRAP
++config BR2_PACKAGE_PYTHON_PYGAME_SCRAP
+ bool "pygame.scrap"
+ depends on BR2_PACKAGE_SDL_X11
+ help
+ pygame module for clipboard support (X11 needed)
+
-+endmenu
-Index: buildroot/package/pygame/pygame.mk
++endif
+Index: buildroot/package/python-pygame/python-pygame.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk 2012-01-05 15:45:16.000000000 +0100
-@@ -0,0 +1,100 @@
-+######################################################################
++++ buildroot/package/python-pygame/python-pygame.mk 2012-01-12 21:24:05.000000000 +0100
+@@ -0,0 +1,111 @@
++#############################################################
+#
+# Pygame
+#
-+######################################################################
-+
-+PYGAME_VERSION:= 1.9.1release
-+PYGAME_SITE:= http://www.pygame.org/ftp/
-+
-+ifeq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
-+PYGAME_OPT_DEPENDS += sdl_image
++#############################################################
++# stable 1.9.1 release requires V4L which has been wiped out of recent Linux
++# kernels, so use latest mercurial revision until next stable release is out.
++PYTHON_PYGAME_VERSION = f0bb4a4b365d
++PYTHON_PYGAME_SOURCE = pygame-$(PYTHON_PYGAME_VERSION).tar.gz
++PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame
++PYTHON_PYGAME_SITE_METHOD = hg
++
++ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
++PYTHON_PYGAME_OPT_DEPENDS += sdl_image
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_FONT),y)
-+PYGAME_OPT_DEPENDS += sdl_ttf
-+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MIXER),y)
-+PYGAME_OPT_DEPENDS += sdl_mixer
++
++ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y)
++PYTHON_PYGAME_OPT_DEPENDS += sdl_ttf
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
-+PYGAME_OPT_DEPENDS += smpeg
++
++ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y)
++PYTHON_PYGAME_OPT_DEPENDS += sdl_mixer
+endif
-+PYGAME_DEPENDENCIES = python sdl $(PYGAME_OPT_DEPENDS)
+
-+ifneq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
-+define PYGAME_CONFIGURE_IMAGE
++PYTHON_PYGAME_DEPENDENCIES = python sdl $(PYTHON_PYGAME_OPT_DEPENDS)
++
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
++define PYTHON_PYGAME_UNCONFIGURE_IMAGE
+ $(SED) 's/^imageext/#imageext/' $(@D)/Setup
+endef
+endif
+
-+ifneq ($(BR2_PACKAGE_PYGAME_FONT),y)
-+define PYGAME_CONFIGURE_FONT
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y)
++define PYTHON_PYGAME_UNCONFIGURE_FONT
+ $(SED) 's/^font/#font/' $(@D)/Setup
+endef
+endif
+
-+ifneq ($(BR2_PACKAGE_PYGAME_MIXER),y)
-+define PYGAME_CONFIGURE_MIXER
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y)
++define PYTHON_PYGAME_UNCONFIGURE_MIXER
+ $(SED) 's/^mixer/#mixer/g' $(@D)/Setup
+endef
+endif
+
-+ifneq ($(BR2_PACKAGE_PYGAME_SNDARRAY),y)
-+define PYGAME_CONFIGURE_SNDARRAY
++# Both require numpy or numeric python module
++define PYTHON_PYGAME_UNCONFIGURE_SNDARRAY
+ $(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup
+endef
-+endif
+
-+ifneq ($(BR2_PACKAGE_PYGAME_SURFARRAY),y)
-+define PYGAME_CONFIGURE_SURFARRAY
++define PYTHON_PYGAME_UNCONFIGURE_SURFARRAY
+ $(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup
+endef
-+endif
+
-+ifneq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
-+define PYGAME_CONFIGURE_MOVIE
++# Requires smpeg
++define PYTHON_PYGAME_UNCONFIGURE_MOVIE
+ $(SED) 's/^movie/#movie/' $(@D)/Setup
+endef
-+endif
+
-+ifneq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
-+define PYGAME_CONFIGURE_SCRAP
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_SCRAP),y)
++define PYTHON_PYGAME_UNCONFIGURE_SCRAP
+ $(SED) 's/^scrap/#scrap/' $(@D)/Setup
+endef
+endif
+
-+PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-+PYGAME_SDL_FLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
++PYTHON_PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
++PYTHON_PYGAME_SDL_FLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
+
+# Pygame needs a Setup file where options should be commented out if
+# dependencies are not available
-+define PYGAME_CONFIGURE_CMDS
++define PYTHON_PYGAME_CONFIGURE_CMDS
+ cp -f $(@D)/Setup.in $(@D)/Setup
-+ $(SED) 's<^SDL = <SDL = $(PYGAME_SDL_FLAGS) \n#<' $(@D)/Setup
++ $(SED) 's~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~' $(@D)/Setup
+ $(SED) 's/^pypm/#pypm/' $(@D)/Setup
-+ $(PYGAME_CONFIGURE_IMAGE)
-+ $(PYGAME_CONFIGURE_FONT)
-+ $(PYGAME_CONFIGURE_MIXER)
-+ $(PYGAME_CONFIGURE_SNDARRAY)
-+ $(PYGAME_CONFIGURE_SURFARRAY)
-+ $(PYGAME_CONFIGURE_MOVIE)
-+ $(PYGAME_CONFIGURE_SCRAP)
++ $(PYTHON_PYGAME_UNCONFIGURE_IMAGE)
++ $(PYTHON_PYGAME_UNCONFIGURE_FONT)
++ $(PYTHON_PYGAME_UNCONFIGURE_MIXER)
++ $(PYTHON_PYGAME_UNCONFIGURE_SNDARRAY)
++ $(PYTHON_PYGAME_UNCONFIGURE_SURFARRAY)
++ $(PYTHON_PYGAME_UNCONFIGURE_MOVIE)
++ $(PYTHON_PYGAME_UNCONFIGURE_SCRAP)
+endef
+
-+define PYGAME_BUILD_CMDS
++define PYTHON_PYGAME_BUILD_CMDS
+ (cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
++ CROSS_COMPILING=yes \
++ _python_sysroot=$(STAGING_DIR) \
++ _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
++ _python_prefix=/usr \
++ _python_exec_prefix=/usr \
+ $(HOST_DIR)/usr/bin/python setup.py build)
+endef
+
-+define PYGAME_INSTALL_TARGET_CMDS
-+ (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr && \
-+ rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs && \
-+ rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests)
++ifneq ($(BR2_HAVE_DOCUMENTATION),y)
++define PYTHON_PYGAME_REMOVE_DOC
++ rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs
++endef
++endif
++
++define PYTHON_PYGAME_INSTALL_TARGET_CMDS
++ (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install \
++ --prefix=$(TARGET_DIR)/usr)
++ rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests
++ $(PYTHON_PYGAME_REMOVE_DOC)
+endef
+
-+define PYGAME_UNINSTALL_TARGET_CMDS
++define PYTHON_PYGAME_UNINSTALL_TARGET_CMDS
+ rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame*
+endef
+
-+$(eval $(call GENTARGETS,package,pygame))
++$(eval $(call GENTARGETS,package,python-pygame))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-01-03 19:24:08.000000000 +0100
-+++ buildroot/package/Config.in 2012-01-05 15:45:47.000000000 +0100
+--- buildroot.orig/package/Config.in 2012-01-12 21:16:29.000000000 +0100
++++ buildroot/package/Config.in 2012-01-12 21:25:13.000000000 +0100
@@ -112,6 +112,7 @@
source "package/imagemagick/Config.in"
source "package/linux-fusion/Config.in"
source "package/lite/Config.in"
-+source "package/pygame/Config.in"
++source "package/python-pygame/Config.in"
source "package/sawman/Config.in"
source "package/sdl/Config.in"
source "package/sdl_image/Config.in"
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index 8b4c35d..a67af75 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -7,7 +7,7 @@
rm -rf buildroot/package/games/quake-pak/
rm -rf buildroot/package/games/sdlquake/
rm -rf buildroot/package/gpm/
-rm -rf buildroot/package/pygame/
+rm -rf buildroot/package/python-pygame/
rm -rf buildroot/package/uucp/
rm -f buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/multimedia/flite/
hooks/post-receive
--
armadeus
|
