merge of '17c1f582fb1ba7d52e6ad876c69650cdf8ea9dfb'

     and 'd6351c7d214a7c507e680a26e7986755d049ccd2'

6 files changed, 56 insertions, 56 deletions

diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb
deleted file mode 100644
index b3f45381a0..0000000000
--- a/packages/fuse/fuse_2.5.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require fuse.inc
-
-PR = "r2"
-
-#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
-PACKAGES += "fuse-utils"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += "${libdir}/*.la"
-FILES_fuse-utils = "${bindir} ${base_sbindir}"
-DEBIAN_NOAUTONAME_fuse-utils = "1"
-EXTRA_OECONF = " --disable-kernel-module"
-
-fakeroot do_stage() {
-	autotools_stage_all
-}
-
-
diff --git a/packages/fuse/fuse_2.6.0.bb b/packages/fuse/fuse_2.6.0.bb
deleted file mode 100644
index 7eff4dce46..0000000000
--- a/packages/fuse/fuse_2.6.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require fuse.inc
-
-SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
-
-EXTRA_OECONF = " --disable-kernel-module"
-
-#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
-PACKAGES =+ "lib${PN} libulockmgr"
-FILES_${PN}-dev += 	"${libdir}/*.la"
-FILES_lib${PN} = 	"${libdir}/libfuse*.so.*"
-FILES_libulockmgr = 	"${libdir}/libulockmgr.so.*"
-
-fakeroot do_stage() {
-	autotools_stage_all
-}
-
-
diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb
deleted file mode 100644
index adb0b3586f..0000000000
--- a/packages/fuse/sshfs-fuse_1.3.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html"
-DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE."
-
-LICENSE_${PN} = "LGPL"
-
-DEPENDS = "fakeroot-native fuse"
-RRECOMMENDS_${PN} = "fuse-module"
-
-SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-
diff --git a/packages/fuse/sshfs-fuse_1.7.bb b/packages/fuse/sshfs-fuse_1.8.bb
index 1f40ac8c8c..0ca2e132bc 100644
--- a/packages/fuse/sshfs-fuse_1.7.bb
+++ b/packages/fuse/sshfs-fuse_1.8.bb
@@ -5,11 +5,9 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 fuse"
-
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
-
 S = "${WORKDIR}/${P}"
 
 inherit autotools
diff --git a/packages/libsdl/libsdl-ttf-native_2.0.3.bb b/packages/libsdl/libsdl-ttf-native_2.0.3.bb
index 9786c352b2..0c37f4c5a1 100644
--- a/packages/libsdl/libsdl-ttf-native_2.0.3.bb
+++ b/packages/libsdl/libsdl-ttf-native_2.0.3.bb
@@ -6,5 +6,5 @@ FILESPATH = "${FILE_DIRNAME}/libsdl-ttf-${PV}:${FILE_DIRNAME}/libsdl-ttf:${FILE_
 
 EXTRA_OECONF = "--disable-sdltest --with-sdl-prefix=${STAGING_LIBDIR}/.."
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native"
+export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
 
diff --git a/packages/tasks/task-sdl.bb b/packages/tasks/task-sdl.bb
index de457c7e3e..3cda723e87 100644
--- a/packages/tasks/task-sdl.bb
+++ b/packages/tasks/task-sdl.bb
@@ -1,15 +1,64 @@
 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 \
+  crimsonfields \
+  freedroid \
+  frozen-bubble \
+  lbreakout2 \
+  nogravity \
+  horizon \
+  openttd \
+  prboom \
+  quake1 \
+  quetoo \
+  rocksndiamonds \
+  rott \
+  supertux \
+  uqm \
+  xmame \
+  "
+
+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"
+
+
 
-RDEPENDS_task-sdl-games = "abuse freedroid lbreakout2 openttd prboom quake1 rott supertux xmame"
 
-RDEPENDS_task-sdl-emulators = "dgen-sdl e-uae frodo snes9x"