Index: branches/2017Q4/mail/thunderbird/Makefile =================================================================== --- branches/2017Q4/mail/thunderbird/Makefile (revision 454976) +++ branches/2017Q4/mail/thunderbird/Makefile (revision 454977) @@ -1,89 +1,89 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= thunderbird DISTVERSION= 52.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ nss>=3.28.3:security/nss \ libevent>=2.0.21_2:devel/libevent \ harfbuzz>=1.4.1:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.25:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.17.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= -soundtouch USE_GL= gl USES= tar:xz MOZ_OPTIONS= --enable-application=mail --enable-official-branding MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_PKGCONFIG_FILES= PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK3 LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MOZSRC:= ${WRKSRC}/mozilla .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} .include Index: branches/2017Q4/mail/thunderbird/files/patch-bug1414440 =================================================================== --- branches/2017Q4/mail/thunderbird/files/patch-bug1414440 (nonexistent) +++ branches/2017Q4/mail/thunderbird/files/patch-bug1414440 (revision 454977) @@ -0,0 +1,77 @@ +Always build libyuv x86 optimizations with Clang. + +diff --git media/libyuv/include/libyuv/compare_row.h media/libyuv/include/libyuv/compare_row.h +index 38a957b2ce33..59ec4b30c238 100644 +--- mozilla/media/libyuv/include/libyuv/compare_row.h ++++ mozilla/media/libyuv/include/libyuv/compare_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/planar_functions.h media/libyuv/include/libyuv/planar_functions.h +index 881b0c5c6473..491c022bfe8f 100644 +--- mozilla/media/libyuv/include/libyuv/planar_functions.h ++++ mozilla/media/libyuv/include/libyuv/planar_functions.h +@@ -450,7 +450,7 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y, + int width, int height, int interpolation); + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/rotate_row.h media/libyuv/include/libyuv/rotate_row.h +index ebc487f9abf4..59fbd10b573c 100644 +--- mozilla/media/libyuv/include/libyuv/rotate_row.h ++++ mozilla/media/libyuv/include/libyuv/rotate_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/row.h media/libyuv/include/libyuv/row.h +index 069d73bd3f2e..3616ecd81c3d 100644 +--- mozilla/media/libyuv/include/libyuv/row.h ++++ mozilla/media/libyuv/include/libyuv/row.h +@@ -38,7 +38,7 @@ extern "C" { + var = 0 + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/scale_row.h media/libyuv/include/libyuv/scale_row.h +index df699e6c2282..242f025b1e6e 100644 +--- mozilla/media/libyuv/include/libyuv/scale_row.h ++++ mozilla/media/libyuv/include/libyuv/scale_row.h +@@ -20,7 +20,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/linux.mk media/libyuv/linux.mk +index ee5a3a70705a..c1a45173c9ab 100644 +--- mozilla/media/libyuv/linux.mk ++++ mozilla/media/libyuv/linux.mk +@@ -78,4 +78,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr Property changes on: branches/2017Q4/mail/thunderbird/files/patch-bug1414440 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4/www/firefox/Makefile =================================================================== --- branches/2017Q4/www/firefox/Makefile (revision 454976) +++ branches/2017Q4/www/firefox/Makefile (revision 454977) @@ -1,77 +1,77 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 56.0.2 DISTVERSIONSUFFIX=.source -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.4.7:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ png>=1.6.31:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.19.3:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ llvm40>0:devel/llvm40 \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Firefox USE_GL= gl USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png MOZ_EXPORT= BINDGEN_CFLAGS="-isystem${LOCALBASE}/include/nspr \ -isystem${LOCALBASE}/include/pixman-1" # XXX bug 1341234 MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding OPTIONS_DEFAULT= BUNDLED_CAIRO OPTIONS_EXCLUDE= GNOMEUI .include "${.CURDIR}/../../www/firefox/Makefile.options" WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2017Q4/www/firefox/files/patch-bug1414440 =================================================================== --- branches/2017Q4/www/firefox/files/patch-bug1414440 (nonexistent) +++ branches/2017Q4/www/firefox/files/patch-bug1414440 (revision 454977) @@ -0,0 +1,108 @@ +Always build libyuv x86 optimizations with Clang. + +diff --git media/libyuv/libyuv/include/libyuv/compare_row.h media/libyuv/libyuv/include/libyuv/compare_row.h +index 7abc2d4aef8f..542df1ef504b 100644 +--- media/libyuv/libyuv/include/libyuv/compare_row.h ++++ media/libyuv/libyuv/include/libyuv/compare_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/libyuv/include/libyuv/planar_functions.h media/libyuv/libyuv/include/libyuv/planar_functions.h +index 040839c211b1..5f6a8034d209 100644 +--- media/libyuv/libyuv/include/libyuv/planar_functions.h ++++ media/libyuv/libyuv/include/libyuv/planar_functions.h +@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, + int interpolation); + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/libyuv/include/libyuv/rotate_row.h media/libyuv/libyuv/include/libyuv/rotate_row.h +index 2c51584eee8b..8e60a713c4cf 100644 +--- media/libyuv/libyuv/include/libyuv/rotate_row.h ++++ media/libyuv/libyuv/include/libyuv/rotate_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/libyuv/include/libyuv/row.h media/libyuv/libyuv/include/libyuv/row.h +index f74bd9f7d17a..b8f674ba124d 100644 +--- media/libyuv/libyuv/include/libyuv/row.h ++++ media/libyuv/libyuv/include/libyuv/row.h +@@ -31,7 +31,7 @@ extern "C" { + var = 0 + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/libyuv/include/libyuv/scale_row.h media/libyuv/libyuv/include/libyuv/scale_row.h +index edb46cc8c647..2b2c7a0700ef 100644 +--- media/libyuv/libyuv/include/libyuv/scale_row.h ++++ media/libyuv/libyuv/include/libyuv/scale_row.h +@@ -20,7 +20,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/libyuv/linux.mk media/libyuv/libyuv/linux.mk +index 923345ae4d12..9e555e303913 100644 +--- media/libyuv/libyuv/linux.mk ++++ media/libyuv/libyuv/linux.mk +@@ -80,4 +80,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr +diff --git media/libyuv/libyuv/source/row_gcc.cc media/libyuv/libyuv/source/row_gcc.cc +index 8735070b619d..9df8c6a627db 100644 +--- media/libyuv/libyuv/source/row_gcc.cc ++++ media/libyuv/libyuv/source/row_gcc.cc +@@ -5479,7 +5479,7 @@ void HalfFloatRow_SSE2(const uint16* src, uint16* dst, float scale, int width) { + : "+r"(src), // %0 + "+r"(dst), // %1 + "+r"(width) // %2 +- : "x"(scale * kScaleBias) // %3 ++ : "mx"(scale * kScaleBias) // %3 + : "memory", "cc", + "xmm2", "xmm3", "xmm4", "xmm5" + ); +@@ -5515,7 +5515,7 @@ void HalfFloatRow_AVX2(const uint16* src, uint16* dst, float scale, int width) { + : "+r"(src), // %0 + "+r"(dst), // %1 + "+r"(width) // %2 +- : "x"(scale * kScaleBias) // %3 ++ : "mx"(scale * kScaleBias) // %3 + : "memory", "cc", + "xmm2", "xmm3", "xmm4", "xmm5" + ); +@@ -5548,7 +5548,7 @@ void HalfFloatRow_F16C(const uint16* src, uint16* dst, float scale, int width) { + : "+r"(src), // %0 + "+r"(dst), // %1 + "+r"(width) // %2 +- : "x"(scale) // %3 ++ : "mx"(scale) // %3 + : "memory", "cc", + "xmm2", "xmm3", "xmm4" + ); Property changes on: branches/2017Q4/www/firefox/files/patch-bug1414440 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4/www/firefox-esr/Makefile =================================================================== --- branches/2017Q4/www/firefox-esr/Makefile (revision 454976) +++ branches/2017Q4/www/firefox-esr/Makefile (revision 454977) @@ -1,78 +1,78 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 52.4.1 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source PKGNAMESUFFIX= -esr MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ nss>=3.29.5:security/nss \ libevent>=2.0.21_2:devel/libevent \ harfbuzz>=1.4.1:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.28:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.17.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox-[0-9]* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Firefox USE_GL= gl USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding OPTIONS_DEFINE= RUST OPTIONS_DEFAULT= BUNDLED_CAIRO GTK2 OPTIONS_SINGLE+= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 .include "${.CURDIR}/../../www/firefox/Makefile.options" WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION}esr post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2017Q4/www/firefox-esr/files/patch-bug1414440 =================================================================== --- branches/2017Q4/www/firefox-esr/files/patch-bug1414440 (nonexistent) +++ branches/2017Q4/www/firefox-esr/files/patch-bug1414440 (revision 454977) @@ -0,0 +1,77 @@ +Always build libyuv x86 optimizations with Clang. + +diff --git media/libyuv/include/libyuv/compare_row.h media/libyuv/include/libyuv/compare_row.h +index 38a957b2ce33..59ec4b30c238 100644 +--- media/libyuv/include/libyuv/compare_row.h ++++ media/libyuv/include/libyuv/compare_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/planar_functions.h media/libyuv/include/libyuv/planar_functions.h +index 881b0c5c6473..491c022bfe8f 100644 +--- media/libyuv/include/libyuv/planar_functions.h ++++ media/libyuv/include/libyuv/planar_functions.h +@@ -450,7 +450,7 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y, + int width, int height, int interpolation); + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/rotate_row.h media/libyuv/include/libyuv/rotate_row.h +index ebc487f9abf4..59fbd10b573c 100644 +--- media/libyuv/include/libyuv/rotate_row.h ++++ media/libyuv/include/libyuv/rotate_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/row.h media/libyuv/include/libyuv/row.h +index 069d73bd3f2e..3616ecd81c3d 100644 +--- media/libyuv/include/libyuv/row.h ++++ media/libyuv/include/libyuv/row.h +@@ -38,7 +38,7 @@ extern "C" { + var = 0 + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/scale_row.h media/libyuv/include/libyuv/scale_row.h +index df699e6c2282..242f025b1e6e 100644 +--- media/libyuv/include/libyuv/scale_row.h ++++ media/libyuv/include/libyuv/scale_row.h +@@ -20,7 +20,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/linux.mk media/libyuv/linux.mk +index ee5a3a70705a..c1a45173c9ab 100644 +--- media/libyuv/linux.mk ++++ media/libyuv/linux.mk +@@ -78,4 +78,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr Property changes on: branches/2017Q4/www/firefox-esr/files/patch-bug1414440 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4/www/seamonkey/Makefile =================================================================== --- branches/2017Q4/www/seamonkey/Makefile (revision 454976) +++ branches/2017Q4/www/seamonkey/Makefile (revision 454977) @@ -1,90 +1,90 @@ # Created by: eivind/dima/jseger # $FreeBSD$ PORTNAME= seamonkey DISTVERSION= 2.49.1 -PORTREVISION= 2 +PORTREVISION= 3 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ nss>=3.28.6:security/nss \ libevent>=2.0.21_2:devel/libevent \ harfbuzz>=1.4.1:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.25:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.17.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l SSP_UNSAFE= yes USE_GECKO= gecko USE_GL= gl USES= tar:xz MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_EXTENSIONS= default MOZ_OPTIONS+= --enable-application=suite USE_MOZILLA= -soundtouch MOZ_PKGCONFIG_FILES= OPTIONS_DEFINE= LDAP LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=CANBERRA GTK2 LDAP LIGHTNING LDAP_DESC?= LDAP support for Mailnews .include "${.CURDIR}/../../www/firefox/Makefile.options" .include WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MOZSRC:= ${WRKSRC}/mozilla .if ! ${PORT_OPTIONS:MLDAP} MOZ_OPTIONS+= --disable-ldap .else MOZ_OPTIONS+= --enable-ldap .endif .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/suite/app/nsSuiteApp.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/init/all.js @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png .include Index: branches/2017Q4/www/seamonkey/files/patch-bug1414440 =================================================================== --- branches/2017Q4/www/seamonkey/files/patch-bug1414440 (nonexistent) +++ branches/2017Q4/www/seamonkey/files/patch-bug1414440 (revision 454977) @@ -0,0 +1,77 @@ +Always build libyuv x86 optimizations with Clang. + +diff --git media/libyuv/include/libyuv/compare_row.h media/libyuv/include/libyuv/compare_row.h +index 38a957b2ce33..59ec4b30c238 100644 +--- mozilla/media/libyuv/include/libyuv/compare_row.h ++++ mozilla/media/libyuv/include/libyuv/compare_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/planar_functions.h media/libyuv/include/libyuv/planar_functions.h +index 881b0c5c6473..491c022bfe8f 100644 +--- mozilla/media/libyuv/include/libyuv/planar_functions.h ++++ mozilla/media/libyuv/include/libyuv/planar_functions.h +@@ -450,7 +450,7 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y, + int width, int height, int interpolation); + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/rotate_row.h media/libyuv/include/libyuv/rotate_row.h +index ebc487f9abf4..59fbd10b573c 100644 +--- mozilla/media/libyuv/include/libyuv/rotate_row.h ++++ mozilla/media/libyuv/include/libyuv/rotate_row.h +@@ -19,7 +19,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/row.h media/libyuv/include/libyuv/row.h +index 069d73bd3f2e..3616ecd81c3d 100644 +--- mozilla/media/libyuv/include/libyuv/row.h ++++ mozilla/media/libyuv/include/libyuv/row.h +@@ -38,7 +38,7 @@ extern "C" { + var = 0 + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/include/libyuv/scale_row.h media/libyuv/include/libyuv/scale_row.h +index df699e6c2282..242f025b1e6e 100644 +--- mozilla/media/libyuv/include/libyuv/scale_row.h ++++ mozilla/media/libyuv/include/libyuv/scale_row.h +@@ -20,7 +20,7 @@ extern "C" { + #endif + + #if defined(__pnacl__) || defined(__CLR_VER) || \ +- (defined(__i386__) && !defined(__SSE2__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) + #define LIBYUV_DISABLE_X86 + #endif + // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/linux.mk media/libyuv/linux.mk +index ee5a3a70705a..c1a45173c9ab 100644 +--- mozilla/media/libyuv/linux.mk ++++ mozilla/media/libyuv/linux.mk +@@ -78,4 +78,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr Property changes on: branches/2017Q4/www/seamonkey/files/patch-bug1414440 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 454976) +++ branches/2017Q4 (revision 454977) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r453437,453446,453721