Wed Jun 28 15:35:48 2017 UTC ()
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@


(he)
diff -r1.70 -r1.71 pkgsrc/multimedia/libvpx/Makefile
diff -r1.33 -r1.34 pkgsrc/multimedia/libvpx/distinfo
diff -r1.21 -r1.22 pkgsrc/multimedia/libvpx/patches/patch-ad
diff -r1.4 -r1.5 pkgsrc/multimedia/libvpx/patches/patch-configure
cvs diff -r1.70 -r1.71 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2017/06/13 17:32:07 1.70
+++ pkgsrc/multimedia/libvpx/Makefile 2017/06/28 15:35:48 1.71
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.70 2017/06/13 17:32:07 joerg Exp $ 1# $NetBSD: Makefile,v 1.71 2017/06/28 15:35:48 he Exp $
2 2
3DISTNAME= libvpx-1.6.1 3DISTNAME= libvpx-1.6.1
 4PKGREVISION= 1
4CATEGORIES= multimedia 5CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/}
6GITHUB_PROJECT= libvpx 7GITHUB_PROJECT= libvpx
7GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
8 9
9MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://chromium.googlesource.com/webm/libvpx 11HOMEPAGE= https://chromium.googlesource.com/webm/libvpx
11COMMENT= On2 VP8 library from Google 12COMMENT= On2 VP8 library from Google
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14USE_LANGUAGES= c c++11 15USE_LANGUAGES= c c++11
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16USE_TOOLS+= gmake bash:build perl:build 17USE_TOOLS+= gmake bash:build perl:build
cvs diff -r1.33 -r1.34 pkgsrc/multimedia/libvpx/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/distinfo 2017/01/16 12:12:59 1.33
+++ pkgsrc/multimedia/libvpx/distinfo 2017/06/28 15:35:48 1.34
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.33 2017/01/16 12:12:59 wiz Exp $ 1$NetBSD: distinfo,v 1.34 2017/06/28 15:35:48 he Exp $
2 2
3SHA1 (libvpx-1.6.1.tar.gz) = 9e41a6bb2b991f5542c264676ac452114cda9c7c 3SHA1 (libvpx-1.6.1.tar.gz) = 9e41a6bb2b991f5542c264676ac452114cda9c7c
4RMD160 (libvpx-1.6.1.tar.gz) = d8f27afbdec026460e26486914fb092f5ef1e70d 4RMD160 (libvpx-1.6.1.tar.gz) = d8f27afbdec026460e26486914fb092f5ef1e70d
5SHA512 (libvpx-1.6.1.tar.gz) = 13b7eb515d026b302b8c484d6f06df067feb5aed4ceac953d85fe84fd684dab07e89ddbf80b4f395c6d9127709422156287e5754f49246050b2e18930adb3970 5SHA512 (libvpx-1.6.1.tar.gz) = 13b7eb515d026b302b8c484d6f06df067feb5aed4ceac953d85fe84fd684dab07e89ddbf80b4f395c6d9127709422156287e5754f49246050b2e18930adb3970
6Size (libvpx-1.6.1.tar.gz) = 2493087 bytes 6Size (libvpx-1.6.1.tar.gz) = 2493087 bytes
7SHA1 (patch-aa) = 0025e7eff1efbd44069f797d1c37c5efa19fb183 7SHA1 (patch-aa) = 0025e7eff1efbd44069f797d1c37c5efa19fb183
8SHA1 (patch-ab) = 6d0703e07785214113b81775fefad46485b048c7 8SHA1 (patch-ab) = 6d0703e07785214113b81775fefad46485b048c7
9SHA1 (patch-ac) = 17410f43ff9952d616be3211ca697f37c107610a 9SHA1 (patch-ac) = 17410f43ff9952d616be3211ca697f37c107610a
10SHA1 (patch-ad) = 72801b4a7fbcc8152ab2fde065ad8eaa284c5016 10SHA1 (patch-ad) = e1a1ce370024e44c6d66489e3211107973a770d8
11SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6 11SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6
12SHA1 (patch-configure) = 3b3064995ca840e4d918e52e66a071ff4dfc05b2 12SHA1 (patch-configure) = a154bf94ef9618514d7fd0f3416a97ed27b7c394
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/libvpx/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/patches/Attic/patch-ad 2017/01/16 12:12:59 1.21
+++ pkgsrc/multimedia/libvpx/patches/Attic/patch-ad 2017/06/28 15:35:48 1.22
@@ -1,66 +1,78 @@ @@ -1,66 +1,78 @@
1$NetBSD: patch-ad,v 1.21 2017/01/16 12:12:59 wiz Exp $ 1$NetBSD: patch-ad,v 1.22 2017/06/28 15:35:48 he Exp $
2 2
3*BSD and qnx are identified as linux. 3*BSD and qnx are identified as linux.
4Add another SDK path on Mac OS X. 4Add another SDK path on Mac OS X.
5All sparc cpus can not do unaligned access. 5All sparc cpus can not do unaligned access.
6Detect NetBSD ARMv7 hardfloat toolchain. 6Detect NetBSD ARMv7 hardfloat toolchain.
 7Recognize powerpc as a target ISA, so we don't end up with generic-gnu
 8and possibly no libm reference...
