wok-4.x rev 8773
Fix: ffmpeg-svn (use few coreutils to compile)
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Mon Feb 21 19:39:17 2011 +0100 (2011-02-21) |
parents | 52c31d10f766 |
children | 14075218486d |
files | ffmpeg-svn/receipt ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch |
line diff
1.1 --- a/ffmpeg-svn/receipt Mon Feb 21 17:03:04 2011 +0000 1.2 +++ b/ffmpeg-svn/receipt Mon Feb 21 19:39:17 2011 +0100 1.3 @@ -7,7 +7,8 @@ 1.4 MAINTAINER="jozee@slitaz.org" 1.5 WEB_SITE="http://ffmpeg.org/" 1.6 DEPENDS="bzlib freetype imlib2 alsa-lib jack-audio-connection-kit zlib" 1.7 -BUILD_DEPENDS="subversion imlib2-dev freetype-dev libsdl-dev zlib-dev " 1.8 +BUILD_DEPENDS="subversion imlib2-dev freetype-dev libsdl-dev zlib-dev \ 1.9 +coreutils-file-format coreutils-file-special" 1.10 PROVIDE="ffmpeg" 1.11 SUGGESTED="ffplay" 1.12 TAGS="audio video convert stream" 1.13 @@ -18,8 +19,6 @@ 1.14 compile_rules() 1.15 { 1.16 cd $src 1.17 - # make busybox compatible or add coreutils-file-format coreutils-file-special in BUILD_DEPENDS if patch/configure fails 1.18 - patch -Np1 -i ../../stuff/$PACKAGE-$VERSION-mktemp.patch 1.19 1.20 sed -i 's/av_bswap/bswap_/' libswscale/*.c 1.21
2.1 --- a/ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch Mon Feb 21 17:03:04 2011 +0000 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,43 +0,0 @@ 2.4 ---- ffmpeg/configure Mon Apr 19 12:17:54 2010 2.5 -+++ ffmpeg/configure Mon Apr 19 12:22:54 2010 2.6 -@@ -1666,34 +1666,12 @@ 2.7 - : ${TMPDIR:=$TMP} 2.8 - : ${TMPDIR:=/tmp} 2.9 - 2.10 --if ! check_cmd type mktemp; then 2.11 -- # simple replacement for missing mktemp 2.12 -- # NOT SAFE FOR GENERAL USE 2.13 -- mktemp(){ 2.14 -- echo "${2%XXX*}.${HOSTNAME}.${UID}.$$" 2.15 -- } 2.16 --fi 2.17 -- 2.18 --tmpfile(){ 2.19 -- tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 && 2.20 -- (set -C; exec > $tmp) 2>/dev/null || 2.21 -- die "Unable to create temporary file in $TMPDIR." 2.22 -- append TMPFILES $tmp 2.23 -- eval $1=$tmp 2.24 --} 2.25 -- 2.26 --trap 'rm -f -- $TMPFILES' EXIT 2.27 --trap exit HUP INT TERM 2.28 -- 2.29 --tmpfile TMPC .c 2.30 --tmpfile TMPE $EXESUF 2.31 --tmpfile TMPH .h 2.32 --tmpfile TMPO .o 2.33 --tmpfile TMPS .S 2.34 --tmpfile TMPV .ver 2.35 --tmpfile TMPSH .sh 2.36 -- 2.37 --unset -f mktemp 2.38 -+TMPC="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" 2.39 -+TMPE="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" 2.40 -+TMPH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" 2.41 -+TMPO="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" 2.42 -+TMPS="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" 2.43 -+TMPSH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh" 2.44 - 2.45 - # make sure we can execute files in $TMPDIR 2.46 - cat > $TMPSH 2>> $logfile <<EOF