CVS commit: pkgsrc/www/firefox

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Tue Dec  6 08:14:22 UTC 2016

Modified Files:
        pkgsrc/www/firefox: PLIST mozilla-common.mk

Log Message:
Mark libmozavcodec.so and libmozavutil.so as x86-only


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.83 -r1.84 pkgsrc/www/firefox/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.112 pkgsrc/www/firefox/PLIST:1.113
--- pkgsrc/www/firefox/PLIST:1.112      Sat Dec  3 09:58:25 2016
+++ pkgsrc/www/firefox/PLIST    Tue Dec  6 08:14:22 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.112 2016/12/03 09:58:25 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.113 2016/12/06 08:14:22 martin Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -3419,8 +3419,8 @@ lib/firefox/hyphenation/hyph_sv.dic
 lib/firefox/hyphenation/hyph_tr.dic
 lib/firefox/hyphenation/hyph_uk.dic
 lib/firefox/liblgpllibs.so
-lib/firefox/libmozavcodec.so
-lib/firefox/libmozavutil.so
+${PLIST.avx86}lib/firefox/libmozavcodec.so
+${PLIST.avx86}lib/firefox/libmozavutil.so
 lib/firefox/libmozsqlite3.so
 lib/firefox/libxul.so
 lib/firefox/modules/AboutReader.jsm

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.83 pkgsrc/www/firefox/mozilla-common.mk:1.84
--- pkgsrc/www/firefox/mozilla-common.mk:1.83   Tue Sep 20 20:01:41 2016
+++ pkgsrc/www/firefox/mozilla-common.mk        Tue Dec  6 08:14:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.83 2016/09/20 20:01:41 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.84 2016/12/06 08:14:22 martin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -108,13 +108,17 @@ OBJDIR=                   ../build
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIGURE_SCRIPT=      ${WRKSRC}/configure
 
-PLIST_VARS+=   sps vorbis tremor glskia throwwrapper mozglue
+PLIST_VARS+=   sps vorbis tremor glskia throwwrapper mozglue avx86
 
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "little"
 PLIST.glskia=  yes
 .endif
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+PLIST.avx86=   yes     # see media/libav/README_MOZILLA: only used on x86
+.endif
+
 .if ${MACHINE_ARCH} != "sparc64"
 # For some reasons the configure test for GCC bug 26905 still triggers on
 # sparc64, which makes mozilla skip the installation of a few wrapper headers.