diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/mplayer/PKGBUILD | 33 | ||||
| -rw-r--r-- | libre/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 | ||||
| -rw-r--r-- | libre/mplayer/mplayer.png | bin | 1982 -> 0 bytes |
3 files changed, 16 insertions, 58 deletions
diff --git a/libre/mplayer/PKGBUILD b/libre/mplayer/PKGBUILD index c512ae873..72554a3e8 100644 --- a/libre/mplayer/PKGBUILD +++ b/libre/mplayer/PKGBUILD @@ -2,23 +2,26 @@ # Contributor (Arch): Ionut Biru <ibiru@archlinux.org> # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor (Arch): Hugo Doria <hugo@archlinux.org> -# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> -# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: André Silva <emulatorman@hyperbola.info> +# Contributor: Márcio Silva <coadde@hyperbola.info> + +# parabola changes and rationale: +# - removed support for unrar und faac pkgbase=mplayer pkgname=('mplayer' 'mencoder') -pkgver=37998 -pkgrel=2.parabola1 +pkgver=38017 +pkgrel=1.parabola1 pkgdesc='Media player for GNU/Linux, without using of UnRAR executable and nonfree faac support' url='http://www.mplayerhq.hu/' -arch=('i686' 'x86_64' 'armv7h') +arch=('x86_64' 'i686' 'armv7h') license=('GPL') makedepends=('libxxf86dga' 'libmad' 'libxinerama' 'libmng' 'libxss' 'smbclient' 'aalib' 'jack' 'libcaca' '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') -options=('!buildflags' '!emptydirs') +options=('!emptydirs') source=(${pkgbase}-${pkgver}::"svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}" mplayer.desktop include-samba-4.0.patch @@ -37,13 +40,12 @@ prepare() { build() { cd ${pkgbase}-${pkgver} - - # CPU detection doesn't work in ARM - if [ "$CARCH" != "armv7h" ]; then - extra=--enable-runtime-cpudetection - fi - + export CFLAGS="${CFLAGS/-march=x86-64/}" + export CFLAGS="${CFLAGS/-mtune=generic/}" + export LDFLAGS="${LDFLAGS/,O1/}" + export LDFLAGS="${LDFLAGS/,--sort-common/}" ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ --disable-gui \ --disable-arts \ --disable-liblzo \ @@ -64,7 +66,8 @@ build() { --enable-smb \ --language=all \ --confdir=/etc/mplayer \ - $extra + --extra-cflags="${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" [[ "${CARCH}" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak make } @@ -76,8 +79,6 @@ package_mplayer() { 'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient' 'jack' 'libmad' 'libcaca' 'libxxf86dga' 'faad2' 'libxvmc' 'mpg123' 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg') - replaces=('mplayer-libre' 'mplayer-parabola') - conflicts=('mplayer-libre' 'mplayer-parabola') cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man @@ -91,8 +92,6 @@ package_mencoder() { pkgdesc='Free command line video decoding, encoding and filtering tool, without using of UnRAR executable and nonfree faac support' depends=('enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'smbclient' 'libmad' 'faad2' 'mpg123' 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg') - replaces=('mencoder-libre' 'mencoder-parabola') - conflicts=('mencoder-libre' 'mencoder-parabola') make -C ${pkgbase}-${pkgver} DESTDIR="${pkgdir}" install-mencoder install-mencoder-man find "${pkgdir}/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + diff --git a/libre/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/libre/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch deleted file mode 100644 index 15d2600d1..000000000 --- a/libre/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 -From: James Zern <jzern@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@niedermayer.cc> -Signed-off-by: James Zern <jzern@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 - diff --git a/libre/mplayer/mplayer.png b/libre/mplayer/mplayer.png Binary files differdeleted file mode 100644 index 799769335..000000000 --- a/libre/mplayer/mplayer.png +++ /dev/null |
