Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=c8a3b632044d935026a27a3e006014e8450d263c
commit c8a3b632044d935026a27a3e006014e8450d263c Author: crazy <[email protected]> Date: Thu Jan 7 03:19:11 2016 +0100 ffmpeg-2.8.4-1-x86_64 * version bump diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild index d1582f2..8dbe941 100644 --- a/source/xmultimedia/ffmpeg/FrugalBuild +++ b/source/xmultimedia/ffmpeg/FrugalBuild @@ -2,25 +2,31 @@ # Maintainer: James Buren <[email protected]> pkgname=ffmpeg -pkgver=2.8.3 -pkgrel=2 +pkgver=2.8.4 +pkgrel=1 pkgdesc="FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix." url="http://ffmpeg.sourceforge.net/"; -depends=('alsa-lib' 'a52dec' 'amrnb' 'amrwb' 'faac>=1.28' 'lame' 'libtheora' 'libvorbis' \ - 'x264>=20151115_2245' 'xvidcore' 'libdc1394' 'imlib2' 'sdl>=1.2.13-2' 'faad2>=2.7' 'gsm' \ - 'opencore-amr>=0.1.2' 'libxfixes' 'libvpx>=1.5.0' 'libva' 'libvdpau' 'libxcb' 'libbluray' \ - 'speex' 'v4l-utils' 'rtmpdump' 'openjpeg' 'libpulse>=6.0' 'x265>=1.8' 'libass' 'libcaca') -makedepends=('freetype2' 'yasm' 'x11-protos') +depends=('alsa-lib>=1.1.0-2' 'a52dec>=0.7.4-5' 'amrnb>=11.0.0.0-4' 'amrwb>=11.0.0.0-4' 'faac>=1.28-4' 'lame>=3.99.5-4' \ + 'libtheora>=1.1.1-4' 'libvorbis>=1.3.5-4' 'x264>=20151115_2245-2' 'xvidcore>=1.3.4-2' 'libdc1394>=2.2.3-4' \ + 'imlib2>=1.4.7-3' 'sdl>=1.2.15-3' 'faad2>=2.7-5' 'gsm>=1.0.14-2' 'opencore-amr>=0.1.3-2' 'libxfixes>=5.0.1-2' \ + 'libvpx>=1.5.0-2' 'libva>=1.6.2-5' 'libvdpau>=1.1.1-2' 'libxcb>=1.11.1-3' 'libbluray>=0.9.2' 'speex>=1.2rc2-4' \ + 'v4l-utils>=1.8.1-3' 'rtmpdump>=2.4-2' 'openjpeg>=1.5.2' 'libpulse>=7.1-3' 'x265>=1.8-2' 'libass>=0.13.1-2' \ + 'libcaca>=0.99.beta19-5' 'libstdc++>=5.3.0-2') +makedepends=('freetype2>=2.6.2-3' 'yasm>=1.3.0-2' 'x11-protos') groups=('xmultimedia') archs=('i686' 'x86_64') up2date="Flasttar http://www.ffmpeg.org/releases/"; -source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 libvpx.patch) -_F_conf_notry="build" -signatures=("${source[0]}.asc" '') +source=(http://www.ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +signatures=("${source[0]}.asc") build() { - Fpatchall - Fconf \ + + Fcd + ## dons't use F* here + ./configure \ + --prefix='/usr' \ + --docdir="/usr/share/doc/ffmpeg-$pkgver" \ + --mandir='/usr/share/man' \ --enable-gpl \ --enable-nonfree \ --enable-postproc \ @@ -52,9 +58,10 @@ build() { --enable-avresample \ --enable-libass \ --enable-libcaca \ - --enable-libbluray + --enable-libbluray || Fdie make SHARED_PP="yes" || Fdie make DESTDIR=$Fdestdir install || Fdie + } # optimization OK diff --git a/source/xmultimedia/ffmpeg/libvpx.patch b/source/xmultimedia/ffmpeg/libvpx.patch deleted file mode 100644 index 15d2600..0000000 --- a/source/xmultimedia/ffmpeg/libvpx.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <[email protected]> -Date: Mon, 19 Oct 2015 22:44:11 -0700 -Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings - -VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed -from libvpx and the remaining values were never used here - -Reviewed-by: Michael Niedermayer <[email protected]> -Signed-off-by: James Zern <[email protected]> ---- - libavcodec/libvpxenc.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c -index 5f39783..992122c 100644 ---- a/libavcodec/libvpxenc.c -+++ b/libavcodec/libvpxenc.c -@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { - - /** String mappings for enum vp8e_enc_control_id */ - static const char *const ctlidstr[] = { -- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", -- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", -- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", -- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", -- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", -- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", - [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", - [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", - [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", -- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", - [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", - [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", -- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", - [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", - [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", - [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", --- -1.7.10.4 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
