diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-17 10:38:27 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-17 10:38:27 +0000 |
| commit | 95b74692ab2b86aff72857fa886fbea1e7e006a9 (patch) | |
| tree | 368c9314313cb51a0686b081ea9e8398f444c840 /main | |
| parent | a020c738cc0683f275ac426edf6f3bd637694d2c (diff) | |
| download | aports-95b74692ab2b86aff72857fa886fbea1e7e006a9.tar.bz2 aports-95b74692ab2b86aff72857fa886fbea1e7e006a9.tar.xz | |
main/ffmpeg: build fix
dont use mktemp -u
Diffstat (limited to 'main')
| -rw-r--r-- | main/ffmpeg/APKBUILD | 4 | ||||
| -rw-r--r-- | main/ffmpeg/bb-mktemp.patch | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 1fb76d070..ad08ebf6b 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg pkgver=0.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" arch="all" @@ -12,6 +12,7 @@ makedepends="lame-dev libvorbis-dev faad2-dev faac-dev xvidcore-dev zlib-dev libvpx-dev" depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 + bb-mktemp.patch pic.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -54,4 +55,5 @@ package() { # strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1 } md5sums="f7819307dad55aa0d6b40ac0e862884d ffmpeg-0.6.2.tar.bz2 +c7937983bdf9a49b22d7c01ee84a05f8 bb-mktemp.patch d4870ae7350caed041d2b39e406a173b pic.patch" diff --git a/main/ffmpeg/bb-mktemp.patch b/main/ffmpeg/bb-mktemp.patch new file mode 100644 index 000000000..a0438c6bb --- /dev/null +++ b/main/ffmpeg/bb-mktemp.patch @@ -0,0 +1,17 @@ +--- ./configure.orig ++++ ./configure +@@ -1684,12 +1684,12 @@ + # simple replacement for missing mktemp + # NOT SAFE FOR GENERAL USE + mktemp(){ +- echo "${2%XXX*}.${HOSTNAME}.${UID}.$$" ++ echo "${1%XXX*}.${HOSTNAME}.${UID}.$$" + } + fi + + tmpfile(){ +- tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 && ++ tmp=$(mktemp "${TMPDIR}/ffconf.XXXXXXXX")$2 && + (set -C; exec > $tmp) 2>/dev/null || + die "Unable to create temporary file in $TMPDIR." + append TMPFILES $tmp |