From: mirko Date: Mon, 10 May 2010 17:54:07 +0000 (+0000) Subject: adjust dependencies regarding previous name change "DirectFB" -> "directfb" X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=6752f940329df506d6db400000a5e6956b65a0ab;p=packages.git adjust dependencies regarding previous name change "DirectFB" -> "directfb" git-svn-id: svn://svn.openwrt.org/openwrt/packages@21419 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile index 3605fef15..1bded155d 100644 --- a/Xorg/lib/cairo/Makefile +++ b/Xorg/lib/cairo/Makefile @@ -26,7 +26,7 @@ define Package/cairo SUBMENU:=libraries TITLE:=Multi-platform 2D graphics library DEPENDS:=+fontconfig +libpng +libexpat +pixman \ - +FEATURE_drawing-backend_DirectFB:DirectFB \ + +FEATURE_drawing-backend_DirectFB:directfb \ +FEATURE_drawing-backend_libX11:libX11 URL:=http://cairographics.org/ endef diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile index 780eb4f67..9866781d0 100644 --- a/Xorg/lib/gtk2/Makefile +++ b/Xorg/lib/gtk2/Makefile @@ -40,7 +40,7 @@ define Package/gtk2 SUBMENU:=framework TITLE:=GTK+-2.0 DEPENDS:=+cairo +pango +libpng +libjpeg +atk +libtiff \ - +FEATURE_drawing-backend_DirectFB:DirectFB \ + +FEATURE_drawing-backend_DirectFB:directfb \ +FEATURE_drawing-backend_libX11:libX11 \ +FEATURE_drawing-backend_libX11:libXext \ +FEATURE_drawing-backend_libX11:libXrender \ diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile index d074b4caa..afadf9f66 100644 --- a/Xorg/lib/qt4/Makefile +++ b/Xorg/lib/qt4/Makefile @@ -34,12 +34,12 @@ endef define Package/qt4 $(call Package/qt4/Default) - DEPENDS:=@FEATURE_drawing-backend_DirectFB +FEATURE_drawing-backend_DirectFB:DirectFB +zlib +libstdcpp +libsqlite3 # require directfb for now, as other systems (libX11, xcb) are untested + DEPENDS:=@FEATURE_drawing-backend_DirectFB +FEATURE_drawing-backend_DirectFB:directfb +zlib +libstdcpp +libsqlite3 # require directfb for now, as other systems (libX11, xcb) are untested endef define Package/qt4-gui $(call Package/qt4/Default) - #DEPENDS+=+FEATURE_drawing-backend_DirectFB:DirectFB +libpng +libtiff +libjpeg +libfreetype + #DEPENDS+=+FEATURE_drawing-backend_DirectFB:directfb +libpng +libtiff +libjpeg +libfreetype DEPENDS+=+libpng +libtiff +libjpeg +libfreetype TITLE+=(gui) endef diff --git a/libs/libsdl/Makefile b/libs/libsdl/Makefile index 6f48abe60..26964558f 100644 --- a/libs/libsdl/Makefile +++ b/libs/libsdl/Makefile @@ -27,7 +27,7 @@ define Package/libsdl CATEGORY:=Libraries TITLE:=Simple DirectMedia Layer URL:=http://www.libsdl.org - DEPENDS:=+DirectFB +zlib +libpthread +AUDIO_SUPPORT:alsa-lib + DEPENDS:=+directfb +zlib +libpthread +AUDIO_SUPPORT:alsa-lib endef define Package/libsdl/description