diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-17 11:03:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-17 11:03:15 +0000 |
| commit | 41247d136cb31d3444bc3e79fc7347622b8ab93e (patch) | |
| tree | 65dda13ca20ce53a8530e985ac2bacebae0d4f70 | |
| parent | 7e9320ce004b8d0916ceeafec732e00434a945b2 (diff) | |
| download | aports-41247d136cb31d3444bc3e79fc7347622b8ab93e.tar.bz2 aports-41247d136cb31d3444bc3e79fc7347622b8ab93e.tar.xz | |
Revert "main/ffmpeg: build fix"
This reverts commit 95b74692ab2b86aff72857fa886fbea1e7e006a9.
| -rw-r--r-- | main/ffmpeg/APKBUILD | 4 | ||||
| -rw-r--r-- | main/ffmpeg/bb-mktemp.patch | 17 |
2 files changed, 1 insertions, 20 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index ad08ebf6b0..1fb76d0707 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=1 +pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" arch="all" @@ -12,7 +12,6 @@ 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 @@ -55,5 +54,4 @@ 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 deleted file mode 100644 index a0438c6bbf..0000000000 --- a/main/ffmpeg/bb-mktemp.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./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 |