Merge branch 'master' of git+ssh://openadk.org/git/openadk

Makefile

@@ -62,6 +62,7 @@ pkg-help:
 
 dev-help:
 	@echo 'Regenerate menu information via "make menu"'
+	@echo 'Regenerate dependency information via "make dep"'
 	@echo
 	@echo 'Fast way of updating package patches:'
 	@echo '  run "make package=<pkgname> clean" to start with a good base'
@@ -146,6 +147,9 @@ bulk: .prereq_done
 menu: .prereq_done
 	@${GMAKE_INV} menu
 
+dep: .prereq_done
+	@${GMAKE_INV} dep
+
 world: .prereq_done
 	@${GMAKE_INV} world
 

mk/build.mk

@@ -423,4 +423,7 @@ bulk:
 	mksh $(TOPDIR)/package/pkgmaker
 	@:>.menu
 
-.PHONY: menu
+dep:
+	mksh $(TOPDIR)/package/depmaker
+
+.PHONY: menu dep

package/Config.in

@@ -501,6 +501,8 @@ source "package/readline/Config.in"
 source "package/cyrus-sasl/Config.in.lib"
 source "package/sdl/Config.in"
 source "package/sdl/Config.in.lib"
+source "package/sdl-image/Config.in"
+source "package/sdl-image/Config.in.lib"
 source "package/speex/Config.in"
 source "package/openssl/Config.in.lib"
 source "package/sqlite/Config.in.lib"

package/base-files/extra/sbin/update

@@ -27,19 +27,19 @@ prepare() {
 
 extract_from_file() {
 	prepare
-        cat $1 | $updatecmd
+        cat $1 | eval $updatecmd
 	check_exit
 }
 
 extract_from_ssh() {
 	prepare
-        ssh $1 "cat $2" | $updatecmd
+        ssh $1 "cat $2" | eval $updatecmd
 	check_exit
 }
 
 extract_from_http() {
 	prepare
-        wget -O - $1 | $updatecmd
+        wget -O - $1 | eval $updatecmd
 	check_exit
 }
                 

package/sdl-image/Makefile

@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		sdl-image
+PKG_VERSION:=		1.2.10
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		6c06584b31559e2b59f2b982d0d1f628
+PKG_DESCR:=		Simple DirectMedia Layer
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libpng libtiff libjpeg
+PKG_BUILDDEP:=		libpng libtiff jpeg
+PKG_URL:=		http://www.libsdl.org
+PKG_SITES:=		http://www.libsdl.org/projects/SDL_image/release/
+
+DISTFILES:=             SDL_image-${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/SDL_image-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--enable-png \
+			--enable-jpg \
+			--enable-bmp \
+			--enable-tif
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
+	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/sdl/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		e52086d1b508fa0b76c52ee30b55bec4
 PKG_DESCR:=		Simple DirectMedia Layer
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		libusb alsa-lib libpthread
+PKG_BUILDDEP+=		libusb alsa-lib
 PKG_URL:=		http://www.libsdl.org
 PKG_SITES:=		http://www.libsdl.org/release/
 
@@ -20,7 +22,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
-CONFIGURE_ARGS+=	--disable-esd
+CONFIGURE_ARGS+=	--disable-esd \
+			--disable-oss \
+			--enable-alsa \
+			--enable-video-fbcon \
+			--disable-video-directfb \
+			--disable-video-opengl \
+			--without-x
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 

target/Config.in

@@ -221,6 +221,7 @@ config ADK_LINUX_X86_ALIX2D
 	select BUSYBOX_HWCLOCK
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_LEDS
 	help
 	  Support for ALIX2D boards.
 	  http://www.pcengines.ch/
@@ -241,6 +242,7 @@ config ADK_LINUX_X86_ALIX2D13
 	select BUSYBOX_HWCLOCK
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_LEDS
 	help
 	  Support for ALIX2D13 boards.
 	  http://www.pcengines.ch/

target/linux/config/Config.in.input

@@ -24,7 +24,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
-	depends on ADK_TARGET_USB
+	depends on ADK_TARGET_WITH_USB
 	default n
 
 config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD