wok-current rev 2710
ffmpeg mktemp patch fails so cp configure
author | Rohit Joshi <jozee@slitaz.org> |
---|---|
date | Wed Apr 22 19:00:20 2009 +0000 (2009-04-22) |
parents | 957267380153 |
children | cbbe39d2645a |
files | ffmpeg/receipt ffmpeg/stuff/build.patch |
line diff
1.1 --- a/ffmpeg/receipt Wed Apr 22 16:57:34 2009 +0000 1.2 +++ b/ffmpeg/receipt Wed Apr 22 19:00:20 2009 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="ffmpeg" 1.7 -VERSION="18330" 1.8 +VERSION="18664" 1.9 CATEGORY="multimedia" 1.10 SHORT_DESC="Record, convert and stream audio and video." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 @@ -12,20 +12,21 @@ 1.13 1.14 # Référence externe extraite à la révision 27917. 1.15 # 1.16 -# Révision 18330 extraite. 1.17 +# Révision 18664 extraite. 1.18 1.19 # Rules to configure and make the package. 1.20 compile_rules() 1.21 { 1.22 mkdir $src 2> /dev/null 1.23 cd $src 1.24 - [ -f ffmpeg/configure ] || svn checkout -r $VERSION \ 1.25 + [ -f ffmpeg/configure ] || svn checkout -r 'HEAD' \ 1.26 svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg 1.27 cd ffmpeg 1.28 sed -i 's/pr -. -t/cat/' configure 1.29 # mktemp busybox hack patch 1.30 - patch -p1 < ../../stuff/build.patch 1.31 - 1.32 + #patch -p0 < ../../stuff/build.patch 1.33 + cp -a ../../stuff/configure . 1.34 + 1.35 ./configure --prefix=/usr --enable-gpl \ 1.36 --arch=i486 --cpu=i486 \ 1.37 --enable-shared --enable-small \
2.1 --- a/ffmpeg/stuff/build.patch Wed Apr 22 16:57:34 2009 +0000 2.2 +++ b/ffmpeg/stuff/build.patch Wed Apr 22 19:00:20 2009 +0000 2.3 @@ -1,17 +1,17 @@ 2.4 ---- configure Tue Apr 21 20:37:50 2009 2.5 -+++ configure Tue Apr 21 20:53:07 2009 2.6 +--- configure.orig Wed Apr 22 17:24:34 2009 2.7 ++++ configure Tue Apr 21 21:21:01 2009 2.8 @@ -1371,33 +1371,13 @@ 2.9 : ${TMPDIR:=$TMP} 2.10 : ${TMPDIR:=/tmp} 2.11 2.12 -if ! check_cmd type mktemp; then 2.13 -- # simple replacement for missing mktemp 2.14 +- # simple replacement for missing mktemp 2.15 - # NOT SAFE FOR GENERAL USE 2.16 - mktemp(){ 2.17 - echo "${2%XXX*}.${HOSTNAME}.${UID}.$$" 2.18 - } 2.19 -fi 2.20 - 2.21 +- 2.22 -tmpfile(){ 2.23 - tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 && 2.24 - (set -C; exec > $tmp) 2>/dev/null || 2.25 @@ -19,7 +19,7 @@ 2.26 - append TMPFILES $tmp 2.27 - eval $1=$tmp 2.28 -} 2.29 -- 2.30 + 2.31 -trap 'rm -f -- $TMPFILES' EXIT 2.32 -trap exit HUP INT TERM 2.33 -