diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-22 19:29:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-22 19:29:20 +0200 |
| commit | d279b5d1fe744cac44da7cd1b51f9ba6a2cc4647 (patch) | |
| tree | bf575aca8f9ce9cf088ce3aee992fc846cd6e130 /package/ffmpeg | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
fix libmix packages, while checking all packages make some style cleanup
Diffstat (limited to 'package/ffmpeg')
| -rw-r--r-- | package/ffmpeg/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 9c4cea01c..03f81b698 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -5,13 +5,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg PKG_VERSION:= 2.0.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 6c5cfed204d8a108325d1fc439ab734a PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ +PKH_LIBNAME:= libffmpeg +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !avr32 !cris @@ -29,6 +31,8 @@ PKGSS_FFSERVER:= libffmpeg PKGSD_FFPROBE:= simple multimedia stream analyzer PKGSC_FFPROBE:= multimedia PKGSS_FFPROBE:= libffmpeg +PKGSD_LIBFFMPEG:= ffmpeg library +PKGSC_LIBFFMPEG:= libs PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA PKG_FLAVOURS_LIBFFMPEG+= WITH_XVID WITH_VORBIS WITH_X264 @@ -84,9 +88,13 @@ endif DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +ifeq ($(ADK_STATIC),y) +PKG_OPTS+= libmix +endif + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKGSD_LIBFFMPEG},${PKGSC_LIBFFMPEG},${PKG_OPTS})) $(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFMPEG},${PKGSC_FFMPEG})) $(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFSERVER},${PKGSC_FFSERVER})) $(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE})) |