From 3438aee79df2f634723cb77828edd30364ea0e43 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 18 Sep 2011 17:57:02 +0200
Subject: add support for theora/vorbis, some minor fixes

---
 package/ffmpeg/Makefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'package/ffmpeg')

diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index c81fef65e..aabe94394 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -27,7 +27,8 @@ PKGSC_FFSERVER:=	multimedia
 PKGSD_FFPROBE:=		simple multimedia stream analyzer
 PKGSC_FFPROBE:=		multimedia
 
-PKG_FLAVOURS_LIBFFMPEG:=	WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA WITH_XVID
+PKG_FLAVOURS_LIBFFMPEG:=	WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA
+PKG_FLAVOURS_LIBFFMPEG+=	WITH_XVID WITH_VORBIS
 
 PKGFD_WITH_AAC:=	with AAC encoding support
 PKGFS_WITH_AAC:=	libfaac
@@ -64,6 +65,13 @@ ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y)
 PKG_FDEPENDS+=		libxvid
 endif
 
+PKGFD_WITH_VORBIS:=	with Vorbis encoding support
+PKGFS_WITH_VORBIS:=	libvorbisenc
+PKGFB_WITH_VORBIS:=	libvorbis
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS),y)
+PKG_FDEPENDS+=		libvorbisenc
+endif
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
@@ -128,6 +136,9 @@ endif
 ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y)
 CONFIGURE_ARGS+=	--enable-libxvid
 endif
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS),y)
+CONFIGURE_ARGS+=	--enable-libvorbis
+endif
 
 libffmpeg-install:
 	${INSTALL_DIR} ${IDIR_LIBFFMPEG}/usr/lib
-- 
cgit v1.2.3