7 9
8--- build/make/configure.sh.orig 2017-01-12 20:27:27.000000000 +0000 10--- build/make/configure.sh.orig 2017-01-12 20:27:27.000000000 +0000
9+++ build/make/configure.sh 11+++ build/make/configure.sh
10@@ -1,4 +1,4 @@ 12@@ -1,4 +1,4 @@
11-#!/bin/sh 13-#!/bin/sh
12+#!/usr/pkg/bin/bash 14+#!/usr/pkg/bin/bash
13 ## 15 ##
14 ## configure.sh 16 ## configure.sh
15 ## 17 ##
16@@ -680,7 +680,7 @@ process_common_toolchain() { 18@@ -680,7 +680,7 @@ process_common_toolchain() {
17 aarch64*) 19 aarch64*)
18 tgt_isa=arm64 20 tgt_isa=arm64
19 ;; 21 ;;
20- armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf) 22- armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
21+ armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf | armv7*-netbsd*-*hf) 23+ armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf | armv7*-netbsd*-*hf)
22 tgt_isa=armv7 24 tgt_isa=armv7
23 float_abi=hard 25 float_abi=hard
24 ;; 26 ;;
25@@ -732,7 +732,7 @@ process_common_toolchain() { 27@@ -697,6 +697,9 @@ process_common_toolchain() {
 28 *sparc*)
 29 tgt_isa=sparc
 30 ;;
 31+ *powerpc*)
 32+ tgt_isa=powerpc
 33+ ;;
 34 esac
 35
 36 # detect tgt_os
 37@@ -732,7 +735,7 @@ process_common_toolchain() {
26 [ -z "$tgt_isa" ] && tgt_isa=x86 38 [ -z "$tgt_isa" ] && tgt_isa=x86
27 tgt_os=win32 39 tgt_os=win32
28 ;; 40 ;;
29- *linux*|*bsd*) 41- *linux*|*bsd*)
30+ *linux*|*bsd*|*qnx6*) 42+ *linux*|*bsd*|*qnx6*)
31 tgt_os=linux 43 tgt_os=linux
32 ;; 44 ;;
33 *solaris2.10) 45 *solaris2.10)
34@@ -775,6 +775,9 @@ process_common_toolchain() { 46@@ -775,6 +778,9 @@ process_common_toolchain() {
35 mips*) 47 mips*)
36 enable_feature mips 48 enable_feature mips
37 ;; 49 ;;
38+ sparc*) 50+ sparc*)
39+ disable_feature fast_unaligned 51+ disable_feature fast_unaligned
40+ ;; 52+ ;;
41 esac 53 esac
42  54
43 # PIC is probably what we want when building shared libs 55 # PIC is probably what we want when building shared libs
44@@ -1382,7 +1385,7 @@ EOF 56@@ -1382,7 +1388,7 @@ EOF
45 check_cc <<EOF 57 check_cc <<EOF
46 unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E'; 58 unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
47 EOF 59 EOF
48- [ -f "${TMP_O}" ] && od -A n -t x1 "${TMP_O}" | tr -d '\n' | 60- [ -f "${TMP_O}" ] && od -A n -t x1 "${TMP_O}" | tr -d '\n' |
49+ [ -f "${TMP_O}" ] && od -t x1 "${TMP_O}" | tr -d '\n' | 61+ [ -f "${TMP_O}" ] && od -t x1 "${TMP_O}" | tr -d '\n' |
50 grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian 62 grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
51  63
52 # Try to find which inline keywords are supported 64 # Try to find which inline keywords are supported
53@@ -1399,11 +1402,33 @@ EOF 65@@ -1399,11 +1405,33 @@ EOF
54 # bionic includes basic pthread functionality, obviating -lpthread. 66 # bionic includes basic pthread functionality, obviating -lpthread.
55 ;; 67 ;;
56 *) 68 *)
57- check_header pthread.h && add_extralibs -lpthread 69- check_header pthread.h && add_extralibs -lpthread
58+ check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 70+ check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
59 ;; 71 ;;
60 esac 72 esac
61 fi 73 fi
62  74
63+ case ${tgt_os} in 75+ case ${tgt_os} in
64+ darwin*) 76+ darwin*)
65+ add_extralibs -lm 77+ add_extralibs -lm
66+ ;; 78+ ;;
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/libvpx/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/patches/patch-configure 2016/08/16 23:53:25 1.4
+++ pkgsrc/multimedia/libvpx/patches/patch-configure 2017/06/28 15:35:48 1.5
@@ -1,32 +1,36 @@ @@ -1,32 +1,36 @@
1$NetBSD: patch-configure,v 1.4 2016/08/16 23:53:25 ryoon Exp $ 1$NetBSD: patch-configure,v 1.5 2017/06/28 15:35:48 he Exp $
 2
 3Recognize sparc and powerpc linux (or BSD...) platforms.
 4Don't do doxygen.
