wok-next rev 5569

Up: ffmpeg-svn; mktemp patch to make it busybox compatible and drop coreutils-* build_depends
author Rohit Joshi <jozee@slitaz.org>
date Fri May 14 10:25:33 2010 -0400 (2010-05-14)
parents 865c0b9402ab
children 3f8e04bc567f
files ffmpeg-svn-dev/receipt ffmpeg-svn/receipt ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch
line diff
     1.1 --- a/ffmpeg-svn-dev/receipt	Fri May 14 16:01:18 2010 +0200
     1.2 +++ b/ffmpeg-svn-dev/receipt	Fri May 14 10:25:33 2010 -0400
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="ffmpeg-svn-dev"
     1.7 -VERSION="22914"
     1.8 +VERSION="23117"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Record, convert and stream audio and video, development files."
    1.11  MAINTAINER="jozee@slitaz.org"
     2.1 --- a/ffmpeg-svn/receipt	Fri May 14 16:01:18 2010 +0200
     2.2 +++ b/ffmpeg-svn/receipt	Fri May 14 10:25:33 2010 -0400
     2.3 @@ -1,13 +1,13 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="ffmpeg-svn"
     2.7 -VERSION="22914"
     2.8 +VERSION="23117"
     2.9  CATEGORY="multimedia"
    2.10  SHORT_DESC="Record, convert and stream audio and video."
    2.11  MAINTAINER="jozee@slitaz.org"
    2.12  WEB_SITE="http://ffmpeg.org/"
    2.13  DEPENDS="bzlib freetype imlib2 alsa-lib jack-audio-connection-kit zlib"
    2.14 -BUILD_DEPENDS="subversion imlib2-dev freetype-dev libsdl-dev zlib-dev coreutils-file-format coreutils-file-special"
    2.15 +BUILD_DEPENDS="subversion imlib2-dev freetype-dev libsdl-dev zlib-dev "
    2.16  PROVIDE="ffmpeg"
    2.17  SUGGESTED="ffplay"
    2.18  TAGS="audio video convert stream"
    2.19 @@ -23,13 +23,14 @@
    2.20  	elif [ -f $TARBALL ]; then
    2.21  		tar xzf $TARBALL
    2.22  	else
    2.23 -		svn checkout -r 'HEAD' svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg &&
    2.24 +		svn checkout -r "$VERSION" svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg &&
    2.25  		tar czf $TARBALL ffmpeg
    2.26  	fi
    2.27  
    2.28 -	cd ffmpeg
    2.29 -	sed -i 's/mktemp -u/mktemp/' configure
    2.30 -	
    2.31 +	cd ffmpeg	
    2.32 +	# make busybox compatible or add  coreutils-file-format coreutils-file-special in BUILD_DEPENDS if patch/configure fails
    2.33 +	patch -Np1 -i ../../stuff/$PACKAGE-$VERSION-mktemp.patch
    2.34 +
    2.35  	./configure \
    2.36  		--prefix=/usr \
    2.37  		--enable-gpl \
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/ffmpeg-svn/stuff/ffmpeg-svn-23117-mktemp.patch	Fri May 14 10:25:33 2010 -0400
     3.3 @@ -0,0 +1,43 @@
     3.4 +--- ffmpeg/configure	Mon Apr 19 12:17:54 2010
     3.5 ++++ ffmpeg/configure	Mon Apr 19 12:22:54 2010
     3.6 +@@ -1666,34 +1666,12 @@
     3.7 + : ${TMPDIR:=$TMP}
     3.8 + : ${TMPDIR:=/tmp}
     3.9 + 
    3.10 +-if ! check_cmd type mktemp; then
    3.11 +-    # simple replacement for missing mktemp
    3.12 +-    # NOT SAFE FOR GENERAL USE
    3.13 +-    mktemp(){
    3.14 +-        echo "${2%XXX*}.${HOSTNAME}.${UID}.$$"
    3.15 +-    }
    3.16 +-fi
    3.17 +-
    3.18 +-tmpfile(){
    3.19 +-    tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 &&
    3.20 +-        (set -C; exec > $tmp) 2>/dev/null ||
    3.21 +-        die "Unable to create temporary file in $TMPDIR."
    3.22 +-    append TMPFILES $tmp
    3.23 +-    eval $1=$tmp
    3.24 +-}
    3.25 +-
    3.26 +-trap 'rm -f -- $TMPFILES' EXIT
    3.27 +-trap exit HUP INT TERM
    3.28 +-
    3.29 +-tmpfile TMPC  .c
    3.30 +-tmpfile TMPE  $EXESUF
    3.31 +-tmpfile TMPH  .h
    3.32 +-tmpfile TMPO  .o
    3.33 +-tmpfile TMPS  .S
    3.34 +-tmpfile TMPV  .ver
    3.35 +-tmpfile TMPSH .sh
    3.36 +-
    3.37 +-unset -f mktemp
    3.38 ++TMPC="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
    3.39 ++TMPE="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}"
    3.40 ++TMPH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
    3.41 ++TMPO="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
    3.42 ++TMPS="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
    3.43 ++TMPSH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
    3.44 + 
    3.45 + # make sure we can execute files in $TMPDIR
    3.46 + cat > $TMPSH 2>> $logfile <<EOF