From de8cd7d4d2d0feef640f9500627244f0a2c8a217 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 20 Jun 2010 21:05:15 +0200
Subject: update to latest upstream

---
 package/ffmpeg/Makefile                |  8 ++---
 package/ffmpeg/patches/patch-configure | 63 ----------------------------------
 2 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 package/ffmpeg/patches/patch-configure

(limited to 'package/ffmpeg')

diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index a2d577fbe..669c168ba 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		0.5
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		be8503f15c3b81ba00eb8379ca8dcf33
+PKG_VERSION:=		0.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d6142a9a5821d6a6262a6edb903faa24
 PKG_DESCR:=		solution to record, convert and stream audio and video
 PKG_SECTION:=		sound
 PKG_DEPENDS:=		libfaad2
@@ -25,6 +25,7 @@ CONFIG_STYLE:=		minimal
 include ${TOPDIR}/mk/cpu.mk
 
 CONFIGURE_ARGS:=	--prefix=/usr \
+			--target-os=linux \
 			--arch=${CPU_ARCH} \
 			--enable-cross-compile \
 			--source-path=${WRKSRC} \
@@ -39,7 +40,6 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-ffmpeg \
 			--disable-ffplay \
 			--disable-ffserver \
-			--disable-vhook \
 			--enable-gpl \
 			--enable-swscale \
 			--enable-postproc \
diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure
deleted file mode 100644
index 5ff0e14c8..000000000
--- a/package/ffmpeg/patches/patch-configure
+++ /dev/null
@@ -1,63 +0,0 @@
---- ffmpeg-0.5.orig/configure	2009-03-01 18:57:14.000000000 +0100
-+++ ffmpeg-0.5/configure	2010-01-06 20:34:48.343750000 +0100
-@@ -1167,7 +1167,7 @@ arch=`uname -m`
- cpu="generic"
- 
- # OS
--target_os=$(tolower $(uname -s))
-+target_os=linux
- 
- # configurable options
- enable debug
-@@ -2486,51 +2486,6 @@ cmp -s $TMPH config.h &&
- 
- rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH
- 
--# build tree in object directory if source path is different from current one
--if enabled source_path_used; then
--    DIRS="\
--        doc               \
--        libavcodec        \
--        libavcodec/alpha  \
--        libavcodec/arm    \
--        libavcodec/bfin   \
--        libavcodec/mlib   \
--        libavcodec/ppc    \
--        libavcodec/sh4    \
--        libavcodec/sparc  \
--        libavcodec/x86    \
--        libavdevice       \
--        libavfilter       \
--        libavformat       \
--        libavutil         \
--        libpostproc       \
--        libswscale        \
--        tests             \
--        tools             \
--        vhook             \
--        "
--    FILES="\
--        Makefile             \
--        common.mak           \
--        subdir.mak           \
--        doc/texi2pod.pl      \
--        libavcodec/Makefile  \
--        libavdevice/Makefile \
--        libavfilter/Makefile \
--        libavformat/Makefile \
--        libavutil/Makefile   \
--        libpostproc/Makefile \
--        libswscale/Makefile  \
--        "
--    for dir in $DIRS ; do
--        mkdir -p $dir
--    done
--    for f in $FILES ; do
--        $ln_s "$source_path/$f" $f
--    done
--fi
--
--
- # build pkg-config files
- 
- pkgconfig_generate(){
-- 
cgit v1.2.3