2 5
3--- configure.orig 2016-07-21 01:15:41.000000000 +0000 6--- configure.orig 2016-07-21 01:15:41.000000000 +0000
4+++ configure 7+++ configure
5@@ -1,4 +1,4 @@ 8@@ -1,4 +1,4 @@
6-#!/bin/sh 9-#!/bin/sh
7+#!/usr/pkg/bin/bash 10+#!/usr/pkg/bin/bash
8 ## 11 ##
9 ## configure 12 ## configure
10 ## 13 ##
11@@ -114,6 +114,7 @@ all_platforms="${all_platforms} armv7s-d 14@@ -113,6 +113,8 @@ all_platforms="${all_platforms} armv7s-d
12 all_platforms="${all_platforms} armv8-linux-gcc" 15 all_platforms="${all_platforms} armv8-linux-gcc"
13 all_platforms="${all_platforms} mips32-linux-gcc" 16 all_platforms="${all_platforms} mips32-linux-gcc"
14 all_platforms="${all_platforms} mips64-linux-gcc" 17 all_platforms="${all_platforms} mips64-linux-gcc"
 18+all_platforms="${all_platforms} powerpc-linux-gcc"
15+all_platforms="${all_platforms} sparc-linux-gcc" 19+all_platforms="${all_platforms} sparc-linux-gcc"
16 all_platforms="${all_platforms} sparc-solaris-gcc" 20 all_platforms="${all_platforms} sparc-solaris-gcc"
17 all_platforms="${all_platforms} x86-android-gcc" 21 all_platforms="${all_platforms} x86-android-gcc"
18 all_platforms="${all_platforms} x86-darwin8-gcc" 22 all_platforms="${all_platforms} x86-darwin8-gcc"
19@@ -181,19 +182,6 @@ if [ "`cd \"${source_path}\" && pwd`" != 23@@ -175,19 +177,6 @@ if [ "`cd \"${source_path}\" && pwd`" !=
20 fi 24 fi
21 fi 25 fi
22  26
23-# check installed doxygen version 27-# check installed doxygen version
24-doxy_version=$(doxygen --version 2>/dev/null) 28-doxy_version=$(doxygen --version 2>/dev/null)
25-doxy_major=${doxy_version%%.*} 29-doxy_major=${doxy_version%%.*}
26-if [ ${doxy_major:-0} -ge 1 ]; then 30-if [ ${doxy_major:-0} -ge 1 ]; then
27- doxy_version=${doxy_version#*.} 31- doxy_version=${doxy_version#*.}
28- doxy_minor=${doxy_version%%.*} 32- doxy_minor=${doxy_version%%.*}
29- doxy_patch=${doxy_version##*.} 33- doxy_patch=${doxy_version##*.}
30- 34-
31- [ $doxy_major -gt 1 ] && enable_feature doxygen 35- [ $doxy_major -gt 1 ] && enable_feature doxygen
32- [ $doxy_minor -gt 5 ] && enable_feature doxygen 36- [ $doxy_minor -gt 5 ] && enable_feature doxygen