From d7de8596c3877a545321776e8ebe9d7a41eb3ed6 Mon Sep 17 00:00:00 2001
From: Isaac David <isacdaavid@isacdaavid.info>
Date: Wed, 25 Nov 2015 13:29:52 -0600
Subject: libre/mplayer: armv7h port

---
 libre/mplayer/PKGBUILD | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'libre/mplayer/PKGBUILD')

diff --git a/libre/mplayer/PKGBUILD b/libre/mplayer/PKGBUILD
index 2d9766f70..a9780385e 100644
--- a/libre/mplayer/PKGBUILD
+++ b/libre/mplayer/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
 pkgver=37379
-pkgrel=6.parabola1
+pkgrel=6.parabola2
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -28,14 +28,16 @@ source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
         cdio-includes.patch
         include-samba-4.0.patch
         ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
-        revert-icl-fixes.patch)
+        revert-icl-fixes.patch
+        37386.patch)
 md5sums=('SKIP'
          'e75d598921285d6775f20164a91936ac'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d'
          '71be9bcd297cb9ce833bbc5d425c0470'
-         '3579402002b7302fdf2d146639333efd')
+         '3579402002b7302fdf2d146639333efd'
+         '9131fa5229c857174ab029ed9b0cb71b')
 
 pkgver() {
   cd $pkgbase-$pkgver
@@ -50,6 +52,8 @@ prepare() {
   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
+  # fix ffmpeg/libav linkage for ARM
+  patch -p0 -i ../37386.patch
 
   ./version.sh
 }
@@ -57,9 +61,8 @@ prepare() {
 build() {
   cd $pkgbase-$pkgver
 
-  if [ "$CARCH" = "armv7h" ]; then
-    extra=--enable-armv5te
-  else
+  # CPU detection doesn't work in ARM
+  if [ "$CARCH" != "armv7h" ]; then
     extra=--enable-runtime-cpudetection
   fi
 
-- 
cgit v1.2.3-54-g00ecf