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/libtheora/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libtheora') diff --git a/package/libtheora/Makefile b/package/libtheora/Makefile index aac2a225c..6c9b242a5 100644 --- a/package/libtheora/Makefile +++ b/package/libtheora/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libtheora PKG_VERSION:= 1.1.1 PKG_RELEASE:= 2 PKG_MD5SUM:= 292ab65cedd5021d6b7ddd117e07cd8e -PKG_DESCR:= Theora video codec -PKG_SECTION:= libs +PKG_DESCR:= open source video codec library +PKG_SECTION:= libs/video PKG_DEPENDS:= libogg libvorbis PKG_BUILDDEP:= libogg libvorbis PKG_URL:= http://www.theora.org/ -- cgit v1.2.3