diff options
| -rw-r--r-- | package/ffmpeg/Makefile | 16 | ||||
| -rw-r--r-- | package/xvidcore/.Makefile.swp | bin | 0 -> 12288 bytes | |||
| -rw-r--r-- | package/xvidcore/Makefile | 28 |
3 files changed, 42 insertions, 2 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index ac7f1fa5f..c81fef65e 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg PKG_VERSION:= 0.8.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 556870ccfd6c9c0426c7dd86dd5beb62 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs @@ -27,7 +27,7 @@ PKGSC_FFSERVER:= multimedia PKGSD_FFPROBE:= simple multimedia stream analyzer PKGSC_FFPROBE:= multimedia -PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA +PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA WITH_XVID PKGFD_WITH_AAC:= with AAC encoding support PKGFS_WITH_AAC:= libfaac @@ -57,6 +57,13 @@ ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_THEORA),y) PKG_FDEPENDS+= libtheora endif +PKGFD_WITH_XVID:= with Xvid encoding support +PKGFS_WITH_XVID:= libxvid +PKGFB_WITH_XVID:= xvidcore +ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y) +PKG_FDEPENDS+= libxvid +endif + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk @@ -118,6 +125,9 @@ endif ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_THEORA),y) CONFIGURE_ARGS+= --enable-libtheora endif +ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y) +CONFIGURE_ARGS+= --enable-libxvid +endif libffmpeg-install: ${INSTALL_DIR} ${IDIR_LIBFFMPEG}/usr/lib @@ -138,6 +148,8 @@ ffmpeg-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/ffmpeg ${IDIR_FFMPEG}/usr/bin ffserver-install: + ${INSTALL_DIR} ${IDIR_FFSERVER}/etc + $(INSTALL_DATA) $(WRKBUILD)/doc/ffserver.conf ${IDIR_FFSERVER}/etc ${INSTALL_DIR} ${IDIR_FFSERVER}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/ffserver ${IDIR_FFSERVER}/usr/bin diff --git a/package/xvidcore/.Makefile.swp b/package/xvidcore/.Makefile.swp Binary files differnew file mode 100644 index 000000000..2a882c77b --- /dev/null +++ b/package/xvidcore/.Makefile.swp diff --git a/package/xvidcore/Makefile b/package/xvidcore/Makefile new file mode 100644 index 000000000..e17bbe8ea --- /dev/null +++ b/package/xvidcore/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xvidcore +PKG_VERSION:= 1.3.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 87c8cf7b69ebed93c2d82ea5709d098a +PKG_DESCR:= Xvid Codec library +PKG_SECTION:= libs +PKG_URL:= http://www.xvid.org/ +PKG_SITES:= http://downloads.xvid.org/downloads/ + +PKG_SUBPKGS:= LIBXVID + +WRKDIST= $(WRKDIR)/$(PKG_NAME)/build/generic + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXVID,libxvid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +libxvid-install: + $(INSTALL_DIR) $(IDIR_LIBXVID)/usr/lib + $(CP) $(WRKINST)/usr/lib/libxvidcore.so* \ + $(IDIR_LIBXVID)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk |