[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2662-g2cc750f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2662-g2cc750f
|
From: Julien B a. A. <ar...@us...> - 2012-01-05 17:56:33
|
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 2cc750fd3f6f5edf90cbd9ed9f45af9f5c72126a (commit)
via 58045a00453c4194e6c7f4c029f3eefbd47aaaa4 (commit)
from 5a96900829e6e6f3b5eff8a81d763c3d5d9cde43 (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 2cc750fd3f6f5edf90cbd9ed9f45af9f5c72126a
Merge: 58045a0 5a96900
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 5 18:55:37 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 58045a00453c4194e6c7f4c029f3eefbd47aaaa4
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 5 16:03:28 2012 +0100
[BUILDROOT] Updates pygame to 1.9 and rework BR makefile while we are at it
-----------------------------------------------------------------------
Summary of changes:
.../2011.05/083-adds_pygame_package.patch | 272 +++++++-------------
1 files changed, 98 insertions(+), 174 deletions(-)
diff --git a/patches/buildroot/2011.05/083-adds_pygame_package.patch b/patches/buildroot/2011.05/083-adds_pygame_package.patch
index 79544fe..a9f6fc7 100644
--- a/patches/buildroot/2011.05/083-adds_pygame_package.patch
+++ b/patches/buildroot/2011.05/083-adds_pygame_package.patch
@@ -1,10 +1,10 @@
-
This patch adds PyGame package to buildroot.
Currently added to "graphic libraries".
Movie and Scrap modules are NOT tested: movie requires spmeg (SDL MPEG library)
and Scrap needs X11.
-numeric*array modules requires Numeric Python package which is not in BR yet.
+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.
@@ -13,16 +13,17 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/pygame/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in 2011-08-08 12:14:50.000000000 +0200
-@@ -0,0 +1,92 @@
++++ buildroot/package/pygame/Config.in 2012-01-05 15:13:40.000000000 +0100
+@@ -0,0 +1,85 @@
+config BR2_PACKAGE_PYGAME
+ bool "pygame"
+ depends on BR2_PACKAGE_PYTHON
+ select BR2_PACKAGE_SDL
-+ default n
+ help
-+ Pygame is a set of Python modules designed for writing games.
-+ Pygame adds functionality on top of the excellent SDL library.
++ Pygame is a cross-platfrom library designed to make it easy to write
++ multimedia software, such as games, in Python. Pygame requires the
++ Python language and SDL multimedia library.
++ It can also make use of several other popular libraries.
+
+ http://www.pygame.org/
+
@@ -32,49 +33,41 @@ Index: buildroot/package/pygame/Config.in
+config BR2_PACKAGE_PYGAME_IMAGE
+ bool "pygame.image"
+ default y
-+ select BR2_PACKAGE_SDL_IMAGE
++ depends on BR2_PACKAGE_SDL_IMAGE
++ depends on BR2_PACKAGE_SDL_IMAGE_PNG
++ depends on BR2_PACKAGE_SDL_IMAGE_JPEG
+ help
-+ pygame module for image transfer
-+
-+menu "Image formats"
-+ depends on BR2_PACKAGE_PYGAME_IMAGE
++ pygame module for loading, saving and transfering images
+
-+config BR2_PACKAGE_PYGAME_IMAGE_PNG
-+ bool "png"
-+ default y
-+ select BR2_PACKAGE_SDL_IMAGE_PNG
-+
-+config BR2_PACKAGE_PYGAME_IMAGE_JPEG
-+ bool "jpeg"
-+ default n
-+ select BR2_PACKAGE_SDL_IMAGE_JPEG
-+
-+endmenu
++comment "pygame.image requires sdl_image with png and jpeg support"
++ depends on !BR2_PACKAGE_PYGAME_IMAGE
+
+config BR2_PACKAGE_PYGAME_FONT
+ bool "pygame.font"
-+ default n
-+ select BR2_PACKAGE_SDL_TTF
++ depends on BR2_PACKAGE_SDL_TTF
+ help
+ pygame module for loading and rendering fonts
+
++comment "pygame.font requires sdl_ttf"
++ depends on !BR2_PACKAGE_PYGAME_FONT
++
+config BR2_PACKAGE_PYGAME_MIXER
+ bool "pygame.mixer"
-+ default n
-+ select BR2_PACKAGE_SDL_MIXER
++ depends on BR2_PACKAGE_SDL_MIXER
+ help
+ pygame module for loading and playing sounds
+
++comment "pygame.mixer requires sdl_mixer"
++ depends on !BR2_PACKAGE_PYGAME_MIXER
++
+config BR2_PACKAGE_PYGAME_MIXER_MUSIC
+ bool "pygame.mixer.music"
-+ default n
+ depends on BR2_PACKAGE_PYGAME_MIXER
+ help
+ pygame module for controlling streamed audio
+
+config BR2_PACKAGE_PYGAME_SNDARRAY
+ bool "pygame.sndarray"
-+ default n
+ depends on BR2_PACKAGE_PYGAME_MIXER && BR2_PACKAGE_PYTHON_NUMERIC
+ help
+ pygame module for accessing sound sample data
@@ -84,7 +77,6 @@ Index: buildroot/package/pygame/Config.in
+
+config BR2_PACKAGE_PYGAME_SURFARRAY
+ bool "pygame.surfarray"
-+ default n
+ depends on BR2_PACKAGE_PYTHON_NUMERIC
+ help
+ pygame module for accessing surface pixel data using array interfaces
@@ -94,14 +86,15 @@ Index: buildroot/package/pygame/Config.in
+
+config BR2_PACKAGE_PYGAME_MOVIE
+ bool "pygame.movie"
-+ default n
-+ select BR2_PACKAGE_SMPEG
++ 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
++
+config BR2_PACKAGE_PYGAME_SCRAP
+ bool "pygame.scrap"
-+ default n
+ depends on BR2_PACKAGE_SDL_X11
+ help
+ pygame module for clipboard support (X11 needed)
@@ -110,19 +103,16 @@ Index: buildroot/package/pygame/Config.in
Index: buildroot/package/pygame/pygame.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk 2011-08-08 12:14:50.000000000 +0200
++++ buildroot/package/pygame/pygame.mk 2012-01-05 15:45:16.000000000 +0100
@@ -0,0 +1,100 @@
++######################################################################
+#
+# Pygame
+#
++######################################################################
+
-+PYGAME_VERSION:= 1.8.1release
-+PYGAME_SOURCE:= pygame-$(PYGAME_VERSION).tar.gz
++PYGAME_VERSION:= 1.9.1release
+PYGAME_SITE:= http://www.pygame.org/ftp/
-+PYGAME_DIR:= $(BUILD_DIR)/pygame-$(PYGAME_VERSION)
-+PYGAME_BINARY:= pygame
-+PYGAME_CAT:= $(ZCAT)
-+
+
+ifeq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
+PYGAME_OPT_DEPENDS += sdl_image
@@ -136,86 +126,89 @@ Index: buildroot/package/pygame/pygame.mk
+ifeq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
+PYGAME_OPT_DEPENDS += smpeg
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
-+PYGAME_OPT_DEPENDS += ?X11?
-+endif
-+PYGAME_SDL_CFLAGS=$(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-+
-+
-+$(DL_DIR)/$(PYGAME_SOURCE):
-+ $(WGET) -P $(DL_DIR) $(PYGAME_SITE)/$(PYGAME_SOURCE)
-+
-+pygame-source: $(DL_DIR)/$(PYGAME_SOURCE)
++PYGAME_DEPENDENCIES = python sdl $(PYGAME_OPT_DEPENDS)
+
-+$(PYGAME_DIR)/.unpacked: $(DL_DIR)/$(PYGAME_SOURCE)
-+ $(PYGAME_CAT) $(DL_DIR)/$(PYGAME_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(PYGAME_DIR)/.configured: $(PYGAME_DIR)/.unpacked
-+ cp -f package/pygame/Setup $(PYGAME_DIR)
-+ echo "$(PYGAME_SDL_INCLUDES)"
-+ $(SED) 's#SDL_CUSTOM_CFLAGS_REPLACE_ME#$(PYGAME_SDL_CFLAGS)#' $(PYGAME_DIR)/Setup
-+ifeq ($(BR2_PACKAGE_SDL_X11),y)
-+ sed -i "s/-DDISABLE_X11//" $(PYGAME_DIR)/Setup
-+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
-+ sed -i "s/#image/image/" $(PYGAME_DIR)/Setup
++ifneq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
++define PYGAME_CONFIGURE_IMAGE
++ $(SED) 's/^imageext/#imageext/' $(@D)/Setup
++endef
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_FONT),y)
-+ sed -i "s/#font/font/" $(PYGAME_DIR)/Setup
-+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MIXER),y)
-+ sed -i "s/#mixer/mixer/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_FONT),y)
++define PYGAME_CONFIGURE_FONT
++ $(SED) 's/^font/#font/' $(@D)/Setup
++endef
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SNDARRAY),y)
-+ sed -i "s/#_numericsndarray/_numericsndarray/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_MIXER),y)
++define PYGAME_CONFIGURE_MIXER
++ $(SED) 's/^mixer/#mixer/g' $(@D)/Setup
++endef
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SURFARRAY),y)
-+ sed -i "s/#_numericsurfarray/_numericsurfarray/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_SNDARRAY),y)
++define PYGAME_CONFIGURE_SNDARRAY
++ $(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup
++endef
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
-+ sed -i "s/#movie/movie/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_SURFARRAY),y)
++define PYGAME_CONFIGURE_SURFARRAY
++ $(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup
++endef
+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
-+ sed -i "s/#scrap/scrap/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
++define PYGAME_CONFIGURE_MOVIE
++ $(SED) 's/^movie/#movie/' $(@D)/Setup
++endef
+endif
+
-+$(PYGAME_DIR)/.built: $(PYGAME_DIR)/.configured
-+ (cd $(PYGAME_DIR); \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
-+ $(PYTHON_DIR)/hostpython setup.py build );
-+ touch $@
++ifneq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
++define PYGAME_CONFIGURE_SCRAP
++ $(SED) 's/^scrap/#scrap/' $(@D)/Setup
++endef
++endif
+
-+$(PYGAME_DIR)/.installed: $(PYGAME_DIR)/.built
-+ (cd $(PYGAME_DIR); \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CFLAGS="$(TARGET_CFLAGS)" \
++PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
++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
++ cp -f $(@D)/Setup.in $(@D)/Setup
++ $(SED) 's<^SDL = <SDL = $(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)
++endef
++
++define PYGAME_BUILD_CMDS
++ (cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
-+ $(PYTHON_DIR)/hostpython setup.py install --prefix=$(TARGET_DIR)/usr);
-+ touch $@
-+
-+pygame: python sdl $(PYGAME_OPT_DEPENDS) $(PYGAME_DIR)/.installed
++ $(HOST_DIR)/usr/bin/python setup.py build)
++endef
+
-+pygame-clean:
-+ rm -rf $(TARGET_DIR)/usr/lib/python2.4/pygame/site-packages/
++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)
++endef
+
-+pygame-dirclean:
-+ rm -rf $(PYGAME_DIR)
++define PYGAME_UNINSTALL_TARGET_CMDS
++ rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame*
++endef
+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_PYGAME)),y)
-+TARGETS+=pygame
-+endif
++$(eval $(call GENTARGETS,package,pygame))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-08-08 12:14:46.000000000 +0200
-+++ buildroot/package/Config.in 2011-08-08 12:14:50.000000000 +0200
+--- 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
@@ -112,6 +112,7 @@
source "package/imagemagick/Config.in"
source "package/linux-fusion/Config.in"
@@ -224,72 +217,3 @@ Index: buildroot/package/Config.in
source "package/sawman/Config.in"
source "package/sdl/Config.in"
source "package/sdl_image/Config.in"
-Index: buildroot/package/pygame/Setup
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Setup 2011-08-08 12:14:50.000000000 +0200
-@@ -0,0 +1,64 @@
-+#This Setup file is used by the setup.py script to configure the
-+#python extensions. You will likely use the "config.py" which will
-+#build a correct Setup file for you based on your system settings.
-+#If not, the format is simple enough to edit by hand. First change
-+#the needed commandline flags for each dependency, then comment out
-+#any unavailable optional modules in the first optional section.
-+
-+
-+SDL = -lSDL -DDISABLE_X11 SDL_CUSTOM_CFLAGS_REPLACE_ME
-+FONT = -lSDL_ttf
-+IMAGE = -lSDL_image
-+MIXER = -lSDL_mixer
-+SMPEG = -D_REENTRANT -lsmpeg -lSDL
-+PNG = -lpng
-+JPEG = -ljpeg
-+SCRAP = -lX11
-+
-+#DEBUG = -C-W -C-Wall
-+DEBUG =
-+
-+#the following modules are optional. you will want to compile
-+#everything you can, but you can ignore ones you don't have
-+#dependencies for, just comment them out
-+
-+#imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
-+#font src/font.c $(SDL) $(FONT) $(DEBUG)
-+#mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
-+#mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
-+#_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
-+#_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-+#movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-+#scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-+
-+#experimental new movie movie. requires libavcodec and libavformat.
-+#add any necessary compile flags to this line and uncomment.
-+#movieext src/movie.c src/ffmovie.c $(SDL) -lavcodec -lavformat
-+
-+
-+#these modules are required for pygame to run. they only require
-+#SDL as a dependency. these should not be altered
-+
-+base src/base.c $(SDL) $(DEBUG)
-+cdrom src/cdrom.c $(SDL) $(DEBUG)
-+color src/color.c $(SDL) $(DEBUG)
-+constants src/constants.c $(SDL) $(DEBUG)
-+display src/display.c $(SDL) $(DEBUG)
-+event src/event.c $(SDL) $(DEBUG)
-+fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
-+key src/key.c $(SDL) $(DEBUG)
-+mouse src/mouse.c $(SDL) $(DEBUG)
-+rect src/rect.c $(SDL) $(DEBUG)
-+rwobject src/rwobject.c $(SDL) $(DEBUG)
-+surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
-+surflock src/surflock.c $(SDL) $(DEBUG)
-+time src/time.c $(SDL) $(DEBUG)
-+joystick src/joystick.c $(SDL) $(DEBUG)
-+draw src/draw.c $(SDL) $(DEBUG)
-+image src/image.c $(SDL) $(DEBUG)
-+overlay src/overlay.c $(SDL) $(DEBUG)
-+transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL) $(DEBUG)
-+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
-+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
-+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
-+
hooks/post-receive
--
armadeus
|
