Recognize powerpc as an ISA, and add powerpc-linux-gnu, so that ...

NetBSD/macppc can build this, and get a proper dependence on -lm,
contrary to when configured as generic--gnu.
Bump PKGREVISION, OK from jperkin@

4 files changed, 29 insertions, 12 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 3b12d4ad40e..63d34c621ea 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2017/06/13 17:32:07 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2017/06/28 15:35:48 he Exp $
 
 DISTNAME=	libvpx-1.6.1
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=webmproject/}
 GITHUB_PROJECT=	libvpx
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 71339c014db..dc7e2c5944d 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2017/01/16 12:12:59 wiz Exp $
+$NetBSD: distinfo,v 1.34 2017/06/28 15:35:48 he Exp $
 
 SHA1 (libvpx-1.6.1.tar.gz) = 9e41a6bb2b991f5542c264676ac452114cda9c7c
 RMD160 (libvpx-1.6.1.tar.gz) = d8f27afbdec026460e26486914fb092f5ef1e70d
@@ -7,6 +7,6 @@ Size (libvpx-1.6.1.tar.gz) = 2493087 bytes
 SHA1 (patch-aa) = 0025e7eff1efbd44069f797d1c37c5efa19fb183
 SHA1 (patch-ab) = 6d0703e07785214113b81775fefad46485b048c7
 SHA1 (patch-ac) = 17410f43ff9952d616be3211ca697f37c107610a
-SHA1 (patch-ad) = 72801b4a7fbcc8152ab2fde065ad8eaa284c5016
+SHA1 (patch-ad) = e1a1ce370024e44c6d66489e3211107973a770d8
 SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6
-SHA1 (patch-configure) = 3b3064995ca840e4d918e52e66a071ff4dfc05b2
+SHA1 (patch-configure) = a154bf94ef9618514d7fd0f3416a97ed27b7c394
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index b993d89ac2d..57a13cc3728 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,9 +1,11 @@
-$NetBSD: patch-ad,v 1.21 2017/01/16 12:12:59 wiz Exp $
+$NetBSD: patch-ad,v 1.22 2017/06/28 15:35:48 he Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
 All sparc cpus can not do unaligned access.
 Detect NetBSD ARMv7 hardfloat toolchain.
+Recognize powerpc as a target ISA, so we don't end up with generic-gnu
+and possibly no libm reference...
 
 --- build/make/configure.sh.orig	2017-01-12 20:27:27.000000000 +0000
 +++ build/make/configure.sh
@@ -22,7 +24,17 @@ Detect NetBSD ARMv7 hardfloat toolchain.
          tgt_isa=armv7
          float_abi=hard
          ;;
-@@ -732,7 +732,7 @@ process_common_toolchain() {
+@@ -697,6 +697,9 @@ process_common_toolchain() {
+       *sparc*)
+         tgt_isa=sparc
+         ;;
++      *powerpc*)
++	tgt_isa=powerpc
++	;;
+     esac
+ 
+     # detect tgt_os
+@@ -732,7 +735,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32
          ;;
@@ -31,7 +43,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
          tgt_os=linux
          ;;
        *solaris2.10)
-@@ -775,6 +775,9 @@ process_common_toolchain() {
+@@ -775,6 +778,9 @@ process_common_toolchain() {
      mips*)
        enable_feature mips
        ;;
@@ -41,7 +53,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
    esac
  
    # PIC is probably what we want when building shared libs
-@@ -1382,7 +1385,7 @@ EOF
+@@ -1382,7 +1388,7 @@ EOF
    check_cc <<EOF
  unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
@@ -50,7 +62,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
      # Try to find which inline keywords are supported
-@@ -1399,11 +1402,33 @@ EOF
+@@ -1399,11 +1405,33 @@ EOF
          # bionic includes basic pthread functionality, obviating -lpthread.
          ;;
        *)
diff --git a/multimedia/libvpx/patches/patch-configure b/multimedia/libvpx/patches/patch-configure
index 369533e02c6..10650832104 100644
--- a/multimedia/libvpx/patches/patch-configure
+++ b/multimedia/libvpx/patches/patch-configure
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure,v 1.4 2016/08/16 23:53:25 ryoon Exp $
+$NetBSD: patch-configure,v 1.5 2017/06/28 15:35:48 he Exp $
+
+Recognize sparc and powerpc linux (or BSD...) platforms.
+Don't do doxygen.
 
 --- configure.orig	2016-07-21 01:15:41.000000000 +0000
 +++ configure
@@ -8,15 +11,16 @@ $NetBSD: patch-configure,v 1.4 2016/08/16 23:53:25 ryoon Exp $
  ##
  ##  configure
  ##
-@@ -114,6 +114,7 @@ all_platforms="${all_platforms} armv7s-d
+@@ -113,6 +113,8 @@ all_platforms="${all_platforms} armv7s-d
  all_platforms="${all_platforms} armv8-linux-gcc"
  all_platforms="${all_platforms} mips32-linux-gcc"
  all_platforms="${all_platforms} mips64-linux-gcc"
++all_platforms="${all_platforms} powerpc-linux-gcc"
 +all_platforms="${all_platforms} sparc-linux-gcc"
  all_platforms="${all_platforms} sparc-solaris-gcc"
  all_platforms="${all_platforms} x86-android-gcc"
  all_platforms="${all_platforms} x86-darwin8-gcc"
-@@ -181,19 +182,6 @@ if [ "`cd \"${source_path}\" && pwd`" !=
+@@ -175,19 +177,6 @@ if [ "`cd \"${source_path}\" && pwd`" !=
    fi
  fi