sparc cpus better do not try to use "fast" unaligned access.

3 files changed, 27 insertions, 11 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 16a8f4046d4..5657c96d7c0 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2014/05/10 06:10:19 pho Exp $
+# $NetBSD: Makefile,v 1.46 2014/05/15 11:15:10 martin Exp $
 
 DISTNAME=	libvpx_1.3.0.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/libv/libvpx/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index ea6d336b1a7..45dea3080a6 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2014/05/05 21:16:28 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2014/05/15 11:15:10 martin Exp $
 
 SHA1 (libvpx_1.3.0.orig.tar.bz2) = fd90afbdba7905b9b3ab6c707c41369627d208e9
 RMD160 (libvpx_1.3.0.orig.tar.bz2) = f90e26d7657b26d8a3bdba82c55db5ecafc23835
@@ -6,7 +6,7 @@ Size (libvpx_1.3.0.orig.tar.bz2) = 2077846 bytes
 SHA1 (patch-aa) = a34e812f51c9fbd6ae99d48d1e23bcf922cf0ac0
 SHA1 (patch-ab) = dfd61002748f01a5651dc58ce6f67a9906f9a456
 SHA1 (patch-ac) = 2086b1896c6c6a23ba7da75824375fae0bdb97d1
-SHA1 (patch-ad) = 865028a8c0eea859591b1b83d8e43d0ae5284d01
+SHA1 (patch-ad) = 15b8898b93266ef0be3f075f8dd532e52f249ab0
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index 37e2d5f9f40..5a21103a2ed 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,11 +1,18 @@
-$NetBSD: patch-ad,v 1.13 2014/05/05 21:16:28 ryoon Exp $
+$NetBSD: patch-ad,v 1.14 2014/05/15 11:15:10 martin Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
+All sparc cpus can not do unaligned access.
 
---- build/make/configure.sh.orig	2013-12-17 17:05:18.000000000 +0000
-+++ build/make/configure.sh
-@@ -665,7 +665,7 @@ process_common_toolchain() {
+--- build/make/configure.sh.orig	2013-12-17 18:05:18.000000000 +0100
++++ build/make/configure.sh	2014-05-15 13:11:08.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/pkg/bin/bash
+ ##
+ ##  configure.sh
+ ##
+@@ -665,7 +665,7 @@
                  [ -z "$tgt_isa" ] && tgt_isa=x86
                  tgt_os=win32
                  ;;
@@ -14,7 +21,15 @@ Add another SDK path on Mac OS X.
                  tgt_os=linux
                  ;;
              *solaris2.10)
-@@ -799,7 +799,7 @@ process_common_toolchain() {
+@@ -704,6 +704,7 @@
+     case ${tgt_isa} in
+         arm*) enable_feature arm;;
+         mips*) enable_feature mips;;
++	sparc) disable_feature fast_unaligned;;
+     esac
+ 
+     # PIC is probably what we want when building shared libs
+@@ -799,7 +800,7 @@
  
          case ${tgt_cc} in
          gcc)
@@ -23,7 +38,7 @@ Add another SDK path on Mac OS X.
              link_with_cc=gcc
              setup_gnu_toolchain
              arch_int=${tgt_isa##armv}
-@@ -988,8 +988,6 @@ EOF
+@@ -988,8 +989,6 @@
              check_add_cflags -mips32r2 -mdspr2
              disable_feature fast_unaligned
          fi
@@ -32,7 +47,7 @@ Add another SDK path on Mac OS X.
          check_add_asflags -KPIC
      ;;
      ppc*)
-@@ -1219,7 +1217,7 @@ EOF
+@@ -1219,7 +1218,7 @@
      check_cc <<EOF
      unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
@@ -41,7 +56,7 @@ Add another SDK path on Mac OS X.
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
      # Try to find which inline keywords are supported
-@@ -1235,10 +1233,32 @@ EOF
+@@ -1235,10 +1234,32 @@
          case ${toolchain} in
              *-win*-vs*);;
              *-android-gcc);;