From 29305d896b0d54c1de34204fd27de19d95e85804 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 14 Jul 2010 18:39:12 +0200
Subject: misc stuff

- remove broken patch from silicon motion driver
- add mpc package for upcoming gcc 4.5.x update
- add /etc/adktarget, which can be used for native targets to identify
- add ffplay subpackage
---
 package/ffmpeg/Makefile                | 54 +++++++++++++++++++++++++++-------
 package/ffmpeg/patches/patch-configure | 11 +++++++
 2 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 package/ffmpeg/patches/patch-configure

(limited to 'package/ffmpeg')

diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index e9234fa68..142c6fa07 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -5,51 +5,85 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
 PKG_VERSION:=		0.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d6142a9a5821d6a6262a6edb903faa24
-PKG_DESCR:=		solution to record, convert and stream audio and video
-PKG_SECTION:=		multimedia
+PKG_DESCR:=		record, convert and stream audio & video
+PKG_SECTION:=		libs
 PKG_DEPENDS:=		libfaad2
-PKG_BUILDDEP+=		faad2
-PKG_URL:=		http://www.ffmpeg.org
+PKG_BUILDDEP+=		faad2 sdl
+PKG_URL:=		http://www.ffmpeg.org/
 PKG_SITES:=		http://www.ffmpeg.org/releases/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_SECTION_FFPLAY:=	multimedia
+PKG_DESCR_FFPLAY:=	ffmpeg based video player
+PKG_DEPENDS_FFPLAY:=	libsdl libpthread ffmpeg
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_FFPLAY},${PKG_DESCR_FFPLAY},${PKG_SECTION_FFPLAY}))
 
-CONFIG_STYLE:=		minimal
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+=	ffplay-install
+
+ifeq ($(ADK_TARGET),alix1c)
+CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
+			--disable-sse \
+			--enable-amd3dnow \
+			--enable-amd3dnowext \
+			--enable-mmx \
+			--enable-mmx2
+else
+CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
+			--disable-sse \
+			--disable-amd3dnow \
+			--disable-amd3dnowext \
+			--disable-mmx \
+			--disable-mmx2
+endif
 
-include ${TOPDIR}/mk/cpu.mk
+# gcc 4.5 produces internal compiler error with -Os
+#TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+
+CONFIG_STYLE:=		minimal
 
 CONFIGURE_ARGS:=	--prefix=/usr \
 			--target-os=linux \
 			--arch=${CPU_ARCH} \
 			--enable-cross-compile \
+			--sysroot=${STAGING_DIR} \
 			--source-path=${WRKSRC} \
 			--cross-prefix=${TARGET_CROSS} \
 			--cc=$(TARGET_CC) \
 			--host-cc=$(HOSTCC) \
 			--disable-debug \
+			--disable-optimizations \
 			--disable-stripping \
-			--enable-small \
 			--enable-shared \
 			--enable-static \
 			--disable-ffmpeg \
-			--disable-ffplay \
 			--disable-ffserver \
+			--enable-ffplay \
 			--enable-gpl \
 			--enable-swscale \
 			--enable-postproc \
 			--enable-libfaad \
 			${CONFIGURE_CPU_OPTS}
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavcodec.so* ${IDIR_FFMPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libavutil.so* ${IDIR_FFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libpostproc.so* ${IDIR_FFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libswscale.so* ${IDIR_FFMPEG}/usr/lib
+
+ffplay-install:
+	${INSTALL_DIR} ${IDIR_FFPLAY}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/ffplay ${IDIR_FFPLAY}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure
new file mode 100644
index 000000000..d3edea539
--- /dev/null
+++ b/package/ffmpeg/patches/patch-configure
@@ -0,0 +1,11 @@
+--- ffmpeg-0.6.orig/configure	2010-06-15 21:44:30.000000000 +0200
++++ ffmpeg-0.6/configure	2010-07-12 21:34:52.258102064 +0200
+@@ -2640,7 +2640,7 @@ if enabled libdc1394; then
+     die "ERROR: No version of libdc1394 found "
+ fi
+ 
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="${sysroot}/usr/bin/sdl-config"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+     sdl_cflags=$("${SDL_CONFIG}" --cflags)
+     sdl_libs=$("${SDL_CONFIG}" --libs)
-- 
cgit v1.2.3