[oe-commits] org.oe.dev merge of '5f655daae211bb56e41cac62621d6f18543c5bd2'

[rwhitby commit]

merge of '5f655daae211bb56e41cac62621d6f18543c5bd2'
     and '6fc40d7a0fd4df5006df760583d8e2e7e87d80b1'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 3eeee83b495171a3097820abe214e3b9259e3c69
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3eeee83b495171a3097820abe214e3b9259e3c69
Files:
1
packages/openocd/openocd_svn.bb
packages/fuse/fuse_2.5.3.bb
packages/fuse/fuse_2.6.0.bb
packages/fuse/sshfs-fuse_1.3.bb
packages/fuse/sshfs-fuse_1.7.bb
packages/fuse/sshfs-fuse_1.8.bb
conf/machine/include/gumstix.inc
packages/libsdl/libsdl-ttf-native_2.0.3.bb
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/openmoko2/openmoko-dialer2_svn.bb
packages/tasks/task-sdl.bb
Diffs:

#
# mt diff -r5f655daae211bb56e41cac62621d6f18543c5bd2 -r3eeee83b495171a3097820abe214e3b9259e3c69
#
# 
# 
# patch "packages/openocd/openocd_svn.bb"
#  from [db913b69369bbce05c7db34eda5b089de8836bfe]
#    to [a0cc3e78ddf617567092bc819022548cfb0fd186]
# 
============================================================
--- packages/openocd/openocd_svn.bb	db913b69369bbce05c7db34eda5b089de8836bfe
+++ packages/openocd/openocd_svn.bb	a0cc3e78ddf617567092bc819022548cfb0fd186
@@ -9,4 +9,4 @@ S = "${WORKDIR}/trunk"
            file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
+EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"  
-EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"  


#
# mt diff -r6fc40d7a0fd4df5006df760583d8e2e7e87d80b1 -r3eeee83b495171a3097820abe214e3b9259e3c69
#
# 
# 
# delete "packages/fuse/fuse_2.5.3.bb"
# 
# delete "packages/fuse/fuse_2.6.0.bb"
# 
# delete "packages/fuse/sshfs-fuse_1.3.bb"
# 
# delete "packages/fuse/sshfs-fuse_1.7.bb"
# 
# add_file "packages/fuse/sshfs-fuse_1.8.bb"
#  content [487f03cb08294fd614752e053cde87fca63e578b]
# 
# patch "conf/machine/include/gumstix.inc"
#  from [8cece65d17833204e5ccdd15bd8c7c456a999ebd]
#    to [4f23fdf13b573be4f10b1cecd95b3977df99b4d7]
# 
# patch "packages/libsdl/libsdl-ttf-native_2.0.3.bb"
#  from [42847ad98ccf686ec384bb6e58217010abf42e9b]
#    to [f358e2ee13a4aa21315cdbd799159993d1645fb1]
# 
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
#  from [09af962af20bc3d0a2a4b656f06577e664c2ec7c]
#    to [6f60622a6c3257b507d66772637c986adf0fef66]
# 
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
#  from [ddf08c9ec19b24e123f2901415b40738b0cd4311]
#    to [25771c80cdee9255a27706a601a2f88cc0e901ad]
# 
# patch "packages/tasks/task-sdl.bb"
#  from [ccc842048039b23bb776391ae8290cc24e96148b]
#    to [847f83830c86d3e3221d36b4d8981166189b8b75]
# 
============================================================
--- packages/fuse/sshfs-fuse_1.8.bb	487f03cb08294fd614752e053cde87fca63e578b
+++ packages/fuse/sshfs-fuse_1.8.bb	487f03cb08294fd614752e053cde87fca63e578b
@@ -0,0 +1,15 @@
+DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE."
+AUTHOR = "Miklos Szeredi <miklos at szeredi.hu>"
+HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "glib-2.0 fuse"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
+S = "${WORKDIR}/${P}"
+
+inherit autotools
+
+FILES_${PN} += "${libdir}/sshnodelay.so"
============================================================
--- conf/machine/include/gumstix.inc	8cece65d17833204e5ccdd15bd8c7c456a999ebd
+++ conf/machine/include/gumstix.inc	4f23fdf13b573be4f10b1cecd95b3977df99b4d7
@@ -20,12 +20,15 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian 
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-unix \
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-core \
                              kernel-module-rtc-dev \
                              kernel-module-rtc-proc \
                              kernel-module-rtc-sa1100 \
