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/omxplayer/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/omxplayer') diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index 6c86babd9..724865a53 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -9,7 +9,7 @@ PKG_VERSION:= 0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 1c882539dfcbc4e8efeae85ff8069cbe PKG_DESCR:= video player for raspberry pi -PKG_SECTION:= multimedia +PKG_SECTION:= mm/video PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre PKG_DEPENDS+= librt zlib libpthread libstdcxx libdbus PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus -- cgit v1.2.3