[arch-commits] Commit in mplayer/trunk (2 files)
Antonio Rojas
arojas at archlinux.org
Mon Jul 4 07:54:34 UTC 2016
Date: Monday, July 4, 2016 @ 07:54:33
Author: arojas
Revision: 270931
ffmpeg 3.1 rebuild
Modified:
mplayer/trunk/PKGBUILD
Deleted:
mplayer/trunk/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
------------------------------------------------------------+
PKGBUILD | 39 +++-------
ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 -----------
2 files changed, 12 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-07-04 07:39:36 UTC (rev 270930)
+++ PKGBUILD 2016-07-04 07:54:33 UTC (rev 270931)
@@ -6,16 +6,15 @@
pkgbase=mplayer
pkgname=('mplayer' 'mencoder')
pkgver=37857
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
makedepends=(
- 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
- 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
- 'faac' 'faad2' 'lirc' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
- 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
- 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
- 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls'
- 'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg'
+ 'libxxf86dga' 'libmad' 'libxinerama'
+ 'libmng' 'libxss' 'smbclient' 'aalib' 'jack' 'libcaca'
+ 'faac' 'faad2' 'lirc' 'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip' 'mesa'
+ 'live-media' 'yasm' 'git' 'mpg123' 'ladspa'
+ 'libcdio-paranoia' 'subversion' 'x264' 'libx264' 'rtmpdump'
+ 'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg'
)
license=('GPL')
url='http://www.mplayerhq.hu/'
@@ -23,19 +22,12 @@
source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
mplayer.desktop
include-samba-4.0.patch
- ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
revert-icl-fixes.patch)
md5sums=('SKIP'
'62f44a58f072b2b1a3c3d3e4976d64b3'
'868a92bdef148df7f38bfa992b26ce9d'
- '71be9bcd297cb9ce833bbc5d425c0470'
'3579402002b7302fdf2d146639333efd')
-#pkgver() {
-# cd $pkgbase-$pkgver
-# svnversion
-#}
-
prepare() {
cd $pkgbase-$pkgver
# mv ../ffmpeg-*/ ./ffmpeg
@@ -42,7 +34,6 @@
patch -Np1 -i ../include-samba-4.0.patch
patch -Np0 -i ../revert-icl-fixes.patch
-# patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
./version.sh
}
@@ -80,12 +71,9 @@
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
depends=(
'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
- 'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
- 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
- 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
- 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
- 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump'
- 'gsm' 'gnutls' 'libdvdnav' 'ffmpeg'
+ 'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient'
+ 'jack' 'libmad' 'libcaca' 'libxxf86dga' 'faac' 'faad2' 'libxvmc' 'mpg123'
+ 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg'
)
cd $pkgbase-$pkgver
@@ -104,11 +92,8 @@
package_mencoder() {
pkgdesc='Free command line video decoding, encoding and filtering tool'
depends=(
- 'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame'
- 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
- 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
- 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
- 'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav' 'ffmpeg'
+ 'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'smbclient' 'libmad' 'faac' 'faad2'
+ 'mpg123' 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg'
)
make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
Deleted: ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
===================================================================
--- ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2016-07-04 07:39:36 UTC (rev 270930)
+++ ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2016-07-04 07:54:33 UTC (rev 270931)
@@ -1,41 +0,0 @@
-From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
-From: James Zern <jzern at google.com>
-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 <michael at niedermayer.cc>
-Signed-off-by: James Zern <jzern at google.com>
----
- 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
-
More information about the arch-commits
mailing list