-                             kernel-module-rtc-sysfs"          
+                             kernel-module-rtc-sysfs \
+                             kernel-module-smc91x \
+                             kernel-module-gumstix-smc91x \
+                             "          
 
 
 # used by sysvinit_2
============================================================
--- packages/libsdl/libsdl-ttf-native_2.0.3.bb	42847ad98ccf686ec384bb6e58217010abf42e9b
+++ packages/libsdl/libsdl-ttf-native_2.0.3.bb	f358e2ee13a4aa21315cdbd799159993d1645fb1
@@ -6,5 +6,5 @@ EXTRA_OECONF = "--disable-sdltest --with
 
 EXTRA_OECONF = "--disable-sdltest --with-sdl-prefix=${STAGING_LIBDIR}/.."
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native"
+export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
 
============================================================
--- packages/linux/linux-handhelds-2.6/h2200/defconfig	09af962af20bc3d0a2a4b656f06577e664c2ec7c
+++ packages/linux/linux-handhelds-2.6/h2200/defconfig	6f60622a6c3257b507d66772637c986adf0fef66
@@ -729,9 +729,9 @@ CONFIG_MII=m
 #
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
-CONFIG_SMC91X=m
+# CONFIG_SMC91X is not set
 CONFIG_DM9000=m
-CONFIG_SMC911X=m
+# CONFIG_SMC911X is not set
 
 #
 # Ethernet (1000 Mbit)
============================================================
--- packages/openmoko2/openmoko-dialer2_svn.bb	ddf08c9ec19b24e123f2901415b40738b0cd4311
+++ packages/openmoko2/openmoko-dialer2_svn.bb	25771c80cdee9255a27706a601a2f88cc0e901ad
@@ -1,13 +1,11 @@ PV = "0.1.0+svn${SVNREV}"
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r4"
+PR = "r5"
 
 inherit openmoko2
 
-SRC_URI += "file://openmoko-dialer.patch;patch=1"
-
 EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
 
 FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
============================================================
--- packages/tasks/task-sdl.bb	ccc842048039b23bb776391ae8290cc24e96148b
+++ packages/tasks/task-sdl.bb	847f83830c86d3e3221d36b4d8981166189b8b75
@@ -1,15 +1,64 @@ LICENSE = "MIT"
 DESCRIPTION = "Tasks for SDL stuff"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 inherit task
 
-PACKAGES = "task-sdl-libs task-sdl-games task-sdl-emulators"
+PACKAGES = "\
+  task-sdl-libs \
+  task-sdl-games \
+  task-sdl-emulators \
+#  task-sdl-misc \
+"
 
 # no need to add libsdl as all libsdl-* already rdepend on it
-RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net"
+RDEPENDS_task-sdl-libs = "\
+  libsdl-gfx \
+  libsdl-image \
+  libsdl-mixer \
+  libsdl-ttf \
+  libsdl-net \
+"
 
-RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame"
+RDEPENDS_task-sdl-games = "\
+  abuse \
+  crimsonfields \
+  freedroid \
+  frozen-bubble \
+  lbreakout2 \
+  nogravity \
+  horizon \
+  openttd \
+  prboom \
+  quake1 \
+  quetoo \
+  rocksndiamonds \
+  rott \
+  supertux \
+  uqm \
+  xmame \
+  "
 
-RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x"
+RDEPENDS_task-sdl-emulators = "\
+  dgen-sdl \
+  dosbox \
+  e-uae \
+  fceu \
+  frodo \
+  scummvm \
+  snes9x \
+"
 
+RDEPENDS_task-sdl-others = "\
+  synaestehsia \
+  chibitracker \
+  gnash \
+  midpath \
+"
+
+# ./powermanga/powermanga_0.79.bb:DEPENDS = "libsdl-qpe libsdl-mixer"
+
+
+
+
+