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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -63,34 +63,26 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/ @@ -63,34 +63,26 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/
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