Index: head/devel/electron6/Makefile =================================================================== --- head/devel/electron6/Makefile (revision 528593) +++ head/devel/electron6/Makefile (revision 528594) @@ -1,319 +1,320 @@ # $FreeBSD$ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v6.0.9/:chromium \ https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \ chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \ ${CHROMIUM_NODE_MODULES_HASH}:chromium_node \ ${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \ electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch DIST_SUBDIR= ${PORTNAME} MAINTAINER= tagattie@yandex.com COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS LICENSE= MIT LICENSE_FILE= ${WRKSRC}/electron/LICENSE FETCH_DEPENDS= yarn:www/yarn-node12 EXTRACT_DEPENDS= yarn:www/yarn-node12 PATCH_DEPENDS= git:devel/git BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \ gperf:devel/gperf \ yasm:devel/yasm \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ node:www/node12 \ npm:www/npm-node12 LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libdbus-1.so:devel/dbus \ libnotify.so:devel/libnotify \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ liblcms2.so:graphics/lcms2 \ libdrm.so:graphics/libdrm \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ npm:www/npm-node12 USES= bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \ ninja pkgconfig python:2.7,build,test tar:xz xorg USE_GITHUB= yes GH_TAGNAME= ${DISTVERSIONPREFIX}${ELECTRON_VER} GH_TUPLE= nodejs:node:v${NODE_VER}:node # boto:boto:f7574aa6cc2c819430c1f05e9a1a1a666ef8169b:boto \ # yaml:pyyaml:3.12:pyyaml \ # kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests # Official chromium version containing "gn" which is known to work CHROMIUM_OFFICIAL_VER= 76.0.3809.132 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 76.0.3809.146 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH CHROMIUM_NODE_MODULES_HASH= 2dd750e768cec597fc018509009637819ae4549c # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH CHROMIUM_TEST_FONTS_HASH= a22de844e32a3f720d219e3911c3da3478039f89 # See ${WRKSRC}/electron/DEPS for NODE_VER NODE_VER= 12.4.0 NO_WRKSUBDIR= yes WRKSRC_SUBDIR= src DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h BINARY_ALIAS= python=${PYTHON_CMD} USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \ xrender xscrnsaver xtst USE_GL= gl glesv2 USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt USE_JAVA= yes JAVA_VERSION= 1.8 JAVA_BUILD= yes USE_LDCONFIG= ${DATADIR} GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_jumbo_build=true \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_lcms2=true \ use_system_libdrm=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles ALL_TARGET= electron third_party/electron_node:headers MAKE_ARGS= -C out/${BUILDTYPE} MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include OPTIONS_DEFINE= CUPS DEBUG DIST DRIVER KERBEROS DIST_DESC= Build distribution zip files DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO OPTIONS_DEFAULT= CUPS DRIVER KERBEROS ALSA OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_component_build=false DEBUG_VARS_OFF= BUILDTYPE=Release DIST_IMPLIES= DRIVER DRIVER_ALL_TARGET= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false POST_BUILD_TARGETS= licenses version POST_BUILD_DIST_TARGETS= electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip YARN_TIMESTAMP= 1582868122 PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR} .include "Makefile.version" .include .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" .else PLIST_SUB+= AMD64="@comment " .endif .if ${ARCH} == "i386" PLIST_SUB+= I386="" .else PLIST_SUB+= I386="@comment " .endif pre-fetch: @${MKDIR} ${DISTDIR}/${DIST_SUBDIR} if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \ then ${MKDIR} ${WRKDIR}; \ ${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \ ${WRKDIR}/.yarnrc; \ ${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \ cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \ yarn --frozen-lockfile --ignore-scripts; \ ${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \ -e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \ -e 's:\([gu]id\)=[0-9]*:\1=0:g' \ -e 's:flags=.*:flags=none:' \ -e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \ ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \ @yarn-offline-cache.mtree; \ ${RM} -r ${WRKDIR}; \ fi post-extract: ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC} ${RM} -r ${WRKSRC}/tools/gn ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \ ${WRKSRC}/tools/gn ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \ ${WRKSRC}/third_party/electron_node ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR} ${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc cd ${WRKSRC}/electron && \ ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline # ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_boto}-${GH_TAGNAME_boto} \ # ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_pyyaml}-${GH_TAGNAME_pyyaml} \ # ${WRKSRC}/electron/vendor/${GH_PROJECT_pyyaml} # ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_requests}-${GH_TAGNAME_requests} \ # ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts pre-patch: ${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC} # ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete # ${FIND} ${WRKSRC} -type f -name '*~' -print -delete pre-configure: # cd ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} && \ # ${PYTHON_CMD} setup.py build # cd ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} && \ # ${PYTHON_CMD} setup.py build # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libjpeg \ libusb libvpx libwebp libxml libxslt openh264 opus re2 snappy \ yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \ --args='import("//electron/build/args/${BUILDTYPE:tl}.gn") ${GN_ARGS}' # Setup nodejs dependency ${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node # Setup java dependency ${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java # do-build: # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C out/${BUILDTYPE} ${ALL_TARGET} post-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS} post-build-DIST-on: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ ${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ ${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ ${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt do-install: ${MKDIR} ${STAGEDIR}${DATADIR} .for f in electron mksnapshot v8_context_snapshot_generator ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .for f in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor ${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for f in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${f} ${STAGEDIR}${DATADIR}/swiftshader .endfor .for f in LICENSE LICENSES.chromium.html icudtl.dat natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin version ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor ${MKDIR} ${STAGEDIR}${DATADIR}/locales ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales ${MKDIR} ${STAGEDIR}${DATADIR}/resources .for f in default_app.asar electron.asar ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources .endfor cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR} ${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX} post-install-DIST-on: ${MKDIR} ${STAGEDIR}${DATADIR}/releases ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver ${STAGEDIR}${DATADIR} do-test: # Note 1: "npm install" will run before actual tests are executed # Note 2: Xvfb or something similar is necessary for headless testing cd ${WRKSRC}/electron && \ ${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} \ npm run test -- --ci .include Index: head/devel/electron6/files/patch-third__party_fontconfig_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_fontconfig_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_fontconfig_BUILD.gn (nonexistent) @@ -1,111 +0,0 @@ ---- third_party/fontconfig/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/fontconfig/BUILD.gn -@@ -1,102 +1,13 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2017 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//third_party/fontconfig/fontconfig.gni") -- - assert(is_linux) - --if (use_bundled_fontconfig) { -- config("fontconfig_config") { -- include_dirs = [ "src" ] -- } -+config("fontconfig_config") { -+ libs = [ "fontconfig" ] -+} - -- component("fontconfig") { -- sources = [ -- "src/src/fcarch.h", -- "src/src/fcatomic.c", -- "src/src/fccache.c", -- "src/src/fccfg.c", -- "src/src/fccharset.c", -- "src/src/fccompat.c", -- "src/src/fcdbg.c", -- "src/src/fcdefault.c", -- "src/src/fcdir.c", -- "src/src/fcformat.c", -- "src/src/fcfreetype.c", -- "src/src/fcfs.c", -- "src/src/fchash.c", -- "src/src/fcinit.c", -- "src/src/fclang.c", -- "src/src/fclist.c", -- "src/src/fcmatch.c", -- "src/src/fcmatrix.c", -- "src/src/fcname.c", -- "src/src/fcobjs.c", -- "src/src/fcpat.c", -- "src/src/fcptrlist.c", -- "src/src/fcrange.c", -- "src/src/fcserialize.c", -- "src/src/fcstat.c", -- "src/src/fcstr.c", -- "src/src/fcweight.c", -- "src/src/fcxml.c", -- "src/src/ftglue.c", -- "src/src/ftglue.h", -- ] -- -- include_dirs = [ -- "include", -- "include/src", -- ] -- -- defines = [ -- "HAVE_CONFIG_H", -- "FC_CACHEDIR=\"/var/cache/fontconfig\"", -- "FC_TEMPLATEDIR=\"/usr/share/fontconfig/conf.avail\"", -- "FONTCONFIG_PATH=\"/etc/fonts\"", -- ] -- -- # Fontconfig symbols should not be exported from chrome, nacl_helper, or -- # anything else. -- if (!is_component_build) { -- defines += [ -- "FC_ATTRIBUTE_VISIBILITY_HIDDEN=__attribute((visibility(\"hidden\")))", -- "FC_ATTRIBUTE_VISIBILITY_EXPORT=__attribute((visibility(\"hidden\")))", -- ] -- } -- -- deps = [ -- "//build/config/freetype", -- "//third_party/libxml", -- "//third_party/zlib", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- -- public_configs = [ ":fontconfig_config" ] -- -- if (is_clang) { -- cflags = [ -- # Work around a null-conversion warning. See crbug.com/358852. -- "-Wno-non-literal-null-conversion", -- -- # Work around a pointer-to-bool conversion. -- "-Wno-pointer-bool-conversion", -- ] -- } -- -- if (!is_win) { -- libs = [ "uuid" ] -- } -- } --} else { -- config("fontconfig_config") { -- libs = [ "fontconfig" ] -- } -- -- group("fontconfig") { -- public_configs = [ ":fontconfig_config" ] -- } -+group("fontconfig") { -+ public_configs = [ ":fontconfig_config" ] - } Property changes on: head/devel/electron6/files/patch-third__party_fontconfig_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_libxml_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_libxml_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_libxml_BUILD.gn (nonexistent) @@ -1,251 +0,0 @@ ---- third_party/libxml/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/libxml/BUILD.gn -@@ -1,243 +1,18 @@ --# Copyright (c) 2013 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --# Define an "os_include" variable that points at the OS-specific generated --# headers. These were generated by running the configure script offline. --if (is_linux || is_android || is_nacl || is_fuchsia) { -- os_include = "linux" --} else if (is_mac || is_ios) { -- os_include = "mac" --} else if (is_win) { -- os_include = "win32" --} -+import("//build/config/linux/pkg_config.gni") - --config("libxml_config") { -- # Define LIBXML_STATIC as nothing to match how libxml.h (an internal header) -- # defines LIBXML_STATIC, otherwise we get the macro redefined warning from -- # GCC. ("defines" does "-DFOO" which defines the macro FOO as 1.) -- cflags = [ "-DLIBXML_STATIC=" ] -- -- include_dirs = [ -- "src/include", -- "$os_include/include", -- ] -+pkg_config("system_libxml") { -+ packages = [ "libxml-2.0" ] - } - --config("libxml_warnings") { -- if (is_win) { -- cflags_c = [ -- "/wd4018", # Signed/unsigned mismatch in comparison. -- "/wd4267", # TODO(brucedawson): http://crbug.com/554200 fix C4267 -- "/wd4311", # and C4311 warnings. -- ] -- } -- if (is_clang) { -- cflags = [ -- # libxml passes `const unsigned char*` through `const char*`. -- "-Wno-pointer-sign", -- -- # pattern.c and uri.c both have an intentional `for (...);` / -- # `while(...);` loop. I submitted a patch to move the `'` to its own -- # line, but until that's landed suppress the warning: -- "-Wno-empty-body", -- -- # debugXML.c compares array 'arg' to NULL. -- "-Wno-tautological-pointer-compare", -- -- # threads.c attempts to forward declare a pthread_equal which doesn't -- # match the prototype in pthreads.h -- "-Wno-ignored-attributes", -- -- # libxml casts from int to long to void*. -- "-Wno-int-to-void-pointer-cast", -- -- # libxml passes a volatile LPCRITICAL_SECTION* to a function expecting -- # a void* volatile*. -- "-Wno-incompatible-pointer-types", -- -- # trio_is_special_quantity and trio_is_negative are only -- # used with certain preprocessor defines set. -- "-Wno-unused-function", -- -- # Comparison between xmlElementType and xmlXPathTypeVal. -- # TODO(hans): See if we can fix upstream (http://crbug.com/763944). -- "-Wno-enum-compare", -- ] -- } else if (is_linux) { -- cflags = [ -- # gcc spits out a bunch of warnings about passing too many arguments to -- # __xmlSimpleError. -- "-Wno-format-extra-args", -- ] -- } --} -- - static_library("libxml") { -- output_name = "libxml2" -- -- # Commented out sources are libxml2 files we do not want to include. They are -- # here to make it easy to identify files which are new. - sources = [ - "chromium/libxml_utils.cc", - "chromium/libxml_utils.h", -- "linux/config.h", -- "linux/include/libxml/xmlversion.h", -- "mac/config.h", -- "mac/include/libxml/xmlversion.h", -- -- #"src/DOCBparser.c", -- "src/HTMLparser.c", -- "src/HTMLtree.c", -- -- #"src/SAX.c", -- "src/SAX2.c", -- "src/buf.c", -- "src/buf.h", -- -- #"src/c14n.c", -- #"src/catalog.c", -- "src/chvalid.c", -- -- #"src/debugXML.c", -- "src/dict.c", -- "src/elfgcchack.h", -- "src/enc.h", -- "src/encoding.c", -- "src/entities.c", -- "src/error.c", -- "src/globals.c", -- "src/hash.c", -- "src/include/libxml/DOCBparser.h", -- "src/include/libxml/HTMLparser.h", -- "src/include/libxml/HTMLtree.h", -- "src/include/libxml/SAX.h", -- "src/include/libxml/SAX2.h", -- "src/include/libxml/c14n.h", -- "src/include/libxml/catalog.h", -- "src/include/libxml/chvalid.h", -- "src/include/libxml/debugXML.h", -- "src/include/libxml/dict.h", -- "src/include/libxml/encoding.h", -- "src/include/libxml/entities.h", -- "src/include/libxml/globals.h", -- "src/include/libxml/hash.h", -- "src/include/libxml/list.h", -- "src/include/libxml/nanoftp.h", -- "src/include/libxml/nanohttp.h", -- "src/include/libxml/parser.h", -- "src/include/libxml/parserInternals.h", -- "src/include/libxml/pattern.h", -- "src/include/libxml/relaxng.h", -- "src/include/libxml/schemasInternals.h", -- "src/include/libxml/schematron.h", -- "src/include/libxml/threads.h", -- "src/include/libxml/tree.h", -- "src/include/libxml/uri.h", -- "src/include/libxml/valid.h", -- "src/include/libxml/xinclude.h", -- "src/include/libxml/xlink.h", -- "src/include/libxml/xmlIO.h", -- "src/include/libxml/xmlautomata.h", -- "src/include/libxml/xmlerror.h", -- "src/include/libxml/xmlexports.h", -- "src/include/libxml/xmlmemory.h", -- "src/include/libxml/xmlmodule.h", -- "src/include/libxml/xmlreader.h", -- "src/include/libxml/xmlregexp.h", -- "src/include/libxml/xmlsave.h", -- "src/include/libxml/xmlschemas.h", -- "src/include/libxml/xmlschemastypes.h", -- "src/include/libxml/xmlstring.h", -- "src/include/libxml/xmlunicode.h", -- "src/include/libxml/xmlwriter.h", -- "src/include/libxml/xpath.h", -- "src/include/libxml/xpathInternals.h", -- "src/include/libxml/xpointer.h", -- "src/include/win32config.h", -- "src/include/wsockcompat.h", -- -- #"src/legacy.c", -- "src/libxml.h", -- "src/list.c", -- "src/parser.c", -- "src/parserInternals.c", -- "src/pattern.c", -- -- #"src/relaxng.c", -- "src/save.h", -- -- #"src/schematron.c", -- "src/threads.c", -- "src/timsort.h", -- "src/tree.c", -- "src/triodef.h", -- "src/trionan.h", -- -- #"src/trio.c", -- #"src/trio.h", -- #"src/triodef.h", -- # Note: xpath.c #includes trionan.c -- #"src/trionan.c", -- #"src/triop.h", -- #"src/triostr.c", -- #"src/triostr.h", -- "src/uri.c", -- "src/valid.c", -- -- #"src/xinclude.c", -- #"src/xlink.c", -- "src/xmlIO.c", -- "src/xmlmemory.c", -- -- #"src/xmlmodule.c", -- "src/xmlreader.c", -- -- #"src/xmlregexp.c", -- "src/xmlsave.c", -- -- #"src/xmlschemas.c", -- #"src/xmlschemastypes.c", -- "src/xmlstring.c", -- "src/xmlunicode.c", -- "src/xmlwriter.c", -- "src/xpath.c", -- -- #"src/xpointer.c", -- #"src/xzlib.c", -- "src/xzlib.h", -- "win32/config.h", -- "win32/include/libxml/xmlversion.h", - ] - -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- -- # Must be after no_chromium_code for warning flags to be ordered correctly. -- ":libxml_warnings", -- ] -- -- if (is_win) { -- # libxml2 already defines WIN32_LEAN_AND_MEAN. -- configs -= [ "//build/config/win:lean_and_mean" ] -- } -- -- public_configs = [ ":libxml_config" ] -- public_deps = [ -- "//third_party/icu:icuuc", -- ] -- deps = [ -- "//third_party/zlib", -- ] -- -- if (is_mac || is_ios || is_android || is_fuchsia) { -- # http://www.xmlsoft.org/threads.html says that this is required when using -- # libxml from several threads, which can possibly happen in chrome. On -- # linux, this is picked up by transitivity from pkg-config output from -- # build/linux/system.gyp. -- defines = [ "_REENTRANT" ] -- } -- -- include_dirs = [ "$os_include" ] -+ public_configs = [ ":system_libxml" ] - } Property changes on: head/devel/electron6/files/patch-third__party_libxml_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_libusb_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_libusb_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_libusb_BUILD.gn (nonexistent) @@ -1,191 +0,0 @@ ---- third_party/libusb/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/libusb/BUILD.gn -@@ -1,174 +1,24 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --# libusb is only used by //services/device/usb on Windows and macOS. --assert(is_win || is_mac) -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") - --import("//build/config/features.gni") -- --config("libusb_config") { -- include_dirs = [ "src/libusb" ] -+pkg_config("system_libusb") { -+ packages = [ "libusb-1.0" ] - } - --config("libusb_linker_config") { -- if (is_win) { -- ldflags = [ -- "/DELAYLOAD:advapi32.dll", -- "/DELAYLOAD:cfgmgr32.dll", -- "/DELAYLOAD:ole32.dll", -- "/DELAYLOAD:setupapi.dll", -- "/DELAYLOAD:winusb.dll", -- ] -- } -+shim_headers("libusb_shim") { -+ root_path = "src/libusb" -+ headers = [ -+ "libusb.h", -+ ] - } - --config("libusb_warnings") { -- visibility = [ ":*" ] -- if (is_clang) { -- # guid_eq in windows_usb.c is unused. -- cflags = [ "-Wno-unused-function" ] -- if (is_linux && !use_udev) { -- cflags += [ "-Wno-pointer-sign" ] -- } -- } --} -- --static_library("libusb") { -- visibility = [ -- "//services/device:tests", -- "//services/device/usb", -+source_set("libusb") { -+ deps = [ -+ ":libusb_shim", - ] -- sources = [ -- "src/config.h", -- "src/libusb/core.c", -- "src/libusb/descriptor.c", -- "src/libusb/hotplug.c", -- "src/libusb/hotplug.h", -- "src/libusb/interrupt.c", -- "src/libusb/interrupt.h", -- "src/libusb/io.c", -- "src/libusb/libusb.h", -- "src/libusb/libusbi.h", -- "src/libusb/os/darwin_usb.c", -- "src/libusb/os/darwin_usb.h", -- "src/libusb/os/poll_posix.c", -- "src/libusb/os/poll_posix.h", -- "src/libusb/os/poll_windows.c", -- "src/libusb/os/poll_windows.h", -- "src/libusb/os/threads_posix.c", -- "src/libusb/os/threads_posix.h", -- "src/libusb/os/threads_windows.c", -- "src/libusb/os/threads_windows.h", -- "src/libusb/os/windows_common.h", -- "src/libusb/os/windows_usb.c", -- "src/libusb/os/windows_usb.h", -- "src/libusb/strerror.c", -- "src/libusb/sync.c", -- "src/libusb/version.h", -- "src/libusb/version_nano.h", -- "src/msvc/config.h", -- "src/msvc/inttypes.h", -- "src/msvc/stdint.h", -- ] -- deps = [] -- include_dirs = [ "src/libusb/os" ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- -- # Must be after no_chromium_code for warning flags to be ordered correctly. -- ":libusb_warnings", -- ] -- -- public_configs = [ ":libusb_config" ] -- all_dependent_configs = [ ":libusb_linker_config" ] -- -- if (is_posix) { -- defines = [ -- "DEFAULT_VISIBILITY=", -- "HAVE_GETTIMEOFDAY=1", -- "HAVE_POLL_H=1", -- "HAVE_SYS_TIME_H=1", -- "LIBUSB_DESCRIBE=\"1.0.16\"", -- "POLL_NFDS_TYPE=nfds_t", -- "THREADS_POSIX=1", -- ] -- } -- -- if (is_mac) { -- defines += [ -- "OS_DARWIN=1", -- -- # Needed on OSX 10.12 to silence a deprecation warning. -- "OBJC_SILENCE_GC_DEPRECATIONS=1", -- ] -- libs = [ -- "CoreFoundation.framework", -- "IOKit.framework", -- ] -- } else { -- sources -= [ -- "src/libusb/os/darwin_usb.c", -- "src/libusb/os/darwin_usb.h", -- ] -- } -- -- if (is_linux) { -- sources += [ -- "src/libusb/os/linux_usbfs.c", -- "src/libusb/os/linux_usbfs.h", -- ] -- defines += [ -- "OS_LINUX=1", -- "_GNU_SOURCE=1", -- ] -- } -- -- if (is_chromeos) { -- defines += [ "USBI_TIMERFD_AVAILABLE" ] -- } -- -- if (use_udev) { -- sources += [ "src/libusb/os/linux_udev.cc" ] -- defines += [ -- "HAVE_LIBUDEV=1", -- "USE_UDEV=1", -- ] -- deps += [ "//build/linux/libudev" ] -- } -- -- if (is_linux && !use_udev) { -- sources += [ "src/libusb/os/linux_netlink.c" ] -- defines += [ "HAVE_LINUX_NETLINK_H" ] -- } -- -- if (is_win) { -- include_dirs += [ "src/msvc" ] -- sources -= [ -- "src/libusb/os/poll_posix.c", -- "src/libusb/os/threads_posix.c", -- ] -- libs = [ -- "advapi32.lib", -- "ole32.lib", -- "setupapi.lib", -- "winusb.lib", -- ] -- } else { -- include_dirs += [ "src" ] -- sources -= [ -- "src/libusb/os/poll_windows.c", -- "src/libusb/os/poll_windows.h", -- "src/libusb/os/threads_windows.c", -- "src/libusb/os/threads_windows.h", -- "src/libusb/os/windows_common.h", -- "src/libusb/os/windows_usb.c", -- "src/libusb/os/windows_usb.h", -- "src/msvc/config.h", -- "src/msvc/inttypes.h", -- "src/msvc/stdint.h", -- ] -- } -+ public_configs = [ ":system_libusb" ] - } Property changes on: head/devel/electron6/files/patch-third__party_libusb_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_libvpx_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_libvpx_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_libvpx_BUILD.gn (nonexistent) @@ -1,400 +0,0 @@ ---- third_party/libvpx/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/libvpx/BUILD.gn -@@ -1,372 +1,34 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//build/config/android/config.gni") --import("//build/config/arm.gni") --import("//build/config/sanitizers/sanitizers.gni") --import("//third_party/libvpx/libvpx_srcs.gni") --import("//third_party/yasm/yasm_assemble.gni") -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") - --# Sets the architecture name for building libvpx. --if (current_cpu == "x86") { -- cpu_arch_full = "ia32" --} else if (current_cpu == "x64") { -- if (is_msan) { -- cpu_arch_full = "generic" -- } else { -- cpu_arch_full = "x64" -- } --} else if (current_cpu == "arm") { -- if (is_chromeos) { -- # ChromeOS gets highbd vp9 but other arm targets do not. -- cpu_arch_full = "arm-neon-highbd" -- } else if (arm_use_neon) { -- cpu_arch_full = "arm-neon" -- } else if (is_android) { -- cpu_arch_full = "arm-neon-cpu-detect" -- } else { -- cpu_arch_full = "arm" -- } --} else { -- if (is_chromeos) { -- cpu_arch_full = "arm64-highbd" -- } else { -- cpu_arch_full = current_cpu -- } -+pkg_config("system_libvpx") { -+ packages = [ "vpx" ] - } - --if (is_nacl) { -- platform_include_dir = "source/config/nacl" --} else { -- # The mac configurations are currently a relic. They were useful when -- # x86inc.asm did not work for MACH_O but now the build is identical to the -- # linux config. iOS for arm on the other hand needs an apple-specific twist in -- # vpx_config.asm -- if (is_ios && current_cpu == "arm") { -- os_category = current_os -- } else if (is_posix || is_fuchsia) { -- # Should cover linux, fuchsia, mac, and the ios simulator. -- os_category = "linux" -- } else { # This should only match windows. -- os_category = current_os -- } -- platform_include_dir = "source/config/$os_category/$cpu_arch_full" -+shim_headers("libvpx_shim") { -+ root_path = "source/libvpx" -+ headers = [ -+ "vpx/vp8.h", -+ "vpx/vp8cx.h", -+ "vpx/vp8dx.h", -+ "vpx/vpx_codec.h", -+ "vpx/vpx_codec_impl_bottom.h", -+ "vpx/vpx_codec_impl_top.h", -+ "vpx/vpx_decoder.h", -+ "vpx/vpx_encoder.h", -+ "vpx/vpx_frame_buffer.h", -+ "vpx/vpx_image.h", -+ "vpx/vpx_integer.h", -+ ] - } - --libvpx_include_dirs = [ -- "source/config", -- platform_include_dir, -- "source/libvpx", --] -- --config("libvpx_config") { -- include_dirs = libvpx_include_dirs -- -- # gn orders flags on a target before flags from configs. The default config -- # adds -Wall, and these flags have to be after -Wall -- so they need to come -- # from a config and can't be on the target directly. -- if (is_clang) { -- cflags = [ -- # libvpx heavily relies on implicit enum casting. -- "-Wno-conversion", -- -- # libvpx does `if ((a == b))` in some places. -- "-Wno-parentheses-equality", -- -- # libvpx has many static functions in header, which trigger this warning. -- "-Wno-unused-function", -- ] -- -- # Fixes a mac / ios simulator link error for vpx_scaled_2d: -- # Undefined symbols for architecture x86_64: -- # "_vpx_scaled_2d", referenced from: -- # _vp9_scale_and_extend_frame_c in libvpx.a(vp9_frame_scale.o) -- # (maybe you meant: _vpx_scaled_2d_ssse3) -- # ld: symbol(s) not found for architecture x86_64 -- if (is_mac || (is_ios && (current_cpu == "x86" || current_cpu == "x64"))) { -- cflags += [ "-fno-common" ] -- } -- } else if (!is_win) { -- cflags = [ -- "-Wno-unused-function", -- "-Wno-sign-compare", -- ] -- } --} -- --# This config is applied to targets that depend on libvpx. --config("libvpx_external_config") { -- include_dirs = [ "source/libvpx" ] --} -- --if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) { -- yasm_assemble("libvpx_yasm") { -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_assembly -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_assembly -- } -- -- defines = [ "CHROMIUM" ] -- if (is_android) { -- # On Android, define __ANDROID__ to use alternative standard library -- # functions. -- defines += [ "__ANDROID__" ] -- } -- include_dirs = libvpx_include_dirs -- } --} -- --if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) { -- # The following targets are deliberately source_set rather than -- # static_library. The :libvpx target exposes these intrinsic implementations -- # via global function pointer symbols, which hides the object dependency at -- # link time. On Mac, this results in undefined references to the intrinsic -- # symbols. -- -- source_set("libvpx_intrinsics_mmx") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- if (!is_win) { -- cflags = [ "-mmmx" ] -- } -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_mmx -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_mmx -- } -- } -- -- source_set("libvpx_intrinsics_sse2") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- if (!is_win || is_clang) { -- cflags = [ "-msse2" ] -- } -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_sse2 -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_sse2 -- } -- } -- -- source_set("libvpx_intrinsics_ssse3") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- if (!is_win || is_clang) { -- cflags = [ "-mssse3" ] -- } -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_ssse3 -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_ssse3 -- } -- } -- -- source_set("libvpx_intrinsics_sse4_1") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- if (!is_win || is_clang) { -- cflags = [ "-msse4.1" ] -- } -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_sse4_1 -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_sse4_1 -- } -- } -- -- source_set("libvpx_intrinsics_avx") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- if (is_win) { -- cflags = [ "/arch:AVX" ] -- } else { -- cflags = [ "-mavx" ] -- } -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_avx -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_avx -- } -- } -- -- source_set("libvpx_intrinsics_avx2") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- if (is_win) { -- cflags = [ "/arch:AVX2" ] -- } else { -- cflags = [ "-mavx2" ] -- } -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_avx2 -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_avx2 -- } -- } -- -- source_set("libvpx_intrinsics_avx512") { -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- if (is_win) { -- # clang-cl does not accept this flag. -- # https://bugs.chromium.org/p/chromium/issues/detail?id=783370 -- cflags = [ "/arch:AVX512" ] -- } else { -- cflags = [ -- "-mavx512f", -- "-mavx512cd", -- "-mavx512bw", -- "-mavx512dq", -- "-mavx512vl", -- ] -- } -- if (current_cpu == "x86") { -- sources = libvpx_srcs_x86_avx512 -- } else if (current_cpu == "x64") { -- sources = libvpx_srcs_x86_64_avx512 -- } -- } --} -- --if (cpu_arch_full == "arm-neon-cpu-detect") { -- static_library("libvpx_intrinsics_neon") { -- configs -= [ "//build/config/compiler:compiler_arm_fpu" ] -- configs += [ ":libvpx_config" ] -- cflags = [ "-mfpu=neon" ] -- sources = libvpx_srcs_arm_neon_cpu_detect_neon -- } --} -- --if (current_cpu == "arm") { -- if (cpu_arch_full == "arm-neon") { -- arm_assembly_sources = libvpx_srcs_arm_neon_assembly -- } else if (cpu_arch_full == "arm-neon-highbd") { -- arm_assembly_sources = libvpx_srcs_arm_neon_highbd_assembly -- } else if (cpu_arch_full == "arm-neon-cpu-detect") { -- arm_assembly_sources = libvpx_srcs_arm_neon_cpu_detect_assembly -- } else { -- arm_assembly_sources = libvpx_srcs_arm_assembly -- } --} -- --# Converts ARM assembly files to GAS style. --if (current_cpu == "arm" && arm_assembly_sources != []) { -- action_foreach("convert_arm_assembly") { -- script = "//third_party/libvpx/run_perl.py" -- sources = arm_assembly_sources -- gen_file = -- get_label_info("//third_party/libvpx/source/libvpx", "root_gen_dir") + -- "/{{source_root_relative_dir}}/{{source_file_part}}.S" -- outputs = [ -- gen_file, -- ] -- if (is_ios) { -- ads2gas_script = -- "//third_party/libvpx/source/libvpx/build/make/ads2gas_apple.pl" -- } else { -- ads2gas_script = -- "//third_party/libvpx/source/libvpx/build/make/ads2gas.pl" -- } -- args = [ -- "-s", -- rebase_path(ads2gas_script, root_build_dir), -- "-i", -- "{{source}}", -- "-o", -- rebase_path(gen_file, root_build_dir), -- ] -- } -- -- static_library("libvpx_assembly_arm") { -- sources = get_target_outputs(":convert_arm_assembly") -- configs -= [ "//build/config/compiler:compiler_arm_fpu" ] -- configs += [ ":libvpx_config" ] -- if (cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect" || -- cpu_arch_full == "arm-neon-highbd") { -- asmflags = [ "-mfpu=neon" ] -- -- # allow asm files to include generated sources which match the source -- # tree layout, e.g., vpx_dsp/arm/... -- include_dirs = [ get_label_info("//third_party/libvpx/source/libvpx", -- "target_gen_dir") ] -- } -- deps = [ -- ":convert_arm_assembly", -- ] -- } --} -- --static_library("libvpx") { -- if (!is_debug && is_win) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- if (is_nacl) { -- sources = libvpx_srcs_generic -- } else if (current_cpu == "x86") { -- sources = libvpx_srcs_x86 -- } else if (current_cpu == "x64") { -- if (is_msan) { -- sources = libvpx_srcs_generic -- } else { -- sources = libvpx_srcs_x86_64 -- } -- } else if (current_cpu == "mipsel" || current_cpu == "mips64el") { -- sources = libvpx_srcs_mips -- } else if (current_cpu == "arm") { -- if (is_chromeos) { -- sources = libvpx_srcs_arm_neon_highbd -- } else if (arm_use_neon) { -- sources = libvpx_srcs_arm_neon -- } else if (is_android) { -- sources = libvpx_srcs_arm_neon_cpu_detect -- } else { -- sources = libvpx_srcs_arm -- } -- } else if (current_cpu == "arm64") { -- if (is_chromeos || is_win) { -- sources = libvpx_srcs_arm64_highbd -- } else { -- sources = libvpx_srcs_arm64 -- } -- } -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":libvpx_config" ] -- deps = [] -- if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) { -- deps += [ -- ":libvpx_intrinsics_avx", -- ":libvpx_intrinsics_avx2", -- ":libvpx_intrinsics_avx512", -- ":libvpx_intrinsics_mmx", -- ":libvpx_intrinsics_sse2", -- ":libvpx_intrinsics_sse4_1", -- ":libvpx_intrinsics_ssse3", -- ":libvpx_yasm", -- ] -- } -- if (cpu_arch_full == "arm-neon-cpu-detect") { -- deps += [ ":libvpx_intrinsics_neon" ] -- } -- if (is_android) { -- deps += [ "//third_party/android_sdk:cpu_features" ] -- } -- if (current_cpu == "arm" && arm_assembly_sources != []) { -- deps += [ ":libvpx_assembly_arm" ] -- } -- -- public_configs = [ ":libvpx_external_config" ] -+source_set("libvpx") { -+ deps = [ -+ ":libvpx_shim", -+ ] -+ public_configs = [ ":system_libvpx" ] - } Property changes on: head/devel/electron6/files/patch-third__party_libvpx_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_flac_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_flac_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_flac_BUILD.gn (nonexistent) @@ -1,138 +0,0 @@ ---- third_party/flac/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/flac/BUILD.gn -@@ -1,113 +1,32 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --config("flac_config") { -- defines = [ -- "FLAC__NO_DLL", -- ] -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_flac") { -+ packages = [ "flac" ] - } - --# Need a separate config to ensure the warnings are added to the end. --config("flac_private_config") { -- if (is_clang) { -- cflags = [ -- # libflac converts between FLAC__StreamDecoderState and -- # FLAC__StreamDecoderInitStatus a lot in stream_decoder.c. -- "-Wno-conversion", -- # libflac contains constants that are only used in certain compile-time -- # cases, which triggers unused-const-variable warnings in other cases. -- "-Wno-unused-const-variable", -- ] -- } -+shim_headers("flac_shim") { -+ root_path = "include" -+ headers = [ -+ "FLAC/all.h", -+ "FLAC/assert.h", -+ "FLAC/callback.h", -+ "FLAC/export.h", -+ "FLAC/format.h", -+ "FLAC/metadata.h", -+ "FLAC/ordinals.h", -+ "FLAC/stream_decoder.h", -+ "FLAC/stream_encoder.h", -+ ] - } - - source_set("flac") { -- sources = [ -- "include/FLAC/all.h", -- "include/FLAC/assert.h", -- "include/FLAC/callback.h", -- "include/FLAC/export.h", -- "include/FLAC/format.h", -- "include/FLAC/metadata.h", -- "include/FLAC/ordinals.h", -- "include/FLAC/stream_decoder.h", -- "include/FLAC/stream_encoder.h", -- "include/share/alloc.h", -- "include/share/compat.h", -- "include/share/endswap.h", -- "include/share/private.h", -- "src/libFLAC/alloc.c", -- "src/libFLAC/bitmath.c", -- "src/libFLAC/bitreader.c", -- "src/libFLAC/bitwriter.c", -- "src/libFLAC/cpu.c", -- "src/libFLAC/crc.c", -- "src/libFLAC/fixed.c", -- "src/libFLAC/float.c", -- "src/libFLAC/format.c", -- "src/libFLAC/lpc.c", -- "src/libFLAC/md5.c", -- "src/libFLAC/memory.c", -- "src/libFLAC/stream_decoder.c", -- "src/libFLAC/stream_encoder.c", -- "src/libFLAC/stream_encoder_framing.c", -- "src/libFLAC/window.c", -- "src/libFLAC/include/private/all.h", -- "src/libFLAC/include/private/bitmath.h", -- "src/libFLAC/include/private/bitreader.h", -- "src/libFLAC/include/private/bitwriter.h", -- "src/libFLAC/include/private/cpu.h", -- "src/libFLAC/include/private/crc.h", -- "src/libFLAC/include/private/fixed.h", -- "src/libFLAC/include/private/float.h", -- "src/libFLAC/include/private/format.h", -- "src/libFLAC/include/private/lpc.h", -- "src/libFLAC/include/private/macros.h", -- "src/libFLAC/include/private/md5.h", -- "src/libFLAC/include/private/memory.h", -- "src/libFLAC/include/private/metadata.h", -- "src/libFLAC/include/private/stream_encoder.h", -- "src/libFLAC/include/private/stream_encoder_framing.h", -- "src/libFLAC/include/private/window.h", -- "src/libFLAC/include/protected/all.h", -- "src/libFLAC/include/protected/stream_decoder.h", -- "src/libFLAC/include/protected/stream_encoder.h", -+ deps = [ -+ ":flac_shim", - ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- ":flac_config", -- ":flac_private_config", -- "//build/config/compiler:no_chromium_code", -- ] -- public_configs = [ ":flac_config" ] -- -- include_dirs = [ -- "include", -- "src/libFLAC/include", -- ] -- -- defines = [ -- "FLAC__OVERFLOW_DETECT", -- "VERSION=\"1.3.1\"", -- "HAVE_LROUND", -- ] -- -- if (is_win) { -- sources += [ -- "include/share/win_utf8_io.h", -- "src/share/win_utf8_io/win_utf8_io.c", -- ] -- # win_utf8_io.c defines this itself. -- configs -= [ "//build/config/win:lean_and_mean" ] -- cflags = [ -- "/wd4334", # 32-bit shift converted to 64 bits. -- "/wd4267" # Converting from size_t to unsigned on 64-bit. -- ] -- } else { -- defines += [ -- "HAVE_INTTYPES_H", -- ] -- } -+ public_configs = [ ":system_flac" ] - } Property changes on: head/devel/electron6/files/patch-third__party_flac_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_libjpeg.gni =================================================================== --- head/devel/electron6/files/patch-third__party_libjpeg.gni (revision 528593) +++ head/devel/electron6/files/patch-third__party_libjpeg.gni (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/libjpeg.gni.orig 2019-09-16 10:03:44 UTC -+++ third_party/libjpeg.gni -@@ -4,7 +4,7 @@ - - declare_args() { - # Uses system libjpeg. If true, overrides use_libjpeg_turbo. -- use_system_libjpeg = false -+ use_system_libjpeg = true - - # Uses libjpeg_turbo as the jpeg implementation. Has no effect if - # use_system_libjpeg is set. Property changes on: head/devel/electron6/files/patch-third__party_libjpeg.gni ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_libwebp_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_libwebp_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_libwebp_BUILD.gn (nonexistent) @@ -1,659 +0,0 @@ ---- third_party/libwebp/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/libwebp/BUILD.gn -@@ -1,636 +1,39 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//build/config/arm.gni") --import("//build/config/sanitizers/sanitizers.gni") --import("//testing/libfuzzer/fuzzer_test.gni") -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") - --config("libwebp_config") { -- include_dirs = [ "./src" ] -- defines = [ "WEBP_EXTERN=extern" ] --} -- --config("libwebp_config_internal") { -- include_dirs = [ "." ] -- defines = [ -- "WEBP_NEAR_LOSSLESS=0", -- "WEBP_DISABLE_STATS", -- "WEBP_REDUCE_SIZE", -+pkg_config("system_libwebp") { -+ packages = [ -+ "libwebp", -+ "libwebpdemux", -+ "libwebpmux", - ] -- if (!is_ios) { -- defines += [ "WEBP_REDUCE_CSP" ] -- } - } - --set_opt_level = !is_debug && (is_posix || is_fuchsia) && -- (current_cpu == "arm" || current_cpu == "arm64") -- --# webp's dsp code can be built for all configurations. Skipping it when both --# arm_use_neon and arm_optionally_use_neon are false will result in link errors --# for its dsp init functions. --use_dsp_neon = -- current_cpu == "arm64" || (current_cpu == "arm" && arm_version >= 7) -- --source_set("libwebp_webp") { -- sources = [ -- "src/webp/decode.h", -- "src/webp/demux.h", -- "src/webp/encode.h", -- "src/webp/format_constants.h", -- "src/webp/mux.h", -- "src/webp/mux_types.h", -- "src/webp/types.h", -+shim_headers("libwebp_shim") { -+ root_path = "src" -+ headers = [ -+ "webp/decode.h", -+ "webp/demux.h", -+ "webp/encode.h", -+ "webp/mux.h", -+ "webp/mux_types.h", -+ "webp/types.h", - ] - } - --static_library("libwebp_dec") { -- sources = [ -- "src/dec/alpha_dec.c", -- "src/dec/alphai_dec.h", -- "src/dec/buffer_dec.c", -- "src/dec/common_dec.h", -- "src/dec/frame_dec.c", -- "src/dec/idec_dec.c", -- "src/dec/io_dec.c", -- "src/dec/quant_dec.c", -- "src/dec/tree_dec.c", -- "src/dec/vp8_dec.c", -- "src/dec/vp8_dec.h", -- "src/dec/vp8i_dec.h", -- "src/dec/vp8l_dec.c", -- "src/dec/vp8li_dec.h", -- "src/dec/webp_dec.c", -- "src/dec/webpi_dec.h", -- ] -- -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -+source_set("libwebp_webp") { - deps = [ -- ":libwebp_dsp", -- ":libwebp_utils", -- ":libwebp_webp", -+ ":libwebp_shim", - ] -- all_dependent_configs = [ ":libwebp_config" ] -- if (use_dsp_neon) { -- deps += [ ":libwebp_dsp_neon" ] -- } -+ public_configs = [ ":system_libwebp" ] - } - --static_library("libwebp_demux") { -- sources = [ -- "src/demux/demux.c", -- ] -- all_dependent_configs = [ ":libwebp_config" ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- deps = [ -- ":libwebp_utils", -- ":libwebp_webp", -- ] --} -- --static_library("libwebp_mux") { -- sources = [ -- "src/mux/anim_encode.c", -- "src/mux/animi.h", -- "src/mux/muxedit.c", -- "src/mux/muxi.h", -- "src/mux/muxinternal.c", -- "src/mux/muxread.c", -- ] -- all_dependent_configs = [ ":libwebp_config" ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- deps = [ -- ":libwebp_dec", -- ":libwebp_utils", -- ":libwebp_webp", -- ] --} -- --static_library("libwebp_dsp") { -- sources = [ -- "src/dsp/alpha_processing.c", -- "src/dsp/alpha_processing_mips_dsp_r2.c", -- "src/dsp/cost.c", -- "src/dsp/cost_mips32.c", -- "src/dsp/cost_mips_dsp_r2.c", -- "src/dsp/cpu.c", -- "src/dsp/dec.c", -- "src/dsp/dec_clip_tables.c", -- "src/dsp/dec_mips32.c", -- "src/dsp/dec_mips_dsp_r2.c", -- "src/dsp/dec_msa.c", -- "src/dsp/dsp.h", -- "src/dsp/enc.c", -- "src/dsp/enc_mips32.c", -- "src/dsp/enc_mips_dsp_r2.c", -- "src/dsp/enc_msa.c", -- "src/dsp/filters.c", -- "src/dsp/filters_mips_dsp_r2.c", -- "src/dsp/filters_msa.c", -- "src/dsp/lossless.c", -- "src/dsp/lossless.h", -- "src/dsp/lossless_common.h", -- "src/dsp/lossless_enc.c", -- "src/dsp/lossless_enc_mips32.c", -- "src/dsp/lossless_enc_mips_dsp_r2.c", -- "src/dsp/lossless_enc_msa.c", -- "src/dsp/lossless_mips_dsp_r2.c", -- "src/dsp/lossless_msa.c", -- "src/dsp/mips_macro.h", -- "src/dsp/msa_macro.h", -- "src/dsp/neon.h", -- "src/dsp/quant.h", -- "src/dsp/rescaler.c", -- "src/dsp/rescaler_mips32.c", -- "src/dsp/rescaler_mips_dsp_r2.c", -- "src/dsp/rescaler_msa.c", -- "src/dsp/ssim.c", -- "src/dsp/upsampling.c", -- "src/dsp/upsampling_mips_dsp_r2.c", -- "src/dsp/upsampling_msa.c", -- "src/dsp/yuv.c", -- "src/dsp/yuv.h", -- "src/dsp/yuv_mips32.c", -- "src/dsp/yuv_mips_dsp_r2.c", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- all_dependent_configs = [ ":libwebp_config" ] -- deps = [ -- ":libwebp_dsp_sse2", -- ":libwebp_dsp_sse41", -- ":libwebp_utils", -- ":libwebp_webp", -- ] -- if (is_android) { -- deps += [ "//third_party/android_sdk:cpu_features" ] -- } -- if (current_cpu == "x86" || current_cpu == "x64") { -- defines = [ -- "WEBP_HAVE_SSE2", -- "WEBP_HAVE_SSE41", -- ] -- } --} -- --static_library("libwebp_dsp_sse41") { -- sources = [ -- "src/dsp/alpha_processing_sse41.c", -- "src/dsp/common_sse41.h", -- "src/dsp/dec_sse41.c", -- "src/dsp/enc_sse41.c", -- "src/dsp/lossless_enc_sse41.c", -- "src/dsp/upsampling_sse41.c", -- "src/dsp/yuv_sse41.c", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- all_dependent_configs = [ ":libwebp_config" ] -- if (!is_msan) { -- if ((current_cpu == "x86" || current_cpu == "x64") && -- (!is_win || is_clang)) { -- cflags = [ "-msse4.1" ] -- } -- } --} -- --static_library("libwebp_dsp_sse2") { -- sources = [ -- "src/dsp/alpha_processing_sse2.c", -- "src/dsp/common_sse2.h", -- "src/dsp/cost_sse2.c", -- "src/dsp/dec_sse2.c", -- "src/dsp/enc_sse2.c", -- "src/dsp/filters_sse2.c", -- "src/dsp/lossless_enc_sse2.c", -- "src/dsp/lossless_sse2.c", -- "src/dsp/rescaler_sse2.c", -- "src/dsp/ssim_sse2.c", -- "src/dsp/upsampling_sse2.c", -- "src/dsp/yuv_sse2.c", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- all_dependent_configs = [ ":libwebp_config" ] -- if (!is_msan) { -- if ((current_cpu == "x86" || current_cpu == "x64") && -- (!is_win || is_clang)) { -- cflags = [ "-msse2" ] -- } -- } --} -- --if (use_dsp_neon) { -- static_library("libwebp_dsp_neon") { -- sources = [ -- "src/dsp/alpha_processing_neon.c", -- "src/dsp/cost_neon.c", -- "src/dsp/dec_neon.c", -- "src/dsp/enc_neon.c", -- "src/dsp/filters_neon.c", -- "src/dsp/lossless_enc_neon.c", -- "src/dsp/lossless_neon.c", -- "src/dsp/rescaler_neon.c", -- "src/dsp/upsampling_neon.c", -- "src/dsp/yuv_neon.c", -- ] -- -- configs += [ ":libwebp_config_internal" ] -- -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- if (current_cpu == "arm") { -- # behavior similar to *.c.neon in an Android.mk -- configs -= [ "//build/config/compiler:compiler_arm_fpu" ] -- cflags = [ "-mfpu=neon" ] -- } else if (current_cpu == "arm64" && !is_clang) { -- # avoid an ICE with gcc-4.9: b/15574841 -- cflags = [ "-frename-registers" ] -- } -- } --} # use_dsp_neon -- --static_library("libwebp_enc") { -- sources = [ -- "src/enc/alpha_enc.c", -- "src/enc/analysis_enc.c", -- "src/enc/backward_references_cost_enc.c", -- "src/enc/backward_references_enc.c", -- "src/enc/backward_references_enc.h", -- "src/enc/config_enc.c", -- "src/enc/cost_enc.c", -- "src/enc/cost_enc.h", -- "src/enc/filter_enc.c", -- "src/enc/frame_enc.c", -- "src/enc/histogram_enc.c", -- "src/enc/histogram_enc.h", -- "src/enc/iterator_enc.c", -- "src/enc/near_lossless_enc.c", -- "src/enc/picture_csp_enc.c", -- "src/enc/picture_enc.c", -- "src/enc/picture_psnr_enc.c", -- "src/enc/picture_rescale_enc.c", -- "src/enc/picture_tools_enc.c", -- "src/enc/predictor_enc.c", -- "src/enc/quant_enc.c", -- "src/enc/syntax_enc.c", -- "src/enc/token_enc.c", -- "src/enc/tree_enc.c", -- "src/enc/vp8i_enc.h", -- "src/enc/vp8l_enc.c", -- "src/enc/vp8li_enc.h", -- "src/enc/webp_enc.c", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- all_dependent_configs = [ ":libwebp_config" ] -- -- deps = [ -- ":libwebp_utils", -- ":libwebp_webp", -- ] --} -- --config("libwebp_utils_warnings") { -- if (is_clang) { -- # See https://code.google.com/p/webp/issues/detail?id=253. -- cflags = [ "-Wno-incompatible-pointer-types" ] -- } --} -- --static_library("libwebp_utils") { -- sources = [ -- "src/utils/bit_reader_inl_utils.h", -- "src/utils/bit_reader_utils.c", -- "src/utils/bit_reader_utils.h", -- "src/utils/bit_writer_utils.c", -- "src/utils/bit_writer_utils.h", -- "src/utils/color_cache_utils.c", -- "src/utils/color_cache_utils.h", -- "src/utils/endian_inl_utils.h", -- "src/utils/filters_utils.c", -- "src/utils/filters_utils.h", -- "src/utils/huffman_encode_utils.c", -- "src/utils/huffman_encode_utils.h", -- "src/utils/huffman_utils.c", -- "src/utils/huffman_utils.h", -- "src/utils/quant_levels_dec_utils.c", -- "src/utils/quant_levels_dec_utils.h", -- "src/utils/quant_levels_utils.c", -- "src/utils/quant_levels_utils.h", -- "src/utils/random_utils.c", -- "src/utils/random_utils.h", -- "src/utils/rescaler_utils.c", -- "src/utils/rescaler_utils.h", -- "src/utils/thread_utils.c", -- "src/utils/thread_utils.h", -- "src/utils/utils.c", -- "src/utils/utils.h", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- all_dependent_configs = [ ":libwebp_config" ] -- -- public_configs = [ ":libwebp_utils_warnings" ] -- -- deps = [ -- ":libwebp_webp", -- ] --} -- - group("libwebp") { - deps = [ -- ":libwebp_dec", -- ":libwebp_demux", -- ":libwebp_dsp", -- ":libwebp_enc", -- ":libwebp_mux", -- ":libwebp_utils", -- ] -- public_deps = [ - ":libwebp_webp", - ] -- public_configs = [ ":libwebp_config" ] -- if (use_dsp_neon) { -- deps += [ ":libwebp_dsp_neon" ] -- } --} -- --############################################################################### --# Executables -- --if (current_toolchain == host_toolchain) { -- source_set("example_util") { -- sources = [ -- "examples/example_util.c", -- "examples/example_util.h", -- ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- deps = [ -- ":imageio_util", -- ":libwebp_webp", -- ] -- configs += [ ":libwebp_config" ] -- configs += [ ":libwebp_config_internal" ] -- visibility = [ ":*" ] -- } -- -- source_set("imageio_util") { -- sources = [ -- "imageio/imageio_util.c", -- "imageio/imageio_util.h", -- ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- deps = [ -- ":libwebp_webp", -- ] -- configs += [ ":libwebp_config" ] -- configs += [ ":libwebp_config_internal" ] -- visibility = [ ":*" ] -- } -- -- source_set("imagedec") { -- sources = [ -- "imageio/image_dec.c", -- "imageio/image_dec.h", -- "imageio/jpegdec.c", -- "imageio/jpegdec.h", -- "imageio/metadata.c", -- "imageio/metadata.h", -- "imageio/pngdec.c", -- "imageio/pngdec.h", -- "imageio/pnmdec.c", -- "imageio/pnmdec.h", -- "imageio/tiffdec.c", -- "imageio/tiffdec.h", -- "imageio/webpdec.c", -- "imageio/webpdec.h", -- "imageio/wicdec.c", -- "imageio/wicdec.h", -- ] -- defines = [ "WEBP_HAVE_PNG" ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- deps = [ -- ":imageio_util", -- ":libwebp_webp", -- "//third_party/libpng", -- "//third_party/zlib", -- ] -- configs += [ ":libwebp_config" ] -- visibility = [ ":*" ] -- } -- -- source_set("imageenc") { -- sources = [ -- "imageio/image_enc.c", -- "imageio/image_enc.h", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- deps = [ -- ":imageio_util", -- ":libwebp_webp", -- ] -- configs += [ ":libwebp_config" ] -- visibility = [ ":*" ] -- } -- -- executable("cwebp") { -- sources = [ -- "examples/cwebp.c", -- "examples/stopwatch.h", -- ] -- -- deps = [ -- ":example_util", -- ":imagedec", -- ":imageio_util", -- ":libwebp", -- ":libwebp_webp", -- "//base", -- "//build/win:default_exe_manifest", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- } -- -- executable("dwebp") { -- sources = [ -- "examples/dwebp.c", -- "examples/stopwatch.h", -- ] -- -- deps = [ -- ":example_util", -- ":imagedec", -- ":imageenc", -- ":imageio_util", -- ":libwebp", -- ":libwebp_webp", -- "//base", -- "//build/win:default_exe_manifest", -- ] -- configs += [ ":libwebp_config_internal" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- if (set_opt_level) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- } --} -- --############################################################################## # --# Fuzzers --# TODO(https://bugs.chromium.org/p/webp/issues/detail?id=409): --# Eliminated need for cflags_cc. -- --fuzzer_test("libwebp_simple_api_fuzzer") { -- sources = [ -- "fuzzing/fuzz_simple_api.cc", -- ] -- dict = "fuzzing/fuzz.dict" -- seed_corpus = "fuzzing/fuzz_seed_corpus" -- deps = [ -- ":libwebp", -- ":libwebp_webp", -- ] -- cflags_cc = [ "-Wno-unused-function" ] -- defines = [ "WEBP_MAX_IMAGE_SIZE=838860800" ] -- additional_configs = [ ":libwebp_config_internal" ] --} -- --fuzzer_test("libwebp_advanced_api_fuzzer") { -- sources = [ -- "fuzzing/fuzz_advanced_api.cc", -- ] -- dict = "fuzzing/fuzz.dict" -- seed_corpus = "fuzzing/fuzz_seed_corpus" -- deps = [ -- ":libwebp", -- ":libwebp_webp", -- ] -- cflags_cc = [ "-Wno-unused-function" ] -- defines = [ "WEBP_MAX_IMAGE_SIZE=838860800" ] -- additional_configs = [ ":libwebp_config_internal" ] --} -- --fuzzer_test("libwebp_animation_api_fuzzer") { -- sources = [ -- "fuzzing/fuzz_animation_api.cc", -- "src/demux/anim_decode.c", -- ] -- dict = "fuzzing/fuzz.dict" -- seed_corpus = "fuzzing/fuzz_seed_corpus" -- deps = [ -- ":libwebp", -- ":libwebp_webp", -- ] -- cflags_cc = [ "-Wno-unused-function" ] -- defines = [ "WEBP_MAX_IMAGE_SIZE=838860800" ] -- additional_configs = [ ":libwebp_config_internal" ] --} -- --fuzzer_test("libwebp_demux_api_fuzzer") { -- sources = [ -- "fuzzing/fuzz_demux_api.cc", -- ] -- dict = "fuzzing/fuzz.dict" -- seed_corpus = "fuzzing/fuzz_seed_corpus" -- deps = [ -- ":libwebp", -- ":libwebp_webp", -- ] -- cflags_cc = [ "-Wno-unused-function" ] -- defines = [ "WEBP_MAX_IMAGE_SIZE=838860800" ] -- additional_configs = [ ":libwebp_config_internal" ] --} -- --fuzzer_test("libwebp_enc_dec_api_fuzzer") { -- sources = [ -- "fuzzing/fuzz_webp_enc_dec.cc", -- ] -- dict = "fuzzing/fuzz.dict" -- seed_corpus = "fuzzing/fuzz_seed_corpus" -- deps = [ -- ":libwebp", -- ":libwebp_webp", -- ] -- cflags_cc = [ "-Wno-unused-function" ] -- defines = [ "WEBP_MAX_IMAGE_SIZE=838860800" ] -- additional_configs = [ ":libwebp_config_internal" ] - } Property changes on: head/devel/electron6/files/patch-third__party_libwebp_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_opus_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_opus_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_opus_BUILD.gn (nonexistent) @@ -1,639 +0,0 @@ ---- third_party/opus/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/opus/BUILD.gn -@@ -1,615 +1,45 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2017 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//build/config/arm.gni") --import("//testing/test.gni") -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") - --# If fixed point implementation shall be used (otherwise float). --use_opus_fixed_point = current_cpu == "arm" || current_cpu == "arm64" -- --# If ARM optimizations shall be used to accelerate performance. --# TODO(scottmg): Disabled on Fuchsia for now, see https://crbug.com/775272. --use_opus_arm_optimization = -- current_cpu == "arm" || (current_cpu == "arm64" && is_ios) -- --# NaCl, unlike Chrome, doesn't target SSE2 minimum, so skip optimizations for --# the sake of simplicity. --use_opus_x86_optimization = -- !is_nacl && (current_cpu == "x86" || current_cpu == "x64") -- --# If OPUS Run Time CPU Detections (RTCD) shall be used. --# Based on the conditions in celt/arm/armcpu.c: --# defined(_MSC_VER) || defined(__linux__). --use_opus_arm_rtcd = current_cpu == "arm" && (is_win || is_android || is_linux) -- --config("opus_config") { -- include_dirs = [ "src/include" ] -- -- if (use_opus_fixed_point) { -- defines = [ "OPUS_FIXED_POINT" ] -- } -+pkg_config("opus_config") { -+ packages = [ "opus" ] - } - --config("opus_private_config") { -- defines = [ -- "OPUS_BUILD", -- "OPUS_EXPORT=", -- -- # Prefer alloca() over variable length arrays which are often inefficient; -- # the opus code will automatically handle this correctly per-platform. -- "USE_ALLOCA", -- "HAVE_ALLOCA_H", -+shim_headers("opus_shim") { -+ root_path = "src/include" -+ headers = [ -+ "opus.h", -+ "opus_defines.h", -+ "opus_multistream.h", -+ "opus_types.h", - ] -- -- include_dirs = [ -- "src", -- "src/celt", -- "src/silk", -- ] -- -- cflags = [] -- -- if (is_win) { -- defines += [ "inline=__inline" ] -- -- cflags += [ -- "/wd4305", # Disable truncation warning in celt/pitch.c . -- "/wd4334", # Disable 32-bit shift warning in src/opus_encoder.c . -- ] -- } else { -- defines += [ -- "HAVE_LRINT", -- "HAVE_LRINTF", -- ] -- } -- -- if (is_debug) { -- # Turn off a warning in opus_decoder.c when compiling without optimization. -- defines += [ "OPUS_WILL_BE_SLOW" ] -- } -- -- if (use_opus_x86_optimization) { -- defines += [ -- # Run Time CPU Detections (RTCD) is always enabled for x86. -- "OPUS_HAVE_RTCD", -- "CPU_INFO_BY_ASM", -- -- # Chrome always targets SSE2+. -- "OPUS_X86_MAY_HAVE_SSE", -- "OPUS_X86_MAY_HAVE_SSE2", -- "OPUS_X86_PRESUME_SSE", -- "OPUS_X86_PRESUME_SSE2", -- -- # Some systems may have SSE4.1+ support. -- "OPUS_X86_MAY_HAVE_SSE4_1", -- -- # At present libopus has no AVX functions so no sources are add for this, -- # if you see linker errors on AVX code the this flag is why. -- "OPUS_X86_MAY_HAVE_AVX", -- ] -- } -- -- if (use_opus_fixed_point) { -- defines += [ "FIXED_POINT" ] -- include_dirs += [ "src/silk/fixed" ] -- } else { -- include_dirs += [ "src/silk/float" ] -- } -- -- if (use_opus_arm_optimization) { -- if (current_cpu == "arm") { -- defines += [ -- "OPUS_ARM_ASM", -- "OPUS_ARM_INLINE_ASM", -- "OPUS_ARM_INLINE_EDSP", -- ] -- } -- -- if (use_opus_arm_rtcd) { -- defines += [ -- "OPUS_ARM_MAY_HAVE_EDSP", -- "OPUS_ARM_MAY_HAVE_MEDIA", -- "OPUS_HAVE_RTCD", -- ] -- } -- -- if (arm_use_neon) { -- defines += [ -- "OPUS_ARM_MAY_HAVE_NEON", -- "OPUS_ARM_MAY_HAVE_NEON_INTR", -- ] -- } -- -- if (is_ios && current_cpu == "arm64") { -- # Runtime detection of CPU features not available on iOS. -- defines += [ -- "OPUS_ARM_PRESUME_NEON_INTR", -- "OPUS_ARM_PRESUME_AARCH64_NEON_INTR", -- ] -- } -- } - } - --config("opus_test_config") { -- include_dirs = [ -- "src/celt", -- "src/silk", -+source_set("opus") { -+ deps = [ -+ ":opus_shim", - ] -- -- if (is_win) { -- defines = [ "inline=__inline" ] -- } -- if (is_android) { -- libs = [ "log" ] -- } -- if (is_clang) { -- cflags = [ "-Wno-absolute-value" ] -- } --} -- --if (use_opus_arm_rtcd) { -- action("convert_rtcd_assembler") { -- script = "convert_rtcd_assembler.py" -- outputs = [ -- "$target_gen_dir/celt_pitch_xcorr_arm_gnu.S", -- ] -- args = [ -- rebase_path("//third_party/opus/src/celt/arm/arm2gnu.pl", root_build_dir), -- rebase_path("//third_party/opus/src/celt/arm/celt_pitch_xcorr_arm.s", -- root_build_dir), -- rebase_path("$target_gen_dir/celt_pitch_xcorr_arm_gnu.S", root_build_dir), -- ] -- } --} -- --if (use_opus_x86_optimization) { -- source_set("opus_sse41") { -- sources = [ -- "src/celt/x86/pitch_sse4_1.c", -- "src/silk/x86/NSQ_del_dec_sse.c", -- "src/silk/x86/NSQ_sse.c", -- "src/silk/x86/VAD_sse.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ -- ":opus_private_config", -- ":opus_config", -- ] -- -- if (!is_win || is_clang) { -- cflags = [ "-msse4.1" ] -- } -- } -- # TODO(dalecurtis): If libopus ever adds AVX support, add an opus_avx block. --} -- --# Note: Do not add any defines or include_dirs to this target, those should all --# go in the opus_private_config so they can be shared with intrinsic targets. --static_library("opus") { -- sources = [ -- "src/celt/_kiss_fft_guts.h", -- "src/celt/arch.h", -- "src/celt/bands.c", -- "src/celt/bands.h", -- "src/celt/celt.c", -- "src/celt/celt.h", -- "src/celt/celt_decoder.c", -- "src/celt/celt_encoder.c", -- "src/celt/celt_lpc.c", -- "src/celt/celt_lpc.h", -- "src/celt/cpu_support.h", -- "src/celt/cwrs.c", -- "src/celt/cwrs.h", -- "src/celt/ecintrin.h", -- "src/celt/entcode.c", -- "src/celt/entcode.h", -- "src/celt/entdec.c", -- "src/celt/entdec.h", -- "src/celt/entenc.c", -- "src/celt/entenc.h", -- "src/celt/fixed_debug.h", -- "src/celt/fixed_generic.h", -- "src/celt/float_cast.h", -- "src/celt/kiss_fft.c", -- "src/celt/kiss_fft.h", -- "src/celt/laplace.c", -- "src/celt/laplace.h", -- "src/celt/mathops.c", -- "src/celt/mathops.h", -- "src/celt/mdct.c", -- "src/celt/mdct.h", -- "src/celt/mfrngcod.h", -- "src/celt/modes.c", -- "src/celt/modes.h", -- "src/celt/os_support.h", -- "src/celt/pitch.c", -- "src/celt/pitch.h", -- "src/celt/quant_bands.c", -- "src/celt/quant_bands.h", -- "src/celt/rate.c", -- "src/celt/rate.h", -- "src/celt/stack_alloc.h", -- "src/celt/static_modes_fixed.h", -- "src/celt/static_modes_float.h", -- "src/celt/vq.c", -- "src/celt/vq.h", -- "src/include/opus.h", -- "src/include/opus_custom.h", -- "src/include/opus_defines.h", -- "src/include/opus_multistream.h", -- "src/include/opus_types.h", -- "src/silk/A2NLSF.c", -- "src/silk/API.h", -- "src/silk/CNG.c", -- "src/silk/HP_variable_cutoff.c", -- "src/silk/Inlines.h", -- "src/silk/LPC_analysis_filter.c", -- "src/silk/LPC_fit.c", -- "src/silk/LPC_inv_pred_gain.c", -- "src/silk/LP_variable_cutoff.c", -- "src/silk/MacroCount.h", -- "src/silk/MacroDebug.h", -- "src/silk/NLSF2A.c", -- "src/silk/NLSF_VQ.c", -- "src/silk/NLSF_VQ_weights_laroia.c", -- "src/silk/NLSF_decode.c", -- "src/silk/NLSF_del_dec_quant.c", -- "src/silk/NLSF_encode.c", -- "src/silk/NLSF_stabilize.c", -- "src/silk/NLSF_unpack.c", -- "src/silk/NSQ.c", -- "src/silk/NSQ.h", -- "src/silk/NSQ_del_dec.c", -- "src/silk/PLC.c", -- "src/silk/PLC.h", -- "src/silk/SigProc_FIX.h", -- "src/silk/VAD.c", -- "src/silk/VQ_WMat_EC.c", -- "src/silk/ana_filt_bank_1.c", -- "src/silk/biquad_alt.c", -- "src/silk/bwexpander.c", -- "src/silk/bwexpander_32.c", -- "src/silk/check_control_input.c", -- "src/silk/code_signs.c", -- "src/silk/control.h", -- "src/silk/control_SNR.c", -- "src/silk/control_audio_bandwidth.c", -- "src/silk/control_codec.c", -- "src/silk/debug.c", -- "src/silk/debug.h", -- "src/silk/dec_API.c", -- "src/silk/decode_core.c", -- "src/silk/decode_frame.c", -- "src/silk/decode_indices.c", -- "src/silk/decode_parameters.c", -- "src/silk/decode_pitch.c", -- "src/silk/decode_pulses.c", -- "src/silk/decoder_set_fs.c", -- "src/silk/define.h", -- "src/silk/enc_API.c", -- "src/silk/encode_indices.c", -- "src/silk/encode_pulses.c", -- "src/silk/errors.h", -- "src/silk/gain_quant.c", -- "src/silk/init_decoder.c", -- "src/silk/init_encoder.c", -- "src/silk/inner_prod_aligned.c", -- "src/silk/interpolate.c", -- "src/silk/lin2log.c", -- "src/silk/log2lin.c", -- "src/silk/macros.h", -- "src/silk/main.h", -- "src/silk/pitch_est_defines.h", -- "src/silk/pitch_est_tables.c", -- "src/silk/process_NLSFs.c", -- "src/silk/quant_LTP_gains.c", -- "src/silk/resampler.c", -- "src/silk/resampler_down2.c", -- "src/silk/resampler_down2_3.c", -- "src/silk/resampler_private.h", -- "src/silk/resampler_private_AR2.c", -- "src/silk/resampler_private_IIR_FIR.c", -- "src/silk/resampler_private_down_FIR.c", -- "src/silk/resampler_private_up2_HQ.c", -- "src/silk/resampler_rom.c", -- "src/silk/resampler_rom.h", -- "src/silk/resampler_structs.h", -- "src/silk/shell_coder.c", -- "src/silk/sigm_Q15.c", -- "src/silk/sort.c", -- "src/silk/stereo_LR_to_MS.c", -- "src/silk/stereo_MS_to_LR.c", -- "src/silk/stereo_decode_pred.c", -- "src/silk/stereo_encode_pred.c", -- "src/silk/stereo_find_predictor.c", -- "src/silk/stereo_quant_pred.c", -- "src/silk/structs.h", -- "src/silk/sum_sqr_shift.c", -- "src/silk/table_LSF_cos.c", -- "src/silk/tables.h", -- "src/silk/tables_LTP.c", -- "src/silk/tables_NLSF_CB_NB_MB.c", -- "src/silk/tables_NLSF_CB_WB.c", -- "src/silk/tables_gain.c", -- "src/silk/tables_other.c", -- "src/silk/tables_pitch_lag.c", -- "src/silk/tables_pulses_per_block.c", -- "src/silk/tuning_parameters.h", -- "src/silk/typedef.h", -- "src/src/analysis.c", -- "src/src/analysis.h", -- "src/src/mlp.c", -- "src/src/mlp.h", -- "src/src/mlp_data.c", -- "src/src/opus.c", -- "src/src/opus_decoder.c", -- "src/src/opus_encoder.c", -- "src/src/opus_multistream.c", -- "src/src/opus_multistream_decoder.c", -- "src/src/opus_multistream_encoder.c", -- "src/src/repacketizer.c", -- "src/src/tansig_table.h", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- ":opus_private_config", -- ] - public_configs = [ ":opus_config" ] -- -- if (!is_debug && (current_cpu == "arm" || current_cpu == "arm64")) { -- configs -= [ "//build/config/compiler:default_optimization" ] -- -- # TODO(crbug.com/621335) Rework this so that we don't have the confusion -- # between "optimize_speed" and "optimize_max". -- configs += [ "//build/config/compiler:optimize_speed" ] -- } -- -- deps = [] -- -- if (use_opus_x86_optimization) { -- sources += [ -- "src/celt/x86/celt_lpc_sse.h", -- "src/celt/x86/pitch_sse.c", -- "src/celt/x86/pitch_sse.h", -- "src/celt/x86/pitch_sse2.c", -- "src/celt/x86/vq_sse.h", -- "src/celt/x86/vq_sse2.c", -- "src/celt/x86/x86_celt_map.c", -- "src/celt/x86/x86cpu.c", -- "src/celt/x86/x86cpu.h", -- "src/silk/x86/SigProc_FIX_sse.h", -- "src/silk/x86/main_sse.h", -- "src/silk/x86/x86_silk_map.c", -- ] -- deps += [ ":opus_sse41" ] -- } -- -- if (use_opus_fixed_point) { -- sources += [ -- "src/silk/fixed/LTP_analysis_filter_FIX.c", -- "src/silk/fixed/LTP_scale_ctrl_FIX.c", -- "src/silk/fixed/apply_sine_window_FIX.c", -- "src/silk/fixed/autocorr_FIX.c", -- "src/silk/fixed/burg_modified_FIX.c", -- "src/silk/fixed/corrMatrix_FIX.c", -- "src/silk/fixed/encode_frame_FIX.c", -- "src/silk/fixed/find_LPC_FIX.c", -- "src/silk/fixed/find_LTP_FIX.c", -- "src/silk/fixed/find_pitch_lags_FIX.c", -- "src/silk/fixed/find_pred_coefs_FIX.c", -- "src/silk/fixed/k2a_FIX.c", -- "src/silk/fixed/k2a_Q16_FIX.c", -- "src/silk/fixed/main_FIX.h", -- "src/silk/fixed/noise_shape_analysis_FIX.c", -- "src/silk/fixed/pitch_analysis_core_FIX.c", -- "src/silk/fixed/process_gains_FIX.c", -- "src/silk/fixed/regularize_correlations_FIX.c", -- "src/silk/fixed/residual_energy16_FIX.c", -- "src/silk/fixed/residual_energy_FIX.c", -- "src/silk/fixed/schur64_FIX.c", -- "src/silk/fixed/schur_FIX.c", -- "src/silk/fixed/structs_FIX.h", -- "src/silk/fixed/vector_ops_FIX.c", -- "src/silk/fixed/warped_autocorrelation_FIX.c", -- ] -- } else { -- sources += [ -- "src/silk/float/LPC_analysis_filter_FLP.c", -- "src/silk/float/LPC_inv_pred_gain_FLP.c", -- "src/silk/float/LTP_analysis_filter_FLP.c", -- "src/silk/float/LTP_scale_ctrl_FLP.c", -- "src/silk/float/SigProc_FLP.h", -- "src/silk/float/apply_sine_window_FLP.c", -- "src/silk/float/autocorrelation_FLP.c", -- "src/silk/float/burg_modified_FLP.c", -- "src/silk/float/bwexpander_FLP.c", -- "src/silk/float/corrMatrix_FLP.c", -- "src/silk/float/encode_frame_FLP.c", -- "src/silk/float/energy_FLP.c", -- "src/silk/float/find_LPC_FLP.c", -- "src/silk/float/find_LTP_FLP.c", -- "src/silk/float/find_pitch_lags_FLP.c", -- "src/silk/float/find_pred_coefs_FLP.c", -- "src/silk/float/inner_product_FLP.c", -- "src/silk/float/k2a_FLP.c", -- "src/silk/float/main_FLP.h", -- "src/silk/float/noise_shape_analysis_FLP.c", -- "src/silk/float/pitch_analysis_core_FLP.c", -- "src/silk/float/process_gains_FLP.c", -- "src/silk/float/regularize_correlations_FLP.c", -- "src/silk/float/residual_energy_FLP.c", -- "src/silk/float/scale_copy_vector_FLP.c", -- "src/silk/float/scale_vector_FLP.c", -- "src/silk/float/schur_FLP.c", -- "src/silk/float/sort_FLP.c", -- "src/silk/float/structs_FLP.h", -- "src/silk/float/warped_autocorrelation_FLP.c", -- "src/silk/float/wrappers_FLP.c", -- ] -- } -- -- if (use_opus_arm_optimization) { -- sources += [ -- "src/celt/arm/fixed_arm64.h", -- "src/celt/arm/fixed_armv4.h", -- "src/celt/arm/fixed_armv5e.h", -- "src/celt/arm/kiss_fft_armv4.h", -- "src/celt/arm/kiss_fft_armv5e.h", -- "src/celt/arm/pitch_arm.h", -- "src/silk/arm/SigProc_FIX_armv4.h", -- "src/silk/arm/SigProc_FIX_armv5e.h", -- "src/silk/arm/macros_arm64.h", -- "src/silk/arm/macros_armv4.h", -- "src/silk/arm/macros_armv5e.h", -- ] -- -- if (use_opus_arm_rtcd) { -- sources += [ -- "$target_gen_dir/celt_pitch_xcorr_arm_gnu.S", -- "src/celt/arm/arm_celt_map.c", -- "src/celt/arm/armcpu.c", -- "src/celt/arm/armcpu.h", -- "src/celt/arm/fft_arm.h", -- "src/celt/arm/mdct_arm.h", -- "src/celt/arm/pitch_arm.h", -- "src/silk/arm/arm_silk_map.c", -- ] -- deps += [ ":convert_rtcd_assembler" ] -- } -- -- if (arm_use_neon) { -- sources += [ -- "src/celt/arm/celt_neon_intr.c", -- "src/celt/arm/pitch_neon_intr.c", -- "src/silk/arm/LPC_inv_pred_gain_arm.h", -- "src/silk/arm/LPC_inv_pred_gain_neon_intr.c", -- "src/silk/arm/NSQ_del_dec_arm.h", -- "src/silk/arm/NSQ_del_dec_neon_intr.c", -- "src/silk/arm/NSQ_neon.c", -- "src/silk/arm/NSQ_neon.h", -- "src/silk/arm/biquad_alt_arm.h", -- "src/silk/arm/biquad_alt_neon_intr.c", -- "src/silk/fixed/arm/warped_autocorrelation_FIX_arm.h", -- "src/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c", -- ] -- } -- } - } - --executable("opus_compare") { -- sources = [ -- "src/src/opus_compare.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- ":opus_test_config", -- ] -- -- deps = [ -- ":opus", -- "//build/win:default_exe_manifest", -- ] -+source_set("opus_compare") { - } - --executable("opus_demo") { -- sources = [ -- "src/src/opus_demo.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- ":opus_test_config", -- ] -- -- deps = [ -- ":opus", -- "//build/win:default_exe_manifest", -- ] -+source_set("opus_demo") { - } - --test("test_opus_api") { -- sources = [ -- "src/tests/test_opus_api.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- ":opus_test_config", -- ] -- -- deps = [ -- ":opus", -- ] -+source_set("test_opus_api") { - } - --test("test_opus_encode") { -- sources = [ -- "src/tests/opus_encode_regressions.c", -- "src/tests/test_opus_encode.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- ":opus_test_config", -- ] -- -- deps = [ -- ":opus", -- ] -+source_set("test_opus_decode") { - } - --# GN orders flags on a target before flags from configs. The default config --# adds -Wall, and this flag have to be after -Wall -- so they need to --# come from a config and can't be on the target directly. --config("test_opus_decode_config") { -- # test_opus_decode passes a null pointer to opus_decode() for an argument -- # marked as requiring a non-null value by the nonnull function attribute, -- # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid -- # a compilation error if -Werror is specified. -- if (is_clang) { -- cflags = [ "-Wno-nonnull" ] -- } -+source_set("test_opus_encode") { - } - --test("test_opus_decode") { -- sources = [ -- "src/tests/test_opus_decode.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- ":opus_test_config", -- ":test_opus_decode_config", -- ] -- -- deps = [ -- ":opus", -- ] --} -- --test("test_opus_padding") { -- sources = [ -- "src/tests/test_opus_padding.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- ":opus_test_config", -- ] -- -- deps = [ -- ":opus", -- ] -+source_set("test_opus_padding") { - } Property changes on: head/devel/electron6/files/patch-third__party_opus_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_openh264_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_openh264_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_openh264_BUILD.gn (nonexistent) @@ -1,221 +0,0 @@ ---- third_party/openh264/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/openh264/BUILD.gn -@@ -1,195 +1,42 @@ --# Copyright 2015 The Chromium Authors. All rights reserved. -+# Copyright 2017 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//build/config/sanitizers/sanitizers.gni") --import("//third_party/openh264/openh264_args.gni") --import("//third_party/openh264/openh264_sources.gni") --import("//third_party/yasm/yasm_assemble.gni") -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") - --# Config shared by all openh264 targets. --config("config") { -- cflags = [] -- defines = [] -+pkg_config("config") { -+ packages = [ "openh264" ] -+} - -- if (is_chromeos && target_cpu == "arm") { -- # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS -- # devices. -- defines += [ -- "HAVE_NEON", -- "__chromeos__", -- ] -- } -- -- # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags. -- if (!is_win || is_clang) { -- cflags += [ -- "-Wno-format", -- "-Wno-format-security", -- "-Wno-header-hygiene", -- "-Wno-unused-function", -- "-Wno-unused-value", -- ] -- } -- -- # Platform-specific defines. -- if (is_android) { -- # Android NDK is necessary for its cpufeatures and this define is what -- # OpenH264 code uses to check if it should be used. -- defines += [ "ANDROID_NDK" ] -- } -+shim_headers("openh264_shim") { -+ prefix = "wels/" -+ root_path = "src/codec/api/svc" -+ headers = [ -+ "codec_api.h", -+ "codec_app_def.h", -+ "codec_def.h", -+ "codec_ver.h", -+ ] - } - --# YASM assembly is only checked to be working on Windows and Linux. --# Mac is known to fail certain tests when building, but actual assembly --# is believed to work. --# MSAN builds are flaky with assembler. crbug.com/685168 -- --use_assembler = (is_win || is_linux) && -- (target_cpu == "x86" || target_cpu == "x64") && !is_msan -- --# This IF statement will make the targets visible only on specific builds, --# which will lead to failures on other platforms if accidentally invoked. --if (use_assembler) { -- yasm_defines = [] -- if (!is_component_build) { -- if (is_mac || is_ios) { -- yasm_defines += [ "WELS_PRIVATE_EXTERN=:private_extern" ] -- } else if (is_linux || is_android || is_fuchsia) { -- yasm_defines += [ "WELS_PRIVATE_EXTERN=:hidden" ] -- } -- } -- -- yasm_assemble("openh264_common_yasm") { -- include_dirs = openh264_common_include_dirs -- sources = openh264_common_sources_asm_x86 -- defines = yasm_defines -- if (target_cpu == "x86") { -- defines += [ "X86_32" ] -- } else { # x64 -- if (is_mac) { -- defines += [ -- "PREFIX", -- "UNIX64", -- ] -- } else if (is_win) { -- defines += [ "WIN64" ] -- } else if (is_linux) { -- defines += [ "UNIX64" ] -- } -- } -- } -- -- yasm_assemble("openh264_processing_yasm") { -- include_dirs = openh264_processing_include_dirs -- include_dirs += [ "./src/codec/common/x86" ] -- sources = openh264_processing_sources_asm_x86 -- defines = yasm_defines -- if (target_cpu == "x86") { -- defines += [ "X86_32" ] -- } else { # x64 -- if (is_mac) { -- defines += [ -- "PREFIX", -- "UNIX64", -- ] -- } else if (is_win) { -- defines += [ "WIN64" ] -- } else if (is_linux) { -- defines += [ "UNIX64" ] -- } -- } -- } -- -- yasm_assemble("openh264_encoder_yasm") { -- include_dirs = openh264_encoder_include_dirs -- include_dirs += [ "./src/codec/common/x86" ] -- sources = openh264_encoder_sources_asm_x86 -- defines = yasm_defines -- if (target_cpu == "x86") { -- defines += [ "X86_32" ] -- } else { # x64 -- if (is_mac) { -- defines += [ -- "PREFIX", -- "UNIX64", -- ] -- } else if (is_win) { -- defines += [ "WIN64" ] -- } else if (is_linux) { -- defines += [ "UNIX64" ] -- } -- } -- } --} # if (is_win || is_linux) -- - source_set("common") { -- sources = openh264_common_sources -- if (is_chromeos && target_cpu == "arm") { -- sources += openh264_common_sources_asm_arm -- } -- include_dirs = openh264_common_include_dirs -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":config" ] -- deps = [] -- if (use_assembler) { -- defines = [ "X86_ASM" ] -- deps += [ ":openh264_common_yasm" ] -- } -- if (is_android) { -- deps += [ -- # Defines "android_get/setCpu..." functions. The original OpenH264 build -- # files replaces these using macros for "wels_..." versions of the same -- # functions. We do not have access to these and use the -- # ones instead. -- "//third_party/android_sdk:cpu_features", -- ] -- } -+ deps = [ -+ ":openh264_shim", -+ ] -+ public_configs = [ ":config" ] - } - - source_set("processing") { -- sources = openh264_processing_sources -- if (is_chromeos && target_cpu == "arm") { -- sources += openh264_processing_sources_asm_arm -- } -- include_dirs = openh264_processing_include_dirs -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":config" ] - deps = [ -- ":common", -+ ":openh264_shim", - ] -- if (use_assembler) { -- defines = [ "X86_ASM" ] -- deps += [ ":openh264_processing_yasm" ] -- } -+ public_configs = [ ":config" ] - } - - source_set("encoder") { -- sources = openh264_encoder_sources -- if (is_chromeos && target_cpu == "arm") { -- sources += openh264_encoder_sources_asm_arm -- } -- include_dirs = openh264_encoder_include_dirs -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ ":config" ] -- -- # TODO: Remove after fixing always-true condition -- # third_party/openh264/src/codec/encoder/core/src/encoder_ext.cpp:142. -- if (is_clang) { -- configs -= [ "//build/config/clang:extra_warnings" ] -- } - deps = [ -- ":common", -- ":processing", -+ ":openh264_shim", - ] -- if (use_assembler) { -- defines = [ "X86_ASM" ] -- deps += [ ":openh264_encoder_yasm" ] -- } -+ public_configs = [ ":config" ] - } Property changes on: head/devel/electron6/files/patch-third__party_openh264_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_re2_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_re2_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_re2_BUILD.gn (nonexistent) @@ -1,91 +0,0 @@ ---- third_party/re2/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/re2/BUILD.gn -@@ -1,70 +1,29 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//testing/libfuzzer/fuzzer_test.gni") -+import("//build/config/c++/c++.gni") -+import("//build/shim_headers.gni") - --config("re2_config") { -- include_dirs = [ "src" ] --} -+assert(!use_custom_libcxx, -+ "Usage of the system libre2.so is not supported with " + -+ "use_custom_libcxx=true because the library's interface relies on " + -+ "libstdc++'s std::string and std::vector.") - --static_library("re2") { -- sources = [ -- "src/re2/bitmap256.h", -- "src/re2/bitstate.cc", -- "src/re2/compile.cc", -- "src/re2/dfa.cc", -- "src/re2/filtered_re2.cc", -- "src/re2/filtered_re2.h", -- "src/re2/mimics_pcre.cc", -- "src/re2/nfa.cc", -- "src/re2/onepass.cc", -- "src/re2/parse.cc", -- "src/re2/perl_groups.cc", -- "src/re2/prefilter.cc", -- "src/re2/prefilter.h", -- "src/re2/prefilter_tree.cc", -- "src/re2/prefilter_tree.h", -- "src/re2/prog.cc", -- "src/re2/prog.h", -- "src/re2/re2.cc", -- "src/re2/re2.h", -- "src/re2/regexp.cc", -- "src/re2/regexp.h", -- "src/re2/set.cc", -- "src/re2/set.h", -- "src/re2/simplify.cc", -- "src/re2/stringpiece.cc", -- "src/re2/stringpiece.h", -- "src/re2/tostring.cc", -- "src/re2/unicode_casefold.cc", -- "src/re2/unicode_casefold.h", -- "src/re2/unicode_groups.cc", -- "src/re2/unicode_groups.h", -- "src/re2/walker-inl.h", -- "src/util/flags.h", -- "src/util/logging.h", -- "src/util/mix.h", -- "src/util/mutex.h", -- "src/util/rune.cc", -- "src/util/sparse_array.h", -- "src/util/sparse_set.h", -- "src/util/strutil.cc", -- "src/util/strutil.h", -- "src/util/utf.h", -- "src/util/util.h", -+shim_headers("re2_shim") { -+ root_path = "src" -+ headers = [ -+ "re2/filtered_re2.h", -+ "re2/re2.h", -+ "re2/set.h", -+ "re2/stringpiece.h", -+ "re2/variadic_function.h", - ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- public_configs = [ ":re2_config" ] - } - --fuzzer_test("third_party_re2_fuzzer") { -- sources = [ -- "src/re2/fuzzing/re2_fuzzer.cc", -- ] -+source_set("re2") { - deps = [ -- ":re2", -+ ":re2_shim", - ] -+ libs = [ "re2" ] - } Property changes on: head/devel/electron6/files/patch-third__party_re2_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_libdrm_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_libdrm_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_libdrm_BUILD.gn (nonexistent) @@ -1,98 +0,0 @@ ---- third_party/libdrm/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/libdrm/BUILD.gn -@@ -1,84 +1,22 @@ --# Copyright 2016 The Chromium Authors. All rights reserved. -+# Copyright 2017 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. --assert(is_linux) - --config("libdrm_config") { -- # TODO(thomasanderson): Remove this hack once -- # https://patchwork.kernel.org/patch/10545295/ lands. -- defines = [ "typeof(x)=__typeof__(x)" ] -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") - -- include_dirs = [ -- "src", -- "src/include", -- "src/include/drm", -- ] -- -- # libdrm uses macros defined by which are being moved to -- # . GLIBC headers give a pragma warning in this case. -- # Suppress this warning for now. This may be removed once -- # https://patchwork.kernel.org/patch/9628231/ lands. -- cflags = [ "-Wno-#pragma-messages" ] -- -- # glibc version >= 2.25 explicitly include -- cflags += [ "-DMAJOR_IN_SYSMACROS=1" ] -- -- if (is_clang) { -- cflags += [ -- "-Wno-enum-conversion", -- -- # TODO(crbug.com/932060) fix unused result from asprintf in modetest.c. -- "-Wno-unused-result", -- ] -- } -+pkg_config("system_libdrm") { -+ packages = [ "libdrm" ] - } - --static_library("libdrm") { -- sources = [ -- "src/xf86drm.c", -- "src/xf86drmHash.c", -- "src/xf86drmMode.c", -- "src/xf86drmRandom.c", -- ] -- -- include_dirs = [ -- "src", -- "src/include", -- ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- cflags = [ -- # xf86drm.c uses readdir_r, which has been deprecated as of -- # glibc-2.24. This causes a build error when using the Debian -- # Stretch sysroot. -- "-Wno-deprecated-declarations", -- ] -- -- public_configs = [ ":libdrm_config" ] -+shim_headers("libdrm_shim") { -+ root_path = "src/include" -+ headers = [ "drm.h" ] - } - --executable("modetest") { -- sources = [ -- "src/tests/modetest/buffers.c", -- "src/tests/modetest/buffers.h", -- "src/tests/modetest/cursor.c", -- "src/tests/modetest/cursor.h", -- "src/tests/modetest/modetest.c", -- "src/tests/util/common.h", -- "src/tests/util/format.c", -- "src/tests/util/format.h", -- "src/tests/util/kms.c", -- "src/tests/util/kms.h", -- "src/tests/util/pattern.c", -- "src/tests/util/pattern.h", -- ] -- -- include_dirs = [ -- "src/tests", -- "src/tests/modetest", -- ] -- -+source_set("libdrm") { - deps = [ -- ":libdrm", -+ ":libdrm_shim", - ] -+ public_configs = [ ":system_libdrm" ] - } Property changes on: head/devel/electron6/files/patch-third__party_libdrm_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_snappy_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_snappy_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_snappy_BUILD.gn (nonexistent) @@ -1,77 +0,0 @@ ---- third_party/snappy/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/snappy/BUILD.gn -@@ -1,60 +1,22 @@ --# Copyright (c) 2013 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("//testing/test.gni") -+import("//build/shim_headers.gni") - --config("snappy_config") { -- include_dirs = [ "src" ] -- -- # These OS-specific generated headers were made by running the configure -- # script offline. -- if (is_win) { -- include_dirs += [ "win32" ] -- } else if (is_mac) { -- include_dirs += [ "mac" ] -- } else { -- include_dirs += [ "linux" ] -- } -+shim_headers("snappy_shim") { -+ root_path = "src" -+ headers = [ -+ "snappy-c.h", -+ "snappy-sinksource.h", -+ "snappy-stubs-public.h", -+ "snappy.h", -+ ] - } - --config("snappy_warnings") { -- cflags = [] -- -- if (is_win) { -- cflags += [ "/wd4018" ] # Signed/unsigned mismatch in comparison. -- } --} -- --static_library("snappy") { -- sources = [ -- "src/snappy-internal.h", -- "src/snappy-sinksource.cc", -- "src/snappy-sinksource.h", -- "src/snappy-stubs-internal.cc", -- "src/snappy-stubs-internal.h", -- "src/snappy.cc", -- "src/snappy.h", -+source_set("snappy") { -+ deps = [ -+ ":snappy_shim", - ] -- -- if (is_win) { -- sources += [ "win32/snappy-stubs-public.h" ] -- } else if (is_mac) { -- sources += [ "mac/snappy-stubs-public.h" ] -- } else { -- sources += [ "linux/snappy-stubs-public.h" ] -- } -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- -- # Must be after no_chromium_code for warning flags to be ordered correctly. -- ":snappy_warnings", -- ] -- public_configs = [ ":snappy_config" ] -- -- # Chromium doesn't use automake, but we generated config.h offline for all the -- # platforms that we build for. -- defines = [ "HAVE_CONFIG_H" ] -+ libs = [ "snappy" ] - } Property changes on: head/devel/electron6/files/patch-third__party_snappy_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_libxslt_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_libxslt_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_libxslt_BUILD.gn (nonexistent) @@ -1,111 +0,0 @@ ---- third_party/libxslt/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/libxslt/BUILD.gn -@@ -1,102 +1,13 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --config("libxslt_config") { -- defines = [ "LIBXSLT_STATIC" ] -- include_dirs = [ "src" ] --} -+import("//build/config/linux/pkg_config.gni") - --config("libxslt_warnings") { -- if (is_clang) { -- cflags = [ -- # libxslt stores a char[3] in a `const unsigned char*`. -- "-Wno-pointer-sign", -- -- # xsltDefaultRegion and xsltCalibrateTimestamps are only -- # used with certain preprocessor defines set. -- "-Wno-unused-function", -- ] -- } -+pkg_config("system_libxslt") { -+ packages = [ "libxslt" ] - } - --static_library("libxslt") { -- sources = [ -- "linux/config.h", -- "mac/config.h", -- "src/libxslt/attributes.c", -- "src/libxslt/attributes.h", -- "src/libxslt/attrvt.c", -- "src/libxslt/documents.c", -- "src/libxslt/documents.h", -- "src/libxslt/extensions.c", -- "src/libxslt/extensions.h", -- "src/libxslt/extra.c", -- "src/libxslt/extra.h", -- "src/libxslt/functions.c", -- "src/libxslt/functions.h", -- "src/libxslt/imports.c", -- "src/libxslt/imports.h", -- "src/libxslt/keys.c", -- "src/libxslt/keys.h", -- "src/libxslt/libxslt.h", -- "src/libxslt/namespaces.c", -- "src/libxslt/namespaces.h", -- "src/libxslt/numbers.c", -- "src/libxslt/numbersInternals.h", -- "src/libxslt/pattern.c", -- "src/libxslt/pattern.h", -- "src/libxslt/preproc.c", -- "src/libxslt/preproc.h", -- "src/libxslt/security.c", -- "src/libxslt/security.h", -- "src/libxslt/templates.c", -- "src/libxslt/templates.h", -- "src/libxslt/transform.c", -- "src/libxslt/transform.h", -- "src/libxslt/trio.h", -- "src/libxslt/triodef.h", -- "src/libxslt/variables.c", -- "src/libxslt/variables.h", -- "src/libxslt/win32config.h", -- "src/libxslt/xslt.c", -- "src/libxslt/xslt.h", -- "src/libxslt/xsltInternals.h", -- "src/libxslt/xsltconfig.h", -- "src/libxslt/xsltexports.h", -- "src/libxslt/xsltlocale.c", -- "src/libxslt/xsltlocale.h", -- "src/libxslt/xsltutils.c", -- "src/libxslt/xsltutils.h", -- "win32/config.h", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- -- # Must be after no_chromium_code for warning flags to be ordered correctly. -- ":libxslt_warnings", -- ] -- public_configs = [ ":libxslt_config" ] -- -- cflags = [] -- if (is_linux || is_android || is_fuchsia) { -- include_dirs = [ "linux" ] -- } else if (is_win) { -- include_dirs = [ "win32" ] -- cflags += [ -- "/wd4267", # size_t to int. -- -- # TODO(brucedawson): http://crbug.com/554200 4311 is a VS -- # 2015 64-bit warning for pointer truncation -- "/wd4311", -- ] -- } else if (is_mac) { -- include_dirs = [ "mac" ] -- } -- -- deps = [ -- "//third_party/libxml", -- ] -+source_set("libxslt") { -+ public_configs = [ ":system_libxslt" ] - } Property changes on: head/devel/electron6/files/patch-third__party_libxslt_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_ffmpeg_BUILD.gn =================================================================== --- head/devel/electron6/files/patch-third__party_ffmpeg_BUILD.gn (revision 528593) +++ head/devel/electron6/files/patch-third__party_ffmpeg_BUILD.gn (nonexistent) @@ -1,477 +0,0 @@ ---- third_party/ffmpeg/BUILD.gn.orig 2019-09-16 10:03:44 UTC -+++ third_party/ffmpeg/BUILD.gn -@@ -1,455 +1,37 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. -+# Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import("ffmpeg_generated.gni") --import("ffmpeg_options.gni") -- - import("//build/buildflag_header.gni") --import("//build/config/compiler/compiler.gni") --import("//build/config/sanitizers/sanitizers.gni") -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") - --# Path to platform configuration files. --platform_config_root = -- "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch" -- --has_nasm_deps = -- ffmpeg_asm_sources != [] && -- (current_cpu == "x86" || current_cpu == "x64") && os_config != "linux-noasm" --if (has_nasm_deps) { -- import("//third_party/nasm/nasm_assemble.gni") -- -- # x86inc.asm ignores the PIC flag when compiling for x86 which unfortunately -- # causes text relocations in the object files generated by the assembler. We -- # must disable the warning to allow linking with lld. Unlike gold, ld which -- # will silently allow text relocations, lld support must be explicit. -- # -- # See https://crbug.com/911658#c19 for more information. Tracked upstream at -- # https://trac.ffmpeg.org/ticket/7878 -- config("fix_textrels") { -- ldflags = [ "-Wl,-z,notext" ] -- } -- -- nasm_assemble("ffmpeg_nasm") { -- sources = ffmpeg_asm_sources -- -- # Ensure the architecture defines go in the command line before the -P -- # file below, so don't use defines. -- nasm_flags = [] -- if (current_cpu == "x86") { -- nasm_flags += [ "-DARCH_X86_32" ] -- } else if (current_cpu == "x64") { -- nasm_flags += [ "-DARCH_X86_64" ] -- } -- -- inputs = [ -- # Sets visibility hidden for cglobal functions. Explicitly included -- # to avoid overlooking changes to this file in incremental builds. -- "libavutil/x86/x86inc.asm", -- ] -- -- defines = [ "PIC" ] -- include_dirs = [ -- platform_config_root, -- "libavcodec/x86", -- "libavutil/x86", -- ".", -- ] -- -- nasm_flags += [ -- "-W+error=all", -- "-P" + rebase_path("$platform_config_root/config.asm", root_build_dir), -- ] -- -- if (is_mac) { -- # Necessary to ensure symbols end up with a _ prefix; added by -- # yasm_assemble.gni for Windows, but not Mac. -- defines += [ "PREFIX" ] -- } -- -- # See comments on fix_textrels config. -- if (use_lld && current_cpu == "x86" && !is_win) { -- all_dependent_configs = [ ":fix_textrels" ] -- } -- } --} -- --config("ffmpeg_dependent_config") { -- include_dirs = [ -- platform_config_root, -- ".", -+pkg_config("system_ffmpeg") { -+ packages = [ -+ "libavcodec", -+ "libavformat", -+ "libavutil", - ] - } - --if (is_win) { -- # Stub generator script and signatures of all functions used by Chrome. -- generate_stubs_script = "//tools/generate_stubs/generate_stubs.py" -- -- # Used by ffmpeg_generate_stubs and ffmpeg_generate_def -- sig_files = [ "chromium/ffmpeg.sigs" ] -- -- action("ffmpeg_generate_def") { -- script = generate_stubs_script -- sources = sig_files -- outputs = [ -- "$target_gen_dir/ffmpeg.def", -- ] -- args = [ -- "-i", -- rebase_path(target_out_dir, root_build_dir), -- "-o", -- rebase_path(target_gen_dir, root_build_dir), -- "-t", -- "windows_def", -- "-m", -- "ffmpeg.dll", -- ] + rebase_path(sources, root_build_dir) -- } --} -- --# gn orders flags on a target before flags from configs. The default config --# adds -Wall, and these flags have to be after -Wall -- so they need to come --# from a config and can't be on the target directly. --config("ffmpeg_warnings") { -- if (is_clang) { -- cflags = [ -- "-Wno-absolute-value", -- -- # ffmpeg uses its own deprecated functions. -- "-Wno-deprecated-declarations", -- -- # ffmpeg doesn't care about pointer constness. -- "-Wno-incompatible-pointer-types", -- -- # ffmpeg doesn't follow usual parentheses conventions. -- "-Wno-logical-op-parentheses", -- -- # ffmpeg doesn't care about pointer signedness. -- "-Wno-parentheses", -- -- # ffmpeg doesn't care about pointer signedness. -- "-Wno-pointer-sign", -- -- # ffmpeg doesn't believe in exhaustive switch statements. -- "-Wno-switch", -- -- # matroskadec.c has a "failed:" label that's only used if some -- # CONFIG_ flags we don't set are set. -- "-Wno-unused-label", -- -- # ffmpeg has a lot of unused variables. -- "-Wno-unused-variable", -- -- # This fires on `av_assert0(!"valid element size")` in utils.c -- "-Wno-string-conversion", -- -- # This fires on `pos_min` and `pos_max` in -- # autorename_libavformat_utils.c -- "-Wno-sometimes-uninitialized", -- -- # clock_gettime is marked as 10.12+ in the 10.12 SDK, but ffmpeg does -- # correctly check for that before calling. -- "-Wno-unguarded-availability", -- -- # ffmpeg contains static functions in header files, which lead -- # to unused function warnings. There are a few legit unused -- # functions too. -- "-Wno-unused-function", -- -- # vp3data.h's vp31_inter_dequant stores '128' in an int8_t array. -- "-Wno-constant-conversion", -- -- # utils.c does -- # `return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;` -- # while -Wstring-plus-int wants &FFMPEG_LICENSE[sizeof(LICENSE_PREFIX)-1] -- "-Wno-string-plus-int", -- ] -- if (is_win) { -- # This corresponds to /wd4273 below. -- cflags += [ "-Wno-inconsistent-dllimport" ] -- } -- } --} -- - buildflag_header("ffmpeg_features") { - header = "ffmpeg_features.h" -- flags = [ "USE_SYSTEM_FFMPEG=false" ] -+ flags = [ "USE_SYSTEM_FFMPEG=true" ] - } - --if (is_component_ffmpeg) { -- link_target_type = "source_set" --} else { -- # This must be a static_library in non-component builds to avoid pulling -- # in many large global arrays (and associated code) into chrome.dll. -- link_target_type = "static_library" --} --target(link_target_type, "ffmpeg_internal") { -- sources = ffmpeg_c_sources + ffmpeg_gas_sources + [ -- "$platform_config_root/config.h", -- "$platform_config_root/libavutil/avconfig.h", -- ] -- include_dirs = [ -- platform_config_root, -- ".", -+shim_headers("ffmpeg_shim") { -+ root_path = "." -+ headers = [ -+ "libavcodec/avcodec.h", -+ "libavformat/avformat.h", -+ "libavutil/imgutils.h", - ] -- defines = [ -- "HAVE_AV_CONFIG_H", -- "_POSIX_C_SOURCE=200112", -- "_XOPEN_SOURCE=600", -- "PIC", -- "FFMPEG_CONFIGURATION=NULL", -- ] -+} - -- if (is_component_ffmpeg) { -- configs += [ "//build/config/sanitizers:cfi_icall_disable" ] -- } -- -- # Disable internal ffmpeg logs in the official build; this saves ~158kb. -- if (is_official_build) { -- defines += [ "CHROMIUM_NO_LOGGING" ] -- } -- -- # So we can append below and assume they're defined. -- cflags = [] -- ldflags = [] -- libs = [] -+source_set("ffmpeg") { - deps = [ - ":ffmpeg_features", -- "//third_party/opus", -+ ":ffmpeg_shim", - ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- -- # These must be after no_chromium_code for warning flags to be ordered -- # correctly. -- "//build/config/compiler:no_incompatible_pointer_warnings", -- ":ffmpeg_warnings", -- ] -- -- # Since we are not often debugging FFmpeg, and performance is -- # unacceptable without optimization, freeze the optimizations to -O2. -- # If someone really wants -O1 , they can change these in their checkout. -- # If you want -O0, see the Gotchas in README.Chromium for why that -- # won't work. -- # -- # In addition to the above reasons, /Od optimization won't remove symbols -- # that are under "if (0)" style sections. Which lead to link time errors -- # when for example it tries to link an ARM symbol on X86. -- configs -= [ "//build/config/compiler:default_optimization" ] -- if (is_win) { -- # Setting the optimizations to 'speed' or to 'max' on Windows results in -- # a lot of unresolved symbols. The only supported mode is 'size' (see -- # crbug.com/264459). -- # -- # FFMmpeg require dead code elimination to be available in all build modes -- # and thus doesn't support wpo. -- configs += [ "//build/config/compiler:optimize_no_wpo" ] -- } else { -- configs += [ "//build/config/compiler:optimize_max" ] -- } -- -- if (ffmpeg_use_atomics_fallback) { -- if (is_posix || is_fuchsia) { -- include_dirs += [ "compat/atomics/gcc" ] -- } else if (is_win) { -- include_dirs += [ "compat/atomics/win32" ] -- } -- } -- -- # On x86, sanitizers will fail to compiler the H264 CABAC code due to -- # insufficient registers unless we disable EBP usage. https://crbug.com/786760 -- # -- # Windows builds can't compile without EBP because we can't omit frame -- # pointers like we do on posix. -- if (current_cpu == "x86") { -- if (using_sanitizer || is_win || use_lld) { -- defines += [ "HAVE_EBP_AVAILABLE=0" ] -- } else { -- defines += [ "HAVE_EBP_AVAILABLE=1" ] -- } -- -- # Despite the name, this isn't fixing any bugs with the linker. It's just -- # preventing ffmpeg from silently emitting text relocations. See discussion -- # https://crbug.com/911658#c19 and https://trac.ffmpeg.org/ticket/7878 -- if (use_lld && !is_win) { -- defines += [ "BROKEN_RELOCATIONS=1" ] -- } -- } -- -- if (is_fuchsia || (is_posix && !(is_android && use_call_graph))) { -- # Remove default stack frames config so we can force -fomit-frame-pointer. -- configs -= [ "//build/config/compiler:default_stack_frames" ] -- -- cflags += [ -- "-fPIC", -- "-fomit-frame-pointer", -- -- # ffmpeg uses its own deprecated functions. -- "-Wno-deprecated-declarations", -- ] -- -- if (!is_clang) { -- # gcc doesn't have flags for specific warnings, so disable them -- # all. -- cflags += [ "-w" ] -- } -- -- if (current_cpu == "arm" || current_cpu == "arm64") { -- asmflags = [] -- if (arm_float_abi == "hard") { -- asmflags += [ "-DHAVE_VFP_ARGS=1" ] -- } else { -- asmflags += [ "-DHAVE_VFP_ARGS=0" ] -- } -- } -- } -- -- if (is_fuchsia || (is_posix && !is_mac)) { -- defines += [ -- "_ISOC99_SOURCE", -- "_LARGEFILE_SOURCE", -- ] -- cflags += [ -- "-std=c99", -- "-pthread", -- "-fno-math-errno", -- "-fno-signed-zeros", -- "-fno-tree-vectorize", -- ] -- ldflags = [ -- "-L", -- rebase_path(target_gen_dir, root_build_dir), -- ] -- if (!is_android && !is_fuchsia) { -- # OS=android requires that both -lz and -lm occur after -- # -lc++_shared on the link command line. Android link rules -- # already include -lm, and we get -lz as a transitive dependency -- # of libandroid.so, so simply moving both to the non-Android -- # section solves the problem. -- # -- # The root cause of this problem is certain system libraries -- # (libm starting with MNC and libz before MNC, among others) -- # re-export the libgcc unwinder, and libc++ exports the -- # libc++abi unwinder. As we build against libc++ headers, libc++ -- # must be the first in the runtime symbol lookup order (among -- # all unwinder-providing libraries). -- -- # librt for clock_gettime on precise -- libs += [ -- "m", -- "z", -- "rt", -- ] -- } -- if (is_component_ffmpeg) { -- # Export all symbols when building as component. -- configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] -- configs += [ "//build/config/gcc:symbol_visibility_default" ] -- } -- } -- if (is_mac) { -- if (is_component_ffmpeg) { -- # Export all symbols when building as component. -- configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] -- configs += [ "//build/config/gcc:symbol_visibility_default" ] -- } -- -- defines += [ "_DARWIN_C_SOURCE" ] -- } else if (is_win) { -- defines += [ -- "_ISOC99_SOURCE", -- "_LARGEFILE_SOURCE", -- "HAVE_AV_CONFIG_H", -- ] -- -- if (is_component_ffmpeg) { -- # Required to avoid 4049 and 4217 errors around redundant imports. -- cflags += [ -- "/FIcompat/msvcrt/snprintf.h", -- "/FIcompat/msvcrt/strtod.h", -- ] -- } -- -- # TODO(dalecurtis): We should fix these. http://crbug.com/154421 -- cflags += [ -- "/wd4996", # 'function': was declared deprecated -- "/wd4018", # 'expression': signed/unsigned mismatch -- "/wd4090", # 'operation' : different 'modifier' qualifiers -- "/wd4305", # 'identifier': truncation from 'type1' to 'type2' -- "/wd4133", # 'type' : incompatible types - from 'type1' to 'type2' -- "/wd4146", # unary minus operator applied to unsigned type, result -- # still unsigned -- -- "/wd4554", # 'operator' : check operator precedence for possible -- # error; use parentheses to clarify precedence -- -- "/wd4028", # formal parameter 'number' different from declaration -- "/wd4334", # 'operator' : result of 32-bit shift implicitly -- # converted to 64 bits (was 64-bit shift intended?) -- -- "/wd4101", # 'identifier' : unreferenced local variable -- "/wd4102", # 'label' : unreferenced label -- "/wd4116", # unnamed type definition in parentheses -- "/wd4307", # 'operator' : integral constant overflow -- "/wd4273", # 'function' : inconsistent DLL linkage -- "/wd4005", # 'identifier' : macro redefinition -- "/wd4056", # overflow in floating point constant arithmetic -- "/wd4756", # overflow in constant arithmetic -- ] -- if (current_cpu == "x64") { -- # TODO(wolenetz): We should fix this. http://crbug.com/171009 -- cflags += [ "/wd4267" ] # Conversion from size_t to 'type'. -- } -- } -- -- if (has_nasm_deps) { -- deps += [ ":ffmpeg_nasm" ] -- } --} -- --if (is_component_ffmpeg) { -- shared_library("ffmpeg") { -- if (is_android) { -- configs -= [ "//build/config/android:hide_all_but_jni_onload" ] -- } -- public_configs = [ ":ffmpeg_dependent_config" ] -- deps = [ -- ":ffmpeg_internal", -- ] -- -- # So we can append below and assume they're defined. -- ldflags = [] -- -- if (!is_component_build && is_mac) { -- ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ] -- } -- -- if (is_fuchsia || (is_posix && !is_mac)) { -- # Fixes warnings PIC relocation when building as component. -- ldflags += [ -- "-Wl,-Bsymbolic", -- "-L", -- rebase_path(target_gen_dir, root_build_dir), -- ] -- } else if (is_win) { -- # Windows component build needs the .def file to export ffmpeg symbols. -- deps += [ ":ffmpeg_generate_def" ] -- sources = [ -- "$target_gen_dir/ffmpeg.def", -- ] -- } -- -- if (is_mac && !is_component_build) { -- ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ] -- } -- } --} else { -- source_set("ffmpeg") { -- public_configs = [ ":ffmpeg_dependent_config" ] -- deps = [ -- ":ffmpeg_internal", -- ] -- } -+ public_configs = [ ":system_ffmpeg" ] - } Property changes on: head/devel/electron6/files/patch-third__party_ffmpeg_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/electron6/files/patch-third__party_glslang_src_glslang_Include_PoolAlloc.h =================================================================== --- head/devel/electron6/files/patch-third__party_glslang_src_glslang_Include_PoolAlloc.h (nonexistent) +++ head/devel/electron6/files/patch-third__party_glslang_src_glslang_Include_PoolAlloc.h (revision 528594) @@ -0,0 +1,10 @@ +--- third_party/glslang/src/glslang/Include/PoolAlloc.h.orig 2020-03-15 04:26:41 UTC ++++ third_party/glslang/src/glslang/Include/PoolAlloc.h +@@ -304,7 +304,6 @@ class pool_allocator { (public) + size_type max_size() const { return static_cast(-1) / sizeof(T); } + size_type max_size(int size) const { return static_cast(-1) / size; } + +- void setAllocator(TPoolAllocator* a) { allocator = *a; } + TPoolAllocator& getAllocator() const { return allocator; } + + protected: Property changes on: head/devel/electron6/files/patch-third__party_glslang_src_glslang_Include_PoolAlloc.h ___________________________________________________________________ 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