From 4e93709c6f760c133cf59fe25e8a3b81e6326d0f Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Sun, 12 May 2013 15:31:01 +0200
Subject: Update the libvpx patch.

---
 extra/libvpx/PKGBUILD       |  4 ++--
 extra/libvpx/mips64el.patch | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'extra/libvpx')

diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index 12e0b0707..4f2c6fd5d 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -8,12 +8,12 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webmproject.org/"
 license=('BSD')
 depends=('glibc')
-makedepends=('yasm')
+[ "$CARCH" != "mips64el" ] && makedepends=('yasm')
 source=(ftp://ftp.archlinux.org/other/libvpx/libvpx-$pkgver.tar.xz{,.sig}
         mips64el.patch)
 sha1sums=('75cd953cf2db694412569272803fbdc73f2b599f'
           'SKIP'
-          '4fd775826a4d737102f831c451235a58947f2cde')
+          '78ea367dc417f64ad3ce8e33fda210e56a083f4b')
 
 build() {
     cd "$pkgname-$pkgver"
diff --git a/extra/libvpx/mips64el.patch b/extra/libvpx/mips64el.patch
index a0e84d5c2..075ee8119 100644
--- a/extra/libvpx/mips64el.patch
+++ b/extra/libvpx/mips64el.patch
@@ -1,26 +1,25 @@
-diff -uNar libvpx-v0.9.6.orig//build/make/configure.sh libvpx-v0.9.6/build/make/configure.sh
---- libvpx-v0.9.6.orig//build/make/configure.sh	2011-03-04 17:40:37.000000000 -0300
-+++ libvpx-v0.9.6/build/make/configure.sh	2011-03-27 12:31:49.263260789 -0300
-@@ -805,6 +805,15 @@
+diff -ru libvpx-1.2.0.orig/build/make/configure.sh libvpx-1.2.0/build/make/configure.sh
+--- libvpx-1.2.0.orig/build/make/configure.sh	2013-05-12 15:15:57.130701452 +0200
++++ libvpx-1.2.0/build/make/configure.sh	2013-05-12 15:17:30.904572335 +0200
+@@ -952,6 +952,14 @@
  
          esac
      ;;
 +    mips64*)
-+        CROSS=""
 +        link_with_cc=gcc
 +        setup_gnu_toolchain
 +        tune_cflags="-mtune="
 +        check_add_cflags -march=${tgt_isa}
-+    check_add_asflags -march=${tgt_isa}
-+    check_add_asflags -KPIC
++        check_add_asflags -march=${tgt_isa}
++        check_add_asflags -KPIC
 +    ;;
      mips*)
-         CROSS=${CROSS:-mipsel-linux-uclibc-}
          link_with_cc=gcc
-diff -uNar libvpx-v0.9.6.orig//configure libvpx-v0.9.6/configure
---- libvpx-v0.9.6.orig//configure	2011-03-04 17:40:37.000000000 -0300
-+++ libvpx-v0.9.6/configure	2011-03-27 12:31:05.571213054 -0300
-@@ -94,6 +94,7 @@
+         setup_gnu_toolchain
+diff -ru libvpx-1.2.0.orig/configure libvpx-1.2.0/configure
+--- libvpx-1.2.0.orig/configure	2013-05-12 15:15:57.259672776 +0200
++++ libvpx-1.2.0/configure	2013-05-12 15:17:56.198583024 +0200
+@@ -98,6 +98,7 @@
  all_platforms="${all_platforms} armv7-linux-gcc"     #neon Cortex-A8
  all_platforms="${all_platforms} armv7-none-rvct"     #neon Cortex-A8
  all_platforms="${all_platforms} mips32-linux-gcc"
@@ -28,11 +27,11 @@ diff -uNar libvpx-v0.9.6.orig//configure libvpx-v0.9.6/configure
  all_platforms="${all_platforms} ppc32-darwin8-gcc"
  all_platforms="${all_platforms} ppc32-darwin9-gcc"
  all_platforms="${all_platforms} ppc32-linux-gcc"
-@@ -194,6 +195,7 @@
-     iwmmxt2
+@@ -210,6 +211,7 @@
+     neon
  
      mips32
 +    mips64
+     dspr2
  
      mmx
-     sse
-- 
cgit v1.2.3-54-g00ecf