# HG changeset patch # User Rohit Joshi # Date 1273847133 14400 # Node ID 103ce6814f1dcdab06f3a8068beeba6b5496290e # Parent 865c0b9402ab39a4f2e231813db5e7575c0438ef Up: ffmpeg-svn; mktemp patch to make it busybox compatible and drop coreutils-* build_depends diff -r 865c0b9402ab -r 103ce6814f1d ffmpeg-svn-dev/receipt --- a/ffmpeg-svn-dev/receipt Fri May 14 16:01:18 2010 +0200 +++ b/ffmpeg-svn-dev/receipt Fri May 14 10:25:33 2010 -0400 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="ffmpeg-svn-dev" -VERSION="22914" +VERSION="23117" CATEGORY="development" SHORT_DESC="Record, convert and stream audio and video, development files." MAINTAINER="jozee@slitaz.org" diff -r 865c0b9402ab -r 103ce6814f1d ffmpeg-svn/receipt --- a/ffmpeg-svn/receipt Fri May 14 16:01:18 2010 +0200 +++ b/ffmpeg-svn/receipt Fri May 14 10:25:33 2010 -0400 @@ -1,13 +1,13 @@ # SliTaz package receipt. PACKAGE="ffmpeg-svn" -VERSION="22914" +VERSION="23117" CATEGORY="multimedia" SHORT_DESC="Record, convert and stream audio and video." 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 coreutils-file-format coreutils-file-special" +BUILD_DEPENDS="subversion imlib2-dev freetype-dev libsdl-dev zlib-dev " PROVIDE="ffmpeg" SUGGESTED="ffplay" TAGS="audio video convert stream" @@ -23,13 +23,14 @@ elif [ -f $TARBALL ]; then tar xzf $TARBALL else - svn checkout -r 'HEAD' svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && + svn checkout -r "$VERSION" svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && tar czf $TARBALL ffmpeg fi - cd ffmpeg - sed -i 's/mktemp -u/mktemp/' configure - + cd ffmpeg + # 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 + ./configure \ --prefix=/usr \ --enable-gpl \ diff -r 865c0b9402ab -r 103ce6814f1d ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch Fri May 14 10:25:33 2010 -0400 @@ -0,0 +1,43 @@ +--- 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 <