summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-07-11 17:13:54 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-07-11 17:13:54 +0200
commit50c777082f72cbfca58855965bf41f734ab64084 (patch)
tree9c7476b7d0d5f382f22ea96d0a79a789bdb8c1c2
parentdfcc457a4760a511fe00858802d3ae50134359a5 (diff)
enable non-free, optimize for armv6, disable ffplay for now, SDL detection fails
-rw-r--r--package/ffmpeg/Makefile26
-rw-r--r--target/packages/pkg-available/mpdbox10
2 files changed, 25 insertions, 11 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index bedb412b9..cfc55ca94 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ffmpeg
PKG_VERSION:= 2.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 13a0feb74474f89052f6b8ba1bce46be
PKG_DESCR:= record, convert and stream audio & video
PKG_SECTION:= libs
@@ -15,11 +15,11 @@ PKG_SITES:= http://www.ffmpeg.org/releases/
PKG_ARCH_DEPENDS:= !cris
-PKG_SUBPKGS:= LIBFFMPEG FFPLAY FFSERVER FFPROBE FFMPEG
-PKGSD_FFPLAY:= ffmpeg based video player
-PKGSC_FFPLAY:= multimedia
-PKGSS_FFPLAY:= libsdl libpthread libffmpeg
-PKGSB_FFPLAY:= sdl
+PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG
+#PKGSD_FFPLAY:= ffmpeg based video player
+#PKGSC_FFPLAY:= multimedia
+#PKGSS_FFPLAY:= libsdl libpthread libffmpeg
+#PKGSB_FFPLAY:= sdl
PKGSD_FFMPEG:= ffmpeg video converter
PKGSC_FFMPEG:= multimedia
PKGSS_FFMPEG:= libffmpeg
@@ -83,7 +83,7 @@ $(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${P
$(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}))
-$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY}))
+#$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS))
@@ -103,6 +103,9 @@ CONFIGURE_CPU_OPTS:= --enable-sse
else
CONFIGURE_CPU_OPTS:= --disable-sse
endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+CONFIGURE_CPU_OPTS:= --enable-armv6
+endif
CONFIG_STYLE:= minimal
CONFIGURE_ARGS:= --prefix=/usr \
@@ -121,12 +124,13 @@ CONFIGURE_ARGS:= --prefix=/usr \
--enable-shared \
--enable-static \
--enable-gpl \
+ --enable-nonfree \
--enable-swscale \
--enable-postproc \
${CONFIGURE_CPU_OPTS}
ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_AAC),y)
-CONFIGURE_ARGS+= --enable-nonfree --enable-libfaac
+CONFIGURE_ARGS+= --enable-libfaac
endif
ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_MP3),y)
CONFIGURE_ARGS+= --enable-libmp3lame
@@ -155,9 +159,9 @@ libffmpeg-install:
${CP} ${WRKINST}/usr/lib/libswscale.so* ${IDIR_LIBFFMPEG}/usr/lib
${CP} ${WRKINST}/usr/lib/libswresample.so* ${IDIR_LIBFFMPEG}/usr/lib
-ffplay-install:
- ${INSTALL_DIR} ${IDIR_FFPLAY}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/ffplay ${IDIR_FFPLAY}/usr/bin
+#ffplay-install:
+# ${INSTALL_DIR} ${IDIR_FFPLAY}/usr/bin
+# ${INSTALL_BIN} ${WRKINST}/usr/bin/ffplay ${IDIR_FFPLAY}/usr/bin
ffmpeg-install:
${INSTALL_DIR} ${IDIR_FFMPEG}/usr/bin
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index 304a3a163..3462c2a0a 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -15,6 +15,16 @@ config ADK_PKG_MPDBOX
select ADK_PACKAGE_MPD_WITH_FFMPEG
select ADK_PACKAGE_MPD_WITH_SHOUT
select ADK_PACKAGE_MPD_WITH_CURL
+ select ADK_PACKAGE_FILE
+ select ADK_PACKAGE_FFMPEG
+ select ADK_PACKAGE_FFPROBE
+ select ADK_PACKAGE_LIBFFMPEG
+ select ADK_PACKAGE_LIBFFMPEG_WITH_AAC
+ select ADK_PACKAGE_LIBFFMPEG_WITH_MP3
+ select ADK_PACKAGE_LIBFFMPEG_WITH_VP8
+ select ADK_PACKAGE_LIBFFMPEG_WITH_THEORA
+ select ADK_PACKAGE_LIBFFMPEG_WITH_XVID
+ select ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS
select ADK_PACKAGE_LIGHTTPD
select ADK_PACKAGE_LIGHTTPD_WITH_IPV6
select ADK_PACKAGE_LIGHTTPD_WITH_SSL