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/sdl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/sdl/Makefile') diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 7510c02ba..184ae02bd 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= sdl PKG_VERSION:= 1.2.14 PKG_RELEASE:= 3 PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4 -PKG_DESCR:= Simple DirectMedia Layer -PKG_SECTION:= libs +PKG_DESCR:= simple directmedia layer +PKG_SECTION:= libs/misc PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext PKG_BUILDDEP:= sdl-host libusb alsa-lib libX11 libXext PKG_URL:= http://www.libsdl.org/ -- cgit v1.2.3