Thu Aug 29 14:14:35 2013 UTC ()
Skia does not support GL on big endian machines yet - so adjust PLIST
by conditionalizing it.


(martin)
diff -r1.68 -r1.69 pkgsrc/www/firefox/PLIST
diff -r1.11 -r1.12 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.68 -r1.69 pkgsrc/www/firefox/PLIST (expand / switch to unified diff)

--- pkgsrc/www/firefox/PLIST 2013/08/07 12:17:54 1.68
+++ pkgsrc/www/firefox/PLIST 2013/08/29 14:14:34 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.68 2013/08/07 12:17:54 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.69 2013/08/29 14:14:34 martin Exp $
2bin/firefox 2bin/firefox
3include/firefox/AbstractMediaDecoder.h 3include/firefox/AbstractMediaDecoder.h
4include/firefox/AccEvent.h 4include/firefox/AccEvent.h
5include/firefox/AnimationCommon.h 5include/firefox/AnimationCommon.h
6include/firefox/AudioAvailableEventManager.h 6include/firefox/AudioAvailableEventManager.h
7include/firefox/AudioChannelAgent.h 7include/firefox/AudioChannelAgent.h
8include/firefox/AudioChannelCommon.h 8include/firefox/AudioChannelCommon.h
9include/firefox/AudioChannelFormat.h 9include/firefox/AudioChannelFormat.h
10include/firefox/AudioChannelService.h 10include/firefox/AudioChannelService.h
11include/firefox/AudioChannelServiceChild.h 11include/firefox/AudioChannelServiceChild.h
12include/firefox/AudioEventTimeline.h 12include/firefox/AudioEventTimeline.h
13include/firefox/AudioNodeEngine.h 13include/firefox/AudioNodeEngine.h
14include/firefox/AudioNodeStream.h 14include/firefox/AudioNodeStream.h
@@ -48,27 +48,27 @@ include/firefox/DisplayItemClip.h @@ -48,27 +48,27 @@ include/firefox/DisplayItemClip.h
48include/firefox/DisplayListClipState.h 48include/firefox/DisplayListClipState.h
49include/firefox/ErrorList.h 49include/firefox/ErrorList.h
50include/firefox/ErrorListCDefines.h 50include/firefox/ErrorListCDefines.h
51include/firefox/ErrorListCxxDefines.h 51include/firefox/ErrorListCxxDefines.h
52include/firefox/EventTracer.h 52include/firefox/EventTracer.h
53include/firefox/FileBlockCache.h 53include/firefox/FileBlockCache.h
54include/firefox/ForceDiscreteGPUHelperCGL.h 54include/firefox/ForceDiscreteGPUHelperCGL.h
55include/firefox/FrameLayerBuilder.h 55include/firefox/FrameLayerBuilder.h
56include/firefox/FrameMetrics.h 56include/firefox/FrameMetrics.h
57include/firefox/FramePropertyTable.h 57include/firefox/FramePropertyTable.h
58include/firefox/GLContext.h 58include/firefox/GLContext.h
59include/firefox/GLContextProvider.h 59include/firefox/GLContextProvider.h
60include/firefox/GLContextProviderImpl.h 60include/firefox/GLContextProviderImpl.h
61include/firefox/GLContextSkia.h 61${PLIST.glskia}include/firefox/GLContextSkia.h
62include/firefox/GLContextSymbols.h 62include/firefox/GLContextSymbols.h
63include/firefox/GLContextTypes.h 63include/firefox/GLContextTypes.h
64include/firefox/GLDefs.h 64include/firefox/GLDefs.h
65include/firefox/GLLibraryEGL.h 65include/firefox/GLLibraryEGL.h
66include/firefox/GLLibraryLoader.h 66include/firefox/GLLibraryLoader.h
67include/firefox/GLScreenBuffer.h 67include/firefox/GLScreenBuffer.h
68include/firefox/GLTextureImage.h 68include/firefox/GLTextureImage.h
69include/firefox/GLXLibrary.h 69include/firefox/GLXLibrary.h
70include/firefox/GeckoProfiler.h 70include/firefox/GeckoProfiler.h
71include/firefox/GeneratedEvents.h 71include/firefox/GeneratedEvents.h
72include/firefox/GfxInfoCollector.h 72include/firefox/GfxInfoCollector.h
73include/firefox/GonkCameraControl.h 73include/firefox/GonkCameraControl.h
74include/firefox/GonkIOSurfaceImage.h 74include/firefox/GonkIOSurfaceImage.h
cvs diff -r1.11 -r1.12 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2013/08/25 01:41:08 1.11
+++ pkgsrc/www/firefox/mozilla-common.mk 2013/08/29 14:14:34 1.12
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: mozilla-common.mk,v 1.11 2013/08/25 01:41:08 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.12 2013/08/29 14:14:34 martin 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.include "../../mk/endian.mk"
16# gcc45-4.5.3 of lang/gcc45 does not generate proper binary, 17# gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
17# but gcc 4.5.4 of NetBSD 7 generates working binary. 18# but gcc 4.5.4 of NetBSD 7 generates working binary.
18.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 19.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
19GCC_REQD+= 4.6 20GCC_REQD+= 4.6
20. if ${MACHINE_ARCH} == "i386" 21. if ${MACHINE_ARCH} == "i386"
21# Fix for PR pkg/48152. 22# Fix for PR pkg/48152.
22CPPFLAGS+= -march=i486 23CPPFLAGS+= -march=i486
23. endif 24. endif
24.else 25.else
25GCC_REQD+= 4.5 26GCC_REQD+= 4.5
26.endif 27.endif
27 28
28CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 29CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
@@ -87,27 +88,31 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js @@ -87,27 +88,31 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js
87 88
88PYTHON_FOR_BUILD_ONLY= yes 89PYTHON_FOR_BUILD_ONLY= yes
89.include "../../lang/python/application.mk" 90.include "../../lang/python/application.mk"
90CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 91CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
91 92
92#BUILD_MAKE_FLAGS+= MOZ_WEBRTC_IN_LIBXUL=1 93#BUILD_MAKE_FLAGS+= MOZ_WEBRTC_IN_LIBXUL=1
93 94
94SUBST_CLASSES+= python 95SUBST_CLASSES+= python
95SUBST_STAGE.python= pre-configure 96SUBST_STAGE.python= pre-configure
96SUBST_MESSAGE.python= Fixing path to python. 97SUBST_MESSAGE.python= Fixing path to python.
97SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi 98SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi
98SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},' 99SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},'
99 100
100PLIST_VARS+= sps vorbis tremor 101PLIST_VARS+= sps vorbis tremor glskia
 102
 103.if ${MACHINE_ENDIAN} == "1234"
 104PLIST.glskia= yes
 105.endif
101 106
102.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) 107.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
103PLIST.sps= yes 108PLIST.sps= yes
104.endif 109.endif
105 110
106.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) || ${OPSYS} == "DragonFly" \ 111.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) || ${OPSYS} == "DragonFly" \
107 || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 112 || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
108PLIST.tremor= yes 113PLIST.tremor= yes
109.else 114.else
110PLIST.vorbis= yes 115PLIST.vorbis= yes
111.endif 116.endif
112 117
113# 118#