# HG changeset patch # User Rohit Joshi # Date 1240426820 0 # Node ID 0f5ea8972a3849476e7b391293c3565a461c5100 # Parent 957267380153589e6cb8b0e252b5b8f2608f53a2 ffmpeg mktemp patch fails so cp configure diff -r 957267380153 -r 0f5ea8972a38 ffmpeg/receipt --- a/ffmpeg/receipt Wed Apr 22 16:57:34 2009 +0000 +++ b/ffmpeg/receipt Wed Apr 22 19:00:20 2009 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="ffmpeg" -VERSION="18330" +VERSION="18664" CATEGORY="multimedia" SHORT_DESC="Record, convert and stream audio and video." MAINTAINER="pascal.bellard@slitaz.org" @@ -12,20 +12,21 @@ # Référence externe extraite à la révision 27917. # -# Révision 18330 extraite. +# Révision 18664 extraite. # Rules to configure and make the package. compile_rules() { mkdir $src 2> /dev/null cd $src - [ -f ffmpeg/configure ] || svn checkout -r $VERSION \ + [ -f ffmpeg/configure ] || svn checkout -r 'HEAD' \ svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg cd ffmpeg sed -i 's/pr -. -t/cat/' configure # mktemp busybox hack patch - patch -p1 < ../../stuff/build.patch - + #patch -p0 < ../../stuff/build.patch + cp -a ../../stuff/configure . + ./configure --prefix=/usr --enable-gpl \ --arch=i486 --cpu=i486 \ --enable-shared --enable-small \ diff -r 957267380153 -r 0f5ea8972a38 ffmpeg/stuff/build.patch --- a/ffmpeg/stuff/build.patch Wed Apr 22 16:57:34 2009 +0000 +++ b/ffmpeg/stuff/build.patch Wed Apr 22 19:00:20 2009 +0000 @@ -1,17 +1,17 @@ ---- configure Tue Apr 21 20:37:50 2009 -+++ configure Tue Apr 21 20:53:07 2009 +--- configure.orig Wed Apr 22 17:24:34 2009 ++++ configure Tue Apr 21 21:21:01 2009 @@ -1371,33 +1371,13 @@ : ${TMPDIR:=$TMP} : ${TMPDIR:=/tmp} -if ! check_cmd type mktemp; then -- # simple replacement for missing mktemp +- # 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 || @@ -19,7 +19,7 @@ - append TMPFILES $tmp - eval $1=$tmp -} -- + -trap 'rm -f -- $TMPFILES' EXIT -trap exit HUP INT TERM -