[oe-commits] org.oe.dev merge of '3a05a99898476f8785cfc6c4ffdab52a170cc3e0'

[oe commit]

merge of '3a05a99898476f8785cfc6c4ffdab52a170cc3e0'
     and '7d0e0dda1833d41fc45440f5824943ab387d0698'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d6351c7d214a7c507e680a26e7986755d049ccd2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d6351c7d214a7c507e680a26e7986755d049ccd2
Files:
1
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
packages/libsdl/libsdl-ttf-native_2.0.3.bb
packages/tasks/task-sdl.bb
conf/machine/include/gumstix.inc
Diffs:

#
# mt diff -r3a05a99898476f8785cfc6c4ffdab52a170cc3e0 -rd6351c7d214a7c507e680a26e7986755d049ccd2
#
# 
# 
# 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 "packages/libsdl/libsdl-ttf-native_2.0.3.bb"
#  from [42847ad98ccf686ec384bb6e58217010abf42e9b]
#    to [f358e2ee13a4aa21315cdbd799159993d1645fb1]
# 
# 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"
============================================================
--- 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/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"
+
+
+
+
+


#
# mt diff -r7d0e0dda1833d41fc45440f5824943ab387d0698 -rd6351c7d214a7c507e680a26e7986755d049ccd2
#
# 
# 
# patch "conf/machine/include/gumstix.inc"
#  from [8cece65d17833204e5ccdd15bd8c7c456a999ebd]
#    to [4f23fdf13b573be4f10b1cecd95b3977df99b4d7]
# 
============================================================
--- 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