Wed May 10 10:45:07 2017 UTC ()
Disable libyuv's SSE code on 32-bit SunOS, it doesn't compile at present.


(jperkin)
diff -r1.68 -r1.69 pkgsrc/multimedia/libvpx/Makefile
cvs diff -r1.68 -r1.69 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2017/05/03 08:38:43 1.68
+++ pkgsrc/multimedia/libvpx/Makefile 2017/05/10 10:45:07 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.68 2017/05/03 08:38:43 jperkin Exp $ 1# $NetBSD: Makefile,v 1.69 2017/05/10 10:45:07 jperkin Exp $
2 2
3DISTNAME= libvpx-1.6.1 3DISTNAME= libvpx-1.6.1
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/}
6GITHUB_PROJECT= libvpx 6GITHUB_PROJECT= libvpx
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://chromium.googlesource.com/webm/libvpx 10HOMEPAGE= https://chromium.googlesource.com/webm/libvpx
11COMMENT= On2 VP8 library from Google 11COMMENT= On2 VP8 library from Google
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
@@ -70,26 +70,28 @@ CONFIGURE_ARGS+= --target=x86_64-darwin9 @@ -70,26 +70,28 @@ CONFIGURE_ARGS+= --target=x86_64-darwin9
70. endif 70. endif
71. elif ${MACHINE_ARCH} == "powerpc" 71. elif ${MACHINE_ARCH} == "powerpc"
72. if !empty(OS_VERSION:M9.*) 72. if !empty(OS_VERSION:M9.*)
73CONFIGURE_ARGS+= --target=ppc32-darwin9-gcc 73CONFIGURE_ARGS+= --target=ppc32-darwin9-gcc
74. else 74. else
75CONFIGURE_ARGS+= --target=ppc32-darwin8-gcc 75CONFIGURE_ARGS+= --target=ppc32-darwin8-gcc
76. endif 76. endif
77. endif 77. endif
78.elif ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc*) 78.elif ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc*)
79. if ${MACHINE_ARCH} == "x86_64" 79. if ${MACHINE_ARCH} == "x86_64"
80CONFIGURE_ARGS+= --target=x86_64-solaris-gcc 80CONFIGURE_ARGS+= --target=x86_64-solaris-gcc
81. elif ${MACHINE_ARCH} == "i386" 81. elif ${MACHINE_ARCH} == "i386"
82CONFIGURE_ARGS+= --target=x86-solaris-gcc 82CONFIGURE_ARGS+= --target=x86-solaris-gcc
 83# Disable libyuv SSE code, it doesn't compile at present.
 84CFLAGS+= -U__SSE2__
83. endif 85. endif
84.endif 86.endif
85 87
86.if !empty(PKGSRC_COMPILER:Mclang) 88.if !empty(PKGSRC_COMPILER:Mclang)
87. if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" 89. if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
88# https://bugzilla.mozilla.org/show_bug.cgi?id=982693 90# https://bugzilla.mozilla.org/show_bug.cgi?id=982693
89SUBST_CLASSES+= clang 91SUBST_CLASSES+= clang
90SUBST_STAGE.clang= pre-configure 92SUBST_STAGE.clang= pre-configure
91SUBST_FILES.clang= build/make/Makefile 93SUBST_FILES.clang= build/make/Makefile
92SUBST_MESSAGE.clang= Disabling clang integrated assembler 94SUBST_MESSAGE.clang= Disabling clang integrated assembler
93# Test for whether clang supports -fno-integrated-as instead of -no-integrated-as 95# Test for whether clang supports -fno-integrated-as instead of -no-integrated-as
94CLANG_INTEGRATED_AS!= if ${CCPATH} --version -fno-integrated-as > /dev/null 2>&1; then ${ECHO} "-fno-integrated-as"; else ${ECHO} "-no-integrated-as"; fi 96CLANG_INTEGRATED_AS!= if ${CCPATH} --version -fno-integrated-as > /dev/null 2>&1; then ${ECHO} "-fno-integrated-as"; else ${ECHO} "-no-integrated-as"; fi
95SUBST_SED.clang= -e 's/-DINLINE_ASM/-DINLINE_ASM ${CLANG_INTEGRATED_AS}/' 97SUBST_SED.clang= -e 's/-DINLINE_ASM/-DINLINE_ASM ${CLANG_INTEGRATED_AS}/'