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/squeezelite/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/squeezelite') diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile index 31e4fc310..5c3de10c6 100644 --- a/package/squeezelite/Makefile +++ b/package/squeezelite/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.5 PKG_RELEASE:= 3 PKG_MD5SUM:= 7605af4d64291495645f88575a564475 PKG_DESCR:= headless squeezebox emulator -PKG_SECTION:= multimedia +PKG_SECTION:= mm/audio PKG_DEPENDS:= libflac alsa-lib libvorbis libmad PKG_DEPENDS+= libpthread librt libfaad2 PKG_BUILDDEP:= alsa-lib libmad flac libvorbis mpg123 -- cgit v1.2.3