# HG changeset patch # User Antoine Bodin # Date 1298313557 -3600 # Node ID 809ffd3c9ff1f343434342f4f136f7b6581b2850 # Parent 52c31d10f766241ba84960c43bf81c9088c33164 Fix: ffmpeg-svn (use few coreutils to compile) diff -r 52c31d10f766 -r 809ffd3c9ff1 ffmpeg-svn/receipt --- a/ffmpeg-svn/receipt Mon Feb 21 17:03:04 2011 +0000 +++ b/ffmpeg-svn/receipt Mon Feb 21 19:39:17 2011 +0100 @@ -7,7 +7,8 @@ MAINTAINER="jozee@slitaz.org" WEB_SITE="http://ffmpeg.org/" DEPENDS="bzlib freetype imlib2 alsa-lib jack-audio-connection-kit zlib" -BUILD_DEPENDS="subversion imlib2-dev freetype-dev libsdl-dev zlib-dev " +BUILD_DEPENDS="subversion imlib2-dev freetype-dev libsdl-dev zlib-dev \ +coreutils-file-format coreutils-file-special" PROVIDE="ffmpeg" SUGGESTED="ffplay" TAGS="audio video convert stream" @@ -18,8 +19,6 @@ compile_rules() { cd $src - # make busybox compatible or add coreutils-file-format coreutils-file-special in BUILD_DEPENDS if patch/configure fails - patch -Np1 -i ../../stuff/$PACKAGE-$VERSION-mktemp.patch sed -i 's/av_bswap/bswap_/' libswscale/*.c diff -r 52c31d10f766 -r 809ffd3c9ff1 ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch --- a/ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch Mon Feb 21 17:03:04 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ ---- ffmpeg/configure Mon Apr 19 12:17:54 2010 -+++ ffmpeg/configure Mon Apr 19 12:22:54 2010 -@@ -1666,34 +1666,12 @@ - : ${TMPDIR:=$TMP} - : ${TMPDIR:=/tmp} - --if ! check_cmd type mktemp; then -- # simple replacement for missing mktemp -- # NOT SAFE FOR GENERAL USE -- mktemp(){ -- echo "${2%XXX*}.${HOSTNAME}.${UID}.$$" -- } --fi -- --tmpfile(){ -- tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 && -- (set -C; exec > $tmp) 2>/dev/null || -- die "Unable to create temporary file in $TMPDIR." -- append TMPFILES $tmp -- eval $1=$tmp --} -- --trap 'rm -f -- $TMPFILES' EXIT --trap exit HUP INT TERM -- --tmpfile TMPC .c --tmpfile TMPE $EXESUF --tmpfile TMPH .h --tmpfile TMPO .o --tmpfile TMPS .S --tmpfile TMPV .ver --tmpfile TMPSH .sh -- --unset -f mktemp -+TMPC="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" -+TMPE="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" -+TMPH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" -+TMPO="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" -+TMPS="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" -+TMPSH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh" - - # make sure we can execute files in $TMPDIR - cat > $TMPSH 2>> $logfile <