[oe-commits] org.oe.dev merge of '937e098c88f41af274b6cb04f049439e168d15b9'

oe commit openembedded-commits at lists.openembedded.org
Thu Jan 17 21:04:59 UTC 2008 

merge of '937e098c88f41af274b6cb04f049439e168d15b9'
     and 'e4319c22e09affdcdc5fbec3afd685b355fb8e14'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: b8eab3d0461de7af79a745d6b20c8e008acb7af4
ViewMTN: http://monotone.openembedded.org/revision/info/b8eab3d0461de7af79a745d6b20c8e008acb7af4
Files:
1
packages/asterisk-core-sounds-en-alaw
packages/asterisk-core-sounds-en-g729
packages/asterisk-core-sounds-en-gsm
packages/asterisk-core-sounds-en-ulaw
packages/asterisk-extra-sounds-en-alaw
packages/asterisk-extra-sounds-en-g729
packages/asterisk-extra-sounds-en-gsm
packages/asterisk-extra-sounds-en-ulaw
packages/asterisk-moh-freeplay-alaw
packages/asterisk-moh-freeplay-g729
packages/asterisk-moh-freeplay-gsm
packages/asterisk-moh-freeplay-ulaw
packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tasks/task-openmoko-toolchain-target.bb
packages/orinoco/orinoco-modules.inc
packages/supertux/files/gp2x.patch
packages/supertux/files/img-resize.sh
packages/supertux/files/supertux-smallsize-data.tar.bz2
packages/supertux/supertux-qvga_0.1.3.bb
packages/tasks/task-openmoko-toolchain-host.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/orinoco/orinoco-modules_0.13e.bb
packages/orinoco/orinoco-modules_0.15rc1.bb
packages/orinoco/orinoco-modules_0.15rc2.bb
packages/orinoco/orinoco-modules_cvs.bb
packages/supertux/files/supertux.desktop
packages/tasks/task-openmoko-debug.bb
mtn:manual_merge
true
packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch
packages/gcc/gcc-4.2.2/fortran-static-linking.patch
packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
Diffs:

#
# mt diff -r937e098c88f41af274b6cb04f049439e168d15b9 -rb8eab3d0461de7af79a745d6b20c8e008acb7af4
#
# 
# 
# delete "packages/asterisk-core-sounds-en-alaw"
# 
# delete "packages/asterisk-core-sounds-en-g729"
# 
# delete "packages/asterisk-core-sounds-en-gsm"
# 
# delete "packages/asterisk-core-sounds-en-ulaw"
# 
# delete "packages/asterisk-extra-sounds-en-alaw"
# 
# delete "packages/asterisk-extra-sounds-en-g729"
# 
# delete "packages/asterisk-extra-sounds-en-gsm"
# 
# delete "packages/asterisk-extra-sounds-en-ulaw"
# 
# delete "packages/asterisk-moh-freeplay-alaw"
# 
# delete "packages/asterisk-moh-freeplay-g729"
# 
# delete "packages/asterisk-moh-freeplay-gsm"
# 
# delete "packages/asterisk-moh-freeplay-ulaw"
# 
# rename "packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb"
# 
# rename "packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
# 
# rename "packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb"
# 
# rename "packages/tasks/task-toolchain-openmoko-sdk.bb"
#     to "packages/tasks/task-openmoko-toolchain-target.bb"
# 
# add_file "packages/orinoco/orinoco-modules.inc"
#  content [a0f71de24feba1b09e5a8e110fed2b234ea823b7]
# 
# add_file "packages/supertux/files/gp2x.patch"
#  content [26a86f577e4742adc10c15df42c058f4cea5183a]
# 
# add_file "packages/supertux/files/img-resize.sh"
#  content [0179d1a7105160d62d20293a7513dd948a13cd3c]
# 
# add_file "packages/supertux/files/supertux-smallsize-data.tar.bz2"
#  content [982bfb74c80c28fa6574ec3ccd3facae4e943404]
# 
# add_file "packages/supertux/supertux-qvga_0.1.3.bb"
#  content [53598bc864a257e7201e4e07636d2e6c83095af2]
# 
# add_file "packages/tasks/task-openmoko-toolchain-host.bb"
#  content [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [2f7cb2290c8041be1845553e70a09af8c92e718d]
#    to [1243c122ad661be1683a045938d93537f205ce15]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [0f5e441b0fc2a2781297da7b38cb843e8c77f550]
#    to [d560814623625b6b57fc9aad038a6e4e6b62f271]
# 
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
#  from [fd3ecb56d2f926384dc852689d17e18430014b2e]
#    to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
# 
# patch "packages/meta/meta-toolchain-openmoko.bb"
#  from [2c36f31834b317cfdc81cff2dc8cd7db05229bcf]
#    to [76d692ed056a9397df52f5d27a16c97f29b032cd]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [b52d096ec913c333f9bb14b192bc922b80854834]
#    to [d53849cfd4dc2f21fcd44b4cc0926382313fc1e9]
# 
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
#  from [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
#    to [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
# 
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
#  from [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#    to [90b2cf8a49d86bb43022f62052a46f47d57edcee]
# 
# patch "packages/orinoco/orinoco-modules_0.13e.bb"
#  from [b3160262a35ad7ebdea0018698a346c8d779e410]
#    to [42df7a5fe957c5a457e5b6d10f5fa99b0eccf8ee]
# 
# patch "packages/orinoco/orinoco-modules_0.15rc1.bb"
#  from [b585752da378cdbadf684f6e4698451b398e8f12]
#    to [2e800a3702a89c002b802721cb278ccc07a0c3c7]
# 
# patch "packages/orinoco/orinoco-modules_0.15rc2.bb"
#  from [812f6cf32cdf408de6e218e5e20e447358fc8e68]
#    to [365c34b2f550cda6dee19a2707bddd5521d4426f]
# 
# patch "packages/orinoco/orinoco-modules_cvs.bb"
#  from [b5b9752f46dc04b12fb12c8786ae4924cb7142a0]
#    to [5deb2baa3d4811d2c877109a966a271eed2abc9d]
# 
# patch "packages/supertux/files/supertux.desktop"
#  from [ca0d07025948eea625b61a4c138657fd300ff7ac]
#    to [f35df068437792660755385fb36d3287092c27ea]
# 
# patch "packages/tasks/task-openmoko-debug.bb"
#  from [6f16b58858e9a8858a34530bccc7db757e1303ab]
#    to [7f29d58704ca954c5e6e5ff766840cc0cff0eb5e]
# 
# patch "packages/tasks/task-openmoko-toolchain-target.bb"
#  from [4526d09a7c1a87ae65eac1a78599062dad98e280]
#    to [28005de19ec998c9abe5e7d383d158bf18bbfc14]
# 
#   set "packages/supertux/files/supertux-smallsize-data.tar.bz2"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- packages/orinoco/orinoco-modules.inc	a0f71de24feba1b09e5a8e110fed2b234ea823b7
+++ packages/orinoco/orinoco-modules.inc	a0f71de24feba1b09e5a8e110fed2b234ea823b7
@@ -0,0 +1,21 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
+Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+PROVIDES = "spectrum-modules"
+LICENSE = "GPL"
+
+SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz"
+S = "${WORKDIR}/orinoco-${PV}"
+
+inherit module
+
+PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
+FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
+                                /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules = "/lib/modules/"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"
============================================================
--- packages/supertux/files/gp2x.patch	26a86f577e4742adc10c15df42c058f4cea5183a
+++ packages/supertux/files/gp2x.patch	26a86f577e4742adc10c15df42c058f4cea5183a
@@ -0,0 +1,2614 @@
+Only in supertux-0.1.3: aclocal.m4
+diff -ur supertux-0.1.3/AUTHORS supertux-0.1.3-gp2x/AUTHORS
+--- supertux-0.1.3/AUTHORS	2005-07-02 14:37:30.000000000 +0300
++++ supertux-0.1.3-gp2x/AUTHORS	2006-04-13 06:11:02.000000000 +0300
+@@ -91,6 +91,12 @@
+ 
+     Royalty free CDROMs and FTP sites sounds
+ 
++Port to GP2X
++-----------
++    Ingo Arndt
++    scachi at gmx.de
++    http://www.bitmage.de
++
+ More information and contacts
+ =============================
+ 
+Only in supertux-0.1.3: autom4te.cache
+Only in supertux-0.1.3-gp2x: autoscan.log
+Only in supertux-0.1.3-gp2x: COMPILE4GP2X
+Only in supertux-0.1.3: config.guess
+Only in supertux-0.1.3: config.log
+Only in supertux-0.1.3: config.status
+Only in supertux-0.1.3: config.sub
+Only in supertux-0.1.3: configure
+diff -ur supertux-0.1.3/configure.ac supertux-0.1.3-gp2x/configure.ac
+--- supertux-0.1.3/configure.ac	2005-07-06 12:26:15.000000000 +0300
++++ supertux-0.1.3-gp2x/configure.ac	2006-04-19 22:29:05.000000000 +0300
+@@ -76,13 +76,33 @@
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+ 
++AM_PATH_LIBMIKMOD(,
++            :,
++	    AC_MSG_ERROR([*** mikmod not found!]))
++CXXFLAGS="$CXXFLAGS $LIBMIKMOD_CFLAGS"
++CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
++LIBS="$LIBS $LIBMIKMOD_LIBS"
++
+ dnl Checks for additional libraries.
++AC_CHECK_LIB(smpeg, SMPEG_status)
++
++AC_CHECK_LIB(mikmod, MikMod_Init)
++
+ AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio,,
+ 	AC_MSG_ERROR([SDL_mixer library required]))
+ 
++AC_CHECK_LIB(jpeg,jpeg_abort)
++
++AC_CHECK_LIB(z,compress)
++
++AC_CHECK_LIB(png,png_free)
++
+ AC_CHECK_LIB(SDL_image, IMG_Load,,
+ 	AC_MSG_ERROR([SDL_image library required]))
+ 
++AC_CHECK_LIB(SDL_gfx, rotozoomSurface,,
++	AC_MSG_ERROR([SDL_gfx library required]))
++
+ if test "x${enable_opengl}" != "xno"; then
+   AX_CHECK_GL
+ fi
+@@ -95,7 +115,30 @@
+   LIBS="$LIBS $GL_LIBS"
+ fi
+ 
+-AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([*** zlib is missing]))
++# compile for the testing the 320x240 resolution
++# compile for the gp2x
++AC_ARG_ENABLE(gp2x,
++[  --enable-gp2x          Build the gp2x version [default=no]],
++              , enable_gp2x=no)
++if test x$enable_gp2x = xyes; then
++    CXXFLAGS="$CXXFLAGS -DGP2X"
++fi
++
++AC_ARG_ENABLE(320x240,
++[  --enable-320x240          Test the 320x240 resolution [default=no]],
++              , enable_320x240=no)
++if test x$enable_320x240 = xyes; then
++    CXXFLAGS="$CXXFLAGS -DRES320X240"
++fi
++
++# compile static
++AC_ARG_ENABLE(static,
++[  --enable-static          Build the static version [default=no]],
++              , enable_static=no)
++if test x$enable_static = xyes; then
++    CXXFLAGS="$CXXFLAGS -static"
++fi
++
+ 
+ CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux\"'" 
+ 
+@@ -110,6 +153,9 @@
+ echo " Profile Mode:   $enable_gprof"
+ echo " Debug Mode:     $enable_debug"
+ echo " OpenGL Support: $enable_opengl"
++echo " 320x240 Resolution:    $enable_320x240"
++echo " GP2X Build (+320x240): $enable_gp2x"
++echo " Static Build:          $enable_static"
+ echo ""
+ 
+ # EOF #
+Only in supertux-0.1.3/data: CREDITS
+Only in supertux-0.1.3/data: extro-bonus2.txt
+Only in supertux-0.1.3/data: extro-bonus.txt
+Only in supertux-0.1.3/data: extro.txt
+Only in supertux-0.1.3/data: images
+Only in supertux-0.1.3/data: intro.txt
+Only in supertux-0.1.3/data: levels
+Only in supertux-0.1.3/data: Makefile
+Only in supertux-0.1.3/data: Makefile.in
+Only in supertux-0.1.3/data: music
+Only in supertux-0.1.3/data: sounds
+Only in supertux-0.1.3/data: supertux.strf
+Only in supertux-0.1.3: depcomp
+Only in supertux-0.1.3: install-sh
+Only in supertux-0.1.3: m4
+Only in supertux-0.1.3: Makefile
+Only in supertux-0.1.3: Makefile.in
+Only in supertux-0.1.3: missing
+Only in supertux-0.1.3: mkinstalldirs
+Only in supertux-0.1.3: patches
+diff -ur supertux-0.1.3/src/badguy.cpp supertux-0.1.3-gp2x/src/badguy.cpp
+--- supertux-0.1.3/src/badguy.cpp	2005-06-22 00:16:07.000000000 +0300
++++ supertux-0.1.3-gp2x/src/badguy.cpp	2006-04-20 21:32:23.000000000 +0300
+@@ -250,7 +250,11 @@
+           tux.kick_timer.start(KICKING_TIME);
+           set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+           physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5);
++#ifndef GP2X
+           play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER);
++#else
++          play_chunk(SND_KICK);
++#endif
+         }
+     }
+ 
+@@ -260,6 +264,7 @@
+       check_horizontal_bump();
+       if(mode == KICK && changed != dir)
+         {
++#ifndef GP2X
+           /* handle stereo sound (number 10 should be tweaked...)*/
+           if (base.x < scroll_x + screen->w/2 - 10)
+             play_sound(sounds[SND_RICOCHET], SOUND_LEFT_SPEAKER);
+@@ -267,6 +272,9 @@
+             play_sound(sounds[SND_RICOCHET], SOUND_RIGHT_SPEAKER);
+           else
+             play_sound(sounds[SND_RICOCHET], SOUND_CENTER_SPEAKER);
++#else
++          play_chunk(SND_RICOCHET);
++#endif
+         }
+     }
+ 
+@@ -455,11 +463,15 @@
+ 
+       /* play explosion sound */  // FIXME: is the stereo all right? maybe we should use player cordinates...
+       if (base.x < scroll_x + screen->w/2 - 10)
++#ifndef GP2X
+         play_sound(sounds[SND_EXPLODE], SOUND_LEFT_SPEAKER);
+       else if (base.x > scroll_x + screen->w/2 + 10)
+         play_sound(sounds[SND_EXPLODE], SOUND_RIGHT_SPEAKER);
+       else
+         play_sound(sounds[SND_EXPLODE], SOUND_CENTER_SPEAKER);
++#else
++	play_chunk(SND_EXPLODE);
++#endif
+ 
+     } else if(mode == BOMB_EXPLODE) {
+       remove_me();
+@@ -677,13 +689,21 @@
+     }
+ 
+   // BadGuy fall below the ground
++#ifndef RES320X240
+   if (base.y > screen->h) {
++#else
++  if (base.y > 640) {
++#endif
+     remove_me();
+     return;
+   }
+ 
+   // Once it's on screen, it's activated!
++#ifndef RES320X240
+   if (base.x <= scroll_x + screen->w + OFFSCREEN_DISTANCE)
++#else
++  if (base.x <= scroll_x + 640 + OFFSCREEN_DISTANCE)
++#endif
+     seen = true;
+ 
+   if(!seen)
+@@ -743,7 +763,11 @@
+ BadGuy::draw()
+ {
+   // Don't try to draw stuff that is outside of the screen
++#ifndef RES320X240
+   if(base.x <= scroll_x - base.width || base.x >= scroll_x + screen->w)
++#else
++  if(base.x <= scroll_x - base.width || base.x >= scroll_x + 640)
++#endif
+     return;
+   
+   if(sprite_left == 0 || sprite_right == 0)
+@@ -811,7 +835,11 @@
+     
+   World::current()->add_score(base.x - scroll_x,
+                               base.y, 50 * player_status.score_multiplier);
++#ifndef GP2X
+   play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
++#else
++  play_chunk(SND_SQUISH);
++#endif
+   player_status.score_multiplier++;
+ 
+   dying = DYING_SQUISHED;
+@@ -830,7 +858,11 @@
+    
+     player->jump_of_badguy(this);
+     World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier);
++#ifndef GP2X
+     play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
++#else
++    play_chunk(SND_SQUISH);
++#endif
+     player_status.score_multiplier++;
+     remove_me();
+     return;
+@@ -839,7 +871,11 @@
+     if (mode == NORMAL || mode == KICK)
+       {
+         /* Flatten! */
++#ifndef GP2X
+         play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
++#else
++	play_chunk(SND_STOMP);
++#endif
+         mode = FLAT;
+         set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+         physic.set_velocity_x(0);
+@@ -847,7 +883,11 @@
+         timer.start(4000);
+       } else if (mode == FLAT) {
+         /* Kick! */
++#ifndef GP2X
+         play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
++#else
++	play_chunk(SND_KICK);
++#endif
+ 
+         if (player->base.x < base.x + (base.width/2)) {
+           physic.set_velocity_x(5);
+@@ -925,7 +965,11 @@
+                     score * player_status.score_multiplier);
+ 
+   /* Play death sound: */
++#ifndef GP2X
+   play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
++#else
++	play_chunk(SND_FALL);
++#endif
+ }
+ 
+ void BadGuy::explode(BadGuy *badguy)
+@@ -1053,7 +1097,11 @@
+       /* Get kicked if were flat */
+       if (mode == FLAT && !dying)
+       {
++#ifndef GP2X
+         play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER);
++#else
++	play_chunk(SND_KICK);
++#endif
+ 
+         // Hit from left side
+         if (player->base.x < base.x) {
+diff -ur supertux-0.1.3/src/configfile.cpp supertux-0.1.3-gp2x/src/configfile.cpp
+--- supertux-0.1.3/src/configfile.cpp	2005-06-22 00:16:07.000000000 +0300
++++ supertux-0.1.3-gp2x/src/configfile.cpp	2006-04-10 13:32:19.000000000 +0300
+@@ -92,12 +92,22 @@
+   else
+     use_joystick = true;
+ 
++#ifndef GP2X
+   reader.read_int ("joystick-x", &joystick_keymap.x_axis);
+   reader.read_int ("joystick-y", &joystick_keymap.y_axis);
+   reader.read_int ("joystick-a", &joystick_keymap.a_button);
+   reader.read_int ("joystick-b", &joystick_keymap.b_button);
+   reader.read_int ("joystick-start", &joystick_keymap.start_button);
+   reader.read_int ("joystick-deadzone", &joystick_keymap.dead_zone);
++#else
++  reader.read_int ("joystick-up", &joystick_keymap.up_button);
++  reader.read_int ("joystick-down", &joystick_keymap.down_button);
++  reader.read_int ("joystick-right", &joystick_keymap.right_%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re4319c22e09affdcdc5fbec3afd685b355fb8e14 -rb8eab3d0461de7af79a745d6b20c8e008acb7af4
#
# 
# 
# rename "packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch"
#     to "packages/gcc/gcc-4.2.2/fortran-static-linking.patch"
# 
# add_file "packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch"
#  content [544859e05e08d2a0b5639e1182a8a2a4ef114d07]
# 
# patch "packages/gcc/gcc-4.2.2/fortran-static-linking.patch"
#  from [96ee0c885c5757fde97f61188ec0c799ae5c7b18]
#    to [e51538f27d036e3418faae17b7dcd656ae38313a]
# 
# patch "packages/gcc/gcc-cross-sdk_4.2.2.bb"
#  from [8ef30993fffbbd19108406cd37d0b36449e5143d]
#    to [c51f994c61ce378fb2761f8e6d0cc77071b8dcfe]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [bd6eaf9021e129dcbd70794a3e80ac820d764246]
#    to [638f8a17318b6c935909d7b7f11cc6506e57d6af]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [6bcef9ceeb471bcf1d54c4ae08e78e9b80d6a44c]
#    to [b649640ada6aa7b3be9155792213ea7689d6e6ac]
# 
============================================================
--- packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch	544859e05e08d2a0b5639e1182a8a2a4ef114d07
+++ packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch	544859e05e08d2a0b5639e1182a8a2a4ef114d07
@@ -0,0 +1,30 @@
+* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
+  used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
+  directory.
+
+diff --git a/libgfortran/configure b/libgfortran/configure
+index f7d86fb..d0966ec 100755
+--- a/libgfortran/configure
++++ b/libgfortran/configure
+@@ -4475,6 +4475,6 @@ exec 5>>./config.log
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ ac_ext=${FC_SRCEXT-f}
+ ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+\ No newline at end of file
+diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
+index 4661306..9f83e55 100644
+--- a/libgfortran/configure.ac
++++ b/libgfortran/configure.ac
+@@ -140,7 +140,7 @@ AC_SUBST(enable_static)
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ AC_PROG_FC(gfortran)
+ 
+ # extra LD Flags which are required for targets
============================================================
--- packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch	96ee0c885c5757fde97f61188ec0c799ae5c7b18
+++ packages/gcc/gcc-4.2.2/fortran-static-linking.patch	e51538f27d036e3418faae17b7dcd656ae38313a
@@ -13,7 +13,7 @@ Index: gcc-4.2.2/configure
  
  if test "x$with_mpfr" != x; then
 -  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-Wl,-rpath,$with_mpfr/lib -L$with_mpfr/lib $gmplibs"
++  gmplibs="-static -L$with_mpfr/lib $gmplibs"
    gmpinc="-I$with_mpfr/include"
  fi
  if test "x$with_mpfr_include" != x; then
@@ -21,7 +21,7 @@ Index: gcc-4.2.2/configure
  fi
  if test "x$with_mpfr_lib" != x; then
 -  gmplibs="-L$with_mpfr_lib $gmplibs"
-+  gmplibs="-Wl,-rpath,$with_mpfr_lib -L$with_mpfr_lib $gmplibs"
++  gmplibs="-static -L$with_mpfr_lib $gmplibs"
  fi
  
  # Specify a location for gmp
@@ -34,7 +34,7 @@ Index: gcc-4.2.2/configure.in
  
  if test "x$with_mpfr" != x; then
 -  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-Wl,-rpath,$with_mpfr/lib -L$with_mpfr/lib $gmplibs"
++  gmplibs="-static -L$with_mpfr/lib $gmplibs"
    gmpinc="-I$with_mpfr/include"
  fi
  if test "x$with_mpfr_include" != x; then
@@ -42,7 +42,7 @@ Index: gcc-4.2.2/configure.in
  fi
  if test "x$with_mpfr_lib" != x; then
 -  gmplibs="-L$with_mpfr_lib $gmplibs"
-+  gmplibs="-Wl,-rpath,$with_mpfr_lib -L$with_mpfr_lib $gmplibs"
++  gmplibs="-static -L$with_mpfr_lib $gmplibs"
  fi
  
  # Specify a location for gmp
============================================================
--- packages/gcc/gcc-cross-sdk_4.2.2.bb	8ef30993fffbbd19108406cd37d0b36449e5143d
+++ packages/gcc/gcc-cross-sdk_4.2.2.bb	c51f994c61ce378fb2761f8e6d0cc77071b8dcfe
@@ -8,9 +8,14 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc mpfr"
 PACKAGES = "${PN}"
 
 require gcc_${PV}.bb
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
+		--disable-libgomp --disable-libmudflap \
+		--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb	bd6eaf9021e129dcbd70794a3e80ac820d764246
+++ packages/gcc/gcc-cross_4.2.2.bb	638f8a17318b6c935909d7b7f11cc6506e57d6af
@@ -15,7 +15,6 @@ SRC_URI_append_fail-fast = " file://zeck
 # cross packaging
 require gcc-package-cross.inc
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-SRC_URI_append = " file://fortran-libs-rpath-to-staging-hack.patch;patch=1 "
 # Do not build libssp libmudflap and libgomp
 # We might need them for some beefy targets 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
============================================================
--- packages/gcc/gcc_4.2.2.bb	6bcef9ceeb471bcf1d54c4ae08e78e9b80d6a44c
+++ packages/gcc/gcc_4.2.2.bb	b649640ada6aa7b3be9155792213ea7689d6e6ac
@@ -41,6 +41,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
         file://gfortran.patch;patch=1 \
         file://gcc-4.0.2-e300c2c3.patch;patch=1 \
         file://pr34130.patch;patch=1 \
+        file://fortran-static-linking.patch;patch=1 \
 "
 
 SRC_URI_append_ep93xx = " \
@@ -72,6 +73,8 @@ FORTRAN_linux-gnueabi = ",fortran"
 FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
 
+DEPENDS += " gmp mpfr "
+
 #Set the java bits
 JAVA = ""
 JAVA_arm = ""
@@ -83,3 +86,9 @@ EXTRA_OECONF += " --disable-libssp --dis
 
 EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
 
+# We know some one is including us, but we only want to apply this fortran hack for the real gcc
+python __anonymous () {
+    import bb
+    if bb.data.getVar('PN', d, True) == "gcc":
+        bb.data.setVar('SRC_URI_append', ' file://fortran-cross-compile-hack.patch;patch=1', d)
+}

More information about the Openembedded-commits mailing list