add support for theora/vorbis, some minor fixes

4 files changed, 26 insertions, 10 deletions

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
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 8d00df04a..e46d63f0f 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,16 +5,17 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.0-32749
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		aadc5d8cca503c8b18b3ed00b3a52cf5
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
 PKG_DEPENDS+=		libogg libpng libpthread libvorbis giflib
 PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib
-PKG_DEPENDS+=		libxscrnsaver
+PKG_DEPENDS+=		libxscrnsaver libtheora libxvid libvpx
 PKG_BUILDDEP:=		alsa-lib libmad libvorbis faad2 ncurses zlib
-PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
+PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg libtheora
+PKG_BUILDDEP+=		xvidcore libvpx
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
@@ -102,13 +103,15 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-jpeg \
 			--enable-mad \
 			--enable-libvorbis \
+			--enable-faac \
+			--enable-theora \
+			--enable-xvid \
 			--disable-ossaudio \
 			--disable-vm \
 			--disable-iconv \
 			--disable-lirc \
 			--disable-radio-v4l2 \
 			--disable-speex \
-			--disable-faac \
 			--disable-libdv \
 			--disable-live \
 			--disable-pvr \
@@ -141,6 +144,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			${CONFIGURE_DIRECTFB}
 
 XAKE_FLAGS+=		AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
+TARGET_LDFLAGS+=	-lxvidcore
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 68417de05..9e2481658 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		vlc
 PKG_VERSION:=		1.1.11
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a64846d6f21ea179ae8e8bfb6f9447fe
 PKG_DESCR:=		Media Player
 PKG_SECTION:=		multimedia
-PKG_BUILDDEP:=		ffmpeg xcb-util
-PKG_DEPENDS:=		libffmpeg xcb-util
+PKG_BUILDDEP:=		ffmpeg xcb-util libtheora libgcrypt
+PKG_DEPENDS:=		libffmpeg xcb-util libtheora libgcrypt
 PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/}
 
@@ -26,10 +26,11 @@ CONFIGURE_ARGS+=	--disable-lua \
 			--disable-fribidi \
 			--disable-qt4 \
 			--disable-skins2 \
-			--disable-libgcrypt \
 			--disable-remoteosd \
 			--disable-dvdnav \
-			--disable-libxml2
+			--disable-libxml2 \
+			--enable-libgcrypt \
+			--enable-theora
 
 vlc-install:
 	$(INSTALL_DIR) $(IDIR_VLC)/usr/bin
diff --git a/package/xvidcore/.Makefile.swp b/package/xvidcore/.Makefile.swp
deleted file mode 100644
index 2a882c77b..000000000
--- a/package/xvidcore/.Makefile.swp
+++ /dev/null