From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/DirectFB/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/DirectFB') diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 9078bf041..11d5d86f0 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 1.6.3 PKG_RELEASE:= 3 PKG_EXTRAVER:= 1.6-0 PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906 -PKG_DESCR:= Thin graphic library for the Linux framebuffer devices -PKG_SECTION:= libs +PKG_DESCR:= thin graphic library for framebuffer devices +PKG_SECTION:= libs/image PKG_DEPENDS:= libpng libjpeg-turbo libfreetype PKG_BUILDDEP:= libpng libjpeg-turbo freetype PKG_URL:= http://www.directfb.org/ -- cgit v1.2.3