From 3d45df344602687c8983f5fb609721aa8ca2469f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 18 Jan 2011 15:32:55 +0100
Subject: rework PKG_FLAVOURS. Subpackages can have flavours, so always add
 PKG_NAME to PKG_FLAVOURS variable. ala PKG_FLAVOURS_LIBNCURSES.

Bug reported by Phil Sutter.
---
 package/sdl/Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'package/sdl')

diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index 4b390bb6a..277be34b7 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -9,11 +9,16 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		e52086d1b508fa0b76c52ee30b55bec4
 PKG_DESCR:=		Simple DirectMedia Layer
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libusb alsa-lib libpthread tslib
-PKG_BUILDDEP:=		libusb alsa-lib tslib
+PKG_DEPENDS:=		libusb alsa-lib libpthread libx11 libxext
+PKG_BUILDDEP:=		libusb alsa-lib libX11 libXext
 PKG_URL:=		http://www.libsdl.org/
 PKG_SITES:=		http://www.libsdl.org/release/
 
+PKG_FLAVOURS_LIBSDL:=	WITH_TSLIB
+PKGFD_WITH_TSLIB:=	SDL with touchscreen support
+PKGFS_WITH_TSLIB:=	tslib
+PKGFB_WITH_TSLIB:=	tslib
+
 PKG_SUBPKGS:=		LIBSDL LIBSDL_DEV
 PKGSD_LIBSDL_DEV:=	development files for libsdl
 PKGSC_LIBSDL_DEV:=	devel
@@ -26,13 +31,15 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV}))
 
+ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y)
+CONFIGURE_ARGS+=	--enable-input-tslib
+endif
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-oss \
 			--enable-alsa \
 			--enable-video-fbcon \
 			--disable-video-directfb \
 			--disable-video-opengl \
-			--enable-input-tslib \
 			--with-x
 
 post-install:
-- 
cgit v1.2.3