diff options
29 files changed, 288 insertions, 127 deletions
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 440434229c..39031bf237 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -11,7 +11,7 @@ import time VERSION = "2.5.1" # increase when touching python-core, this should be the same ml version as in python_2.5.1.bb -BASEREV = 5 +BASEREV = 6 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>" __version__ = "20071205" diff --git a/packages/imagemagick/imagemagick-native_6.3.5-10.bb b/packages/imagemagick/imagemagick-native_6.3.5-10.bb new file mode 100644 index 0000000000..b03e18e9c1 --- /dev/null +++ b/packages/imagemagick/imagemagick-native_6.3.5-10.bb @@ -0,0 +1,3 @@ +require imagemagick_${PV}.bb +DEPENDS ="libtool-native" +inherit native diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb index f78d992806..84841d9741 100644 --- a/packages/libsdl/libsdl-mixer_1.2.6.bb +++ b/packages/libsdl/libsdl-mixer_1.2.6.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Simple DirectMedia Layer mixer library." SECTION = "libs" PRIORITY = "optional" -DEPENDS = "virtual/libsdl" +DEPENDS = "virtual/libsdl libmikmod" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz" S = "${WORKDIR}/SDL_mixer-${PV}" @@ -12,7 +12,7 @@ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" inherit autotools -EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod" +EXTRA_OECONF = "--disable-music-mp3" # although we build smpeg... need to find out how # to deal with optional dependencies diff --git a/packages/linux/linux/simpad/defconfig b/packages/linux/linux/simpad/defconfig index 33f08a0593..420d531dc4 100644 --- a/packages/linux/linux/simpad/defconfig +++ b/packages/linux/linux/simpad/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21 -# Sat Jul 7 00:02:55 2007 +# Sat Jan 12 20:06:01 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -227,7 +227,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" +CONFIG_CMDLINE=" quiet " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -413,7 +413,12 @@ CONFIG_BT_BNEP_PROTO_FILTER=y # CONFIG_BT_HCIBLUECARD is not set # CONFIG_BT_HCIBTUART is not set # CONFIG_BT_HCIVHCI is not set -# CONFIG_IEEE80211 is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set CONFIG_WIRELESS_EXT=y # @@ -663,34 +668,40 @@ CONFIG_NET_PCI=y # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y -# CONFIG_NET_WIRELESS_RTNETLINK is not set +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set -# CONFIG_ARLAN is not set +CONFIG_ARLAN=m # CONFIG_WAVELAN is not set CONFIG_PCMCIA_WAVELAN=m -# CONFIG_PCMCIA_NETWAVE is not set +CONFIG_PCMCIA_NETWAVE=m # # Wireless 802.11 Frequency Hopping cards support # -# CONFIG_PCMCIA_RAYCS is not set +CONFIG_PCMCIA_RAYCS=m # # Wireless 802.11b ISA/PCI cards support # -# CONFIG_HERMES is not set -# CONFIG_ATMEL is not set +CONFIG_HERMES=m +CONFIG_ATMEL=m # # Wireless 802.11b Pcmcia/Cardbus cards support # -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_HOSTAP is not set +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_AIRO_CS=m +# CONFIG_PCMCIA_ATMEL is not set +CONFIG_PCMCIA_WL3501=m +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_CS=m CONFIG_NET_WIRELESS=y # @@ -940,10 +951,7 @@ CONFIG_FONT_8x16=y # # Logo configuration # -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound @@ -986,7 +994,7 @@ CONFIG_USB_ARCH_HAS_HCD=y # # MMC/SD Card support # -# CONFIG_MMC_SPI_BLOCK is not set +CONFIG_MMC_SPI_BLOCK=m # CONFIG_MMC is not set # @@ -1247,7 +1255,7 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_AES is not set +CONFIG_CRYPTO_AES=m # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb index f2ab2116be..265a35a4b3 100644 --- a/packages/linux/linux_2.6.21.bb +++ b/packages/linux/linux_2.6.21.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1" DEFAULT_PREFERENCE_gumstix-connex = "1" DEFAULT_PREFERENCE_gumstix-verdex = "1" -PR = "r11" +PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://tsc2003.c \ diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb index 8f4db6382e..80bda20987 100644 --- a/packages/python/python-ecore_cvs.bb +++ b/packages/python/python-ecore_cvs.bb @@ -1,7 +1,7 @@ require python-efl.inc DEPENDS += "ecore" -PR = "r2" +PR = "r3" do_stage() { distutils_stage_all diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb index dfd9722f32..6fc444a6e6 100644 --- a/packages/python/python-edje_cvs.bb +++ b/packages/python/python-edje_cvs.bb @@ -1,5 +1,5 @@ require python-efl.inc DEPENDS += "edje python-evas" -PR = "r1" +PR = "r2" diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb index 610688a2b4..ec5e9cd7e2 100644 --- a/packages/python/python-efl.bb +++ b/packages/python/python-efl.bb @@ -2,5 +2,6 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon" +PR = "ml1" ALLOW_EMPTY = "1" diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index 727c718bd2..fce05fe50f 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -5,6 +5,7 @@ HOMEPAGE = "http://www.enlightenment.org" # somewhere is a bug. cython should be self-contained, but somehow this # does not compile unless pyrex has been built DEPENDS = "python-cython-native python-pyrex-native python-numeric" +RDEPENDS += "python-lang" PV = "0.1.1+cvs${SRCDATE}" inherit setuptools diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb index 79c7f9633b..df0e561da8 100644 --- a/packages/python/python-emotion_cvs.bb +++ b/packages/python/python-emotion_cvs.bb @@ -1,4 +1,4 @@ require python-efl.inc DEPENDS += "emotion python-evas" -PR = "r1" +PR = "r2" diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb index 81ebfcb0c7..5b46ea5417 100644 --- a/packages/python/python-epsilon_cvs.bb +++ b/packages/python/python-epsilon_cvs.bb @@ -1,4 +1,4 @@ require python-efl.inc DEPENDS += "epsilon python-ecore" -PR = "r0" +PR = "r1" diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index ff14d95667..a24b50a850 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -1,7 +1,7 @@ require python-efl.inc DEPENDS += "evas" -PR = "r2" +PR = "r3" do_stage() { distutils_stage_all diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb index 8ad4e797c0..2202e1d474 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.1.bb @@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml5" +PR = "ml6" PYTHON_MAJMIN = "2.5" @@ -79,7 +79,7 @@ do_install() { require python-${PYTHON_MAJMIN}-manifest.inc RPROVIDES_python-core = "python" -RPROVIDES_python-curses = "python" +RRECOMMEND_python-core = "python-readline" PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" diff --git a/packages/roadmap/files/roadmap_path.patch b/packages/roadmap/files/roadmap_path.patch new file mode 100644 index 0000000000..7a7ab74261 --- /dev/null +++ b/packages/roadmap/files/roadmap_path.patch @@ -0,0 +1,57 @@ +--- src/unix/roadmap_path.c.old 2008-01-12 21:08:03.000000000 -0600 ++++ src/unix/roadmap_path.c 2008-01-12 21:29:40.000000000 -0600 +@@ -93,23 +93,18 @@ static const char *RoadMapPathConfig[] = + "/opt/QtPalmtop/share/roadmap", + "/mnt/cf/QtPalmtop/share/roadmap", + "/mnt/card/QtPalmtop/share/roadmap", +-#else ++#endif + /* This is for standard Unix configurations. */ + "/etc/roadmap", + "/usr/local/share/roadmap", + "/usr/share/roadmap", +-#endif + NULL + }; + static const char *RoadMapPathConfigPreferred = + #ifdef ROADMAP_CONFIG_DIR + ROADMAP_CONFIG_DIR; + #else +-#ifdef QWS +- "/mnt/cf/QtPalmtop/share/roadmap"; +-#else +- "/usr/local/share/roadmap"; +-#endif ++ "/usr/share/roadmap"; + #endif + + +@@ -123,7 +118,7 @@ static const char *RoadMapPathMaps[] = { + "/opt/QtPalmtop/share/roadmap/...", + "/mnt/cf/QtPalmtop/share/roadmap/...", + "/mnt/card/QtPalmtop/share/roadmap/...", +-#else ++#endif + /* This is for standard Unix configurations. */ + "&/maps/...", + "/var/lib/roadmap/...", +@@ -134,19 +129,14 @@ static const char *RoadMapPathMaps[] = { + */ + "/usr/local/share/roadmap/...", + "/usr/share/roadmap/...", +-#endif + NULL + }; + static const char *RoadMapPathMapsPreferred = + #ifdef ROADMAP_MAP_DIR + ROADMAP_MAP_DIR; + #else +-#ifdef QWS +- "/mnt/cf/QtPalmtop/share/roadmap"; +-#else + "/var/lib/roadmap"; + #endif +-#endif + + /* The default path for the icon files (the "icons" path): */ + static const char *RoadMapPathIcons[] = { diff --git a/packages/roadmap/roadmap-gtk2.inc b/packages/roadmap/roadmap-gtk2.inc index f64ad8dbfa..6d0db5099b 100644 --- a/packages/roadmap/roadmap-gtk2.inc +++ b/packages/roadmap/roadmap-gtk2.inc @@ -2,23 +2,10 @@ require roadmap.inc SECTION = "x11/applications" -DEPENDS = "agg expat gtk+" +DEPENDS += "agg gtk+" -EXTRA_OEMAKE= "DESKTOP=GTK2 AGG=rgb565 \ - POPT=NO SCRIPTS= BUILD= \ - INSTALLDIR=/usr DESTDIR=${D}" +EXTRA_OEMAKE = "DESKTOP=GTK2 AGG=rgb565 \ + POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \ + desktopdir=${D}${datadir}/applications" CFLAGS += " -I${STAGING_INCDIR}/agg2 " - -do_compile() { - oe_runmake runtime $(TOOLS) icons -} - -do_install() { - oe_runmake install - mv ${D}/usr/applications ${D}/usr/share/ - - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ -} - -FILES_${PN} += "${datadir}/roadmap" diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb index 5855413cbe..1e34238106 100644 --- a/packages/roadmap/roadmap-gtk2_1.1.0.bb +++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb @@ -1,10 +1,11 @@ require roadmap-gtk2.inc -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ file://options.mk.patch;patch=1;pnum=2 \ + file://roadmap_path.patch;patch=1 \ file://roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz " diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index 2efa67821a..9d7adbaa3e 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,11 +1,12 @@ require roadmap-gtk2.inc PV = "0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ file://options.mk.patch;patch=1;pnum=2 \ + file://roadmap_path.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz " S = "${WORKDIR}/roadmap/src" diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc index e9598df178..43b4b1cd3d 100644 --- a/packages/roadmap/roadmap.inc +++ b/packages/roadmap/roadmap.inc @@ -4,5 +4,15 @@ AUTHOR = "Pascal Martin <pascal.martin@iname.com>" HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" LICENSE = "GPL" RRECOMMENDS = "gpsd flite" +DEPENDS = "expat" -PARALLEL_MAKE = "" +FILES_${PN} += "${datadir}/roadmap" + +do_compile() { + oe_runmake runtime ${TOOLS} icons +} + +do_install() { + oe_runmake install + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc index acee708837..3c99f9d234 100644 --- a/packages/roadmap/zroadmap.inc +++ b/packages/roadmap/zroadmap.inc @@ -1,5 +1,7 @@ require roadmap.inc +PARALLEL_MAKE = "" + SECTION = "opie/applications" inherit palmtop @@ -7,7 +9,15 @@ inherit palmtop QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' QT_LIBRARY_append_c7x0 = " -laticore" +EXTRA_OEMAKE = "DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ + POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \ + icondir=${D}${palmtopdir}/pics \ + desktopdir=${D}${palmtopdir}/apps/Applications \ + CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}"" + do_configure() { echo removing pregenerated stuff find . -name "moc*"|xargs rm -f } + diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb index bafcc7c27d..b06e4e7ad0 100644 --- a/packages/roadmap/zroadmap_1.1.0.bb +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -1,45 +1,16 @@ require zroadmap.inc -DEPENDS = "expat" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ + file://options.mk.patch;patch=1;pnum=2 \ file://qt/qt2-fixes.patch;patch=1 \ file://qt/qt_canvas.patch;patch=1 \ file://qt/qt_main.patch;patch=1 \ file://qt/roadmap_main.patch;patch=1 \ + file://roadmap_path.patch;patch=1 \ file://roadmap.desktop.patch;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ - file://zroadgps.png" + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz" S = "${WORKDIR}/roadmap-${PV}/src" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ - CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ - LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a - oe_runmake -C gpx libgpx.a - oe_runmake -C unix libosroadmap.a - oe_runmake -C qt qtroadmap qtroadgps -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -d ${D}${palmtopdir}/share/roadmap - - install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - - install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - - install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - - install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index cb81756041..383ffe8f69 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,42 +1,13 @@ require zroadmap.inc -DEPENDS = "expat" -PV = "1.1.0+cvs${SRCDATE}" -PR = "r1" +PV = "0.0+cvs${SRCDATE}" +PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ + file://options.mk.patch;patch=1;pnum=2 \ file://qt/qt2-fixes.patch;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ - file://zroadgps.png" + file://roadmap_path.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz" S = "${WORKDIR}/roadmap/src" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ - LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a - oe_runmake -C gpx libgpx.a - oe_runmake -C unix libosroadmap.a - oe_runmake -C qt qtroadmap qtroadgps -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -d ${D}${palmtopdir}/share/roadmap - - install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - - install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - - install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - - install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} diff --git a/packages/supertux/files/supertux.desktop b/packages/supertux/files/supertux.desktop new file mode 100644 index 0000000000..ace237bef0 --- /dev/null +++ b/packages/supertux/files/supertux.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Encoding=UTF-8 +Name=SuperTux +Name[en]=SuperTux +Name[de]=SuperTux +Name[cs]=SuperTux +GenericName=A Platform Game +GenericName[en]=A Platform Game +GenericName[de]=Ein Jump&Run Spiel +GenericName[cs]=Plošinová hra +Comment=A Super Mario inspired penguin platform game +Comment[en]=A Super Mario inspired penguin platform game +Comment[de]=Ein von Super Mario inspiriertes Pinguin Jump&Run Spiel +Comment[cs]=Plošinovka inspirovaná SuperMariem s tučňákem Tuxem v hlavní roli +Icon=supertux.png +Exec=supertux +Terminal=false +StartupNotify=false +Categories=Application;Game;ArcadeGame diff --git a/packages/supertux/files/supertux.png b/packages/supertux/files/supertux.png Binary files differindex b26c58122d..82ac69642c 100644 --- a/packages/supertux/files/supertux.png +++ b/packages/supertux/files/supertux.png diff --git a/packages/supertux/supertux_0.1.2.bb b/packages/supertux/supertux_0.1.2.bb index 63c44a0b6c..3afa425f1a 100644 --- a/packages/supertux/supertux_0.1.2.bb +++ b/packages/supertux/supertux_0.1.2.bb @@ -3,7 +3,10 @@ in a style similar to the original SuperMario games." SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r3" +PR = "r4" + +APPIMAGE = "${WORKDIR}/supertux.png" +APPDESKTOP = "${WORKDIR}/supertux.desktop" SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \ http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1 \ @@ -13,5 +16,3 @@ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" EXTRA_OECONF = "--disable-opengl" inherit autotools sdl - -# FIXME: Add .desktop file for Opie/Qtopia diff --git a/packages/supertux/supertux_0.1.3.bb b/packages/supertux/supertux_0.1.3.bb new file mode 100644 index 0000000000..f90670738a --- /dev/null +++ b/packages/supertux/supertux_0.1.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "SuperTux is a classic 2D jump'n'run sidescroller game \ +in a style similar to the original SuperMario games." +SECTION = "games" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r1" + +APPIMAGE = "${WORKDIR}/supertux.png" +APPDESKTOP = "${WORKDIR}/supertux.desktop" + +SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \ +# http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1 \ + file://supertux.png \ + file://supertux.desktop \ + " + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" +EXTRA_OECONF = "--disable-opengl" + +inherit autotools sdl + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch b/packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch new file mode 100644 index 0000000000..98b84430ad --- /dev/null +++ b/packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch @@ -0,0 +1,11 @@ +--- git.orig/fs/ext2/ext2fs.c 2007-12-13 23:16:13.000000000 -0800 ++++ git/fs/ext2/ext2fs.c 2007-12-13 23:16:41.000000000 -0800 +@@ -472,7 +472,7 @@ + return (0); + } + if (dirent.namelen != 0) { +- char filename[dirent.namelen + 1]; ++ char filename[256]; + ext2fs_node_t fdiro; + int type = FILETYPE_UNKNOWN; + diff --git a/packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb index 1cee1edf37..8c7ff5b94a 100644 --- a/packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb +++ b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support" -AUTHOR = "Harald Welte <laforge@openmoko.org>" +AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>" LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" @@ -8,8 +8,9 @@ UBOOT_UPSTREAM_REV = "f34024d4a328e6edd906456da98d2c537155c4f7" UBOOT_OPENMOKO_REV = "2943" UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4" -PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" -PR = "r1" +LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" +PV = "1.2.0${LOCALVERSION}" +PR = "r2" PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" @@ -32,8 +33,7 @@ do_quilt() { do_svnrev() { mv -f tools/setlocalversion tools/setlocalversion.old - echo -n "echo " >>tools/setlocalversion - echo ${PV} >>tools/setlocalversion + echo "echo ${LOCALVERSION}" >>tools/setlocalversion } do_configure_prepend() { diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb new file mode 100644 index 0000000000..7a9800f94a --- /dev/null +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -0,0 +1,85 @@ +DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support" +AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>" +LICENSE = "GPL" +SECTION = "bootloader" +PRIORITY = "optional" + +UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89" +UBOOT_OPENMOKO_REV = "3817" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4" +LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" +PV = "1.3.1${LOCALVERSION}" +PR = "r1" + +PROVIDES = "virtual/bootloader" +S = "${WORKDIR}/git" + +SRC_URI = "\ + git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ + svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \ + file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ + file://makefile-no-dirafter.patch;patch=1 \ + file://fix-data-abort-from-sd-ombug799.patch;patch=1 \ +" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +do_quilt() { + mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + rm -Rf patches .pc +} + +do_svnrev() { + mv -f tools/setlocalversion tools/setlocalversion.old + echo "echo ${LOCALVERSION}" >>tools/setlocalversion +} + +do_configure_prepend() { + find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; + find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; + cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 +} + +do_compile () { + chmod +x board/neo1973/gta*/split_by_variant.sh + for mach in ${UBOOT_MACHINES} + do + oe_runmake ${mach}_config + oe_runmake clean + find board -name lowlevel_foo.bin -exec rm '{}' \; + oe_runmake all + oe_runmake u-boot.udfu + if [ -f u-boot.udfu ]; then + mv u-boot.udfu u-boot_${mach}.bin + else + mv u-boot.bin u-boot_${mach}.bin + fi + if [ -f board/${mach}/lowlevel_foo.bin ]; then + mv board/${mach}/lowlevel_foo.bin \ + lowlevel_foo_${mach}.bin + else + find board -name lowlevel_foo.bin \ + -exec mv '{}' lowlevel_foo_${mach}.bin \; + fi + done +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + for mach in ${UBOOT_MACHINES} + do + install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin + if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then + install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin + fi + done + install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage +} + +do_deploy[dirs] = "${S}" +addtask deploy before do_package after do_install +addtask quilt before do_patch after do_unpack +addtask svnrev before do_patch after do_quilt diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb index 73bb9c471f..2dcf3d4c1f 100644 --- a/packages/u-boot/u-boot-openmoko_svn.bb +++ b/packages/u-boot/u-boot-openmoko_svn.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support" +DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support" AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" SECTION = "bootloader" @@ -10,7 +10,7 @@ PR = "r0" SRCREV_FORMAT = "patches" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2 gta02v3 gta02v4" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4" DEFAULT_PREFERENCE = "-1" |
