[oe-commits] org.oe.dev merge of '355866fda3e7098f7d30f22852c4e3ad5145126b'
oe commit
oe at amethyst.openembedded.net
Mon Sep 1 18:13:31 UTC 2008
merge of '355866fda3e7098f7d30f22852c4e3ad5145126b'
and '5ad8db39f892a4c9b9c381f015e9709e5cd01b4a'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: eaba90d63474ae402b13843f95cbc0b50e36614b
ViewMTN: http://monotone.openembedded.org/revision/info/eaba90d63474ae402b13843f95cbc0b50e36614b
Files:
1
packages/gettext/gettext_0.17.bb
packages/python/python-pygame-1.7.1
packages/python/python-pygame-1.7.1/Setup
packages/python/python-pygame_1.7.1.bb
packages/python/python-pygame-1.8.1
packages/sysstat
packages/python/python-pygame-1.8.1/Setup
packages/python/python-pygame_1.8.1.bb
packages/sysstat/sysstat_8.1.5.bb
packages/images/fso-image.bb
Diffs:
#
# mt diff -r355866fda3e7098f7d30f22852c4e3ad5145126b -reaba90d63474ae402b13843f95cbc0b50e36614b
#
#
#
# patch "packages/gettext/gettext_0.17.bb"
# from [d39e7c39ab4154e36e9937b5f173e7652e401999]
# to [089d02dc9fa1adf968040048a2f64700470abe3a]
#
============================================================
--- packages/gettext/gettext_0.17.bb d39e7c39ab4154e36e9937b5f173e7652e401999
+++ packages/gettext/gettext_0.17.bb 089d02dc9fa1adf968040048a2f64700470abe3a
@@ -2,9 +2,9 @@ LICENSE = "GPL"
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SECTION = "libs"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
-DEPENDS = "virtual/libiconv"
+DEPENDS = "gettext-native virtual/libiconv ncurses expat"
PROVIDES = "virtual/libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
@@ -15,12 +15,6 @@ SRC_URI_append_linux-uclibcgnueabi = " f
SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
-#gettext.class cant be inherit here so use this hack same as in libiconv
-DEPENDS += "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-
PARALLEL_MAKE = ""
inherit autotools
@@ -34,6 +28,7 @@ EXTRA_OECONF += "--without-lispdir \
--with-included-glib \
--without-emacs \
"
+
acpaths = '-I ${S}/autoconf-lib-link/m4/ \
-I ${S}/gettext-runtime/m4 \
-I ${S}/gettext-tools/m4'
#
# mt diff -r5ad8db39f892a4c9b9c381f015e9709e5cd01b4a -reaba90d63474ae402b13843f95cbc0b50e36614b
#
#
#
# delete "packages/python/python-pygame-1.7.1"
#
# delete "packages/python/python-pygame-1.7.1/Setup"
#
# delete "packages/python/python-pygame_1.7.1.bb"
#
# add_dir "packages/python/python-pygame-1.8.1"
#
# add_dir "packages/sysstat"
#
# add_file "packages/python/python-pygame-1.8.1/Setup"
# content [afc5f4e23585b9e72e86fe289aef63f316f8fa37]
#
# add_file "packages/python/python-pygame_1.8.1.bb"
# content [d20237c5870066d97af5c40249900e87c039beda]
#
# add_file "packages/sysstat/sysstat_8.1.5.bb"
# content [0dad3525c7cdc27d60bff198bc7631736117ea7d]
#
# patch "packages/images/fso-image.bb"
# from [c1ef8880079b495bdb218a51113abbbd36449724]
# to [c8a13bba7a46ab4c7fb795f650086b0a34e45787]
#
============================================================
--- packages/python/python-pygame-1.8.1/Setup afc5f4e23585b9e72e86fe289aef63f316f8fa37
+++ packages/python/python-pygame-1.8.1/Setup afc5f4e23585b9e72e86fe289aef63f316f8fa37
@@ -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 = -D_REENTRANT -Xlinker -lSDL -lpthread
+FONT = -lSDL_ttf
+IMAGE = -lSDL_image
+MIXER = -lSDL_mixer
+SMPEG = -lsmpeg
+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)
+
============================================================
--- packages/python/python-pygame_1.8.1.bb d20237c5870066d97af5c40249900e87c039beda
+++ packages/python/python-pygame_1.8.1.bb d20237c5870066d97af5c40249900e87c039beda
@@ -0,0 +1,26 @@
+DESCRIPTION = "Python libSDL Bindings"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.pygame.org"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
+SRCNAME = "pygame"
+PR = "ml0"
+
+SRC_URI = "\
+ ftp://ftp.pyganem.org/pygame/${SRCNAME}-${PV}release.tar.gz \
+ file://Setup"
+S = "${WORKDIR}/${SRCNAME}-${PV}release"
+
+inherit distutils
+
+do_configure_prepend() {
+ cat ${WORKDIR}/Setup >Setup
+ SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup
+}
+
+do_stage() {
+ distutils_stage_all
+}
+
+RDEPENDS = "python-numeric"
============================================================
--- packages/sysstat/sysstat_8.1.5.bb 0dad3525c7cdc27d60bff198bc7631736117ea7d
+++ packages/sysstat/sysstat_8.1.5.bb 0dad3525c7cdc27d60bff198bc7631736117ea7d
@@ -0,0 +1,15 @@
+DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
+HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/"
+LICENSE = "GPL"
+SECTION = "console/utils"
+
+SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz"
+
+inherit autotools
+
+do_configure_prepend() {
+ sed -i s,'-g $(MAN_GROUP)','', Makefile.in
+}
+
+FILES_${PN} += "${libdir}/sa"
+
============================================================
--- packages/images/fso-image.bb c1ef8880079b495bdb218a51113abbbd36449724
+++ packages/images/fso-image.bb c8a13bba7a46ab4c7fb795f650086b0a34e45787
@@ -50,6 +50,7 @@ TOOLS_INSTALL = "\
nano \
powertop \
s3c24xx-gpio \
+ sysstat \
"
# audio
More information about the Openembedded-commits
mailing list