Thu Jun 6 14:07:24 2013 UTC ()
Remove libjpeg-turbo option.

* libjpeg-turbo support is obsolete by patch-image_decoders_nsJPEGDecoder.cpp.


(ryoon)
diff -r1.3 -r1.4 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.3 -r1.4 pkgsrc/www/firefox/mozilla-common.mk (switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2013/06/02 08:29:06 1.3
+++ pkgsrc/www/firefox/mozilla-common.mk 2013/06/06 14:07:23 1.4
@@ -1,156 +1,148 @@ @@ -1,156 +1,148 @@
1# $NetBSD: mozilla-common.mk,v 1.3 2013/06/02 08:29:06 spz Exp $ 1# $NetBSD: mozilla-common.mk,v 1.4 2013/06/06 14:07:23 ryoon Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by devel/xulrunner/Makefile 5# used by devel/xulrunner/Makefile
6# used by mail/thunderbird/Makefile 6# used by mail/thunderbird/Makefile
7# used by www/firefox/Makefile 7# used by www/firefox/Makefile
8# used by www/seamonkey/Makefile 8# used by www/seamonkey/Makefile
9 9
10GNU_CONFIGURE= yes 10GNU_CONFIGURE= yes
11USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 11USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
12USE_LANGUAGES+= c99 c++ 12USE_LANGUAGES+= c99 c++
13UNLIMIT_RESOURCES+= datasize 13UNLIMIT_RESOURCES+= datasize
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16# gcc45-4.5.3 of lang/gcc45 does not generate proper binary, 16# gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
17# but gcc 4.5.4 of NetBSD 7 generates working binary. 17# but gcc 4.5.4 of NetBSD 7 generates working binary.
18.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 18.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
19GCC_REQD+= 4.6 19GCC_REQD+= 4.6
20.else 20.else
21GCC_REQD+= 4.5 21GCC_REQD+= 4.5
22.endif 22.endif
23 23
24CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 24CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
25CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 25CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
26CHECK_INTERPRETER_SKIP+=lib/xulrunner-sdk/sdk/bin/xpt.py 26CHECK_INTERPRETER_SKIP+=lib/xulrunner-sdk/sdk/bin/xpt.py
27 27
28CONFIGURE_ARGS+= --disable-tests --disable-pedantic 28CONFIGURE_ARGS+= --disable-tests --disable-pedantic
29CONFIGURE_ARGS+= --enable-crypto 29CONFIGURE_ARGS+= --enable-crypto
30CONFIGURE_ARGS+= --enable-optimize=-O2 --with-pthreads 30CONFIGURE_ARGS+= --enable-optimize=-O2 --with-pthreads
31CONFIGURE_ARGS+= --disable-javaxpcom 31CONFIGURE_ARGS+= --disable-javaxpcom
32CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 32CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
33CONFIGURE_ARGS+= --enable-svg --enable-mathml 33CONFIGURE_ARGS+= --enable-svg --enable-mathml
34CONFIGURE_ARGS+= --enable-system-cairo 34CONFIGURE_ARGS+= --enable-system-cairo
35CONFIGURE_ARGS+= --enable-system-pixman 35CONFIGURE_ARGS+= --enable-system-pixman
36CONFIGURE_ARGS+= --with-system-libvpx 36CONFIGURE_ARGS+= --with-system-libvpx
37CONFIGURE_ARGS+= --enable-system-hunspell 37CONFIGURE_ARGS+= --enable-system-hunspell
38CONFIGURE_ARGS+= --enable-system-ffi 38CONFIGURE_ARGS+= --enable-system-ffi
39CONFIGURE_ARGS+= --with-system-nss 39CONFIGURE_ARGS+= --with-system-nss
40CONFIGURE_ARGS+= --with-system-nspr 40CONFIGURE_ARGS+= --with-system-nspr
41CONFIGURE_ARGS+= --with-system-jpeg 41CONFIGURE_ARGS+= --with-system-jpeg
42CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2 42CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2
43CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent} 43CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
44CONFIGURE_ARGS+= --enable-system-sqlite 44CONFIGURE_ARGS+= --enable-system-sqlite
45CONFIGURE_ARGS+= --disable-crashreporter 45CONFIGURE_ARGS+= --disable-crashreporter
46CONFIGURE_ARGS+= --disable-libnotify 46CONFIGURE_ARGS+= --disable-libnotify
47CONFIGURE_ARGS+= --disable-necko-wifi 47CONFIGURE_ARGS+= --disable-necko-wifi
48CONFIGURE_ARGS+= --enable-chrome-format=flat 48CONFIGURE_ARGS+= --enable-chrome-format=flat
49 49
50SUBST_CLASSES+= fix-paths 50SUBST_CLASSES+= fix-paths
51SUBST_STAGE.fix-paths= pre-configure 51SUBST_STAGE.fix-paths= pre-configure
52SUBST_MESSAGE.fix-paths= Fixing absolute paths. 52SUBST_MESSAGE.fix-paths= Fixing absolute paths.
53SUBST_FILES.fix-paths= ${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h 53SUBST_FILES.fix-paths= ${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h
54SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp 54SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
55SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' 55SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
56 56
57CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess 57CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess
58CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 58CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
59CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 59CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
60CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 60CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
61CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 61CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
62CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 62CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
63CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 63CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
64CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 64CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
65 65
66PYTHON_FOR_BUILD_ONLY= yes 66PYTHON_FOR_BUILD_ONLY= yes
67.include "../../lang/python/application.mk" 67.include "../../lang/python/application.mk"
68CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 68CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
69 69
70SUBST_CLASSES+= python 70SUBST_CLASSES+= python
71SUBST_STAGE.python= pre-configure 71SUBST_STAGE.python= pre-configure
72SUBST_MESSAGE.python= Fixing path to python. 72SUBST_MESSAGE.python= Fixing path to python.
73SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi 73SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi
74SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},' 74SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},'
75 75
76# When MACHINAE_ARCH == "arm", libjpeg-turbo should be enabled. 
77.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") 
78BUILD_DEPENDS+= yasm>=1.1.0:../../devel/yasm 
79CONFIGURE_ARGS+= --enable-libjpeg-turbo 
80.else 
81CONFIGURE_ARGS+= --disable-libjpeg-turbo 
82.endif 
83 
84PLIST_VARS+= sps vorbis tremor 76PLIST_VARS+= sps vorbis tremor
85 77
86.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) 78.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
87PLIST.sps= yes 79PLIST.sps= yes
88.endif 80.endif
89 81
90.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) || ${OPSYS} == "DragonFly" \ 82.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) || ${OPSYS} == "DragonFly" \
91 || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 83 || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
92PLIST.tremor= yes 84PLIST.tremor= yes
93.else 85.else
94PLIST.vorbis= yes 86PLIST.vorbis= yes
95.endif 87.endif
96 88
97# 89#
98# pysqlite2 is used by xulrunner's Python virtualenv. If pysqlite2 isn't 90# pysqlite2 is used by xulrunner's Python virtualenv. If pysqlite2 isn't
99# installed at build time it will attempt to download it instead, so the 91# installed at build time it will attempt to download it instead, so the
100# problem is stealthy in a networked environment, and obvious in an 92# problem is stealthy in a networked environment, and obvious in an
101# offline environment. 93# offline environment.
102# 94#
103BUILD_DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 95BUILD_DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
104 96
105# Makefiles sometimes call "rm -f" without more arguments. Kludge around ... 97# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
106.PHONY: create-rm-wrapper 98.PHONY: create-rm-wrapper
107pre-configure: create-rm-wrapper 99pre-configure: create-rm-wrapper
108create-rm-wrapper: 100create-rm-wrapper:
109 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ 101 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
110 ${WRAPPER_DIR}/bin/rm 102 ${WRAPPER_DIR}/bin/rm
111 chmod +x ${WRAPPER_DIR}/bin/rm 103 chmod +x ${WRAPPER_DIR}/bin/rm
112 104
113.include "../../mk/bsd.prefs.mk" 105.include "../../mk/bsd.prefs.mk"
114 106
115.if ${OPSYS} == "NetBSD" 107.if ${OPSYS} == "NetBSD"
116# The configure test for __thread succeeds, but later we end up with: 108# The configure test for __thread succeeds, but later we end up with:
117# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 109# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
118CONFIGURE_ENV+= ac_cv_thread_keyword=no 110CONFIGURE_ENV+= ac_cv_thread_keyword=no
119.endif 111.endif
120 112
121.if ${OPSYS} == "SunOS" 113.if ${OPSYS} == "SunOS"
122# native libbz2.so hides BZ2_crc32Table 114# native libbz2.so hides BZ2_crc32Table
123PREFER.bzip2?= pkgsrc 115PREFER.bzip2?= pkgsrc
124.endif 116.endif
125 117
126.if ${OPSYS} == "Linux" 118.if ${OPSYS} == "Linux"
127.include "../../audio/alsa-lib/buildlink3.mk" 119.include "../../audio/alsa-lib/buildlink3.mk"
128.endif 120.endif
129.include "../../archivers/bzip2/buildlink3.mk" 121.include "../../archivers/bzip2/buildlink3.mk"
130BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1 122BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1
131CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al 123CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al
132.include "../../databases/sqlite3/buildlink3.mk" 124.include "../../databases/sqlite3/buildlink3.mk"
133BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 125BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
134.include "../../devel/libevent/buildlink3.mk" 126.include "../../devel/libevent/buildlink3.mk"
135.include "../../devel/libffi/buildlink3.mk" 127.include "../../devel/libffi/buildlink3.mk"
136BUILDLINK_API_DEPENDS.nspr+= nspr>=4.9.6 128BUILDLINK_API_DEPENDS.nspr+= nspr>=4.9.6
137.include "../../devel/nspr/buildlink3.mk" 129.include "../../devel/nspr/buildlink3.mk"
138BUILDLINK_API_DEPENDS.nss+= nss>=3.14.3 130BUILDLINK_API_DEPENDS.nss+= nss>=3.14.3
139.include "../../devel/nss/buildlink3.mk" 131.include "../../devel/nss/buildlink3.mk"
140.include "../../devel/zlib/buildlink3.mk" 132.include "../../devel/zlib/buildlink3.mk"
141## xulrunner-18.0 or later really requires libjpeg-turbo 133## xulrunner-18.0 or later really requires libjpeg-turbo
142#.include "../../mk/jpeg.buildlink3.mk" 134#.include "../../mk/jpeg.buildlink3.mk"
143.include "../../graphics/MesaLib/buildlink3.mk" 135.include "../../graphics/MesaLib/buildlink3.mk"
144BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 136BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
145.include "../../graphics/cairo/buildlink3.mk" 137.include "../../graphics/cairo/buildlink3.mk"
146.include "../../multimedia/libvpx/buildlink3.mk" 138.include "../../multimedia/libvpx/buildlink3.mk"
147.include "../../net/libIDL/buildlink3.mk" 139.include "../../net/libIDL/buildlink3.mk"
148.include "../../textproc/hunspell/buildlink3.mk" 140.include "../../textproc/hunspell/buildlink3.mk"
149BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 141BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
150.include "../../x11/gtk2/buildlink3.mk" 142.include "../../x11/gtk2/buildlink3.mk"
151.include "../../x11/libXt/buildlink3.mk" 143.include "../../x11/libXt/buildlink3.mk"
152.if (${OPSYS} == "Linux") || (${OPSYS} == "Darwin") || \ 144.if (${OPSYS} == "Linux") || (${OPSYS} == "Darwin") || \
153(${OPSYS} == "FreeBSD") || (${OPSYS} == "OpenBSD") 145(${OPSYS} == "FreeBSD") || (${OPSYS} == "OpenBSD")
154.include "../../graphics/libv4l/buildlink3.mk" 146.include "../../graphics/libv4l/buildlink3.mk"
155.endif 147.endif
156 148