diff --git a/accessibility/rubygem-atk/Makefile b/accessibility/rubygem-atk/Makefile index 5e7c73f1ff7..f75247fdd8f 100644 --- a/accessibility/rubygem-atk/Makefile +++ b/accessibility/rubygem-atk/Makefile @@ -1,5 +1,5 @@ PORTNAME= atk -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= accessibility rubygems MASTER_SITES= RG diff --git a/accessibility/rubygem-atk/distinfo b/accessibility/rubygem-atk/distinfo index 18e7874d098..3b06bacf1a1 100644 --- a/accessibility/rubygem-atk/distinfo +++ b/accessibility/rubygem-atk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167226 -SHA256 (rubygem/atk-4.1.8.gem) = 32b3d6bf77cd43c8b36a5a682814481f7654fde0a63754e9e46bdb96b2486f64 -SIZE (rubygem/atk-4.1.8.gem) = 15872 +TIMESTAMP = 1692212055 +SHA256 (rubygem/atk-4.1.9.gem) = c4f4e4a62b4adf577a4216b39ff0c0e19e23b5cd88be74ee58981eb00d1b781d +SIZE (rubygem/atk-4.1.9.gem) = 15872 diff --git a/archivers/Makefile b/archivers/Makefile index 22e73d5ae51..aa9aa103217 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -78,6 +78,7 @@ SUBDIR += lua-lzlib SUBDIR += lua-zlib SUBDIR += lxqt-archiver + SUBDIR += lz4json SUBDIR += lzfse SUBDIR += lzip SUBDIR += lziprecover diff --git a/archivers/lz4json/Makefile b/archivers/lz4json/Makefile new file mode 100644 index 00000000000..9792d938eb5 --- /dev/null +++ b/archivers/lz4json/Makefile @@ -0,0 +1,18 @@ +PORTNAME= lz4json +PORTVERSION= 20191229 +CATEGORIES= archivers www + +MAINTAINER= mi@aldan.algebra.com +COMMENT= Unpack Mozilla lz4json files, such as bookmarks and session restore +WWW= https://github.com/andikleen/lz4json + +USES= uidfix + +USE_GITHUB= yes +GH_ACCOUNT= andikleen +GH_TAGNAME= c44c5100 +PLIST_FILES= bin/lz4jsoncat man/man1/lz4jsoncat.1${COMPRESS_EXT} + +MAKEFILE= ${FILESDIR}/BSDmakefile + +.include diff --git a/archivers/lz4json/distinfo b/archivers/lz4json/distinfo new file mode 100644 index 00000000000..cd6261539be --- /dev/null +++ b/archivers/lz4json/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692684009 +SHA256 (andikleen-lz4json-20191229-c44c5100_GH0.tar.gz) = 0aabebdad1963c9f04c2692993e71bf3cadb7007474e617a4435d424e449eca3 +SIZE (andikleen-lz4json-20191229-c44c5100_GH0.tar.gz) = 2036 diff --git a/archivers/lz4json/files/BSDmakefile b/archivers/lz4json/files/BSDmakefile new file mode 100644 index 00000000000..002b0e28546 --- /dev/null +++ b/archivers/lz4json/files/BSDmakefile @@ -0,0 +1,11 @@ +PROG= lz4jsoncat + +BINDIR= ${LOCALBASE}/bin +MANDIR= ${LOCALBASE}/man/man + +WARNS= 3 + +CFLAGS+=-isystem ${PREFIX}/include +LDADD= -L${PREFIX}/lib -llz4 + +.include diff --git a/archivers/lz4json/files/patch-warnings b/archivers/lz4json/files/patch-warnings new file mode 100644 index 00000000000..13c4f68607a --- /dev/null +++ b/archivers/lz4json/files/patch-warnings @@ -0,0 +1,50 @@ +--- lz4jsoncat.c 2019-12-29 00:44:09.000000000 -0500 ++++ lz4jsoncat.c 2023-08-22 01:48:00.646059000 -0400 +@@ -1,3 +1,3 @@ +-/* ++/* + * Dump mozilla style lz4json files. + * +@@ -30,15 +30,19 @@ + #include + #ifndef __APPLE__ ++# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) ++#include ++# else + #include ++# endif + #else + #define htole32(x) x /* assume apple targets are little endian */ + #endif + +-#include "lz4.h" ++#include + + int main(int ac, char **av) + { +- while (*++av) { +- int fd = open(*av, O_RDONLY); ++ while (--ac) { ++ int fd = open(*++av, O_RDONLY); + if (fd < 0) { + perror(*av); +@@ -56,5 +60,5 @@ + + char *map = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); +- if (map == (char *)-1) { ++ if (map == MAP_FAILED) { + perror(*av); + exit(1); +@@ -64,5 +68,5 @@ + exit(1); + } +- size_t outsz = htole32(*(uint32_t *) (map + 8)); ++ ssize_t outsz = htole32(*(uint32_t *) (map + 8)); + char *out = malloc(outsz); + if (!out) { +@@ -88,5 +92,2 @@ + return 0; + } +- +- +- diff --git a/archivers/lz4json/pkg-descr b/archivers/lz4json/pkg-descr new file mode 100644 index 00000000000..501d1483c77 --- /dev/null +++ b/archivers/lz4json/pkg-descr @@ -0,0 +1,6 @@ +A little utility to unpack lz4json files as generated by Firefox's +bookmark backups and session restore. This is a different format +from what the normal lz4 utility expects. + +The input must be regular file(s) (accessible via mmap()). The +output is dumped to stdout. diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile index 78a740a8cf5..d6648501a22 100644 --- a/audio/cantata/Makefile +++ b/audio/cantata/Makefile @@ -94,7 +94,7 @@ VLC_CMAKE_BOOL= ENABLE_LIBVLC .include .if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MMPG123} -LIB_DEPENDS+= libebur128.so:audio/ebur128 +USES+= ebur128 PLIST_SUB+= REPLAYGAIN="" .else PLIST_SUB+= REPLAYGAIN="@comment " diff --git a/audio/geonkick-lv2/Makefile b/audio/geonkick-lv2/Makefile index d92654ccce8..469005a69ec 100644 --- a/audio/geonkick-lv2/Makefile +++ b/audio/geonkick-lv2/Makefile @@ -1,7 +1,6 @@ PORTNAME= geonkick DISTVERSIONPREFIX= v -DISTVERSION= 2.9.1 -PORTREVISION= 1 +DISTVERSION= 2.9.2 CATEGORIES= audio PKGNAMESUFFIX= -lv2 diff --git a/audio/geonkick-lv2/distinfo b/audio/geonkick-lv2/distinfo index 5273f3fd6b6..1161a614e6d 100644 --- a/audio/geonkick-lv2/distinfo +++ b/audio/geonkick-lv2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652586709 -SHA256 (iurie-sw-geonkick-v2.9.1_GH0.tar.gz) = 30ee2a36a26cabb9af8f458bb12d7b0358b4d6abec67ab5f8df696390b5699b4 -SIZE (iurie-sw-geonkick-v2.9.1_GH0.tar.gz) = 57368565 +TIMESTAMP = 1692763146 +SHA256 (iurie-sw-geonkick-v2.9.2_GH0.tar.gz) = 704225047c3b24b724adf49a990688f0e15aff0c21e0c4a938a611a668ece8d1 +SIZE (iurie-sw-geonkick-v2.9.2_GH0.tar.gz) = 57373900 diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile index 9ff7aaba055..8f157fb7de3 100644 --- a/audio/libfishsound/Makefile +++ b/audio/libfishsound/Makefile @@ -29,12 +29,6 @@ DOXYGEN_IMPLIES=DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=incompatible-function-pointer-types -.endif - post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS = / s| doc||' ${WRKSRC}/Makefile.in diff --git a/audio/libfishsound/files/patch-src-libfishsound-flac.c b/audio/libfishsound/files/patch-src-libfishsound-flac.c new file mode 100644 index 00000000000..dfea5e263cf --- /dev/null +++ b/audio/libfishsound/files/patch-src-libfishsound-flac.c @@ -0,0 +1,22 @@ +--- src/libfishsound/flac.c.orig 2010-02-03 13:34:02 UTC ++++ src/libfishsound/flac.c +@@ -106,7 +106,7 @@ fs_flac_command (FishSound * fsound, int command, void + #if FS_DECODE + static FLAC__StreamDecoderReadStatus + fs_flac_read_callback(const FLAC__StreamDecoder *decoder, +- FLAC__byte buffer[], unsigned int *bytes, ++ FLAC__byte buffer[], size_t *bytes, + void *client_data) + { + FishSound* fsound = (FishSound*)client_data; +@@ -346,8 +346,8 @@ dec_err: + #if FS_ENCODE + static FLAC__StreamEncoderWriteStatus + fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder, +- const FLAC__byte buffer[], unsigned bytes, +- unsigned samples, unsigned current_frame, ++ const FLAC__byte buffer[], size_t bytes, ++ uint32_t samples, uint32_t current_frame, + void *client_data) + { + FishSound* fsound = (FishSound*)client_data; diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 01ba6517621..613aa71d7b3 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ libmodplug.so:audio/libmodplug \ libportaudio.so:audio/portaudio \ libSoundTouch.so:audio/soundtouch \ - libebur128.so:audio/ebur128 \ librubberband.so:audio/rubberband \ libsndfile.so:audio/libsndfile \ libogg.so:audio/libogg \ @@ -33,8 +32,8 @@ LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ libkeyfinder.so:audio/libkeyfinder \ libmp3lame.so:audio/lame -USES= cmake compiler:c++11-lang gl iconv ninja qt:5 pkgconfig sqlite \ - ssl xorg +USES= cmake compiler:c++11-lang ebur128 gl iconv ninja qt:5 pkgconfig \ + sqlite ssl xorg USE_XORG= ice sm x11 xext USE_GL= gl glu USE_GITHUB= yes diff --git a/audio/mixxx22/Makefile b/audio/mixxx22/Makefile index 7fbf676c1f2..86b65949877 100644 --- a/audio/mixxx22/Makefile +++ b/audio/mixxx22/Makefile @@ -24,7 +24,6 @@ LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ libmodplug.so:audio/libmodplug \ libportaudio.so:audio/portaudio \ libSoundTouch.so:audio/soundtouch \ - libebur128.so:audio/ebur128 \ librubberband.so:audio/rubberband \ libsndfile.so:audio/libsndfile \ libvamp-sdk.so:audio/vamp-plugin-sdk \ @@ -34,7 +33,7 @@ LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ libprotobuf.so:devel/protobuf \ liblilv-0.so:audio/lilv -USES= compiler:c++11-lang gl iconv qt:5 pkgconfig scons xorg +USES= compiler:c++11-lang ebur128 gl iconv qt:5 pkgconfig scons xorg USE_XORG= x11 USE_GL= gl glu USE_GITHUB= yes diff --git a/audio/py-librosa/Makefile b/audio/py-librosa/Makefile index e3a7021e6f5..2cca2f5cccf 100644 --- a/audio/py-librosa/Makefile +++ b/audio/py-librosa/Makefile @@ -1,6 +1,5 @@ PORTNAME= librosa -DISTVERSION= 0.10.0 -PORTREVISION= 2 +DISTVERSION= 0.10.1 CATEGORIES= audio python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/audio/py-librosa/distinfo b/audio/py-librosa/distinfo index 019730b0773..b98d4e24f19 100644 --- a/audio/py-librosa/distinfo +++ b/audio/py-librosa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676963593 -SHA256 (librosa-0.10.0.tar.gz) = 8e8669e5084002d1a87f6c82b732f370784a368d0e55c2dd7d7aef3fa02fd058 -SIZE (librosa-0.10.0.tar.gz) = 310074 +TIMESTAMP = 1692732094 +SHA256 (librosa-0.10.1.tar.gz) = 832f7d150d6dd08ed2aa08c0567a4be58330635c32ddd2208de9bc91300802c7 +SIZE (librosa-0.10.1.tar.gz) = 311110 diff --git a/audio/rsgain/Makefile b/audio/rsgain/Makefile index 1ecf33140f3..2be6aa71394 100644 --- a/audio/rsgain/Makefile +++ b/audio/rsgain/Makefile @@ -12,13 +12,12 @@ WWW= https://github.com/complexlogic/rsgain LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libebur128.so:audio/ebur128 \ - libtag.so:audio/taglib \ +LIB_DEPENDS= libtag.so:audio/taglib \ libfmt.so:devel/libfmt \ libinih.so:devel/inih \ libavcodec.so:multimedia/ffmpeg -USES= cmake compiler:c++2b-lang pkgconfig tar:xz +USES= cmake compiler:c++2b-lang ebur128 pkgconfig tar:xz CMAKE_ARGS= -DMAXPROGBARWIDTH=80 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} diff --git a/benchmarks/Makefile b/benchmarks/Makefile index 47c290fb7c2..ce7794570a7 100644 --- a/benchmarks/Makefile +++ b/benchmarks/Makefile @@ -10,7 +10,6 @@ SUBDIR += clpeak SUBDIR += cpipe SUBDIR += dbench - SUBDIR += dbs SUBDIR += ddosify SUBDIR += dhrystone SUBDIR += dkftpbench diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile deleted file mode 100644 index d264ae7b687..00000000000 --- a/benchmarks/dbs/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -PORTNAME= dbs -PORTVERSION= 1.1.5 -PORTREVISION= 7 -CATEGORIES= benchmarks -MASTER_SITES= http://www.kusa.ac.jp/~yukio-m/dbs/software1.1.5/ \ - LOCAL/jkoshy - -MAINTAINER= ports@FreeBSD.org -COMMENT= Distributed network benchmarking system -WWW= http://www.kusa.ac.jp/~yukio-m/dbs/ - -LICENSE= BSD3CLAUSE - -DEPRECATED= Broken on all supported releases for more than an year -EXPIRATION_DATE= 2023-08-16 -BROKEN_FreeBSD_12= tcp_debug.h: field has incomplete type 'struct tcpcb' -BROKEN_FreeBSD_13= tcp_debug.h: field has incomplete type 'struct tcpcb' -BROKEN_FreeBSD_14= tcp_debug.h: field has incomplete type 'struct tcpcb' - -RUN_DEPENDS= gnuplot:math/gnuplot - -BUILD_WRKSRC= ${WRKSRC}/obj/${OPSYS} -INSTALL_WRKSRC= ${WRKSRC}/obj/${OPSYS} - -USES= perl5 -USE_PERL5= run -MAKEFILE= makefile - -PLIST_FILES= bin/dbs_view bin/dbsc bin/dbsd -PORTDOCS= * -PORTEXAMPLES= * - -OPTIONS_DEFINE= DOCS EXAMPLES - -pre-build: - cd ${WRKSRC}/src && ${MAKE_CMD} dir - -do-install: -.for bin in dbsc dbsd - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${bin} ${STAGEDIR}${PREFIX}/bin -.endfor -.for bin in dbs_view - ${INSTALL_SCRIPT} ${WRKSRC}/script/${bin} ${STAGEDIR}${PREFIX}/bin -.endfor - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in Copyright dbs.man dbs.man.jis dbs_paper.ps - ${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${STAGEDIR}${DOCSDIR} -.endfor - -do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.for ex in TCP2.cmd TCPvsMPEG.cmd - ${INSTALL_DATA} ${WRKSRC}/sample/${ex} ${STAGEDIR}${EXAMPLESDIR} -.endfor - -.include diff --git a/benchmarks/dbs/distinfo b/benchmarks/dbs/distinfo deleted file mode 100644 index ad98c3798c5..00000000000 --- a/benchmarks/dbs/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (dbs-1.1.5.tar.gz) = 07f21f041258b83d65659b0ce0b61dd62cddef2fad3318be4bc49f934ed618ea -SIZE (dbs-1.1.5.tar.gz) = 363150 diff --git a/benchmarks/dbs/files/patch-src_Makefile b/benchmarks/dbs/files/patch-src_Makefile deleted file mode 100644 index 5a432a755e1..00000000000 --- a/benchmarks/dbs/files/patch-src_Makefile +++ /dev/null @@ -1,33 +0,0 @@ ---- src/Makefile.orig 1998-06-08 00:25:16 UTC -+++ src/Makefile -@@ -27,10 +27,10 @@ - # make install - # - --BIN =/usr/local/etc -+BIN = ${PREFIX}/bin - - #CC =gcc --CFLAGS =-O -+CFLAGS +=-DHAVE_SYS_PARAM_H - - #CFLAGS =-g # debug - #CFLAGS =-g -DDEBUGMODE -@@ -51,7 +51,7 @@ all:: dbsc dbsd - obj:: - (cd ../obj/$(UNAME); make) - --UNAME = `uname|tr -d '/'``uname -r|tr -d '/'` -+UNAME = `uname|tr -d '/'` - dir:: - -@ mkdir ../obj - -@ mkdir ../obj/$(UNAME) -@@ -74,7 +74,7 @@ tags:: - etags *.c *.h - - install:: -- cp -p dbsc dbsd ../script/dbs_view $(BIN) -+ cp -p dbsc dbsd ../../script/dbs_view $(BIN) - - dbsc: dbsc.o scan.o dbs.o - $(CC) $(BSTATIC) dbsc.o scan.o dbs.o -o $@ -lm $(LDFLAGS) diff --git a/benchmarks/dbs/files/patch-src_dbsc.c b/benchmarks/dbs/files/patch-src_dbsc.c deleted file mode 100644 index 910c1a8e9a1..00000000000 --- a/benchmarks/dbs/files/patch-src_dbsc.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/dbsc.c.orig 1998-06-08 00:23:35 UTC -+++ src/dbsc.c -@@ -51,6 +51,10 @@ - - #define DBSC - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+ - #include - #include - #include -@@ -69,7 +73,7 @@ - #include - #include - --#if !defined(bsdi) -+#if (!defined(BSD) || (BSD < 199306)) - #include - #endif - diff --git a/benchmarks/dbs/files/patch-src_dbsd.c b/benchmarks/dbs/files/patch-src_dbsd.c deleted file mode 100644 index 25814090fba..00000000000 --- a/benchmarks/dbs/files/patch-src_dbsd.c +++ /dev/null @@ -1,35 +0,0 @@ ---- src/dbsd.c.orig 1998-06-08 00:23:26 UTC -+++ src/dbsd.c -@@ -51,6 +51,9 @@ - - #define DBSD - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif - #include - #include - #include -@@ -80,7 +83,7 @@ - #include - #endif - --#if !defined(bsdi) -+#if (!defined(BSD) || (BSD < 199306)) - #include - #endif - -@@ -1002,8 +1005,13 @@ struct timeval origin_time; - d[i].snd_max = htonl((int)rt.d[i].td_cb.snd_max); - d[i].snd_cwnd = htonl((int)rt.d[i].td_cb.snd_cwnd); - d[i].snd_ssthresh = htonl((int)rt.d[i].td_cb.snd_ssthresh); -+#if !defined(__FreeBSD_version) || (__FreeBSD_version < 400009) - d[i].t_idle = htonl((int)rt.d[i].td_cb.t_idle); - d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtt); -+#else -+ d[i].t_idle = htonl((int)rt.d[i].td_cb.t_rcvtime); -+ d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtttime); -+#endif - d[i].t_rtseq = htonl((int)rt.d[i].td_cb.t_rtseq); - d[i].t_srtt = htonl((int)rt.d[i].td_cb.t_srtt); - d[i].t_rttvar = htonl((int)rt.d[i].td_cb.t_rttvar); diff --git a/benchmarks/dbs/files/patch-src_record.h b/benchmarks/dbs/files/patch-src_record.h deleted file mode 100644 index e2dfa972dae..00000000000 --- a/benchmarks/dbs/files/patch-src_record.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/record.h.orig 1997-10-13 00:36:38 UTC -+++ src/record.h -@@ -69,7 +69,9 @@ - #include - - #ifndef __linux__ -+#ifndef __FreeBSD__ - #include -+#endif - #include - #include - /*#define TCPSTATES*/ diff --git a/benchmarks/dbs/files/patch-src_scan.c b/benchmarks/dbs/files/patch-src_scan.c deleted file mode 100644 index 2d7356de605..00000000000 --- a/benchmarks/dbs/files/patch-src_scan.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/scan.c.orig 1997-07-11 00:54:12 UTC -+++ src/scan.c -@@ -49,6 +49,9 @@ - * $Author: yukio-m $ - *****************************************************************/ - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif - #include - #include - -@@ -58,7 +61,8 @@ - #include - #endif - --#if !defined(bsdi) -+#if (!defined(BSD) || (BSD < 199306)) -+#error BSD - #include - #endif - diff --git a/benchmarks/dbs/files/patch-src_sendrecv.c b/benchmarks/dbs/files/patch-src_sendrecv.c deleted file mode 100644 index 17886eb6133..00000000000 --- a/benchmarks/dbs/files/patch-src_sendrecv.c +++ /dev/null @@ -1,35 +0,0 @@ ---- src/sendrecv.c.orig 1997-10-13 03:27:19 UTC -+++ src/sendrecv.c -@@ -70,12 +70,12 @@ - #define INIT_RECORD() (rdp = rd->d, rd->n=0) - #define INIT_RECORD2() (rdp2 = rd2->d, rd2->n=0) - --#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), &tzp),\ -+#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), (struct timezone *)&tzp),\ - rdp->packet_no = (NO),\ - rdp->packet_size = (SIZE),\ - rdp++, rd->n++) - --#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), &tzp),\ -+#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), (struct timezone *)&tzp),\ - rdp2->packet_no = (NO),\ - rdp2->packet_size = (SIZE),\ - rdp2++, rd2->n++) -@@ -87,7 +87,7 @@ - _TP1.tv_usec %= 1000000;\ - } - --#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, &tzp);\ -+#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, (struct timezone *)&tzp);\ - tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ - tp.tv_usec = _TPP.tv_usec - tp.tv_usec;\ - if (tp.tv_usec < 0) {\ -@@ -108,7 +108,7 @@ - USLEEP(tp); - - /* before 0.00001s */ --#define WAIT_BEFORE(_TPP) gettimeofday(&tp, &tzp);\ -+#define WAIT_BEFORE(_TPP) gettimeofday(&tp, (struct timezone *) &tzp);\ - tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ - tp.tv_usec = _TPP.tv_usec - tp.tv_usec - 1000;\ - if (tp.tv_usec < 0) {\ diff --git a/benchmarks/dbs/files/patch-src_tcp__trace.c b/benchmarks/dbs/files/patch-src_tcp__trace.c deleted file mode 100644 index 69450082b5e..00000000000 --- a/benchmarks/dbs/files/patch-src_tcp__trace.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tcp_trace.c.orig 1997-05-05 17:02:18 UTC -+++ src/tcp_trace.c -@@ -307,7 +307,7 @@ int act, flg; - #ifdef _PATH_UNIX - system = _PATH_UNIX; - #else -- system = "/vmunix"; -+ system = "/kernel"; - #endif - #endif - diff --git a/benchmarks/dbs/pkg-descr b/benchmarks/dbs/pkg-descr deleted file mode 100644 index a60b22d410b..00000000000 --- a/benchmarks/dbs/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -DBS is a useful tool chest for evaluating TCP implementations, specifically -flow control, retransmission control and congestion avoidance. - --It can treat multiple TCP connections spanning multiple hosts - simultaneously, and --It has the capability of measuring the changes of application - level throughput at every data transmission. diff --git a/biology/mashmap/Makefile b/biology/mashmap/Makefile index b1be9f3f646..3ec36e51e5c 100644 --- a/biology/mashmap/Makefile +++ b/biology/mashmap/Makefile @@ -1,7 +1,6 @@ PORTNAME= mashmap DISTVERSIONPREFIX= v -DISTVERSION= 3.0.6 -PORTREVISION= 1 +DISTVERSION= 3.1.1 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org @@ -13,7 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_i386= compilation fails: fatal error: unknown type name '__uint128_t' -LIB_DEPENDS= libgsl.so:math/gsl +LIB_DEPENDS= libgsl.so:math/gsl \ + libhts.so:biology/htslib USES= cmake compiler:c++17-lang localbase:ldflags diff --git a/biology/mashmap/distinfo b/biology/mashmap/distinfo index 7cbf1e62148..6782e7a7d7b 100644 --- a/biology/mashmap/distinfo +++ b/biology/mashmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689039441 -SHA256 (marbl-MashMap-v3.0.6_GH0.tar.gz) = 53d1b4efad6650d8efbc28325637d1bdacd108eaad70fcc28e927f40ac5c2112 -SIZE (marbl-MashMap-v3.0.6_GH0.tar.gz) = 234093 +TIMESTAMP = 1692721405 +SHA256 (marbl-MashMap-v3.1.1_GH0.tar.gz) = b5794b181f91637940baf0230e8ddc60228bea041dda4588b03d2f8bc908c072 +SIZE (marbl-MashMap-v3.1.1_GH0.tar.gz) = 25919337 diff --git a/biology/star/Makefile b/biology/star/Makefile index 6172318b1e7..968caa76255 100644 --- a/biology/star/Makefile +++ b/biology/star/Makefile @@ -1,5 +1,6 @@ PORTNAME= STAR DISTVERSION= 2.7.11a +PORTREVISION= 1 CATEGORIES= biology PKGNAMEPREFIX= rna- @@ -26,7 +27,7 @@ USE_GITHUB= yes GH_ACCOUNT= alexdobin WRKSRC_SUBDIR= source -MAKE_FLAGS= HTSLIB='' +MAKE_FLAGS= HTSLIB='' CXXFLAGS_SIMD="" PLIST_FILES= bin/STAR @@ -44,12 +45,6 @@ post-patch: ${WRKSRC}/bam_cat.h \ ${WRKSRC}/signalFromBAM.h -.include - -.if ${ARCH} != amd64 -MAKE_FLAGS+= CXXFLAGS_SIMD="" -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/STAR ${STAGEDIR}${PREFIX}/bin diff --git a/biology/star/files/patch-Makefile b/biology/star/files/patch-Makefile index c9943e2e73b..55d592e70c2 100644 --- a/biology/star/files/patch-Makefile +++ b/biology/star/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-11-01 14:50:35 UTC +--- Makefile.orig 2023-08-15 19:21:58 UTC +++ Makefile -@@ -11,6 +11,10 @@ CXXFLAGSextra ?= +@@ -11,14 +11,19 @@ CXXFLAGSextra ?= # user may define the compiler CXX ?= g++ @@ -9,9 +9,11 @@ +HTSLIB ?= htslib + # pre-defined flags - LDFLAGS_shared := -pthread -Lhtslib -Bstatic -lhts -Bdynamic -lz - LDFLAGS_static := -static -static-libgcc -pthread -Lhtslib -lhts -lz -@@ -18,7 +22,8 @@ LDFLAGS_Mac :=-pthread -lz htslib/libhts.a +-LDFLAGS_shared := -pthread -Lhtslib -Bstatic -lhts -Bdynamic -lz +-LDFLAGS_static := -static -static-libgcc -pthread -Lhtslib -lhts -lz ++LDFLAGS_shared := -pthread -lhts -lz ++LDFLAGS_static := -static -pthread -lhts -lz + LDFLAGS_Mac :=-pthread -lz htslib/libhts.a LDFLAGS_Mac_static :=-pthread -lz -static-libgcc htslib/libhts.a LDFLAGS_gdb := $(LDFLAGS_shared) diff --git a/biology/taxonkit/Makefile b/biology/taxonkit/Makefile index 2ec2af23e5c..fb8ce434b61 100644 --- a/biology/taxonkit/Makefile +++ b/biology/taxonkit/Makefile @@ -1,7 +1,6 @@ PORTNAME= taxonkit DISTVERSIONPREFIX= v -DISTVERSION= 0.14.2 -PORTREVISION= 1 +DISTVERSION= 0.15.0 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org diff --git a/biology/taxonkit/distinfo b/biology/taxonkit/distinfo index 88788d0b98a..78ef5b03b29 100644 --- a/biology/taxonkit/distinfo +++ b/biology/taxonkit/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1681528717 -SHA256 (go/biology_taxonkit/taxonkit-v0.14.2/v0.14.2.mod) = 821f2ea553848ba4acd76e01d18c1026ed94979d59314a16d2c1dd958a1fff92 -SIZE (go/biology_taxonkit/taxonkit-v0.14.2/v0.14.2.mod) = 1022 -SHA256 (go/biology_taxonkit/taxonkit-v0.14.2/v0.14.2.zip) = c02cbdd24e7c26b312b26fd63e0c1bf2de27fdab37d0905e8f473170e2031681 -SIZE (go/biology_taxonkit/taxonkit-v0.14.2/v0.14.2.zip) = 1601649 +TIMESTAMP = 1692728989 +SHA256 (go/biology_taxonkit/taxonkit-v0.15.0/v0.15.0.mod) = 821f2ea553848ba4acd76e01d18c1026ed94979d59314a16d2c1dd958a1fff92 +SIZE (go/biology_taxonkit/taxonkit-v0.15.0/v0.15.0.mod) = 1022 +SHA256 (go/biology_taxonkit/taxonkit-v0.15.0/v0.15.0.zip) = 1f40990801714d145b6bde6e91022e1397a4408162fe84581f8b41b0f255d940 +SIZE (go/biology_taxonkit/taxonkit-v0.15.0/v0.15.0.zip) = 1601287 diff --git a/cad/librnd/Makefile b/cad/librnd/Makefile index d9c187f849b..8c8b1f016a5 100644 --- a/cad/librnd/Makefile +++ b/cad/librnd/Makefile @@ -31,7 +31,6 @@ OPTIONS_DEFINE= DOCS GD MOTIF GTK2 GTK2GL GTK4 STROKE WGET OPTIONS_DEFAULT= GD GTK2 GTK2GL STROKE WGET OPTIONS_SUB= yes GTK2GL_DESC= GTK+ 2 GUI with OpenGL support -GTK4_DESC= GTK+ 4 GUI toolkit support WGET_DESC= Wget support GD_LIB_DEPENDS= libgd.so:graphics/gd diff --git a/cad/qucs-s/Makefile b/cad/qucs-s/Makefile index 72368ee5721..974fe67c13e 100644 --- a/cad/qucs-s/Makefile +++ b/cad/qucs-s/Makefile @@ -1,5 +1,5 @@ PORTNAME= qucs-s -DISTVERSION= 1.0.0 +DISTVERSION= 2.0.0 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -9,8 +9,9 @@ WWW= https://ra3xdh.github.io/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake qt:5 -USE_QT= core gui printsupport svg widgets buildtools:build linguisttools:build qmake:build +USES= bison cmake gl localbase qt:6 +USE_QT= base svg tools:build +USE_GL= gl opengl USE_GITHUB= yes GH_ACCOUNT= ra3xdh diff --git a/cad/qucs-s/distinfo b/cad/qucs-s/distinfo index cfc0d020867..9275155338a 100644 --- a/cad/qucs-s/distinfo +++ b/cad/qucs-s/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667283347 -SHA256 (ra3xdh-qucs_s-1.0.0_GH0.tar.gz) = 956ffd66f137ce4b57b2e782f7b6beefbc6afc0784bc2c3a957f6b6f617878bc -SIZE (ra3xdh-qucs_s-1.0.0_GH0.tar.gz) = 3097846 +TIMESTAMP = 1692638639 +SHA256 (ra3xdh-qucs_s-2.0.0_GH0.tar.gz) = 9eec2f1a16bfc2130b71a5777ca6ce75e859c646a55e2b6f410b39c4faaa9eef +SIZE (ra3xdh-qucs_s-2.0.0_GH0.tar.gz) = 3745766 diff --git a/cad/qucs-s/pkg-plist b/cad/qucs-s/pkg-plist index d5e624b7455..46c5753da33 100644 --- a/cad/qucs-s/pkg-plist +++ b/cad/qucs-s/pkg-plist @@ -4,6 +4,10 @@ bin/qucs-sattenuator bin/qucs-sfilter bin/qucs-spowercombining bin/qucs-strans +bin/qucs_mkdigilib +bin/qucs_run_hdl +bin/qucs_run_verilog +bin/vcd2qucsdat share/applications/qucs-s.desktop share/icons/hicolor/128x128/apps/qucs-s.png share/icons/hicolor/16x16/apps/qucs-s.png @@ -30,6 +34,7 @@ share/man/man1/qucs-s.1.gz %%DATADIR%%/examples/external_interface/probe_and_subcircuit/example_sub_subcircuit.sch %%DATADIR%%/examples/external_interface/probe_and_subcircuit/example_subcircuit.sch %%DATADIR%%/examples/ngspice/2N3904_follower.sch +%%DATADIR%%/examples/ngspice/555timer_osc.sch %%DATADIR%%/examples/ngspice/Amp_Two_Tone.sch %%DATADIR%%/examples/ngspice/B-source_Tunnel_Diode.sch %%DATADIR%%/examples/ngspice/B-sources.sch @@ -45,6 +50,7 @@ share/man/man1/qucs-s.1.gz %%DATADIR%%/examples/ngspice/BSIM4/BSIM4_x1_TRAN.sch %%DATADIR%%/examples/ngspice/BSIM4/nmos4p0.mod %%DATADIR%%/examples/ngspice/BSIM4/pmos4p0.mod +%%DATADIR%%/examples/ngspice/CV_curve.sch %%DATADIR%%/examples/ngspice/Comb_Gen.sch %%DATADIR%%/examples/ngspice/Current_Source_Generator.sch %%DATADIR%%/examples/ngspice/DAC_out.sch @@ -61,6 +67,15 @@ share/man/man1/qucs-s.1.gz %%DATADIR%%/examples/ngspice/MESFETs/testDCIdsVgs.sch %%DATADIR%%/examples/ngspice/MESFETs/testDCMESFETCL1.sch %%DATADIR%%/examples/ngspice/Mixer_FFT.sch +%%DATADIR%%/examples/ngspice/NE555_disc_Oscillator.sch +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunn.sch +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunnel.dat +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunnel.sym +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunnel.va +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunnel_ng.png +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunnel_props.json +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunnel_sym.json +%%DATADIR%%/examples/ngspice/OpenVAF/Tunnel_Ngspice_prj/tunnel_symbol.json %%DATADIR%%/examples/ngspice/RCL_resonance.sch %%DATADIR%%/examples/ngspice/RC_filter_FFT.sch %%DATADIR%%/examples/ngspice/RFLumpComp/RFLumpedComponents.lib @@ -96,6 +111,7 @@ share/man/man1/qucs-s.1.gz %%DATADIR%%/examples/ngspice/fet.sch %%DATADIR%%/examples/ngspice/fet_noise.sch %%DATADIR%%/examples/ngspice/fhr01fh.sch +%%DATADIR%%/examples/ngspice/flip_flops_truth_tables.sch %%DATADIR%%/examples/ngspice/gain_phase_AC.sch %%DATADIR%%/examples/ngspice/giacoletto.sch %%DATADIR%%/examples/ngspice/gilbert.sch @@ -281,24 +297,17 @@ share/man/man1/qucs-s.1.gz %%DATADIR%%/lang/qucs_tr.qm %%DATADIR%%/lang/qucs_uk.qm %%DATADIR%%/lang/qucs_zh_CN.qm -%%DATADIR%%/library/AnalogueCM.lib -%%DATADIR%%/library/AnalogueCM/FNXSPICECM.ifs -%%DATADIR%%/library/AnalogueCM/FNXSPICECM.mod -%%DATADIR%%/library/AnalogueCM/RFind.ifs -%%DATADIR%%/library/AnalogueCM/RFind.mod -%%DATADIR%%/library/AnalogueCM/etd.ifs -%%DATADIR%%/library/AnalogueCM/etd.mod +%%DATADIR%%/library/555_timer.lib %%DATADIR%%/library/BF998.lib +%%DATADIR%%/library/BJT_Extended.lib %%DATADIR%%/library/Bridges.lib %%DATADIR%%/library/Cores.lib %%DATADIR%%/library/Crystal.lib %%DATADIR%%/library/Diodes.lib +%%DATADIR%%/library/DiodesSchottky.lib %%DATADIR%%/library/Ideal.lib %%DATADIR%%/library/JFETs.lib %%DATADIR%%/library/LEDs.lib -%%DATADIR%%/library/MESFETs.lib -%%DATADIR%%/library/MESFETs/curtice1.ifs -%%DATADIR%%/library/MESFETs/curtice1.mod %%DATADIR%%/library/MOSFETs.lib %%DATADIR%%/library/NMOSFETs.lib %%DATADIR%%/library/OpAmps.lib diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index fddfdfd7dc9..30716689d6a 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.8.1 -PORTREVISION= 3 +PORTVERSION= 1.9.1 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -16,7 +15,8 @@ LIB_DEPENDS= libproj.so:graphics/proj \ libboost_system.so:devel/boost-libs \ libexpat.so:textproc/expat2 BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ - ${LOCALBASE}/include/protozero/version.hpp:devel/protozero + ${LOCALBASE}/include/protozero/version.hpp:devel/protozero \ + ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json USE_GITHUB= yes GH_ACCOUNT= openstreetmap @@ -32,7 +32,7 @@ CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}" PORTDOCS= AUTHORS CONTRIBUTING.md README.md PORTDATA= * -OPTIONS_DEFINE= DOCS LUAJIT TEST +OPTIONS_DEFINE= DOCS LUAJIT TEST # GEN (utility built with this option is not installed) LUAJIT_DESC= Build with LuaJIT support LUAJIT_CMAKE_BOOL= WITH_LUAJIT @@ -43,10 +43,16 @@ TEST_TEST_TARGET= test TEST_CMAKE_ON= -DCMAKE_CTEST_ARGUMENTS="--label-regex;NoDB;--output-on-failure" TEST_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR} TEST_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR} +#GEN_DESC= Build experimental osm2pgsql-gen data generalization utility +#GEN_LIB_DEPENDS= libpotrace.so:graphics/libpotrace +#GEN_BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg post-patch: @${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \ ${WRKSRC}/CMakeLists.txt +# for post-patch-GEN-off: when GEN option is implemented + @${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|CImg),no&,' \ + ${WRKSRC}/CMakeLists.txt post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index ca55711a8a3..9a00e96b8af 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676291675 -SHA256 (openstreetmap-osm2pgsql-1.8.1_GH0.tar.gz) = 9e3cd9e13893fd7a153c7b42089bd23338867190c91b157cbdb4ff7176ecba62 -SIZE (openstreetmap-osm2pgsql-1.8.1_GH0.tar.gz) = 2545767 +TIMESTAMP = 1692717818 +SHA256 (openstreetmap-osm2pgsql-1.9.1_GH0.tar.gz) = a34b48f8d9f4d61e72e5fd9b3408c92439eea5ab2a6fb907fb9ad22866aa947c +SIZE (openstreetmap-osm2pgsql-1.9.1_GH0.tar.gz) = 2598813 diff --git a/converters/p5-Convert-ASN1/Makefile b/converters/p5-Convert-ASN1/Makefile index 334e4e348eb..9389c35fa70 100644 --- a/converters/p5-Convert-ASN1/Makefile +++ b/converters/p5-Convert-ASN1/Makefile @@ -1,5 +1,5 @@ PORTNAME= Convert-ASN1 -PORTVERSION= 0.33 +PORTVERSION= 0.34 CATEGORIES= converters perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/converters/p5-Convert-ASN1/distinfo b/converters/p5-Convert-ASN1/distinfo index 061f9e6b9c7..6ecffd32c5f 100644 --- a/converters/p5-Convert-ASN1/distinfo +++ b/converters/p5-Convert-ASN1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632664530 -SHA256 (Convert-ASN1-0.33.tar.gz) = 1fdf004520c79e3a244cf9688616293516c11793d746c761f367496eb3d06076 -SIZE (Convert-ASN1-0.33.tar.gz) = 79306 +TIMESTAMP = 1692212097 +SHA256 (Convert-ASN1-0.34.tar.gz) = a628d7c9d390568fb76359975fa03f626ce57f10dc17980e8e3587d7713e4ee7 +SIZE (Convert-ASN1-0.34.tar.gz) = 79762 diff --git a/databases/Makefile b/databases/Makefile index c2fbd027c49..5df6c01c78a 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -672,6 +672,7 @@ SUBDIR += postgresql-rum SUBDIR += postgresql-semver SUBDIR += postgresql-tds_fdw + SUBDIR += postgresql-wal2json SUBDIR += postgresql-zhparser SUBDIR += postgresql11-client SUBDIR += postgresql11-contrib @@ -817,6 +818,7 @@ SUBDIR += py-redis SUBDIR += py-redis2 SUBDIR += py-redis3 + SUBDIR += py-redis4 SUBDIR += py-rrdtool SUBDIR += py-sispy SUBDIR += py-south @@ -1060,7 +1062,6 @@ SUBDIR += usql SUBDIR += vfront SUBDIR += virtualpg - SUBDIR += virtuoso SUBDIR += vsqlite SUBDIR += webdis SUBDIR += wfb2sql diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index b117c934b2f..941560f5890 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= freetds -PORTVERSION= 1.3.123 +PORTVERSION= 1.3.125 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= https://www.freetds.org/files/current/ \ diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo index a77ac3f565c..5b58c9a738a 100644 --- a/databases/freetds-devel/distinfo +++ b/databases/freetds-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692077437 -SHA256 (freetds-dev.1.3.123.tar.bz2) = 4066cc60764f0649fcfbf4698ba27da4594be7ddcf71249f4d477f347fbbc32a -SIZE (freetds-dev.1.3.123.tar.bz2) = 2301893 +TIMESTAMP = 1692667137 +SHA256 (freetds-dev.1.3.125.tar.bz2) = a32e5719fc84f6aca4094d1955572091838e14f6e72629b56aee029e4f650a31 +SIZE (freetds-dev.1.3.125.tar.bz2) = 2302372 diff --git a/databases/galera26/Makefile b/databases/galera26/Makefile index af893c1711f..e7da6edcb54 100644 --- a/databases/galera26/Makefile +++ b/databases/galera26/Makefile @@ -1,5 +1,5 @@ PORTNAME= galera -PORTVERSION= 26.4.15 +PORTVERSION= 26.4.16 DISTVERSIONPREFIX= release_ CATEGORIES= databases PKGNAMESUFFIX= 26 diff --git a/databases/galera26/distinfo b/databases/galera26/distinfo index 70252d19a8b..c5d957f7e80 100644 --- a/databases/galera26/distinfo +++ b/databases/galera26/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1686916171 -SHA256 (codership-galera-release_26.4.15_GH0.tar.gz) = 4f70b26b9158ce15290f984af36825838acd663ef52ea8d09ecf2aa74f40d066 -SIZE (codership-galera-release_26.4.15_GH0.tar.gz) = 3588667 +TIMESTAMP = 1692354123 +SHA256 (codership-galera-release_26.4.16_GH0.tar.gz) = ffa90cdbdbf18838de158db0a5a411aa959cf1074445a8cd267a1679daca354a +SIZE (codership-galera-release_26.4.16_GH0.tar.gz) = 3588854 SHA256 (codership-wsrep-API-694d6ca47f5eec7873be99b7d6babccf633d1231_GH0.tar.gz) = 31a63c1ddab88ba73f7f7c404c7f18e883236f9ed64e94e95d625a831c721089 SIZE (codership-wsrep-API-694d6ca47f5eec7873be99b7d6babccf633d1231_GH0.tar.gz) = 91929 diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile index 6eab74eab2e..58c34c204c6 100644 --- a/databases/mydumper/Makefile +++ b/databases/mydumper/Makefile @@ -1,6 +1,6 @@ PORTNAME= mydumper DISTVERSIONPREFIX= v -DISTVERSION= 0.15.1-2 +DISTVERSION= 0.15.1-3 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org diff --git a/databases/mydumper/distinfo b/databases/mydumper/distinfo index 8a7eba1c6cd..ae9c0489095 100644 --- a/databases/mydumper/distinfo +++ b/databases/mydumper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069922 -SHA256 (mydumper-mydumper-v0.15.1-2_GH0.tar.gz) = c9d6bab6593bfe716e8c4ed30be2bf7d309c1211bd7b8ed27387d373e9932742 -SIZE (mydumper-mydumper-v0.15.1-2_GH0.tar.gz) = 165179 +TIMESTAMP = 1692211635 +SHA256 (mydumper-mydumper-v0.15.1-3_GH0.tar.gz) = a25bcb283b2eab192640da2e55ab7798d92293693bb717fb1490d59bc35887ee +SIZE (mydumper-mydumper-v0.15.1-3_GH0.tar.gz) = 165488 diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 46fe6eb6c1c..4ac29c7b945 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= mysqlwsrep -DISTVERSION?= 5.7.42 +DISTVERSION?= 5.7.43 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.34 +DISTVERSIONSUFFIX?= -25.35 PORTREVISION= 0 CATEGORIES= databases MASTER_SITES+= SF/boost/boost/1.59.0:boost diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo index df8af60e9b0..7c1aa097b4e 100644 --- a/databases/mysqlwsrep57-server/distinfo +++ b/databases/mysqlwsrep57-server/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1686901625 +TIMESTAMP = 1692366012 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.42-25.34_GH0.tar.gz) = 632fe03b1357dabc33c753605913ad9e760dbb4d0cfa5fa3d3b1654387bc4645 -SIZE (codership-mysql-wsrep-wsrep_5.7.42-25.34_GH0.tar.gz) = 56934680 +SHA256 (codership-mysql-wsrep-wsrep_5.7.43-25.35_GH0.tar.gz) = c41869735ecac2ac41c51359fb2984652a4f27d274d9e017f3120c3b37686a22 +SIZE (codership-mysql-wsrep-wsrep_5.7.43-25.35_GH0.tar.gz) = 56937217 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 diff --git a/databases/plpgsql_check/Makefile b/databases/plpgsql_check/Makefile index 54ed78e7621..0b33dcb6878 100644 --- a/databases/plpgsql_check/Makefile +++ b/databases/plpgsql_check/Makefile @@ -1,5 +1,5 @@ PORTNAME= plpgsql_check -PORTVERSION= 2.3.4 +PORTVERSION= 2.4.0 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= postgresql${PGSQL_VER_NODOT}- @@ -13,7 +13,7 @@ LICENSE_NAME= postcardware LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell -USES= compiler:c11 gmake pgsql:11+ +USES= compiler:c11 gmake pgsql:12+ LLD_UNSAFE= yes MAKE_ARGS= CC="${CC}" diff --git a/databases/plpgsql_check/distinfo b/databases/plpgsql_check/distinfo index 9ece1228c47..cfd7e35a373 100644 --- a/databases/plpgsql_check/distinfo +++ b/databases/plpgsql_check/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681052900 -SHA256 (okbob-plpgsql_check-v2.3.4_GH0.tar.gz) = 67de99541f6acdcbf3f4e837f8b4d7069981648526b26e1ca5999ce97dd285bc -SIZE (okbob-plpgsql_check-v2.3.4_GH0.tar.gz) = 275060 +TIMESTAMP = 1692211637 +SHA256 (okbob-plpgsql_check-v2.4.0_GH0.tar.gz) = 9ba58387a279b35a3bfa39ee611e5684e6cddb2ba046ddb2c5190b3bd2ca254a +SIZE (okbob-plpgsql_check-v2.4.0_GH0.tar.gz) = 210906 diff --git a/databases/postgresql-orafce/Makefile b/databases/postgresql-orafce/Makefile index 7c071a3ace1..baf10632d7d 100644 --- a/databases/postgresql-orafce/Makefile +++ b/databases/postgresql-orafce/Makefile @@ -1,6 +1,6 @@ PORTNAME= orafce -DISTVERSION= 4_4_0 DISTVERSIONPREFIX= VERSION_ +DISTVERSION= 4_5_0 CATEGORIES= databases PKGNAMEPREFIX= postgresql- diff --git a/databases/postgresql-orafce/distinfo b/databases/postgresql-orafce/distinfo index f6322b5f4d0..3b70dfbe7f2 100644 --- a/databases/postgresql-orafce/distinfo +++ b/databases/postgresql-orafce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902001 -SHA256 (orafce-orafce-VERSION_4_4_0_GH0.tar.gz) = 8b6e8d1aada8881482b38a7c5bffc9c86d42c9aae51e5bc2fa9f578c3f662a29 -SIZE (orafce-orafce-VERSION_4_4_0_GH0.tar.gz) = 722409 +TIMESTAMP = 1692211639 +SHA256 (orafce-orafce-VERSION_4_5_0_GH0.tar.gz) = e23bc2e65a92a96ac887b1c611031dcbeb91aba11588f455e3bed722ee754bc2 +SIZE (orafce-orafce-VERSION_4_5_0_GH0.tar.gz) = 723606 diff --git a/databases/postgresql-orafce/pkg-plist b/databases/postgresql-orafce/pkg-plist index 60060618b40..5d2ead5c05a 100644 --- a/databases/postgresql-orafce/pkg-plist +++ b/databases/postgresql-orafce/pkg-plist @@ -27,5 +27,6 @@ share/postgresql/extension/orafce--4.0--4.1.sql share/postgresql/extension/orafce--4.1--4.2.sql share/postgresql/extension/orafce--4.2--4.3.sql share/postgresql/extension/orafce--4.3--4.4.sql -share/postgresql/extension/orafce--4.4.sql +share/postgresql/extension/orafce--4.4--4.5.sql +share/postgresql/extension/orafce--4.5.sql share/postgresql/extension/orafce.control diff --git a/databases/postgresql-wal2json/Makefile b/databases/postgresql-wal2json/Makefile new file mode 100644 index 00000000000..1fc6676ee1c --- /dev/null +++ b/databases/postgresql-wal2json/Makefile @@ -0,0 +1,23 @@ +PORTNAME= wal2json +PORTVERSION= 2.5 +CATEGORIES= databases +PKGNAMEPREFIX= postgresql${PGSQL_VER:S/.//}- + +MAINTAINER= daniel@morante.net +COMMENT= JSON output plugin for changeset extraction for PostgreSQL databases +WWW= https://github.com/getsentry/wal2json/ + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= gmake pgsql:11-14 +WANT_PGSQL= server +USE_GITHUB= yes +GH_ACCOUNT= eulerto +GH_TAGNAME= ${PORTNAME}_${PORTVERSION:S/./_/} + +MAKE_ARGS= PG_CONFIG=${LOCALBASE}/bin/pg_config + +PLIST_FILES= lib/postgresql/wal2json.so + +.include diff --git a/databases/postgresql-wal2json/distinfo b/databases/postgresql-wal2json/distinfo new file mode 100644 index 00000000000..27c45dc415d --- /dev/null +++ b/databases/postgresql-wal2json/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692687620 +SHA256 (eulerto-wal2json-2.5-wal2json_2_5_GH0.tar.gz) = b516653575541cf221b99cf3f8be9b6821f6dbcfc125675c85f35090f824f00e +SIZE (eulerto-wal2json-2.5-wal2json_2_5_GH0.tar.gz) = 91040 diff --git a/databases/postgresql-wal2json/pkg-descr b/databases/postgresql-wal2json/pkg-descr new file mode 100644 index 00000000000..dc54712928f --- /dev/null +++ b/databases/postgresql-wal2json/pkg-descr @@ -0,0 +1,5 @@ +wal2json is an output plugin for logical decoding. It means that the plugin have +access to tuples produced by INSERT and UPDATE. Also, UPDATE/DELETE old row +versions can be accessed depending on the configured replica identity. +Changes can be consumed using the streaming protocol (logical replication slots) +or by a special SQL API. diff --git a/databases/postgresql-wal2json/pkg-message b/databases/postgresql-wal2json/pkg-message new file mode 100644 index 00000000000..9d3553ba00e --- /dev/null +++ b/databases/postgresql-wal2json/pkg-message @@ -0,0 +1,17 @@ +[ +{ type: install + message: <=1.5<2:devel/py-jsonpath-ng@${PY_FLAVOR} -LUA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lupa>=1.14<2:lang/py-lupa@${PY_FLAVOR} +LUA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lupa>=1.14<3.0:lang/py-lupa@${PY_FLAVOR} .include diff --git a/databases/py-fakeredis/distinfo b/databases/py-fakeredis/distinfo index 69283ed0008..bf38799e9cb 100644 --- a/databases/py-fakeredis/distinfo +++ b/databases/py-fakeredis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070010 -SHA256 (fakeredis-2.17.0.tar.gz) = e304bc7addb2f862c3550cb7db58548418a0fadd4cd78a4de66464c84fbc2195 -SIZE (fakeredis-2.17.0.tar.gz) = 110121 +TIMESTAMP = 1692211689 +SHA256 (fakeredis-2.18.0.tar.gz) = f9c18d3dba81a470953cc042868b411e334109e065cde53a7a82beef6702a1de +SIZE (fakeredis-2.18.0.tar.gz) = 111601 diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile index c2a76721961..71e4bed2c33 100644 --- a/databases/py-mycli/Makefile +++ b/databases/py-mycli/Makefile @@ -1,5 +1,5 @@ PORTNAME= mycli -PORTVERSION= 1.26.1 +PORTVERSION= 1.27.0 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-mycli/distinfo b/databases/py-mycli/distinfo index adb52af1112..eba8e589265 100644 --- a/databases/py-mycli/distinfo +++ b/databases/py-mycli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662558018 -SHA256 (mycli-1.26.1.tar.gz) = 8c03035c9b4526dbfa0b0859654e2974a0e77592a9e9b27f40f5a8daae83beb1 -SIZE (mycli-1.26.1.tar.gz) = 277434 +TIMESTAMP = 1692211691 +SHA256 (mycli-1.27.0.tar.gz) = a71db5bd9c1a7d0006f4f2ff01548ce75637d3f50ca3a7e77b950b5b46aff7cd +SIZE (mycli-1.27.0.tar.gz) = 290701 diff --git a/databases/py-psycopg-c/Makefile b/databases/py-psycopg-c/Makefile index a933dd7f066..9ed9cff0131 100644 --- a/databases/py-psycopg-c/Makefile +++ b/databases/py-psycopg-c/Makefile @@ -1,18 +1,18 @@ PORTNAME= psycopg-c -PORTVERSION= 3.1.9 +PORTVERSION= 3.1.10 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= PostgreSQL database adapter for Python - C optimization distribution -WWW= https://www.psycopg.org/ \ +WWW= https://www.psycopg.org/psycopg3/ \ https://github.com/psycopg/psycopg/tree/master/psycopg_c LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=49.2.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR} diff --git a/databases/py-psycopg-c/distinfo b/databases/py-psycopg-c/distinfo index 9e7959ad514..9db0dc6cb9b 100644 --- a/databases/py-psycopg-c/distinfo +++ b/databases/py-psycopg-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683227605 -SHA256 (psycopg-c-3.1.9.tar.gz) = d160b45b0ee1eb05d78a81538c2bc6868bacb5f421b7190ed65d4681e4552455 -SIZE (psycopg-c-3.1.9.tar.gz) = 538790 +TIMESTAMP = 1692211695 +SHA256 (psycopg-c-3.1.10.tar.gz) = 0c923cfac7a8a3796c915c253f51b7c667358492924cbccecc18df9e79b103e9 +SIZE (psycopg-c-3.1.10.tar.gz) = 545504 diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile index ec016d4263d..5802cbf4a98 100644 --- a/databases/py-psycopg/Makefile +++ b/databases/py-psycopg/Makefile @@ -1,18 +1,18 @@ PORTNAME= psycopg -PORTVERSION= 3.1.9 +PORTVERSION= 3.1.10 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= PostgreSQL database adapter for Python -WWW= https://www.psycopg.org/ \ +WWW= https://www.psycopg.org/psycopg3/ \ https://github.com/psycopg/psycopg LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=49.2.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR} USES= pgsql python diff --git a/databases/py-psycopg/distinfo b/databases/py-psycopg/distinfo index f665ce21364..8c5c50ca336 100644 --- a/databases/py-psycopg/distinfo +++ b/databases/py-psycopg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683227603 -SHA256 (psycopg-3.1.9.tar.gz) = ab400f207a8c120bafdd8077916d8f6c0106e809401378708485b016508c30c9 -SIZE (psycopg-3.1.9.tar.gz) = 138729 +TIMESTAMP = 1692211693 +SHA256 (psycopg-3.1.10.tar.gz) = 15b25741494344c24066dc2479b0f383dd1b82fa5e75612fa4fa5bb30726e9b6 +SIZE (psycopg-3.1.10.tar.gz) = 139935 diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index dc513274ada..3d180a41de4 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -1,12 +1,12 @@ PORTNAME= psycopg2 -PORTVERSION= 2.9.6 +PORTVERSION= 2.9.7 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= High performance Python adapter for PostgreSQL -WWW= http://initd.org/psycopg/ \ +WWW= https://www.psycopg.org/ \ https://github.com/psycopg/psycopg2 LICENSE= LGPL3 diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo index d9e451cc0d3..b800575a2f7 100644 --- a/databases/py-psycopg2/distinfo +++ b/databases/py-psycopg2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680726100 -SHA256 (psycopg2-2.9.6.tar.gz) = f15158418fd826831b28585e2ab48ed8df2d0d98f502a2b4fe619e7d5ca29011 -SIZE (psycopg2-2.9.6.tar.gz) = 383979 +TIMESTAMP = 1692211697 +SHA256 (psycopg2-2.9.7.tar.gz) = f00cc35bd7119f1fed17b85bd1007855194dde2cbd8de01ab8ebb17487440ad8 +SIZE (psycopg2-2.9.7.tar.gz) = 383496 diff --git a/databases/py-redis4/Makefile b/databases/py-redis4/Makefile new file mode 100644 index 00000000000..779dc4d23f9 --- /dev/null +++ b/databases/py-redis4/Makefile @@ -0,0 +1,38 @@ +PORTNAME= redis +PORTVERSION= 4.6.0 +CATEGORIES= databases python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 4 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Python client for Redis key-value store +WWW= https://github.com/redis/redis-py + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ + redis-server:databases/redis + +USES= python +USE_PYTHON= autoplist concurrent distutils pytest + +NO_ARCH= yes + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}redis[0-9] + +PORTSCOUT= limit:^4\. + +OPTIONS_DEFINE= HIREDIS +HIREDIS_DESC= High performance response parser + +HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>=1.0.0:databases/py-hiredis@${PY_FLAVOR} + +.include + +.if ${PYTHON_REL} <= 31102 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}async_timeout>=4.0.2:devel/py-async_timeout@${PY_FLAVOR} +.endif + +.include diff --git a/databases/py-redis4/distinfo b/databases/py-redis4/distinfo new file mode 100644 index 00000000000..a6fb3703b05 --- /dev/null +++ b/databases/py-redis4/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1688166154 +SHA256 (redis-4.6.0.tar.gz) = 585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d +SIZE (redis-4.6.0.tar.gz) = 4561721 diff --git a/databases/py-redis4/pkg-descr b/databases/py-redis4/pkg-descr new file mode 100644 index 00000000000..2058c4d187a --- /dev/null +++ b/databases/py-redis4/pkg-descr @@ -0,0 +1 @@ +This is the Python interface to the Redis key-value store. diff --git a/databases/py-sqlalchemy20/Makefile b/databases/py-sqlalchemy20/Makefile index 71f8cc6c8c3..9c5579e0dda 100644 --- a/databases/py-sqlalchemy20/Makefile +++ b/databases/py-sqlalchemy20/Makefile @@ -1,5 +1,5 @@ PORTNAME= sqlalchemy -PORTVERSION= 2.0.19 +PORTVERSION= 2.0.20 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-sqlalchemy20/distinfo b/databases/py-sqlalchemy20/distinfo index dd7c6855516..a1e8ad571d7 100644 --- a/databases/py-sqlalchemy20/distinfo +++ b/databases/py-sqlalchemy20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070014 -SHA256 (SQLAlchemy-2.0.19.tar.gz) = 77a14fa20264af73ddcdb1e2b9c5a829b8cc6b8304d0f093271980e36c200a3f -SIZE (SQLAlchemy-2.0.19.tar.gz) = 9425046 +TIMESTAMP = 1692211701 +SHA256 (SQLAlchemy-2.0.20.tar.gz) = ca8a5ff2aa7f3ade6c498aaafce25b1eaeabe4e42b73e25519183e4566a16fc6 +SIZE (SQLAlchemy-2.0.20.tar.gz) = 9437690 diff --git a/databases/py-sqlalchemy20/pkg-plist b/databases/py-sqlalchemy20/pkg-plist index 51f33c535ee..84223534009 100644 --- a/databases/py-sqlalchemy20/pkg-plist +++ b/databases/py-sqlalchemy20/pkg-plist @@ -117,7 +117,10 @@ %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6589.rst %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/7115.rst %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/README.txt +%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_14/10213.rst +%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_14/10223.rst %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_14/README.txt +%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_14/aiomysql.rst %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_20/README.txt %%PORTDOCS%%%%DOCSDIR%%/build/changelog/whatsnew_20.rst %%PORTDOCS%%%%DOCSDIR%%/build/conf.py diff --git a/databases/py-sqlglot/Makefile b/databases/py-sqlglot/Makefile index bb7abc07a4c..8d11e1260c3 100644 --- a/databases/py-sqlglot/Makefile +++ b/databases/py-sqlglot/Makefile @@ -1,5 +1,5 @@ PORTNAME= sqlglot -PORTVERSION= 17.7.0 +PORTVERSION= 17.14.2 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-sqlglot/distinfo b/databases/py-sqlglot/distinfo index e3e49dc6477..e778f8ea562 100644 --- a/databases/py-sqlglot/distinfo +++ b/databases/py-sqlglot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070016 -SHA256 (sqlglot-17.7.0.tar.gz) = ce401ea84c49ab4dc0bd5bb7f77ffe226ddbe7a2da92efb6811c2b277c092540 -SIZE (sqlglot-17.7.0.tar.gz) = 8342573 +TIMESTAMP = 1692211703 +SHA256 (sqlglot-17.14.2.tar.gz) = 85f4eb2f193a5fd182621b54e0eb0d38acf5d12dcd8453a0243a65db03f68663 +SIZE (sqlglot-17.14.2.tar.gz) = 8498185 diff --git a/databases/py-tiledb/Makefile b/databases/py-tiledb/Makefile index 7edb9fca2ad..8b23badf009 100644 --- a/databases/py-tiledb/Makefile +++ b/databases/py-tiledb/Makefile @@ -1,5 +1,5 @@ PORTNAME= tiledb -PORTVERSION= 0.22.1 +PORTVERSION= 0.22.3 CATEGORIES= databases python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython>=0<3.0:lang/cython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.5.4:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ - tiledb>=2.16.1:databases/tiledb + tiledb>=2.16.3:databases/tiledb LIB_DEPENDS= libtiledb.so:databases/tiledb RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.23.2,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} diff --git a/databases/py-tiledb/distinfo b/databases/py-tiledb/distinfo index 8eb2b93b343..df6041aa5c6 100644 --- a/databases/py-tiledb/distinfo +++ b/databases/py-tiledb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069958 -SHA256 (tiledb-0.22.1.tar.gz) = 48d27a1be4fd6611cb282524eb4175acd8cb98a4f8b565eb596a7cf580fe8f95 -SIZE (tiledb-0.22.1.tar.gz) = 309316 +TIMESTAMP = 1692211659 +SHA256 (tiledb-0.22.3.tar.gz) = e916b5712394eb078464726578f4ff105322856a83a313f85593eb29045a8ebd +SIZE (tiledb-0.22.3.tar.gz) = 310388 diff --git a/databases/rubygem-activemodel70/Makefile b/databases/rubygem-activemodel70/Makefile index e318fcbe260..71d47acb8a2 100644 --- a/databases/rubygem-activemodel70/Makefile +++ b/databases/rubygem-activemodel70/Makefile @@ -1,5 +1,5 @@ PORTNAME= activemodel -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/databases/rubygem-activemodel70/distinfo b/databases/rubygem-activemodel70/distinfo index 5d31f5260e6..e4b756feac3 100644 --- a/databases/rubygem-activemodel70/distinfo +++ b/databases/rubygem-activemodel70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167200 -SHA256 (rubygem/activemodel-7.0.6.gem) = 5231fe572d7599237b6b2a4987ebf439d028754a529227630777dd3d1ad8511c -SIZE (rubygem/activemodel-7.0.6.gem) = 61440 +TIMESTAMP = 1692212029 +SHA256 (rubygem/activemodel-7.0.7.gem) = 0e120a270f63d64bdacd91fe244ff7ee2ade147f9b0beab9802ef5ee095f57e7 +SIZE (rubygem/activemodel-7.0.7.gem) = 61952 diff --git a/databases/rubygem-activerecord70/Makefile b/databases/rubygem-activerecord70/Makefile index b07cbbbac54..d1233ec142f 100644 --- a/databases/rubygem-activerecord70/Makefile +++ b/databases/rubygem-activerecord70/Makefile @@ -1,5 +1,5 @@ PORTNAME= activerecord -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/databases/rubygem-activerecord70/distinfo b/databases/rubygem-activerecord70/distinfo index fc6dc0eb363..c61e811b56a 100644 --- a/databases/rubygem-activerecord70/distinfo +++ b/databases/rubygem-activerecord70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167202 -SHA256 (rubygem/activerecord-7.0.6.gem) = 38ff1e7bbf57132fe78abf3809e8fe9392b54d00df31ce8972f47bb806b119d0 -SIZE (rubygem/activerecord-7.0.6.gem) = 479232 +TIMESTAMP = 1692212031 +SHA256 (rubygem/activerecord-7.0.7.gem) = 9e8923a8f3d8d78d6410ebadf32517d12825a6ce20971e9608f5d1ce0b09eff9 +SIZE (rubygem/activerecord-7.0.7.gem) = 479744 diff --git a/databases/rubygem-redis-client/Makefile b/databases/rubygem-redis-client/Makefile index 4c50afb71d8..3b33342baed 100644 --- a/databases/rubygem-redis-client/Makefile +++ b/databases/rubygem-redis-client/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis-client -PORTVERSION= 0.15.0 +PORTVERSION= 0.16.0 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-redis-client/distinfo b/databases/rubygem-redis-client/distinfo index 1e4fcf1f8be..fabec9bdee3 100644 --- a/databases/rubygem-redis-client/distinfo +++ b/databases/rubygem-redis-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070200 -SHA256 (rubygem/redis-client-0.15.0.gem) = 14aa758840747526b5b42f74ffdbc3425abf1757d94c3c88cab4bc4097137a39 -SIZE (rubygem/redis-client-0.15.0.gem) = 27136 +TIMESTAMP = 1692640066 +SHA256 (rubygem/redis-client-0.16.0.gem) = c7ea672af4ce3af258771ff0ee602c3e28213a18ef70de8d4c09d99dd5a0c407 +SIZE (rubygem/redis-client-0.16.0.gem) = 27136 diff --git a/databases/rubygem-redis-cluster-client/Makefile b/databases/rubygem-redis-cluster-client/Makefile index b873a83e61b..15462e0f8f4 100644 --- a/databases/rubygem-redis-cluster-client/Makefile +++ b/databases/rubygem-redis-cluster-client/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis-cluster-client -PORTVERSION= 0.4.3 +PORTVERSION= 0.4.14 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-redis-cluster-client/distinfo b/databases/rubygem-redis-cluster-client/distinfo index f7440812d1a..95f36358821 100644 --- a/databases/rubygem-redis-cluster-client/distinfo +++ b/databases/rubygem-redis-cluster-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679498866 -SHA256 (rubygem/redis-cluster-client-0.4.3.gem) = e66c0712cc3734ddef274f42564adb9e02fc0828b6689f12ce562052da3fdef7 -SIZE (rubygem/redis-cluster-client-0.4.3.gem) = 17920 +TIMESTAMP = 1692640068 +SHA256 (rubygem/redis-cluster-client-0.4.14.gem) = 9dbe472b1df94811f91dbbf777e703f8476a5a42d4300357577214c4083ffb00 +SIZE (rubygem/redis-cluster-client-0.4.14.gem) = 18432 diff --git a/databases/rubygem-redis-clustering/Makefile b/databases/rubygem-redis-clustering/Makefile index 2e26470605a..b43bf16910b 100644 --- a/databases/rubygem-redis-clustering/Makefile +++ b/databases/rubygem-redis-clustering/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis-clustering -PORTVERSION= 5.0.6 +PORTVERSION= 5.0.7 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-redis-clustering/distinfo b/databases/rubygem-redis-clustering/distinfo index 7f8bf04881f..cb11b407246 100644 --- a/databases/rubygem-redis-clustering/distinfo +++ b/databases/rubygem-redis-clustering/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590092 -SHA256 (rubygem/redis-clustering-5.0.6.gem) = 83ccffec74d543230e463691adb7d7cffd58718512835a5057dc2367ddf4b886 -SIZE (rubygem/redis-clustering-5.0.6.gem) = 8192 +TIMESTAMP = 1692211837 +SHA256 (rubygem/redis-clustering-5.0.7.gem) = 8ce49e243d209468fc1c7625cdcf06e698a33ee3db6cb2257ec8370276cd9357 +SIZE (rubygem/redis-clustering-5.0.7.gem) = 8192 diff --git a/databases/rubygem-redis/Makefile b/databases/rubygem-redis/Makefile index bfa6c20baa8..e2cc0184540 100644 --- a/databases/rubygem-redis/Makefile +++ b/databases/rubygem-redis/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis -PORTVERSION= 5.0.6 +PORTVERSION= 5.0.7 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-redis/distinfo b/databases/rubygem-redis/distinfo index ed400f05360..61d78de27d0 100644 --- a/databases/rubygem-redis/distinfo +++ b/databases/rubygem-redis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590086 -SHA256 (rubygem/redis-5.0.6.gem) = 33597dacb683da6a0fd64ad146d84552b487176aa5f3cd4797b3f4f06af92583 -SIZE (rubygem/redis-5.0.6.gem) = 49664 +TIMESTAMP = 1692211833 +SHA256 (rubygem/redis-5.0.7.gem) = dcf1c03aaa28e13c96dd625ea5c98ce85573d2d9a5ae998d140eb803dfc71803 +SIZE (rubygem/redis-5.0.7.gem) = 51200 diff --git a/databases/tiledb/Makefile b/databases/tiledb/Makefile index 1281603306e..884840adbde 100644 --- a/databases/tiledb/Makefile +++ b/databases/tiledb/Makefile @@ -1,5 +1,5 @@ PORTNAME= tiledb -PORTVERSION= 2.16.1 +PORTVERSION= 2.16.3 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org diff --git a/databases/tiledb/distinfo b/databases/tiledb/distinfo index cdf8a7c81c4..60f74ed48cf 100644 --- a/databases/tiledb/distinfo +++ b/databases/tiledb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069956 -SHA256 (TileDB-Inc-TileDB-2.16.1_GH0.tar.gz) = a6fdf34809486bbd0f7cb065fc575673b3a47cc2f630e9eca836af58d0d7e3da -SIZE (TileDB-Inc-TileDB-2.16.1_GH0.tar.gz) = 4267834 +TIMESTAMP = 1692211657 +SHA256 (TileDB-Inc-TileDB-2.16.3_GH0.tar.gz) = bfa06f71dfe9ef4de4abae55712213ef146326c8e9b56cddcdb73d3c503f0c63 +SIZE (TileDB-Inc-TileDB-2.16.3_GH0.tar.gz) = 4273142 diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile deleted file mode 100644 index 998024cbf0c..00000000000 --- a/databases/virtuoso/Makefile +++ /dev/null @@ -1,113 +0,0 @@ -PORTNAME= virtuoso -PORTVERSION= 7.2.5 -PORTREVISION= 4 -CATEGORIES= databases -MASTER_SITES= SF -DISTNAME= ${PORTNAME}-opensource-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Universal SQL/Application Server -WWW= http://virtuoso.openlinksw.com/ - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Broken on all supported FreeBSD releases for more than an year -EXPIRATION_DATE= 2023-08-16 -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_mips64= Does not compile: error: DV_INT_TAG_WORD undeclared -BROKEN_powerpc64= Does not compile: error: DV_INT_TAG_WORD undeclared -BROKEN_sparc64= Does not compile: error: DV_INT_TAG_WORD undeclared -NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc powerpcspe -NOT_FOR_ARCHS_REASON= can only be built on 64bit platforms - -BUILD_DEPENDS= gawk:lang/gawk\ - htmldoc:textproc/htmldoc\ - flex>2.5.4:textproc/flex\ - gperf>=3.0.3:devel/gperf -LIB_DEPENDS= libxml2.so:textproc/libxml2 - -USES= gmake libtool readline uidfix ssl - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-readline\ - --without-internal-zlib\ - --without-jdk2\ - --without-jdk3\ - --without-jdk4\ - --disable-hslookup\ - --disable-wbxml2\ - --with-layout=freebsd\ - --datadir="${PREFIX}"\ - --localstatedir="${PREFIX}" -CONFIGURE_ENV= ac_cv_header_sys_timeb_h=no -CPPFLAGS+= -std=gnu89 -LDFLAGS+= -lexecinfo -MAKE_ENV= PATH=${LOCALBASE}/bin:${PATH}\ - ISQL=isql-vt -USE_RC_SUBR= virtuoso -USERS= virtuoso -GROUPS= virtuoso -SUB_FILES= pkg-message - -CHECK_PORT= nc -z localhost $$\1 2>\&1 - -OPTIONS_DEFINE= IMAGEMAGICK KERBEROS LDAP IODBC - -post-patch: - ${REINPLACE_CMD} -e 's,-lruby,-lruby${RUBY_SUFFIX},g'\ - ${WRKSRC}/configure - ${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${GREP} -l 'netstat -an.*grep LISTEN' |\ - ${XARGS} ${REINPLACE_CMD}\ - -e 's,expr \$$,expr -- $$,'\ - -e 's,netstat -an.*grep.*$$\([a-zA-Z0-9]*\).*grep LISTEN,${CHECK_PORT},' - -check: - ${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check - -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= OpenSSL version 1.1.0 or greater is currently not supported -BROKEN_FreeBSD_13= OpenSSL version 1.1.0 or greater is currently not supported -BROKEN_FreeBSD_14= OpenSSL version 1.1.0 or greater is currently not supported -.endif - -.if ${PORT_OPTIONS:MIMAGEMAGICK} -CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE} -USES+= magick:6 -PLIST_SUB+= WITH_IMAGEMAGICK="" -.else -CONFIGURE_ARGS+=--disable-imagemagick -PLIST_SUB+= WITH_IMAGEMAGICK="@comment " -.endif - -.if ${PORT_OPTIONS:MIODBC} -CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} -LIB_DEPENDS+= libiodbc.so:databases/libiodbc -CPPFLAGS+= -I${LOCALBASE}/include/libiodbc -PLIST_SUB+= WITH_IODBC="" -.else -CPPFLAGS+= -I../../libsrc/odbcsdk/include -PLIST_SUB+= WITH_IODBC="@comment " -.endif - -.if ${PORT_OPTIONS:MKERBEROS} -CONFIGURE_ARGS+=--enable-krb=${LOCALBASE} -LIB_DEPENDS+= libkrb5.so:security/krb5 -.else -CONFIGURE_ARGS+=--disable-krb -.endif - -.if ${PORT_OPTIONS:MLDAP} -CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE} -USES= ldap -.else -CONFIGURE_ARGS+=--disable-openldap -.endif - -post-install: - ${FIND} ${STAGEDIR} -name "*.ini" -exec ${MV} {} {}.sample \; -print - ${RMDIR} ${STAGEDIR}${PREFIX}/virtuoso/doc/html - -.include diff --git a/databases/virtuoso/distinfo b/databases/virtuoso/distinfo deleted file mode 100644 index a93ce53e37d..00000000000 --- a/databases/virtuoso/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1544683042 -SHA256 (virtuoso-opensource-7.2.5.tar.gz) = 826477d25a8493a68064919873fb4da4823ebe09537c04ff4d26ba49d9543d64 -SIZE (virtuoso-opensource-7.2.5.tar.gz) = 120299376 diff --git a/databases/virtuoso/files/patch-binsrc-tests-Makefile.in b/databases/virtuoso/files/patch-binsrc-tests-Makefile.in deleted file mode 100644 index 66c1cde5d88..00000000000 --- a/databases/virtuoso/files/patch-binsrc-tests-Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- binsrc/tests/Makefile.in.orig 2016-04-25 16:12:58.000000000 +0000 -+++ binsrc/tests/Makefile.in 2016-10-04 17:37:15.132578000 +0000 -@@ -100,7 +100,7 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --bin_PROGRAMS = isql$(EXEEXT) isqlw$(EXEEXT) inifile$(EXEEXT) \ -+bin_PROGRAMS = isql-vt$(EXEEXT) isqlw-vt$(EXEEXT) inifile$(EXEEXT) \ - $(am__EXEEXT_1) - noinst_PROGRAMS = M2$(EXEEXT) paramstats$(EXEEXT) ins$(EXEEXT) \ - blobs$(EXEEXT) blobs2$(EXEEXT) blobnulls$(EXEEXT) \ -@@ -903,7 +903,7 @@ - @rm -f ins-iodbc$(EXEEXT) - $(AM_V_CCLD)$(ins_iodbc_LINK) $(ins_iodbc_OBJECTS) $(ins_iodbc_LDADD) $(LIBS) - --isql$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) $(EXTRA_isql_DEPENDENCIES) -+isql-vt$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) $(EXTRA_isql_DEPENDENCIES) - @rm -f isql$(EXEEXT) - $(AM_V_CCLD)$(isql_LINK) $(isql_OBJECTS) $(isql_LDADD) $(LIBS) - -@@ -911,7 +911,7 @@ - @rm -f isql-iodbc$(EXEEXT) - $(AM_V_CCLD)$(isql_iodbc_LINK) $(isql_iodbc_OBJECTS) $(isql_iodbc_LDADD) $(LIBS) - --isqlw$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) $(EXTRA_isqlw_DEPENDENCIES) -+isqlw-vt$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) $(EXTRA_isqlw_DEPENDENCIES) - @rm -f isqlw$(EXEEXT) - $(AM_V_CCLD)$(isqlw_LINK) $(isqlw_OBJECTS) $(isqlw_LDADD) $(LIBS) - diff --git a/databases/virtuoso/files/patch-binsrc-tests-biftest-thook.sh b/databases/virtuoso/files/patch-binsrc-tests-biftest-thook.sh deleted file mode 100644 index 5d5388d4e3b..00000000000 --- a/databases/virtuoso/files/patch-binsrc-tests-biftest-thook.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- binsrc/tests/biftest/thook.sh.orig 2012-06-15 17:48:39.000000000 +0700 -+++ binsrc/tests/biftest/thook.sh 2012-06-15 17:52:34.000000000 +0700 -@@ -22,7 +22,8 @@ - # - - OUTPUT=thook.output --ISQL=../isql -+ISQL=${ISQL-isql} -+ISQL=../$ISQL - TIMEOUT=1000 - HOST_OS=`uname -s | grep WIN` - SERVER=./virtuoso-iodbc-sample-t diff --git a/databases/virtuoso/files/patch-configure b/databases/virtuoso/files/patch-configure deleted file mode 100644 index 4d1f117256c..00000000000 --- a/databases/virtuoso/files/patch-configure +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.orig 2011-10-29 06:28:32.000000000 +0700 -+++ configure 2012-06-08 12:59:49.000000000 +0700 -@@ -3784,9 +3784,9 @@ - docdir=$datadir/virtuoso/doc - htmldocdir=$datadir/virtuoso/doc/html - pdfdocdir=$datadir/virtuoso/doc/pdf -- demodir=$localstatedir/lib/virtuoso/demo -- dbdir=$localstatedir/lib/virtuoso/db -- httprootdir=$localstatedir/lib/virtuoso/vsp -+ demodir=$localstatedir/virtuoso/demo -+ dbdir=$localstatedir/virtuoso/db -+ httprootdir=$localstatedir/virtuoso/vsp - hostingdir=$libdir/virtuoso/hosting - ;; - diff --git a/databases/virtuoso/files/pkg-message.in b/databases/virtuoso/files/pkg-message.in deleted file mode 100644 index f076a546df3..00000000000 --- a/databases/virtuoso/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: < +# Extraction fails with poudriere on aarch64 for GCC 11. +# It seems that the bug is specific to lang/gcc11 and lang/gcc12 only. +# No other GCC port is affected. +# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271052 +# and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246670 +.if ${ARCH} == aarch64 +EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar +.endif + post-patch: @${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \ ${WRKSRC}//gcc/cp/g++spec.c diff --git a/devel/arduino-irremote/Makefile b/devel/arduino-irremote/Makefile index 3e3dde3f7dd..b1cc10400d4 100644 --- a/devel/arduino-irremote/Makefile +++ b/devel/arduino-irremote/Makefile @@ -1,5 +1,5 @@ PORTNAME= arduino-irremote -PORTVERSION= 4.1.2 +PORTVERSION= 4.2.0 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/arduino-irremote/distinfo b/devel/arduino-irremote/distinfo index 3f586352d2a..0e225372b93 100644 --- a/devel/arduino-irremote/distinfo +++ b/devel/arduino-irremote/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679517741 -SHA256 (z3t0-Arduino-IRremote-v4.1.2_GH0.tar.gz) = cbeed5e7d73c99b76addf44f376a9430b42be25b9aeefcdb4e7a7918cc80141d -SIZE (z3t0-Arduino-IRremote-v4.1.2_GH0.tar.gz) = 808424 +TIMESTAMP = 1692741190 +SHA256 (z3t0-Arduino-IRremote-v4.2.0_GH0.tar.gz) = bd6c4a2d5ec8013240cc19e1c6ebe2d903e28b8acc27bdee6f172d22db3ec392 +SIZE (z3t0-Arduino-IRremote-v4.2.0_GH0.tar.gz) = 814797 diff --git a/devel/capstone/Makefile b/devel/capstone/Makefile index 6087d45a615..269ca0241ae 100644 --- a/devel/capstone/Makefile +++ b/devel/capstone/Makefile @@ -1,5 +1,5 @@ PORTNAME= capstone -DISTVERSION= 5.0-post1 +DISTVERSION= 5.0.1 CATEGORIES= devel MAINTAINER= bofh@FreeBSD.org diff --git a/devel/capstone/distinfo b/devel/capstone/distinfo index f72f66c98a9..8406230fa2e 100644 --- a/devel/capstone/distinfo +++ b/devel/capstone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689444158 -SHA256 (capstone-engine-capstone-5.0-post1_GH0.tar.gz) = 3eedb7232a839bea7654fe5094e539a4792dd6cf64dd50fa8574dc953aaa69fc -SIZE (capstone-engine-capstone-5.0-post1_GH0.tar.gz) = 7636912 +TIMESTAMP = 1692762889 +SHA256 (capstone-engine-capstone-5.0.1_GH0.tar.gz) = 2b9c66915923fdc42e0e32e2a9d7d83d3534a45bb235e163a70047951890c01a +SIZE (capstone-engine-capstone-5.0.1_GH0.tar.gz) = 7654195 diff --git a/devel/cocogitto/Makefile b/devel/cocogitto/Makefile index 3b3e149535c..3d0892c00fb 100644 --- a/devel/cocogitto/Makefile +++ b/devel/cocogitto/Makefile @@ -1,6 +1,5 @@ PORTNAME= cocogitto -DISTVERSION= 5.4.0 -PORTREVISION= 1 +DISTVERSION= 5.5.0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/cocogitto/distinfo b/devel/cocogitto/distinfo index c5e3015746f..f6529593300 100644 --- a/devel/cocogitto/distinfo +++ b/devel/cocogitto/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1687590187 +TIMESTAMP = 1692635425 SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 @@ -445,5 +445,5 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f98 SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422 SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec SIZE (rust/crates/yansi-0.5.1.crate) = 16525 -SHA256 (cocogitto-cocogitto-5.4.0_GH0.tar.gz) = 93065217191d3e1739e6bca78b0b6de7d7dd1b5334229702fff9e84162060feb -SIZE (cocogitto-cocogitto-5.4.0_GH0.tar.gz) = 1288696 +SHA256 (cocogitto-cocogitto-5.5.0_GH0.tar.gz) = 709c54c6c64463af607590ac970dc5a45cbcc0236a5a15d609d9a77461f11325 +SIZE (cocogitto-cocogitto-5.5.0_GH0.tar.gz) = 1290888 diff --git a/devel/gitleaks/Makefile b/devel/gitleaks/Makefile index 378157e2834..9b8642e6464 100644 --- a/devel/gitleaks/Makefile +++ b/devel/gitleaks/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitleaks DISTVERSIONPREFIX= v -DISTVERSION= 8.17.0 -PORTREVISION= 1 +DISTVERSION= 8.18.0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/gitleaks/distinfo b/devel/gitleaks/distinfo index 31af5b41497..6ae519fb05f 100644 --- a/devel/gitleaks/distinfo +++ b/devel/gitleaks/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1687033273 -SHA256 (go/devel_gitleaks/gitleaks-v8.17.0/v8.17.0.mod) = 724a7ebe961578295722e84d0d04921b1226f395a41e1d720d0a5c49687cbff4 -SIZE (go/devel_gitleaks/gitleaks-v8.17.0/v8.17.0.mod) = 1800 -SHA256 (go/devel_gitleaks/gitleaks-v8.17.0/v8.17.0.zip) = 3b280f89aa36e39d720c10ae415cfa5540c201afea56cc04938b785797442b86 -SIZE (go/devel_gitleaks/gitleaks-v8.17.0/v8.17.0.zip) = 249359 -SHA256 (go/devel_gitleaks/gitleaks-v8.17.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 -SIZE (go/devel_gitleaks/gitleaks-v8.17.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 +TIMESTAMP = 1692763640 +SHA256 (go/devel_gitleaks/gitleaks-v8.18.0/v8.18.0.mod) = 7ebb9448dca92b4d8a3ca27a02528d24447bdea5f035168db779d25c27cf5b3a +SIZE (go/devel_gitleaks/gitleaks-v8.18.0/v8.18.0.mod) = 1800 +SHA256 (go/devel_gitleaks/gitleaks-v8.18.0/v8.18.0.zip) = d6a28f139b8bbc6d61bd40a0de476fd1086bb7fa3004d3d9b0ba98739e62472b +SIZE (go/devel_gitleaks/gitleaks-v8.18.0/v8.18.0.zip) = 250499 +SHA256 (go/devel_gitleaks/gitleaks-v8.18.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/devel_gitleaks/gitleaks-v8.18.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile index 365ad3722ea..253374b5690 100644 --- a/devel/gsoap/Makefile +++ b/devel/gsoap/Makefile @@ -1,5 +1,5 @@ PORTNAME= gsoap -PORTVERSION= 2.8.129 +PORTVERSION= 2.8.130 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2 DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo index 4ee9872528f..398bf65e588 100644 --- a/devel/gsoap/distinfo +++ b/devel/gsoap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688073455 -SHA256 (gsoap_2.8.129.zip) = 16cb8852ea791a6aec8f0213d619c15eecc8171e0c888f3b0e0c66d3ef78e20a -SIZE (gsoap_2.8.129.zip) = 35228131 +TIMESTAMP = 1692763960 +SHA256 (gsoap_2.8.130.zip) = 5cece2b1829f3a94c1448d8e763e54dcb16f055710044e6f450d2004f2e5a3df +SIZE (gsoap_2.8.130.zip) = 55318989 diff --git a/devel/hpx/Makefile b/devel/hpx/Makefile index ae13bfb58c8..616b670b0fd 100644 --- a/devel/hpx/Makefile +++ b/devel/hpx/Makefile @@ -1,8 +1,11 @@ PORTNAME= hpx DISTVERSIONPREFIX= v -DISTVERSION= 1.9.0 +DISTVERSION= 1.9.1 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 4a61c0bb764616a103900f948ac9735b3b73e594.diff:-p1 # fix for https://github.com/STEllAR-GROUP/hpx/issues/6316 + MAINTAINER= yuri@FreeBSD.org COMMENT= C++ Standard Library for Parallelism and Concurrency WWW= https://hpx.stellar-group.org/ diff --git a/devel/hpx/distinfo b/devel/hpx/distinfo index 9f2e170fee3..f5cfc2c515e 100644 --- a/devel/hpx/distinfo +++ b/devel/hpx/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1689575833 -SHA256 (STEllAR-GROUP-hpx-v1.9.0_GH0.tar.gz) = 2a8dca78172fbb15eae5a5e9facf26ab021c845f9c09e61b1912e6cf9e72915a -SIZE (STEllAR-GROUP-hpx-v1.9.0_GH0.tar.gz) = 5648944 +TIMESTAMP = 1692730344 +SHA256 (STEllAR-GROUP-hpx-v1.9.1_GH0.tar.gz) = 1adae9d408388a723277290ddb33c699aa9ea72defadf3f12d4acc913a0ff22d +SIZE (STEllAR-GROUP-hpx-v1.9.1_GH0.tar.gz) = 5662661 +SHA256 (4a61c0bb764616a103900f948ac9735b3b73e594.diff) = 6d9d0472ea86ed059124f438d01b322e83d07a5b643a5513f796abf0ffc9a482 +SIZE (4a61c0bb764616a103900f948ac9735b3b73e594.diff) = 8865 diff --git a/devel/hpx/pkg-plist b/devel/hpx/pkg-plist index 9bd3dcceb19..d9225bf247b 100644 --- a/devel/hpx/pkg-plist +++ b/devel/hpx/pkg-plist @@ -64,6 +64,7 @@ include/hpx/agas_base/server/primary_namespace.hpp include/hpx/agas_base/server/symbol_namespace.hpp include/hpx/agas_base/symbol_namespace.hpp include/hpx/algorithm.hpp +include/hpx/algorithm.hpp.in include/hpx/algorithms.hpp include/hpx/algorithms/config/defines.hpp include/hpx/algorithms/traits/is_pair.hpp @@ -189,6 +190,7 @@ include/hpx/async_local/post.hpp include/hpx/async_local/sync.hpp include/hpx/async_local/sync_fwd.hpp include/hpx/barrier.hpp +include/hpx/barrier.hpp.in include/hpx/basic_execution.hpp include/hpx/basic_execution/agent_base.hpp include/hpx/basic_execution/agent_ref.hpp @@ -203,6 +205,7 @@ include/hpx/batch_environments/config/defines.hpp include/hpx/batch_environments/pbs_environment.hpp include/hpx/batch_environments/pjm_environment.hpp include/hpx/batch_environments/slurm_environment.hpp +include/hpx/bit.hpp include/hpx/cache/config/defines.hpp include/hpx/cache/entries/entry.hpp include/hpx/cache/entries/fifo_entry.hpp @@ -216,6 +219,7 @@ include/hpx/cache/statistics/local_full_statistics.hpp include/hpx/cache/statistics/local_statistics.hpp include/hpx/cache/statistics/no_statistics.hpp include/hpx/channel.hpp +include/hpx/channel.hpp.in include/hpx/checkpoint.hpp include/hpx/checkpoint/checkpoint.hpp include/hpx/checkpoint/config/defines.hpp @@ -419,6 +423,7 @@ include/hpx/components_base/traits/is_component.hpp include/hpx/components_base/traits/managed_component_policies.hpp include/hpx/components_fwd.hpp include/hpx/compute.hpp +include/hpx/compute.hpp.in include/hpx/compute/config/defines.hpp include/hpx/compute/detail/new.hpp include/hpx/compute/detail/target_distribution_policy.hpp @@ -531,6 +536,7 @@ include/hpx/coroutines/thread_enums.hpp include/hpx/coroutines/thread_id_type.hpp include/hpx/custom_exception_info.hpp include/hpx/dataflow.hpp +include/hpx/datapar.hpp include/hpx/datastructures.hpp include/hpx/datastructures/any.hpp include/hpx/datastructures/config/defines.hpp @@ -742,6 +748,7 @@ include/hpx/executors/thread_pool_scheduler.hpp include/hpx/executors/thread_pool_scheduler_bulk.hpp include/hpx/executors_distributed/config/defines.hpp include/hpx/executors_distributed/distribution_policy_executor.hpp +include/hpx/experimental/task_group.hpp include/hpx/filesystem.hpp include/hpx/filesystem/config/defines.hpp include/hpx/format.hpp @@ -789,6 +796,7 @@ include/hpx/functional/traits/is_callable.hpp include/hpx/functional/traits/is_invocable.hpp include/hpx/functional/traits/is_placeholder.hpp include/hpx/future.hpp +include/hpx/future.hpp.in include/hpx/futures/config/defines.hpp include/hpx/futures/detail/future_data.hpp include/hpx/futures/detail/future_transforms.hpp @@ -829,12 +837,14 @@ include/hpx/hpx.hpp include/hpx/hpx_finalize.hpp include/hpx/hpx_init.hpp include/hpx/hpx_init_impl.hpp +include/hpx/hpx_init_impl.hpp.orig include/hpx/hpx_init_params.hpp include/hpx/hpx_main.hpp include/hpx/hpx_main_impl.hpp include/hpx/hpx_main_winsocket.hpp include/hpx/hpx_start.hpp include/hpx/hpx_start_impl.hpp +include/hpx/hpx_start_impl.hpp.orig include/hpx/hpx_suspend.hpp include/hpx/hpx_user_main_config.hpp include/hpx/include/actions.hpp @@ -932,9 +942,11 @@ include/hpx/include_local/config/defines.hpp include/hpx/ini/config/defines.hpp include/hpx/ini/ini.hpp include/hpx/init.hpp +include/hpx/init.hpp.in include/hpx/init_runtime/config/defines.hpp include/hpx/init_runtime/detail/init_logging.hpp include/hpx/init_runtime/detail/run_or_start.hpp +include/hpx/init_runtime/detail/run_or_start.hpp.orig include/hpx/init_runtime/pre_main.hpp include/hpx/init_runtime_local/config/defines.hpp include/hpx/init_runtime_local/detail/init_logging.hpp @@ -962,6 +974,7 @@ include/hpx/iterator_support/zip_iterator.hpp include/hpx/itt_notify/config/defines.hpp include/hpx/itt_notify/thread_name.hpp include/hpx/latch.hpp +include/hpx/latch.hpp.in include/hpx/lcos/async.hpp include/hpx/lcos/async_callback.hpp include/hpx/lcos/async_callback_fwd.hpp @@ -1644,6 +1657,7 @@ include/hpx/resource_partitioner/detail/partitioner.hpp include/hpx/resource_partitioner/partitioner.hpp include/hpx/resource_partitioner/partitioner_fwd.hpp include/hpx/runtime.hpp +include/hpx/runtime.hpp.in include/hpx/runtime/actions/action_priority.hpp include/hpx/runtime/actions/action_support.hpp include/hpx/runtime/actions/base_action.hpp @@ -1986,6 +2000,7 @@ include/hpx/serialization/config/defines.hpp include/hpx/serialization/container.hpp include/hpx/serialization/datapar.hpp include/hpx/serialization/deque.hpp +include/hpx/serialization/detail/allow_zero_copy_receive.hpp include/hpx/serialization/detail/constructor_selector.hpp include/hpx/serialization/detail/non_default_constructible.hpp include/hpx/serialization/detail/pointer.hpp @@ -2534,6 +2549,7 @@ lib/cmake/HPX/tests/cxx20_std_execution_policies.cpp lib/cmake/HPX/tests/cxx20_std_ranges_iter_swap.cpp lib/cmake/HPX/tests/cxx20_trivial_virtual_destructor.cpp lib/cmake/HPX/tests/cxx23_std_generator.cpp +lib/cmake/HPX/tests/cxx_14_delete_operator_with_size.cpp lib/cmake/HPX/tests/cxx_lambda_capture_decltype.cpp lib/cmake/HPX/tests/mm_prefetch.cpp lib/cmake/HPX/tests/stable_inplace_merge.cpp @@ -2548,10 +2564,10 @@ lib/cmake/HPX/toolchains/CrayStatic.cmake lib/cmake/HPX/toolchains/XeonPhi.cmake lib/hpx/libhpx_parcel_coalescing.so lib/hpx/libhpx_parcel_coalescing.so.1 -lib/hpx/libhpx_parcel_coalescing.so.1.9.0 +lib/hpx/libhpx_parcel_coalescing.so.1.9.1 lib/libhpx.so lib/libhpx.so.1 -lib/libhpx.so.1.9.0 +lib/libhpx.so.1.9.1 lib/libhpx_actions.a lib/libhpx_actions_base.a lib/libhpx_affinity.a @@ -2575,7 +2591,7 @@ lib/libhpx_command_line_handling.a lib/libhpx_command_line_handling_local.a lib/libhpx_component_storage.so lib/libhpx_component_storage.so.1 -lib/libhpx_component_storage.so.1.9.0 +lib/libhpx_component_storage.so.1.9.1 lib/libhpx_components.a lib/libhpx_components_base.a lib/libhpx_compute.a @@ -2609,7 +2625,7 @@ lib/libhpx_init_runtime_local.a lib/libhpx_io_service.a lib/libhpx_iostreams.so lib/libhpx_iostreams.so.1 -lib/libhpx_iostreams.so.1.9.0 +lib/libhpx_iostreams.so.1.9.1 lib/libhpx_iterator_support.a lib/libhpx_itt_notify.a lib/libhpx_lcos_distributed.a @@ -2625,7 +2641,7 @@ lib/libhpx_parcelset.a lib/libhpx_parcelset_base.a lib/libhpx_partitioned_vector.so lib/libhpx_partitioned_vector.so.1 -lib/libhpx_partitioned_vector.so.1.9.0 +lib/libhpx_partitioned_vector.so.1.9.1 lib/libhpx_performance_counters.a lib/libhpx_plugin.a lib/libhpx_plugin_factories.a @@ -2633,7 +2649,7 @@ lib/libhpx_prefix.a lib/libhpx_preprocessor.a lib/libhpx_process.so lib/libhpx_process.so.1 -lib/libhpx_process.so.1.9.0 +lib/libhpx_process.so.1.9.1 lib/libhpx_program_options.a lib/libhpx_properties.a lib/libhpx_resiliency.a @@ -2664,7 +2680,7 @@ lib/libhpx_topology.a lib/libhpx_type_support.a lib/libhpx_unordered.so lib/libhpx_unordered.so.1 -lib/libhpx_unordered.so.1.9.0 +lib/libhpx_unordered.so.1.9.1 lib/libhpx_util.a lib/libhpx_version.a lib/libhpx_wrap.a diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile index db8e27bd2e7..7e504a96e83 100644 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -1,5 +1,5 @@ PORTNAME= jenkins -PORTVERSION= 2.419 +PORTVERSION= 2.420 CATEGORIES= devel java MASTER_SITES= https://get.jenkins.io/war/${PORTVERSION}/ DISTNAME= jenkins diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo index ef7d89cf5d1..201fbe5a8aa 100644 --- a/devel/jenkins/distinfo +++ b/devel/jenkins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692164083 -SHA256 (jenkins/2.419/jenkins.war) = 895a90dd5929a38c8cc8c0342478d27a6e01470cd7e8da8c4ae51f26aa1bdf85 -SIZE (jenkins/2.419/jenkins.war) = 89544261 +TIMESTAMP = 1692780380 +SHA256 (jenkins/2.420/jenkins.war) = c9e0778a6eb54e652658ee757848d792bfbd702f7af14a8c2e05978155facc62 +SIZE (jenkins/2.420/jenkins.war) = 89547170 diff --git a/devel/level-zero/Makefile b/devel/level-zero/Makefile index d7e7e58965e..a8583375690 100644 --- a/devel/level-zero/Makefile +++ b/devel/level-zero/Makefile @@ -1,5 +1,5 @@ PORTNAME= level-zero -PORTVERSION= 1.13.1 +PORTVERSION= 1.13.5 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/level-zero/distinfo b/devel/level-zero/distinfo index e0da3834f5e..594e9d8b663 100644 --- a/devel/level-zero/distinfo +++ b/devel/level-zero/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398773 -SHA256 (oneapi-src-level-zero-v1.13.1_GH0.tar.gz) = 9c41640edd3738528911405ffe31c3caa9f9a747c43f6a7375a7b2e77eca3192 -SIZE (oneapi-src-level-zero-v1.13.1_GH0.tar.gz) = 886141 +TIMESTAMP = 1692211643 +SHA256 (oneapi-src-level-zero-v1.13.5_GH0.tar.gz) = bb0f37c40b1b2c1eb2c379928314539cac778d3accfc5de66d9f909a2f69fd32 +SIZE (oneapi-src-level-zero-v1.13.5_GH0.tar.gz) = 917575 diff --git a/devel/libddwaf/Makefile b/devel/libddwaf/Makefile index 447d0330c3f..8e3a717470a 100644 --- a/devel/libddwaf/Makefile +++ b/devel/libddwaf/Makefile @@ -1,5 +1,5 @@ PORTNAME= libddwaf -PORTVERSION= 1.12.0 +PORTVERSION= 1.13.0 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org @@ -28,7 +28,7 @@ CMAKE_ON= LIBDDWAF_BUILD_SHARED LIBDDWAF_BUILD_STATIC USE_GITHUB= yes GH_ACCOUNT= DataDog GH_TUPLE= DataDog:appsec-event-rules:1.7.1:DataDog_appsec_event_rules/third_party/proj_event_rules \ - Tencent:rapidjson:a95e013:Tencent_rapidjson/third_party/rapidjson + Tencent:rapidjson:476ffa2:Tencent_rapidjson/third_party/rapidjson post-patch: # Clean up bundled libraries diff --git a/devel/libddwaf/distinfo b/devel/libddwaf/distinfo index 2251211e650..8ff8da89b86 100644 --- a/devel/libddwaf/distinfo +++ b/devel/libddwaf/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1691069924 -SHA256 (DataDog-libddwaf-1.12.0_GH0.tar.gz) = 68000b76f44118fe726750df3a54effc987def5b368be002c495383df9437ac4 -SIZE (DataDog-libddwaf-1.12.0_GH0.tar.gz) = 745164 +TIMESTAMP = 1692640036 +SHA256 (DataDog-libddwaf-1.13.0_GH0.tar.gz) = f473559fb5a78c3bbd760dc963c2b2c089e614c3e3b6723934ab5ce2d4c59cee +SIZE (DataDog-libddwaf-1.13.0_GH0.tar.gz) = 767017 SHA256 (DataDog-appsec-event-rules-1.7.1_GH0.tar.gz) = df0e72ec448f66f7752c0f6c411b8172751524eaae66b9219a477668e1e65f91 SIZE (DataDog-appsec-event-rules-1.7.1_GH0.tar.gz) = 134403 -SHA256 (Tencent-rapidjson-a95e013_GH0.tar.gz) = 44d777549051b4dabea4dd2290d6b63a340c103e819da0c85f658606f4e88b6a -SIZE (Tencent-rapidjson-a95e013_GH0.tar.gz) = 1115459 +SHA256 (Tencent-rapidjson-476ffa2_GH0.tar.gz) = 6a1628b73d007ffe5d2bc84f206d05b2194e25eeb0585a41bfd29db150591f84 +SIZE (Tencent-rapidjson-476ffa2_GH0.tar.gz) = 1115582 diff --git a/devel/libddwaf/files/patch-CMakeLists.txt b/devel/libddwaf/files/patch-CMakeLists.txt index 7409c74399c..5d7df8ac29b 100644 --- a/devel/libddwaf/files/patch-CMakeLists.txt +++ b/devel/libddwaf/files/patch-CMakeLists.txt @@ -1,13 +1,15 @@ ---- CMakeLists.txt.orig 2023-07-28 08:52:50 UTC +--- CMakeLists.txt.orig 2023-08-17 10:28:49 UTC +++ CMakeLists.txt -@@ -8,23 +8,23 @@ set(CMAKE_PROJECT_VERSION ${version}) +@@ -7,24 +7,24 @@ set(CMAKE_PROJECT_VERSION ${version}) + configure_file(src/version.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/version.hpp) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version") +-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version") -if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR - CMAKE_OSX_ARCHITECTURES MATCHES "arm64") - set(CPU_TYPE ${CMAKE_OSX_ARCHITECTURES}) -endif() ++#set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version") +#if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR +# CMAKE_OSX_ARCHITECTURES MATCHES "arm64") +# set(CPU_TYPE ${CMAKE_OSX_ARCHITECTURES}) @@ -34,16 +36,16 @@ option(LIBDDWAF_BUILD_SHARED "Build shared library" ON) option(LIBDDWAF_BUILD_STATIC "Build shared library" ON) -@@ -57,7 +57,7 @@ endif() +@@ -58,7 +58,7 @@ endif() include(GNUInstallDirs) -add_subdirectory(third_party) +#add_subdirectory(third_party) - set(LIBDDWAF_SOURCE - ${libddwaf_SOURCE_DIR}/src/ruleset_builder.cpp -@@ -137,7 +137,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D + add_library(glibc_compat OBJECT ${libddwaf_SOURCE_DIR}/src/glibc-compat/time64.c) + set_target_properties(glibc_compat PROPERTIES POSITION_INDEPENDENT_CODE 1) +@@ -143,7 +143,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D # System dependencies set(LIBDDWAF_INTERFACE_LIBRARIES "") @@ -51,9 +53,9 @@ +#set(LIBDDWAF_PRIVATE_LIBRARIES lib_re2 lib_ac lib_injection lib_radix lib_utf8proc) +set(LIBDDWAF_PRIVATE_LIBRARIES lib_radix) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - # needed for glibc <2.17. We compile with --as-needed so the library won't -@@ -165,6 +166,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + if(NOT MSVC AND LIBDDWAF_TEST_COVERAGE) + target_compile_options(libddwaf_objects PRIVATE -ggdb --coverage) +@@ -176,6 +177,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif(WIN32) list(APPEND LIBDDWAF_INTERFACE_LIBRARIES ws2_32) endif() @@ -81,7 +83,7 @@ target_link_libraries(libddwaf_objects PRIVATE ${LIBDDWAF_PRIVATE_LIBRARIES} -@@ -189,66 +211,67 @@ if (LIBDDWAF_BUILD_STATIC) +@@ -200,71 +222,72 @@ if (LIBDDWAF_BUILD_STATIC) INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) # Post-processing on the static library @@ -118,6 +120,7 @@ - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +- COMMAND ${CMAKE_COMMAND} -E copy $ ar_comb - COMMAND ${CMAKE_AR} -qcs ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} ar_comb/*.o* - - COMMAND ${CMAKE_COMMAND} -E copy ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} $ @@ -126,9 +129,13 @@ - endif() - if(NOT (CMAKE_BUILD_TYPE MATCHES Debug)) - if (CMAKE_SYSTEM_NAME STREQUAL Darwin OR CMAKE_SYSTEM_NAME STREQUAL Linux) -- find_program(STRIP strip) -- if (STRIP STREQUAL "STRIP-NOTFOUND") -- message(FATAL_ERROR "strip not found") +- if (NOT CMAKE_STRIP) +- find_program(STRIP strip) +- if (STRIP STREQUAL "STRIP-NOTFOUND") +- message(FATAL_ERROR "strip not found") +- endif() +- else() +- set(STRIP ${CMAKE_STRIP}) - endif() - add_custom_command(TARGET libddwaf_static POST_BUILD - COMMAND ${STRIP} -x -S $ -o $.stripped) @@ -169,6 +176,7 @@ +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ ++# COMMAND ${CMAKE_COMMAND} -E copy $ ar_comb +# COMMAND ${CMAKE_AR} -qcs ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} ar_comb/*.o* +# +# COMMAND ${CMAKE_COMMAND} -E copy ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} $ @@ -177,9 +185,13 @@ +# endif() +# if(NOT (CMAKE_BUILD_TYPE MATCHES Debug)) +# if (CMAKE_SYSTEM_NAME STREQUAL Darwin OR CMAKE_SYSTEM_NAME STREQUAL Linux) -+# find_program(STRIP strip) -+# if (STRIP STREQUAL "STRIP-NOTFOUND") -+# message(FATAL_ERROR "strip not found") ++# if (NOT CMAKE_STRIP) ++# find_program(STRIP strip) ++# if (STRIP STREQUAL "STRIP-NOTFOUND") ++# message(FATAL_ERROR "strip not found") ++# endif() ++# else() ++# set(STRIP ${CMAKE_STRIP}) +# endif() +# add_custom_command(TARGET libddwaf_static POST_BUILD +# COMMAND ${STRIP} -x -S $ -o $.stripped) @@ -201,7 +213,7 @@ +# OUTPUT_VARIABLE BUILD_ID +# OUTPUT_STRIP_TRAILING_WHITESPACE +# ) -+ set(BUILD_ID "4be56b648aa8ce8b86255b0edad78862d102f65d") ++ set(BUILD_ID "25b0021f1d2ce1eea39a37ad41b6de9eec12ee84") message(STATUS "Build id is ${BUILD_ID}") string(SUBSTRING "${BUILD_ID}" 0 2 BUILD_ID_PREFIX) string(SUBSTRING "${BUILD_ID}" 2 39 BUILD_ID_SUFFIX) diff --git a/devel/libddwaf/files/patch-third_party-CMakeLists.txt b/devel/libddwaf/files/patch-third_party-CMakeLists.txt index bebea8992a6..41564fb5cdf 100644 --- a/devel/libddwaf/files/patch-third_party-CMakeLists.txt +++ b/devel/libddwaf/files/patch-third_party-CMakeLists.txt @@ -1,4 +1,4 @@ ---- third_party/CMakeLists.txt.orig 2023-05-25 10:34:56 UTC +--- third_party/CMakeLists.txt.orig 2023-08-17 10:28:49 UTC +++ third_party/CMakeLists.txt @@ -15,24 +15,24 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-unused-parameter") @@ -42,7 +42,7 @@ target_compile_definitions(lib_rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING=1) set_target_properties(proj_rapidjson PROPERTIES EXCLUDE_FROM_ALL TRUE) -@@ -45,153 +45,153 @@ endif() +@@ -45,32 +45,32 @@ endif() # To avoid building everything for re2, including test binvaries: # BUILD_COMMAND cmake --build --target re2 # But this is not enough, because the install target run afterwards insists on building everything @@ -61,6 +61,7 @@ - -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} - -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} - -DRE2_BUILD_TESTING=0 +- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}re2${CMAKE_STATIC_LIBRARY_SUFFIX} -) +#set(RE2_COMMIT 885eb38accf49e2ccdd2fa6786f3590cf40a3e23) +#ExternalProject_Add(proj_re2 @@ -77,6 +78,7 @@ +# -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} +# -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} +# -DRE2_BUILD_TESTING=0 ++# BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}re2${CMAKE_STATIC_LIBRARY_SUFFIX} +#) # alas, we can't use find_package because by the package is not downloaded by config time # so manually creating the library @@ -95,6 +97,12 @@ +#endif() +#add_dependencies(lib_re2 proj_re2) + if(CMAKE_BUILD_TYPE MATCHES Debug) + set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX}) +@@ -81,54 +81,54 @@ else() + endif() + + -set(GOOGLETEST_COMMIT 955c7f837efad184ec63e771c42542d37545eaef) -ExternalProject_Add(proj_gtest - URL https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz @@ -110,12 +118,9 @@ - -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} - -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} - -DBUILD_SHARED_LIBS=0 +- -DBUILD_GMOCK=ON +- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME} ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME} -) --if(CMAKE_BUILD_TYPE MATCHES Debug) -- set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX}) --else() -- set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}) --endif() +#set(GOOGLETEST_COMMIT 955c7f837efad184ec63e771c42542d37545eaef) +#ExternalProject_Add(proj_gtest +# URL https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz @@ -131,29 +136,34 @@ +# -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} +# -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} +# -DBUILD_SHARED_LIBS=0 ++# -DBUILD_GMOCK=ON ++# BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME} ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME} +#) -+#if(CMAKE_BUILD_TYPE MATCHES Debug) -+# set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX}) -+#else() -+# set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}) -+#endif() -add_library(lib_gtest STATIC IMPORTED GLOBAL) +-add_library(lib_gmock STATIC IMPORTED GLOBAL) -set_property(TARGET lib_gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME}) +-set_property(TARGET lib_gmock PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME}) -target_include_directories(lib_gtest INTERFACE ${INSTALL_DIR}/include) +-target_include_directories(lib_gmock INTERFACE ${INSTALL_DIR}/include) -if(NOT MSVC) - target_link_libraries(lib_gtest INTERFACE -lpthread) +- target_link_libraries(lib_gmock INTERFACE -lpthread) -endif() --add_dependencies(lib_gtest proj_gtest) --set_target_properties(lib_gtest proj_gtest PROPERTIES EXCLUDE_FROM_ALL TRUE) +#add_library(lib_gtest STATIC IMPORTED GLOBAL) ++#add_library(lib_gmock STATIC IMPORTED GLOBAL) +#set_property(TARGET lib_gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGTEST_FILENAME}) ++#set_property(TARGET lib_gmock PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBGMOCK_FILENAME}) +#target_include_directories(lib_gtest INTERFACE ${INSTALL_DIR}/include) ++#target_include_directories(lib_gmock INTERFACE ${INSTALL_DIR}/include) +#if(NOT MSVC) +# target_link_libraries(lib_gtest INTERFACE -lpthread) ++# target_link_libraries(lib_gmock INTERFACE -lpthread) +#endif() -+#add_dependencies(lib_gtest proj_gtest) -+#set_target_properties(lib_gtest proj_gtest PROPERTIES EXCLUDE_FROM_ALL TRUE) + + add_dependencies(lib_gtest proj_gtest) + add_dependencies(lib_gmock proj_gtest) + set_target_properties(lib_gtest lib_gmock proj_gtest PROPERTIES EXCLUDE_FROM_ALL TRUE) -add_library(lib_injection STATIC - libinjection/src/xss.c @@ -185,8 +195,9 @@ add_library(lib_radix STATIC radixlib/radixlib.c) - target_include_directories(lib_radix INTERFACE ${PROJECT_SOURCE_DIR}/radixlib) - set_target_properties(lib_radix PROPERTIES POSITION_INDEPENDENT_CODE 1) +@@ -141,74 +141,74 @@ else () + set(LIBUTF8PROC_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${CMAKE_STATIC_LIBRARY_SUFFIX}) + endif() -set(UTF8PROC_VERSION v2.7.0) -ExternalProject_Add(proj_utf8proc @@ -202,6 +213,7 @@ - -DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO} - -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} - -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} +- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBUTF8PROC_FILENAME} -) +#set(UTF8PROC_VERSION v2.7.0) +#ExternalProject_Add(proj_utf8proc @@ -217,26 +229,38 @@ +# -DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO} +# -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} +# -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} ++# BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBUTF8PROC_FILENAME} +#) -add_library(lib_utf8proc STATIC IMPORTED GLOBAL) --if (MSVC) -- set_property(TARGET lib_utf8proc PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc_static${CMAKE_STATIC_LIBRARY_SUFFIX}) --else () -- set_property(TARGET lib_utf8proc PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${CMAKE_STATIC_LIBRARY_SUFFIX}) --endif() +-set_property(TARGET lib_utf8proc PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBUTF8PROC_FILENAME}) -target_include_directories(lib_utf8proc INTERFACE ${INSTALL_DIR}/include) -add_dependencies(lib_utf8proc proj_utf8proc) +#add_library(lib_utf8proc STATIC IMPORTED GLOBAL) -+#if (MSVC) -+# set_property(TARGET lib_utf8proc PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc_static${CMAKE_STATIC_LIBRARY_SUFFIX}) -+#else () -+# set_property(TARGET lib_utf8proc PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${CMAKE_STATIC_LIBRARY_SUFFIX}) -+#endif() ++#set_property(TARGET lib_utf8proc PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBUTF8PROC_FILENAME}) +#target_include_directories(lib_utf8proc INTERFACE ${INSTALL_DIR}/include) +#add_dependencies(lib_utf8proc proj_utf8proc) # yaml-cpp +-if (NOT MSVC) +- if(CMAKE_BUILD_TYPE MATCHES Debug) +- set(LIBYAML_FILENAME libyaml-cppd${CMAKE_STATIC_LIBRARY_SUFFIX}) +- else() +- set(LIBYAML_FILENAME libyaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) +- endif() +-else() +- set(LIBYAML_FILENAME yaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) +-endif() ++#if (NOT MSVC) ++# if(CMAKE_BUILD_TYPE MATCHES Debug) ++# set(LIBYAML_FILENAME libyaml-cppd${CMAKE_STATIC_LIBRARY_SUFFIX}) ++# else() ++# set(LIBYAML_FILENAME libyaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) ++# endif() ++#else() ++# set(LIBYAML_FILENAME yaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) ++#endif() + -ExternalProject_Add(proj_yamlcpp - URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.7.0.zip - INSTALL_DIR ${INSTALL_DIR} @@ -256,17 +280,13 @@ - -DYAML_MSVC_SHARED_RT=OFF - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} +- BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBYAML_FILENAME} -) -add_library(lib_yamlcpp STATIC IMPORTED GLOBAL) --if (NOT MSVC) -- if(CMAKE_BUILD_TYPE MATCHES Debug) -- set(LIBYAML_FILENAME libyaml-cppd${CMAKE_STATIC_LIBRARY_SUFFIX}) -- else() -- set(LIBYAML_FILENAME libyaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) -- endif() --else() -- set(LIBYAML_FILENAME yaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) --endif() +-set_target_properties(lib_yamlcpp PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBYAML_FILENAME}) +-target_include_directories(lib_yamlcpp INTERFACE ${INSTALL_DIR}/include) +-add_dependencies(lib_yamlcpp proj_yamlcpp) +-set_target_properties(lib_yamlcpp proj_yamlcpp PROPERTIES EXCLUDE_FROM_ALL TRUE) +#ExternalProject_Add(proj_yamlcpp +# URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.7.0.zip +# INSTALL_DIR ${INSTALL_DIR} @@ -286,22 +306,9 @@ +# -DYAML_MSVC_SHARED_RT=OFF +# -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} +# -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} ++# BUILD_BYPRODUCTS ${INSTALL_DIR}/lib/${LIBYAML_FILENAME} +#) +#add_library(lib_yamlcpp STATIC IMPORTED GLOBAL) -+#if (NOT MSVC) -+# if(CMAKE_BUILD_TYPE MATCHES Debug) -+# set(LIBYAML_FILENAME libyaml-cppd${CMAKE_STATIC_LIBRARY_SUFFIX}) -+# else() -+# set(LIBYAML_FILENAME libyaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) -+# endif() -+#else() -+# set(LIBYAML_FILENAME yaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}) -+#endif() - --set_target_properties(lib_yamlcpp PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBYAML_FILENAME}) --target_include_directories(lib_yamlcpp INTERFACE ${INSTALL_DIR}/include) --add_dependencies(lib_yamlcpp proj_yamlcpp) --set_target_properties(lib_yamlcpp proj_yamlcpp PROPERTIES EXCLUDE_FROM_ALL TRUE) +#set_target_properties(lib_yamlcpp PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/lib/${LIBYAML_FILENAME}) +#target_include_directories(lib_yamlcpp INTERFACE ${INSTALL_DIR}/include) +#add_dependencies(lib_yamlcpp proj_yamlcpp) diff --git a/devel/lua-language-server/Makefile b/devel/lua-language-server/Makefile deleted file mode 100644 index a8c8d459dca..00000000000 --- a/devel/lua-language-server/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -PORTNAME= lua-language-server -DISTVERSION= 3.6.9 -PORTEPOCH= 1 -CATEGORIES= devel - -MAINTAINER= adamw@FreeBSD.org -COMMENT= Lua development server and LSP client -WWW= https://github.com/luals/lua-language-server - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Versions after 3.6.9 dump core (and do not compile) -EXPIRATION_DATE=2023-08-15 - -LIB_DEPENDS= libinotify.so:devel/libinotify - -USES= compiler:features dos2unix lua:build ninja:make -USE_GITHUB= yes -GH_ACCOUNT= luals -GH_TUPLE= actboy168:bee.lua:c4e989a:bee/3rd/bee.lua \ - actboy168:bee.lua:eff9325:bee_luamake/3rd/luamake/3rd/bee.lua \ - actboy168:json.lua:b5f5e7b:json/3rd/json.lua \ - actboy168:luamake:3d8d1fd:luamake/3rd/luamake \ - cppcxy:EmmyLuaCodeStyle:66eeece:emmyluacodestyle/3rd/EmmyLuaCodeStyle \ - bjornbytes:lovr-docs:8900d79:lovr/3rd/lovr-api \ - love2d-community:love-api:495ecc7:love/3rd/love-api \ - sqmedeiros:lpeglabel:e25eb35:lpeglabel/3rd/lpeglabel - -BINARY_ALIAS= gcc=${CC} -DOS2UNIX_FILES= 3rd/bee.lua/bee/thread/spinlock.h \ - 3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h -SUB_FILES= lua-language-server -PLIST_FILES= bin/lua-language-server \ - ${DATADIR_REL}/bin/lua-language-server \ - ${DATADIR_REL}/bin/main.lua \ - ${DATADIR_REL}/debugger.lua \ - ${DATADIR_REL}/main.lua -PORTDATA= locale meta script - -.include - -.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130 -BUILD_DEPENDS+= llvm13>0:devel/llvm13 -CPP= ${LOCALBASE}/bin/clang-cpp13 -CC= ${LOCALBASE}/bin/clang13 -CXX= ${LOCALBASE}/bin/clang++13 -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; s|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/3rd/luamake/compile/ninja/freebsd.ninja \ - ${WRKSRC}/3rd/bee.lua/compile/common.lua - -do-build: - ${DO_MAKE_BUILD} -C ${WRKSRC}/3rd/luamake -f compile/ninja/freebsd.ninja - cd ${WRKSRC} && ${MAKE_ENV} ./3rd/luamake/luamake -v - -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/lua-language-server ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/lua-language-server ${STAGEDIR}${DATADIR}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bin/main.lua ${STAGEDIR}${DATADIR}/bin - ${INSTALL_DATA} ${WRKSRC}/debugger.lua ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/main.lua ${STAGEDIR}${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} "locale meta script" ${STAGEDIR}${DATADIR} - -.include diff --git a/devel/lua-language-server/distinfo b/devel/lua-language-server/distinfo deleted file mode 100644 index 2fd62adc3c2..00000000000 --- a/devel/lua-language-server/distinfo +++ /dev/null @@ -1,19 +0,0 @@ -TIMESTAMP = 1676212670 -SHA256 (luals-lua-language-server-3.6.9_GH0.tar.gz) = 6e291e769184cabeb4a42969eaa80cf42fbfeb79e3731ce016209946f1aeafcd -SIZE (luals-lua-language-server-3.6.9_GH0.tar.gz) = 3293832 -SHA256 (actboy168-bee.lua-c4e989a_GH0.tar.gz) = 801cf72c57960293507d2fabe7b3686c9a1343977475cd0ddf72c6b7d841d663 -SIZE (actboy168-bee.lua-c4e989a_GH0.tar.gz) = 480401 -SHA256 (actboy168-bee.lua-eff9325_GH0.tar.gz) = 7c139b1b318a652f41414c677061ddf76e7ed723ca52bb73b83071568e43b229 -SIZE (actboy168-bee.lua-eff9325_GH0.tar.gz) = 480307 -SHA256 (actboy168-json.lua-b5f5e7b_GH0.tar.gz) = ee05dd78a08105d2599c6c100c71301bde20633938a4c198495183bfb305910b -SIZE (actboy168-json.lua-b5f5e7b_GH0.tar.gz) = 12660 -SHA256 (actboy168-luamake-3d8d1fd_GH0.tar.gz) = 9166d4b6812e582b4a594780a62a99bb068e605980c4fea07811bb4ce519be49 -SIZE (actboy168-luamake-3d8d1fd_GH0.tar.gz) = 56409 -SHA256 (cppcxy-EmmyLuaCodeStyle-66eeece_GH0.tar.gz) = 4b16eefc26dc70d124d14aef45bb7b6cb828ab6dd0228a4a365b4fac4487e598 -SIZE (cppcxy-EmmyLuaCodeStyle-66eeece_GH0.tar.gz) = 4243029 -SHA256 (bjornbytes-lovr-docs-8900d79_GH0.tar.gz) = 33b6ab2ec5dd7d26733bf2757d3a2b382174fbea2f18a06159ef753944c88239 -SIZE (bjornbytes-lovr-docs-8900d79_GH0.tar.gz) = 18070542 -SHA256 (love2d-community-love-api-495ecc7_GH0.tar.gz) = 9d63ae5a7a180d2f8db6bc52407900089c15e00b64e0cda65309e548369d06c2 -SIZE (love2d-community-love-api-495ecc7_GH0.tar.gz) = 152170 -SHA256 (sqmedeiros-lpeglabel-e25eb35_GH0.tar.gz) = 07b7771490d7dbd2a5aedc165e01bc4a33ef0e0b2e274182f20ac212a98c0620 -SIZE (sqmedeiros-lpeglabel-e25eb35_GH0.tar.gz) = 83005 diff --git a/devel/lua-language-server/files/lua-language-server.in b/devel/lua-language-server/files/lua-language-server.in deleted file mode 100644 index 3769af67706..00000000000 --- a/devel/lua-language-server/files/lua-language-server.in +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -TMPPATH=$(/usr/bin/mktemp -d '/tmp/lua-language-server.XXXXXX' || exit 1) - -exec '%%DATADIR%%/bin/lua-language-server' \ - --logpath="${TMPPATH}/log" \ - --metapath="${TMPPATH}/meta" \ - "$@" diff --git a/devel/lua-language-server/files/patch-3rd_bee.lua_compile_common.lua b/devel/lua-language-server/files/patch-3rd_bee.lua_compile_common.lua deleted file mode 100644 index a5a69b25e78..00000000000 --- a/devel/lua-language-server/files/patch-3rd_bee.lua_compile_common.lua +++ /dev/null @@ -1,30 +0,0 @@ ---- 3rd/bee.lua/compile/common.lua.orig 2022-08-25 08:04:59 UTC -+++ 3rd/bee.lua/compile/common.lua -@@ -37,7 +37,7 @@ local function need(lst) - end - - lm:source_set "source_bee" { -- includes = ".", -+ includes = {"%%LOCALBASE%%/include", "."}, - sources = "bee/**/*.cpp", - windows = { - sources = need "win" -@@ -152,8 +152,9 @@ lm:lua_source "source_bee" { - sources = { - "!binding/lua_unicode.cpp", - }, -+ includes = "%%LOCALBASE%%/include", - links = "inotify", -- ldflags = "-pthread" -+ ldflags = {"-L%%LOCALBASE%%/lib", "-pthread"} - }, - } - -@@ -191,6 +192,6 @@ lm:source_set 'source_lua' { - flags = "/wd4267" - }, - gcc = { -- flags = "-Wno-maybe-uninitialized", -+ flags = "-Wno-uninitialized", - } - } diff --git a/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja b/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja deleted file mode 100644 index 80e21ca065d..00000000000 --- a/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja +++ /dev/null @@ -1,54 +0,0 @@ ---- 3rd/luamake/compile/ninja/freebsd.ninja.orig 2023-01-31 14:25:23 UTC -+++ 3rd/luamake/compile/ninja/freebsd.ninja -@@ -2,7 +2,7 @@ ninja_required_version = 1.7 - builddir = build/freebsd - bin = $builddir/bin - obj = $builddir/obj --cc = gcc -+cc = %%CC%% - luamake = luamake - rule c_source_bee - command = $cc -MMD -MT $out -MF $out.d -O2 -Wall -Werror $ -@@ -25,7 +25,7 @@ build $obj/source_bee/format.obj: cxx_source_bee $ - build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc - rule cxx_source_bee_1 - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in -+ -Werror -fvisibility=hidden -I3rd/bee.lua -I%%LOCALBASE%%/include -DNDEBUG -o $out -c $in - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -51,7 +51,7 @@ build $obj/source_bee/path_helper.obj: cxx_source_bee_ - rule cxx_source_bee_2 - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $ -- -Itools/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in -+ -Itools/lua54 -I%%LOCALBASE%%/include -DBEE_STATIC -DNDEBUG -o $out -c $in - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -81,7 +81,7 @@ build $obj/source_lua/utf8_crt.obj: c_source_lua $ - 3rd/bee.lua/3rd/lua/utf8_crt.c - rule c_source_lua_1 - command = $cc -MMD -MT $out -MF $out.d -O2 -Wall -Werror -DMAKE_LIB $ -- -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -o $out -c $in -+ -DLUA_USE_LINUX -DNDEBUG -Wno-uninitialized -o $out -c $in - description = Compile C $out - deps = gcc - depfile = $out.d -@@ -99,8 +99,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_boots - build $obj/source_bootstrap/progdir.obj: cxx_source_bootstrap $ - 3rd/bee.lua/bootstrap/progdir.cpp - rule link_luamake -- command = $cc $in -o $out -lm -Wl,-E -linotify -pthread -Wl,-Bstatic $ -- -lstdc++ -Wl,-Bdynamic -static-libgcc -s -+ command = $cc $in -o $out -lm -L%%LOCALBASE%%/lib -linotify -pthread -lstdc++ -s - description = Link Exe $out - build $bin/luamake: link_luamake $obj/source_bootstrap/main.obj $ - $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $ -@@ -143,4 +142,4 @@ build copy_script: phony $bin/main.lua - build test: phony $obj/test.stamp - build copy_luamake: phony luamake - build notest: phony copy_luamake --default test notest -+default notest diff --git a/devel/lua-language-server/files/patch-make.lua b/devel/lua-language-server/files/patch-make.lua deleted file mode 100644 index d5a2d40ab0c..00000000000 --- a/devel/lua-language-server/files/patch-make.lua +++ /dev/null @@ -1,10 +0,0 @@ ---- make.lua.orig 2022-09-06 18:48:12 UTC -+++ make.lua -@@ -96,6 +96,5 @@ lm:build 'unit-test' { - } - - lm:default { -- "bee-test", -- "unit-test", -+ "all" - } diff --git a/devel/lua-language-server/pkg-descr b/devel/lua-language-server/pkg-descr deleted file mode 100644 index 46f3d7de1b4..00000000000 --- a/devel/lua-language-server/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -The Sumneko Lua Language Server is a comprehensive Lua development -server. It functions as an LSP client, supporting: - -* Over 20 supported annotations for documenting your code -* Go to definition -* Dynamic type checking -* Find references -* Diagnostics/Warnings -* Syntax checking -* Element renaming -* Hover to view details on variables, functions, and more -* Autocompletion -* Support for libraries -* Code formatting -* Spell checking -* Custom plugins diff --git a/devel/osc/Makefile b/devel/osc/Makefile index 78e8a105d22..a50a0773994 100644 --- a/devel/osc/Makefile +++ b/devel/osc/Makefile @@ -1,5 +1,5 @@ PORTNAME= osc -PORTVERSION= 1.2.0 +PORTVERSION= 1.3.0 CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org diff --git a/devel/osc/distinfo b/devel/osc/distinfo index e99e613db47..1e055e8fc34 100644 --- a/devel/osc/distinfo +++ b/devel/osc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690310140 -SHA256 (openSUSE-osc-1.2.0_GH0.tar.gz) = 0b2b094a515b340f859b417016def33f9b33a47abe4c3fad66c5dbc8b8447a7d -SIZE (openSUSE-osc-1.2.0_GH0.tar.gz) = 337165 +TIMESTAMP = 1692617012 +SHA256 (openSUSE-osc-1.3.0_GH0.tar.gz) = 77653f92555a644f436570f9d45ea97eec63d76c0a173a154ec4232e05d11d69 +SIZE (openSUSE-osc-1.3.0_GH0.tar.gz) = 341182 diff --git a/devel/p5-App-perlbrew/Makefile b/devel/p5-App-perlbrew/Makefile index 46c281f21cd..31b2743b626 100644 --- a/devel/p5-App-perlbrew/Makefile +++ b/devel/p5-App-perlbrew/Makefile @@ -1,5 +1,5 @@ PORTNAME= App-perlbrew -PORTVERSION= 0.97 +PORTVERSION= 0.98 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:GUGOD @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-CPAN-Perl-Releases>=5.20230423:devel/p5-CPAN-Perl-Releases \ +RUN_DEPENDS= p5-CPAN-Perl-Releases>=5.20230720:devel/p5-CPAN-Perl-Releases \ p5-Capture-Tiny>=0.48:devel/p5-Capture-Tiny \ p5-Devel-PatchPerl>=2.08:devel/p5-Devel-PatchPerl \ p5-local-lib>=2.000014:devel/p5-local-lib diff --git a/devel/p5-App-perlbrew/distinfo b/devel/p5-App-perlbrew/distinfo index 51aa8a9d8ed..18def859bbc 100644 --- a/devel/p5-App-perlbrew/distinfo +++ b/devel/p5-App-perlbrew/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162068 -SHA256 (App-perlbrew-0.97.tar.gz) = bbe211d54090874285c5068053c54091863a039aa976fdff8525d1ee90439102 -SIZE (App-perlbrew-0.97.tar.gz) = 83017 +TIMESTAMP = 1692211665 +SHA256 (App-perlbrew-0.98.tar.gz) = a160f71122588dd535da94dbb0b8301e48e538d25a442a1b13f7190962885932 +SIZE (App-perlbrew-0.98.tar.gz) = 85396 diff --git a/devel/p5-Log-Any/Makefile b/devel/p5-Log-Any/Makefile index 939ed8ce4a4..fcdb9f0ee5a 100644 --- a/devel/p5-Log-Any/Makefile +++ b/devel/p5-Log-Any/Makefile @@ -1,5 +1,5 @@ PORTNAME= Log-Any -PORTVERSION= 1.716 +PORTVERSION= 1.717 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Log-Any/distinfo b/devel/p5-Log-Any/distinfo index 4bf437eb6b1..d0f55131d1e 100644 --- a/devel/p5-Log-Any/distinfo +++ b/devel/p5-Log-Any/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167268 -SHA256 (Log-Any-1.716.tar.gz) = c3bbdeb12e664680b06faf0cc179eecb8777f1f2884ff4a8c35ac18d809d1261 -SIZE (Log-Any-1.716.tar.gz) = 60465 +TIMESTAMP = 1692640092 +SHA256 (Log-Any-1.717.tar.gz) = 56649da0f3900230c9e3d29252cb0a74806fb2ddebd22805acd7368959a65bca +SIZE (Log-Any-1.717.tar.gz) = 62565 diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile index 1b6fe6ba9b6..f258b5d4331 100644 --- a/devel/p5-Module-Release/Makefile +++ b/devel/p5-Module-Release/Makefile @@ -1,5 +1,5 @@ PORTNAME= Module-Release -PORTVERSION= 2.131 +PORTVERSION= 2.133 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Module-Release/distinfo b/devel/p5-Module-Release/distinfo index 7f13e64b8fb..eb408db99aa 100644 --- a/devel/p5-Module-Release/distinfo +++ b/devel/p5-Module-Release/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069984 -SHA256 (Module-Release-2.131.tar.gz) = cab4b579799471ab70de08d3739445738630909c4068cafc7b67d57a4da62039 -SIZE (Module-Release-2.131.tar.gz) = 45346 +TIMESTAMP = 1692211667 +SHA256 (Module-Release-2.133.tar.gz) = 1c386000b0579db9a62f13e6cc0b800ebbaeee1ac556b534a909d41b8b258a5a +SIZE (Module-Release-2.133.tar.gz) = 45545 diff --git a/devel/p5-Module-ScanDeps/Makefile b/devel/p5-Module-ScanDeps/Makefile index a1d4bf7b224..0f419b76e2d 100644 --- a/devel/p5-Module-ScanDeps/Makefile +++ b/devel/p5-Module-ScanDeps/Makefile @@ -1,5 +1,5 @@ PORTNAME= Module-ScanDeps -PORTVERSION= 1.32 +PORTVERSION= 1.33 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Module-ScanDeps/distinfo b/devel/p5-Module-ScanDeps/distinfo index a4edcd80625..34917bc61f9 100644 --- a/devel/p5-Module-ScanDeps/distinfo +++ b/devel/p5-Module-ScanDeps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902055 -SHA256 (Module-ScanDeps-1.32.tar.gz) = 7ab3556ccaa812298da33f0a0515037cd513b9e72c42a76d2c2e4d28832215f0 -SIZE (Module-ScanDeps-1.32.tar.gz) = 56490 +TIMESTAMP = 1692211669 +SHA256 (Module-ScanDeps-1.33.tar.gz) = 55bde24e3b966ebe261e10bdc6720259d331e63a4d2fc086ce551987a5bbbb4c +SIZE (Module-ScanDeps-1.33.tar.gz) = 57056 diff --git a/devel/p5-Object-Pad/Makefile b/devel/p5-Object-Pad/Makefile index df082e1925f..83cecfade1f 100644 --- a/devel/p5-Object-Pad/Makefile +++ b/devel/p5-Object-Pad/Makefile @@ -1,8 +1,9 @@ PORTNAME= Object-Pad -PORTVERSION= 0.79 +PORTVERSION= 0.80.1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- +DISTNAME= Object-Pad-${PORTVERSION:R}${PORTVERSION:E} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Simple syntax for lexical slot-based objects @@ -12,7 +13,7 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= p5-XS-Parse-Keyword>=0.29:devel/p5-XS-Parse-Keyword \ +BUILD_DEPENDS= p5-XS-Parse-Keyword>=0.37:devel/p5-XS-Parse-Keyword \ p5-XS-Parse-Sublike>=0.15:devel/p5-XS-Parse-Sublike TEST_DEPENDS= p5-Test2-Suite>=0.000148:devel/p5-Test2-Suite diff --git a/devel/p5-Object-Pad/distinfo b/devel/p5-Object-Pad/distinfo index 39d4744f3e4..394a51d77bf 100644 --- a/devel/p5-Object-Pad/distinfo +++ b/devel/p5-Object-Pad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684104346 -SHA256 (Object-Pad-0.79.tar.gz) = fb0b10f89e62d54165bd6ab21db55f60b553fa008fc8e75d349870c1a7e22ad6 -SIZE (Object-Pad-0.79.tar.gz) = 167009 +TIMESTAMP = 1692211671 +SHA256 (Object-Pad-0.801.tar.gz) = 7787a7f276b15766bccc078a8b08fba6b48ed4cb4cd4d7af2e1fb21643050902 +SIZE (Object-Pad-0.801.tar.gz) = 170211 diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile index 1f5bdb1ec71..3b86095c337 100644 --- a/devel/p5-Test-Harness/Makefile +++ b/devel/p5-Test-Harness/Makefile @@ -1,5 +1,5 @@ PORTNAME= Test-Harness -PORTVERSION= 3.44 +PORTVERSION= 3.47 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Test-Harness/distinfo b/devel/p5-Test-Harness/distinfo index e4de8df2d67..4a346183933 100644 --- a/devel/p5-Test-Harness/distinfo +++ b/devel/p5-Test-Harness/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650970293 -SHA256 (Test-Harness-3.44.tar.gz) = 7eb591ea6b499ece6745ff3e80e60cee669f0037f9ccbc4e4511425f593e5297 -SIZE (Test-Harness-3.44.tar.gz) = 215148 +TIMESTAMP = 1692212099 +SHA256 (Test-Harness-3.47.tar.gz) = bb31cd4aa90ad4e15f32b08476fb5123b4f19ed0cd28a3291242e8858bf986b5 +SIZE (Test-Harness-3.47.tar.gz) = 215486 diff --git a/devel/p5-Venus/Makefile b/devel/p5-Venus/Makefile index 8d769767e40..84885f3926f 100644 --- a/devel/p5-Venus/Makefile +++ b/devel/p5-Venus/Makefile @@ -1,5 +1,5 @@ PORTNAME= Venus -PORTVERSION= 3.40 +PORTVERSION= 3.55 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:AWNCORP diff --git a/devel/p5-Venus/distinfo b/devel/p5-Venus/distinfo index 4026aa4c6db..88a75c4c132 100644 --- a/devel/p5-Venus/distinfo +++ b/devel/p5-Venus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069992 -SHA256 (Venus-3.40.tar.gz) = 15f72e9ceac7ed5e3b44d7eed8f183b88cb0b289aecd767ca2503bff4373f30f -SIZE (Venus-3.40.tar.gz) = 461057 +TIMESTAMP = 1692211673 +SHA256 (Venus-3.55.tar.gz) = 7a9221e54f8958a71eea0472120854083399be9f72e350ab7b9d223e09ed3bc4 +SIZE (Venus-3.55.tar.gz) = 467244 diff --git a/devel/p5-XS-Parse-Keyword/Makefile b/devel/p5-XS-Parse-Keyword/Makefile index 1bb29a4512e..7da2d4f4e87 100644 --- a/devel/p5-XS-Parse-Keyword/Makefile +++ b/devel/p5-XS-Parse-Keyword/Makefile @@ -1,5 +1,5 @@ PORTNAME= XS-Parse-Keyword -PORTVERSION= 0.36 +PORTVERSION= 0.38 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:PEVANS diff --git a/devel/p5-XS-Parse-Keyword/distinfo b/devel/p5-XS-Parse-Keyword/distinfo index de6f9bdc979..303e5668357 100644 --- a/devel/p5-XS-Parse-Keyword/distinfo +++ b/devel/p5-XS-Parse-Keyword/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069994 -SHA256 (XS-Parse-Keyword-0.36.tar.gz) = 3a4eabeb561e8df50c49f0930a4330e6871df81406abc7a891fb086e364be744 -SIZE (XS-Parse-Keyword-0.36.tar.gz) = 83249 +TIMESTAMP = 1692211675 +SHA256 (XS-Parse-Keyword-0.38.tar.gz) = 2500c47869cf5ca8c61dd23c67badabf66b8f1efb5e279207657c1ce693e211e +SIZE (XS-Parse-Keyword-0.38.tar.gz) = 84144 diff --git a/devel/phpunit10/Makefile b/devel/phpunit10/Makefile index e3adf1e4119..9d30c201349 100644 --- a/devel/phpunit10/Makefile +++ b/devel/phpunit10/Makefile @@ -1,5 +1,5 @@ PORTNAME= phpunit -PORTVERSION= 10.2.7 +PORTVERSION= 10.3.2 CATEGORIES= devel www MASTER_SITES= https://phar.phpunit.de/ PKGNAMESUFFIX= 10${PHP_PKGNAMESUFFIX} diff --git a/devel/phpunit10/distinfo b/devel/phpunit10/distinfo index 230c9517d0b..cc634e2259e 100644 --- a/devel/phpunit10/distinfo +++ b/devel/phpunit10/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069926 -SHA256 (phpunit-10.2.7.phar) = 5baa6719234548c9cdc22e8db99611aa13867e98a8d9894029f2e357bceba4c9 -SIZE (phpunit-10.2.7.phar) = 4626287 +TIMESTAMP = 1692211645 +SHA256 (phpunit-10.3.2.phar) = 0c702bd2823d11482c2a511d245a9d41791810c4930587fdd5957aaa37fe2b1d +SIZE (phpunit-10.3.2.phar) = 4664122 diff --git a/devel/py-aiofiles/Makefile b/devel/py-aiofiles/Makefile index b4c12469c82..d0bac208e65 100644 --- a/devel/py-aiofiles/Makefile +++ b/devel/py-aiofiles/Makefile @@ -1,5 +1,5 @@ PORTNAME= aiofiles -PORTVERSION= 23.1.0 +PORTVERSION= 23.2.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +11,7 @@ WWW= https://github.com/Tinche/aiofiles LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/devel/py-aiofiles/distinfo b/devel/py-aiofiles/distinfo index f5f1b4e84b1..4051d958d0e 100644 --- a/devel/py-aiofiles/distinfo +++ b/devel/py-aiofiles/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682354496 -SHA256 (aiofiles-23.1.0.tar.gz) = edd247df9a19e0db16534d4baaf536d6609a43e1de5401d7a4c1c148753a1635 -SIZE (aiofiles-23.1.0.tar.gz) = 15614 +TIMESTAMP = 1692211705 +SHA256 (aiofiles-23.2.1.tar.gz) = 84ec2218d8419404abcb9f0c02df3f34c6e0a68ed41072acfb1cef5cbc29051a +SIZE (aiofiles-23.2.1.tar.gz) = 32072 diff --git a/devel/py-all-repos/Makefile b/devel/py-all-repos/Makefile new file mode 100644 index 00000000000..72cf08ec2b9 --- /dev/null +++ b/devel/py-all-repos/Makefile @@ -0,0 +1,31 @@ +PORTNAME= all-repos +PORTVERSION= 1.26.0 +CATEGORIES= devel python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= all_repos-${PORTVERSION} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Clone all your repositories and apply sweeping changes +WWW= https://github.com/asottile/all-repos + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= git:devel/git \ + jq:textproc/jq \ + ${PYTHON_PKGNAMEPREFIX}identify>=0:devel/py-identify@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include + +.if ${PYTHON_REL} < 31100 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib-chdir>=0:devel/py-contextlib-chdir@${PY_FLAVOR} +.endif + +.include diff --git a/devel/py-all-repos/distinfo b/devel/py-all-repos/distinfo new file mode 100644 index 00000000000..a541fb50c48 --- /dev/null +++ b/devel/py-all-repos/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211611 +SHA256 (all_repos-1.26.0.tar.gz) = 52fd543c17064af11c06cfe344bb43eda550f5a69de2be767d5c98661a0783b2 +SIZE (all_repos-1.26.0.tar.gz) = 31007 diff --git a/devel/py-all-repos/pkg-descr b/devel/py-all-repos/pkg-descr new file mode 100644 index 00000000000..6a6f1dd3580 --- /dev/null +++ b/devel/py-all-repos/pkg-descr @@ -0,0 +1 @@ +all-repos clones all your repositories and apply sweeping changes. diff --git a/devel/py-attrs-strict/Makefile b/devel/py-attrs-strict/Makefile index 9d429347f8a..ae5a84c43ad 100644 --- a/devel/py-attrs-strict/Makefile +++ b/devel/py-attrs-strict/Makefile @@ -1,6 +1,5 @@ PORTNAME= attrs-strict -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,10 +12,10 @@ WWW= https://github.com/bloomberg/attrs-strict LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=58:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.1.0:devel/py-attrs@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=22.2:devel/py-attrs@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/devel/py-attrs-strict/distinfo b/devel/py-attrs-strict/distinfo index 2bc4573aa25..6ac5f570f0d 100644 --- a/devel/py-attrs-strict/distinfo +++ b/devel/py-attrs-strict/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655561112 -SHA256 (attrs_strict-1.0.0.tar.gz) = 6326c1e51c4fd2fffc9dd607dec06c31add64eedbd37a651ea88f663a37c3f18 -SIZE (attrs_strict-1.0.0.tar.gz) = 25097 +TIMESTAMP = 1692211707 +SHA256 (attrs_strict-1.0.1.tar.gz) = e704863620146c5f2a8b601cd4574d148913db26fc0636f941fe4212e425eafe +SIZE (attrs_strict-1.0.1.tar.gz) = 25069 diff --git a/devel/py-attrs-strict/files/patch-pyproject.toml b/devel/py-attrs-strict/files/patch-pyproject.toml new file mode 100644 index 00000000000..1f8310ee4bf --- /dev/null +++ b/devel/py-attrs-strict/files/patch-pyproject.toml @@ -0,0 +1,13 @@ +--- pyproject.toml.orig 2023-08-14 16:58:30 UTC ++++ pyproject.toml +@@ -1,8 +1,8 @@ + [build-system] + build-backend = 'setuptools.build_meta' + requires = [ +- "setuptools>=67.6.1", +- "setuptools-scm>=7.1", ++ "setuptools>=58", ++ "setuptools-scm>=6", + ] + + [tool.setuptools_scm] diff --git a/devel/py-awscli/Makefile b/devel/py-awscli/Makefile index 3ec1aef6a65..d080f5960f5 100644 --- a/devel/py-awscli/Makefile +++ b/devel/py-awscli/Makefile @@ -1,6 +1,5 @@ PORTNAME= awscli PORTVERSION= 1.29.28 -PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-core/Makefile b/devel/py-azure-core/Makefile index 1351cce8116..38aef378bb5 100644 --- a/devel/py-azure-core/Makefile +++ b/devel/py-azure-core/Makefile @@ -1,5 +1,5 @@ PORTNAME= azure-core -PORTVERSION= 1.28.0 +PORTVERSION= 1.29.2 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3.0:devel/py-typing-extensions@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.0:devel/py-typing-extensions@${PY_FLAVOR} USES= python zip USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-azure-core/distinfo b/devel/py-azure-core/distinfo index 207df2ef32e..d6c5cf71138 100644 --- a/devel/py-azure-core/distinfo +++ b/devel/py-azure-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398825 -SHA256 (azure-core-1.28.0.zip) = e9eefc66fc1fde56dab6f04d4e5d12c60754d5a9fa49bdcfd8534fc96ed936bd -SIZE (azure-core-1.28.0.zip) = 384884 +TIMESTAMP = 1692211709 +SHA256 (azure-core-1.29.2.zip) = beb0fe88d1043d8457318e8fb841d9caa648211092eda213c16b376401f3710d +SIZE (azure-core-1.29.2.zip) = 389341 diff --git a/devel/py-capstone/Makefile b/devel/py-capstone/Makefile index 74f2222cdff..9d210daa22a 100644 --- a/devel/py-capstone/Makefile +++ b/devel/py-capstone/Makefile @@ -1,5 +1,5 @@ PORTNAME= capstone -DISTVERSION= 5.0.0.post1 +DISTVERSION= 5.0.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-capstone/distinfo b/devel/py-capstone/distinfo index 4726c9bdee3..e68b82f9409 100644 --- a/devel/py-capstone/distinfo +++ b/devel/py-capstone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689444982 -SHA256 (python/capstone-5.0.0.post1.tar.gz) = fe0affca395c09ce76a21c5f0fac026e74396839a220798ca5e57c54305bcf65 -SIZE (python/capstone-5.0.0.post1.tar.gz) = 2926420 +TIMESTAMP = 1692762997 +SHA256 (python/capstone-5.0.1.tar.gz) = 740afacc29861db591316beefe30df382c4da08dcb0345a0d10f0cac4f8b1ee2 +SIZE (python/capstone-5.0.1.tar.gz) = 2929485 diff --git a/devel/py-check-jsonschema/Makefile b/devel/py-check-jsonschema/Makefile index 4933601afe4..2dcec10b7aa 100644 --- a/devel/py-check-jsonschema/Makefile +++ b/devel/py-check-jsonschema/Makefile @@ -1,5 +1,5 @@ PORTNAME= check-jsonschema -PORTVERSION= 0.23.3 +PORTVERSION= 0.24.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +11,7 @@ WWW= https://github.com/python-jsonschema/check-jsonschema LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=8<9:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.5.1<5.0:devel/py-jsonschema@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18.0<5.0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0<3.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.17.32:devel/py-ruamel.yaml@${PY_FLAVOR} diff --git a/devel/py-check-jsonschema/distinfo b/devel/py-check-jsonschema/distinfo index 4ce30ba8d56..ff7d42cc4d7 100644 --- a/devel/py-check-jsonschema/distinfo +++ b/devel/py-check-jsonschema/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398831 -SHA256 (check-jsonschema-0.23.3.tar.gz) = 6b174599b5f1a208e7b22b3d1698708a6d948a2a90ab3413a025e5c0217ee056 -SIZE (check-jsonschema-0.23.3.tar.gz) = 186223 +TIMESTAMP = 1692211713 +SHA256 (check-jsonschema-0.24.1.tar.gz) = 336846d97d007ad394a2629165b0eca78ae56c7e1edde1fc50f7555dbad618ed +SIZE (check-jsonschema-0.24.1.tar.gz) = 187114 diff --git a/devel/py-check-jsonschema/files/patch-setup.cfg b/devel/py-check-jsonschema/files/patch-setup.cfg index 55202a56e73..c3fa438885c 100644 --- a/devel/py-check-jsonschema/files/patch-setup.cfg +++ b/devel/py-check-jsonschema/files/patch-setup.cfg @@ -1,11 +1,11 @@ ---- setup.cfg.orig 2023-05-04 17:24:38 UTC +--- setup.cfg.orig 2023-08-10 22:07:07 UTC +++ setup.cfg @@ -17,7 +17,7 @@ classifiers = - python_requires = >=3.7 + python_requires = >=3.8 install_requires = importlib-resources>=1.4.0;python_version<"3.9" - ruamel.yaml==0.17.32 + ruamel.yaml>=0.17.32 - jsonschema>=4.5.1,<5.0 + jsonschema>=4.18.0,<5.0 requests<3.0 click>=8,<9 diff --git a/devel/py-click-help-colors/Makefile b/devel/py-click-help-colors/Makefile index 62487380730..a53ec942200 100644 --- a/devel/py-click-help-colors/Makefile +++ b/devel/py-click-help-colors/Makefile @@ -1,5 +1,5 @@ PORTNAME= click-help-colors -PORTVERSION= 0.9.1 +PORTVERSION= 0.9.2 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-click-help-colors/distinfo b/devel/py-click-help-colors/distinfo index 0751481771f..a0e19789478 100644 --- a/devel/py-click-help-colors/distinfo +++ b/devel/py-click-help-colors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689431885 -SHA256 (click-help-colors-0.9.1.tar.gz) = 78cbcf30cfa81c5fc2a52f49220121e1a8190cd19197d9245997605d3405824d -SIZE (click-help-colors-0.9.1.tar.gz) = 6955 +TIMESTAMP = 1692590414 +SHA256 (click-help-colors-0.9.2.tar.gz) = 756245e542d29226bb3bc056bfa58886f212ba2b82f4e8cf5fc884176ac96d72 +SIZE (click-help-colors-0.9.2.tar.gz) = 7096 diff --git a/devel/py-contextlib-chdir/Makefile b/devel/py-contextlib-chdir/Makefile new file mode 100644 index 00000000000..2de37d0d1c6 --- /dev/null +++ b/devel/py-contextlib-chdir/Makefile @@ -0,0 +1,20 @@ +PORTNAME= contextlib-chdir +PORTVERSION= 1.0.2 +CATEGORIES= devel python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Backport of contextlib.chdir stdlib class added in Python 3.11 +WWW= https://github.com/mondeja/contextlib-chdir + +LICENSE= BSD3CLAUSE + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent pep517 + +NO_ARCH= yes + +.include diff --git a/devel/py-contextlib-chdir/distinfo b/devel/py-contextlib-chdir/distinfo new file mode 100644 index 00000000000..a8d93346186 --- /dev/null +++ b/devel/py-contextlib-chdir/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211613 +SHA256 (contextlib-chdir-1.0.2.tar.gz) = 58406a71db00647fcccfc7e52e9e04e44d29eacf30400e7c0ba3b15f09d5f3fa +SIZE (contextlib-chdir-1.0.2.tar.gz) = 1863 diff --git a/devel/py-contextlib-chdir/files/patch-pyproject.toml b/devel/py-contextlib-chdir/files/patch-pyproject.toml new file mode 100644 index 00000000000..859972f0a53 --- /dev/null +++ b/devel/py-contextlib-chdir/files/patch-pyproject.toml @@ -0,0 +1,10 @@ +--- pyproject.toml.orig 2022-06-08 17:54:37 UTC ++++ pyproject.toml +@@ -9,3 +9,7 @@ packages = [{ include = "contextlib_chdir.*" }, { incl + + [tool.poetry.dependencies] + python = "^3.6" ++ ++[build-system] ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" diff --git a/devel/py-contextlib-chdir/pkg-descr b/devel/py-contextlib-chdir/pkg-descr new file mode 100644 index 00000000000..b18784e79fc --- /dev/null +++ b/devel/py-contextlib-chdir/pkg-descr @@ -0,0 +1,2 @@ +contextlib-chdir provides the backport of contextlib.chdir stdlib class added in +Python 3.11. diff --git a/devel/py-dask/Makefile b/devel/py-dask/Makefile index 1831ec72127..901e51248bb 100644 --- a/devel/py-dask/Makefile +++ b/devel/py-dask/Makefile @@ -1,5 +1,5 @@ PORTNAME= dask -PORTVERSION= 2023.7.1 +PORTVERSION= 2023.8.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -9,7 +9,7 @@ COMMENT= Parallel PyData with Task Scheduling WWW= https://dask.org/ \ https://github.com/dask/dask -LICENSE= BSD4CLAUSE +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=62.6:devel/py-setuptools@${PY_FLAVOR} \ @@ -38,11 +38,11 @@ CPE_VENDOR= anaconda OPTIONS_DEFINE= ARRAY DATAFRAME DIAGNOSTICS ARRAY_DESC= Subset of the NumPy ndarray interface DATAFRAME_DESC= Composed of many smaller Pandas DataFrames +DATAFRAME_IMPLIES= ARRAY DIAGNOSTICS_DESC= Profile and inspect parallel codes ARRAY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR} \ -DATAFRAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pandas>=1.3,1:math/py-pandas@${PY_FLAVOR} +DATAFRAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=1.3,1:math/py-pandas@${PY_FLAVOR} DIAGNOSTICS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}bokeh>=2.4.2<3:www/py-bokeh@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR} diff --git a/devel/py-dask/distinfo b/devel/py-dask/distinfo index 0ad0e9103da..4b519bc6271 100644 --- a/devel/py-dask/distinfo +++ b/devel/py-dask/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070034 -SHA256 (dask-2023.7.1.tar.gz) = bec23e3bfed427d86035f3ecfc1cd1ee6ef375ba40bfb1f8a5f03ad3f2fdbbba -SIZE (dask-2023.7.1.tar.gz) = 8526666 +TIMESTAMP = 1692640044 +SHA256 (dask-2023.8.1.tar.gz) = 5c4b402908938dc87506e0fc07fb0dfa329e59587adf34531cd300fe853b3bf8 +SIZE (dask-2023.8.1.tar.gz) = 8532379 diff --git a/devel/py-ddtrace/Makefile b/devel/py-ddtrace/Makefile index dfaf1a4317f..d4b419408cc 100644 --- a/devel/py-ddtrace/Makefile +++ b/devel/py-ddtrace/Makefile @@ -1,5 +1,5 @@ PORTNAME= ddtrace -PORTVERSION= 1.17.2 +PORTVERSION= 1.18.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.Apache LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.BSD3 BUILD_DEPENDS= cmake:devel/cmake-core \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=4:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=20:devel/py-attrs@${PY_FLAVOR} \ @@ -36,6 +36,8 @@ USE_PYTHON= autoplist concurrent cython pep517 USE_GITHUB= nodefault GH_TUPLE= abseil:abseil-cpp:20211102.0:abseil_abseil_cpp/ddtrace/appsec/iast/_taint_tracking/ +PORTSCOUT= skipv:20230802.0 + OPTIONS_DEFINE= OPENTRACING OPTIONS_DEFAULT=OPENTRACING OPENTRACING_DESC= OpenTracing support diff --git a/devel/py-ddtrace/distinfo b/devel/py-ddtrace/distinfo index 99d8eb15357..2cc600fd5aa 100644 --- a/devel/py-ddtrace/distinfo +++ b/devel/py-ddtrace/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1691070036 -SHA256 (ddtrace-1.17.2.tar.gz) = b20b1fad48c5b1ffb413d57266ecd13431295f1c6380dd5ddf6678c07f67dcde -SIZE (ddtrace-1.17.2.tar.gz) = 6109987 +TIMESTAMP = 1692211717 +SHA256 (ddtrace-1.18.0.tar.gz) = 21ecd7fa81a45ed675fc63c14659743f92c6f29d772a06aa1ac0d0cb0835d4cb +SIZE (ddtrace-1.18.0.tar.gz) = 6199816 SHA256 (abseil-abseil-cpp-20211102.0_GH0.tar.gz) = dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 SIZE (abseil-abseil-cpp-20211102.0_GH0.tar.gz) = 1884080 diff --git a/devel/py-ddtrace/files/patch-pyproject.toml b/devel/py-ddtrace/files/patch-pyproject.toml index 5b1e4264866..f85d6ecfa23 100644 --- a/devel/py-ddtrace/files/patch-pyproject.toml +++ b/devel/py-ddtrace/files/patch-pyproject.toml @@ -1,9 +1,9 @@ ---- pyproject.toml.orig 2023-07-25 21:04:28 UTC +--- pyproject.toml.orig 2023-08-11 14:52:18 UTC +++ pyproject.toml @@ -1,5 +1,5 @@ [build-system] --requires = ["setuptools >= 40.6.0", "setuptools_scm[toml] >=4,<6.1", "cython<3", "cmake"] -+requires = ["setuptools >= 40.6.0", "setuptools_scm[toml] >=4", "cython<3"] +-requires = ["setuptools_scm[toml]>=4", "cython<3", "cmake>=3.24.2; python_version>='3.6'"] ++requires = ["setuptools_scm[toml]>=4", "cython<3"] build-backend = "setuptools.build_meta" - [tool.setuptools_scm] + [project] diff --git a/devel/py-debugpy/Makefile b/devel/py-debugpy/Makefile index d94240cb69c..4079b4e4bc4 100644 --- a/devel/py-debugpy/Makefile +++ b/devel/py-debugpy/Makefile @@ -1,6 +1,7 @@ PORTNAME= debugpy PORTVERSION= 1.6.7 -PORTREVISION= 1 +DISTVERSIONSUFFIX= .post1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-debugpy/distinfo b/devel/py-debugpy/distinfo index b5a52bcd705..94204bdecc7 100644 --- a/devel/py-debugpy/distinfo +++ b/devel/py-debugpy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681052924 -SHA256 (debugpy-1.6.7.zip) = c4c2f0810fa25323abfdfa36cbbbb24e5c3b1a42cb762782de64439c575d67f2 -SIZE (debugpy-1.6.7.zip) = 4660701 +TIMESTAMP = 1692211719 +SHA256 (debugpy-1.6.7.post1.zip) = fe87ec0182ef624855d05e6ed7e0b7cb1359d2ffa2a925f8ec2d22e98b75d0ca +SIZE (debugpy-1.6.7.post1.zip) = 4664667 diff --git a/devel/py-devtools/Makefile b/devel/py-devtools/Makefile index 81a4f434f0b..ffddf2e1a05 100644 --- a/devel/py-devtools/Makefile +++ b/devel/py-devtools/Makefile @@ -1,5 +1,5 @@ PORTNAME= devtools -PORTVERSION= 0.11.0 +PORTVERSION= 0.12.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,16 +13,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asttokens>=2.0.0<3.0.0:devel/py-asttokens@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}executing>=1.1.1:devel/py-executing@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}executing>=1.1.1:devel/py-executing@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.15.0:textproc/py-pygments@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -OPTIONS_DEFINE= PYGMENTS -PYGMENTS_DESC= Highlighted output support - -PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} - .include diff --git a/devel/py-devtools/distinfo b/devel/py-devtools/distinfo index 685ce3db04e..dbc3af5a760 100644 --- a/devel/py-devtools/distinfo +++ b/devel/py-devtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681052926 -SHA256 (devtools-0.11.0.tar.gz) = 4a6d987dfab0c7513a514e7faf0a71296d220423470204e76e0752d146dfad62 -SIZE (devtools-0.11.0.tar.gz) = 74309 +TIMESTAMP = 1692640046 +SHA256 (devtools-0.12.1.tar.gz) = 9cac86adec822108006dd6b1c54fa900fc96c0b7e4c8928680403cd33a557553 +SIZE (devtools-0.12.1.tar.gz) = 74930 diff --git a/devel/py-distributed/Makefile b/devel/py-distributed/Makefile index 8b23e915905..1d266011ce6 100644 --- a/devel/py-distributed/Makefile +++ b/devel/py-distributed/Makefile @@ -1,5 +1,5 @@ PORTNAME= distributed -PORTVERSION= 2023.7.1 +PORTVERSION= 2023.8.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-distributed/distinfo b/devel/py-distributed/distinfo index c28b4d10e6d..e2ea83c3dee 100644 --- a/devel/py-distributed/distinfo +++ b/devel/py-distributed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070040 -SHA256 (distributed-2023.7.1.tar.gz) = 66442f6af32e03815de6d3a5251f8ad9bbd63bb018c48aa361efca5355e46749 -SIZE (distributed-2023.7.1.tar.gz) = 1078202 +TIMESTAMP = 1692640048 +SHA256 (distributed-2023.8.1.tar.gz) = 9eb00dfe08a75c9a450010869de0cbcada016c32bfee43e9b3a281787bdc9d61 +SIZE (distributed-2023.8.1.tar.gz) = 1080842 diff --git a/devel/py-flynt/Makefile b/devel/py-flynt/Makefile index 3e5a8c96eb3..a2085fb1be4 100644 --- a/devel/py-flynt/Makefile +++ b/devel/py-flynt/Makefile @@ -1,6 +1,5 @@ PORTNAME= flynt -PORTVERSION= 0.78 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +13,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astor>0:devel/py-astor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomli>1.1.0:textproc/py-tomli@${PY_FLAVOR} -USES= python +USES= python:3.8+ USE_GITHUB= yes USE_PYTHON= autoplist pep517 diff --git a/devel/py-flynt/distinfo b/devel/py-flynt/distinfo index 59b3a5d9dd2..1574d85327d 100644 --- a/devel/py-flynt/distinfo +++ b/devel/py-flynt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679763402 -SHA256 (ikamensh-flynt-0.78_GH0.tar.gz) = be3508adad6e15878053ffc011fbc2e8e47b8175997661112119e990ef808ac6 -SIZE (ikamensh-flynt-0.78_GH0.tar.gz) = 54675 +TIMESTAMP = 1692736926 +SHA256 (ikamensh-flynt-1.0.1_GH0.tar.gz) = b8a2ad633b3670f04aa1ccac13ac30bb2c0e6a6b83ecea69bd256a0413110ede +SIZE (ikamensh-flynt-1.0.1_GH0.tar.gz) = 55138 diff --git a/devel/py-fypp/Makefile b/devel/py-fypp/Makefile index 21926ee3122..76d116ef630 100644 --- a/devel/py-fypp/Makefile +++ b/devel/py-fypp/Makefile @@ -1,7 +1,7 @@ PORTNAME= fypp -DISTVERSION= 3.1 +DISTVERSION= 3.2 CATEGORIES= devel python -MASTER_SITES= PYPI +#MASTER_SITES= PYPI # missing files needed for tests PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org @@ -12,6 +12,12 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= python -USE_PYTHON= distutils concurrent autoplist +USE_PYTHON= distutils concurrent autoplist pytest + +USE_GITHUB= yes +GH_ACCOUNT= aradi + +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +TEST_WRKSRC= ${WRKSRC}/test .include diff --git a/devel/py-fypp/distinfo b/devel/py-fypp/distinfo index b9c51352c6c..88add7631df 100644 --- a/devel/py-fypp/distinfo +++ b/devel/py-fypp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618892337 -SHA256 (fypp-3.1.tar.gz) = b777ae70081c7c82edcf52eefc01a3e8a566b4e82ccd33ca3b2f06faf1d07d36 -SIZE (fypp-3.1.tar.gz) = 68237 +TIMESTAMP = 1692764039 +SHA256 (aradi-fypp-3.2_GH0.tar.gz) = 33f48c8d2337db539865265ce33c7c50e4d521aacbd31ac7b7e8b189d771ce1d +SIZE (aradi-fypp-3.2_GH0.tar.gz) = 68425 diff --git a/devel/py-giturlparse/Makefile b/devel/py-giturlparse/Makefile index 7c596a78dc4..53b30b60e96 100644 --- a/devel/py-giturlparse/Makefile +++ b/devel/py-giturlparse/Makefile @@ -1,5 +1,5 @@ PORTNAME= giturlparse -PORTVERSION= 0.10.0 +PORTVERSION= 0.11.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,8 +11,11 @@ WWW= https://github.com/nephila/giturlparse LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} + USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/devel/py-giturlparse/distinfo b/devel/py-giturlparse/distinfo index a1116ff63e2..8aa98b64e7c 100644 --- a/devel/py-giturlparse/distinfo +++ b/devel/py-giturlparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658176302 -SHA256 (giturlparse-0.10.0.tar.gz) = 2595ab291d30717cda8474b874c9fd509f1b9802ad7f6968c36a45e4b13eb337 -SIZE (giturlparse-0.10.0.tar.gz) = 15794 +TIMESTAMP = 1692211725 +SHA256 (giturlparse-0.11.1.tar.gz) = cdbe0c062096c69e00f08397826dddebc1f73bc15b793994579c13aafc70c990 +SIZE (giturlparse-0.11.1.tar.gz) = 16062 diff --git a/devel/py-immutables/Makefile b/devel/py-immutables/Makefile index 67b4aadf075..f004ad8be69 100644 --- a/devel/py-immutables/Makefile +++ b/devel/py-immutables/Makefile @@ -1,5 +1,5 @@ PORTNAME= immutables -PORTVERSION= 0.19 +PORTVERSION= 0.20 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,8 +12,11 @@ LICENSE= APACHE20 MIT LICENSE_COMB= multi LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} + USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent pep517 post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/devel/py-immutables/distinfo b/devel/py-immutables/distinfo index 0286e9df38d..99c11cfb861 100644 --- a/devel/py-immutables/distinfo +++ b/devel/py-immutables/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663672828 -SHA256 (immutables-0.19.tar.gz) = df17942d60e8080835fcc5245aa6928ef4c1ed567570ec019185798195048dcf -SIZE (immutables-0.19.tar.gz) = 85490 +TIMESTAMP = 1692211731 +SHA256 (immutables-0.20.tar.gz) = 1d2f83e6a6a8455466cd97b9a90e2b4f7864648616dfa6b19d18f49badac3876 +SIZE (immutables-0.20.tar.gz) = 88933 diff --git a/devel/py-ipykernel/Makefile b/devel/py-ipykernel/Makefile index 54eae29f612..8447273b0bc 100644 --- a/devel/py-ipykernel/Makefile +++ b/devel/py-ipykernel/Makefile @@ -1,5 +1,5 @@ PORTNAME= ipykernel -PORTVERSION= 6.25.0 +PORTVERSION= 6.25.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ipykernel/distinfo b/devel/py-ipykernel/distinfo index 29c85379226..d788201a6aa 100644 --- a/devel/py-ipykernel/distinfo +++ b/devel/py-ipykernel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070056 -SHA256 (ipykernel-6.25.0.tar.gz) = e342ce84712861be4b248c4a73472be4702c1b0dd77448bfd6bcfb3af9d5ddf9 -SIZE (ipykernel-6.25.0.tar.gz) = 155658 +TIMESTAMP = 1692211733 +SHA256 (ipykernel-6.25.1.tar.gz) = 050391364c0977e768e354bdb60cbbfbee7cbb943b1af1618382021136ffd42f +SIZE (ipykernel-6.25.1.tar.gz) = 155925 diff --git a/devel/py-jaraco.classes/Makefile b/devel/py-jaraco.classes/Makefile index 3466497544f..59d8ddfea97 100644 --- a/devel/py-jaraco.classes/Makefile +++ b/devel/py-jaraco.classes/Makefile @@ -1,5 +1,6 @@ PORTNAME= jaraco.classes PORTVERSION= 3.3.0 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +12,10 @@ WWW= https://github.com/jaraco/jaraco.classes LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=56:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>=3.7:devel/py-more-itertools@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>=3.7:devel/py-more-itertools@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-enabler>=0:devel/py-pytest-enabler@${PY_FLAVOR} \ @@ -27,14 +27,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -POST_PLIST= trim-jaraco-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* - -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* - -@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__ - -trim-jaraco-namespace: - @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} - .include diff --git a/devel/py-jaraco.context/Makefile b/devel/py-jaraco.context/Makefile index 3b1fba37692..635ced2932f 100644 --- a/devel/py-jaraco.context/Makefile +++ b/devel/py-jaraco.context/Makefile @@ -1,6 +1,6 @@ PORTNAME= jaraco.context PORTVERSION= 4.3.0 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,10 +12,9 @@ WWW= https://github.com/jaraco/jaraco.context LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=56:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-enabler>=0:devel/py-pytest-enabler@${PY_FLAVOR} \ @@ -27,14 +26,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -POST_PLIST= trim-jaraco-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* - -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* - -@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__ - -trim-jaraco-namespace: - @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} - .include diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile index 0cda24fdca6..9e4b6fd3fcf 100644 --- a/devel/py-jaraco.functools/Makefile +++ b/devel/py-jaraco.functools/Makefile @@ -1,5 +1,5 @@ PORTNAME= jaraco.functools -PORTVERSION= 3.8.0 +PORTVERSION= 3.8.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +11,10 @@ WWW= https://github.com/jaraco/jaraco.functools LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=56:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco.classes>=0:devel/py-jaraco.classes@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ @@ -28,14 +27,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -POST_PLIST= trim-jaraco-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* - -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* - -@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__ - -trim-jaraco-namespace: - @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} - .include diff --git a/devel/py-jaraco.functools/distinfo b/devel/py-jaraco.functools/distinfo index c296a5f6ec8..195f98ad288 100644 --- a/devel/py-jaraco.functools/distinfo +++ b/devel/py-jaraco.functools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166202 -SHA256 (jaraco.functools-3.8.0.tar.gz) = cb5635ae5cc953d35d8ab6744f1a73723074b31eb6be16edee7960261a79b724 -SIZE (jaraco.functools-3.8.0.tar.gz) = 16251 +TIMESTAMP = 1692211735 +SHA256 (jaraco.functools-3.8.1.tar.gz) = e96a0d4ea455005a4092ce89a69ea0f7fb7e22807ad3b1008f9bf70c48d1cf2e +SIZE (jaraco.functools-3.8.1.tar.gz) = 16210 diff --git a/devel/py-jaraco.itertools/Makefile b/devel/py-jaraco.itertools/Makefile index 346afd4a197..8da460dd43a 100644 --- a/devel/py-jaraco.itertools/Makefile +++ b/devel/py-jaraco.itertools/Makefile @@ -1,6 +1,6 @@ PORTNAME= jaraco.itertools PORTVERSION= 6.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,6 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}inflect>=0:devel/py-inflect@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-checkdocs>=2.4:devel/py-pytest-checkdocs@${PY_FLAVOR} \ @@ -30,14 +29,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -POST_PLIST= trim-jaraco-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* - -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* - -@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__ - -trim-jaraco-namespace: - @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} - .include diff --git a/devel/py-jaraco.logging/Makefile b/devel/py-jaraco.logging/Makefile index a29005e4065..7f6cf8704d5 100644 --- a/devel/py-jaraco.logging/Makefile +++ b/devel/py-jaraco.logging/Makefile @@ -1,6 +1,6 @@ PORTNAME= jaraco.logging PORTVERSION= 3.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,11 +12,10 @@ WWW= https://github.com/jaraco/jaraco.logging LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=56:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tempora>=0:devel/py-tempora@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tempora>=0:devel/py-tempora@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0:devel/py-pytest-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} \ @@ -27,14 +26,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -POST_PLIST= trim-jaraco-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* - -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* - -@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__ - -trim-jaraco-namespace: - @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} - .include diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile index 0c7ea22eac9..df4cf7aabd2 100644 --- a/devel/py-jaraco.timing/Makefile +++ b/devel/py-jaraco.timing/Makefile @@ -1,6 +1,6 @@ PORTNAME= jaraco.timing PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +11,10 @@ WWW= https://bitbucket.org/jaraco/jaraco.timing LICENSE= MIT -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=34.4:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tempora>=1.5:devel/py-tempora@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tempora>=1.5:devel/py-tempora@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} USES= python @@ -23,14 +22,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -POST_PLIST= trim-jaraco-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* - -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* - -@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__ - -trim-jaraco-namespace: - @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} - .include diff --git a/devel/py-jaraco.util/Makefile b/devel/py-jaraco.util/Makefile index 86bd27c3048..39c21e44de4 100644 --- a/devel/py-jaraco.util/Makefile +++ b/devel/py-jaraco.util/Makefile @@ -1,6 +1,6 @@ PORTNAME= jaraco.util PORTVERSION= 15.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +11,10 @@ WWW= https://github.com/jaraco/jaraco.util LICENSE= MIT -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=56:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jaraco.context>=0:devel/py-jaraco.context@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco.context>=0:devel/py-jaraco.context@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0.3.7:devel/py-pytest-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-checkdocs>=2.4:devel/py-pytest-checkdocs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ @@ -28,14 +27,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -POST_PLIST= trim-jaraco-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* - -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* - -@${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__ - -trim-jaraco-namespace: - @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} - .include diff --git a/devel/py-jaraco/Makefile b/devel/py-jaraco/Makefile deleted file mode 100644 index 73abb0e6da5..00000000000 --- a/devel/py-jaraco/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -PORTNAME= jaraco -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PORTVERSION= 1 -CATEGORIES= devel python -DISTFILES= # empty - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Shared namespace shim for py-jaraco.* ports - -LICENSE= MIT - -USES= python -USE_PYTHON= flavors - -NO_ARCH= yes -NO_BUILD= yes - -PLIST_FILES= ${PYTHON_SITELIBDIR}/jaraco/__init__.py \ - ${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.opt-1.pyc \ - ${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc - -do-install: - ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco - ${ECHO_CMD} "__path__ = __import__('pkgutil').extend_path(__path__, __name__)" > ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py - ${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - ${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - -.include diff --git a/devel/py-jaraco/pkg-descr b/devel/py-jaraco/pkg-descr deleted file mode 100644 index 7324e036185..00000000000 --- a/devel/py-jaraco/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This port is the shared namespace shim for py-jaraco.* ports. - -py-jaraco provides a common jaraco/__init__.py, which is shared among all -py-jaraco.* ports. diff --git a/devel/py-jellyfish/Makefile b/devel/py-jellyfish/Makefile index 9d30c67634c..447150a1dea 100644 --- a/devel/py-jellyfish/Makefile +++ b/devel/py-jellyfish/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= jellyfish-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for doing approximate and phonetic matching of strings diff --git a/devel/py-json_tricks/Makefile b/devel/py-json_tricks/Makefile index 3eca9b36cfc..f814c700d2b 100644 --- a/devel/py-json_tricks/Makefile +++ b/devel/py-json_tricks/Makefile @@ -1,5 +1,5 @@ PORTNAME= json_tricks -DISTVERSION= 3.17.2 +DISTVERSION= 3.17.3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-json_tricks/distinfo b/devel/py-json_tricks/distinfo index 6faede54d98..ec2c711f03d 100644 --- a/devel/py-json_tricks/distinfo +++ b/devel/py-json_tricks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689829644 -SHA256 (json_tricks-3.17.2.tar.gz) = 9d153d9f2d9ce69a6e81bce1bde61091e27437c11fee4f02b151dd6296c95c71 -SIZE (json_tricks-3.17.2.tar.gz) = 30478 +TIMESTAMP = 1692662675 +SHA256 (json_tricks-3.17.3.tar.gz) = 71561eedad7c22dde019e9a38ff8c46ebd91da789e31e2513f627dd2cbbdbf56 +SIZE (json_tricks-3.17.3.tar.gz) = 30537 diff --git a/devel/py-jsonschema-spec/Makefile b/devel/py-jsonschema-spec/Makefile index 6e9639d2e1b..4256c13caed 100644 --- a/devel/py-jsonschema-spec/Makefile +++ b/devel/py-jsonschema-spec/Makefile @@ -1,5 +1,5 @@ PORTNAME= jsonschema-spec -PORTVERSION= 0.2.3 +PORTVERSION= 0.2.4 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathable>=0.4.1<0.5:devel/py-pathable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}referencing>=0.28.0<0.30.0:devel/py-referencing@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}referencing>=0.28.0<0.31.0:devel/py-referencing@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/devel/py-jsonschema-spec/distinfo b/devel/py-jsonschema-spec/distinfo index cae00aca6ab..d100da66368 100644 --- a/devel/py-jsonschema-spec/distinfo +++ b/devel/py-jsonschema-spec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398855 -SHA256 (jsonschema_spec-0.2.3.tar.gz) = e01b8b100f0676177b0b39027a5cab7e7a16ce4316a3d0d15e576293d954fafc -SIZE (jsonschema_spec-0.2.3.tar.gz) = 11340 +TIMESTAMP = 1692211737 +SHA256 (jsonschema_spec-0.2.4.tar.gz) = 873e396ad1ba6edf9f52d6174c110d4fafb7b5f5894744246a53fe75e5251ec2 +SIZE (jsonschema_spec-0.2.4.tar.gz) = 11477 diff --git a/devel/py-jupyter-server/Makefile b/devel/py-jupyter-server/Makefile index d90538ad146..9b4a3a94f9a 100644 --- a/devel/py-jupyter-server/Makefile +++ b/devel/py-jupyter-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= jupyter-server -PORTVERSION= 2.7.0 +PORTVERSION= 2.7.2 CATEGORIES= devel python MASTER_SITES= PYPI \ https://github.com/jupyter-server/jupyter_server/releases/download/v${PORTVERSION}/ @@ -28,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anyio>=3.1.0:devel/py-anyio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyzmq>=24:net/py-pyzmq@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}send2trash>=0:deskutils/py-send2trash@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}send2trash>=1.8.2:deskutils/py-send2trash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}terminado>=0.8.3:net/py-terminado@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=6.2.0:www/py-tornado@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitlets>=5.6.0:devel/py-traitlets@${PY_FLAVOR} \ diff --git a/devel/py-jupyter-server/distinfo b/devel/py-jupyter-server/distinfo index 74d2e47104a..d12ec4d489d 100644 --- a/devel/py-jupyter-server/distinfo +++ b/devel/py-jupyter-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166206 -SHA256 (jupyter_server-2.7.0.tar.gz) = 36da0a266d31a41ac335a366c88933c17dfa5bb817a48f5c02c16d303bc9477f -SIZE (jupyter_server-2.7.0.tar.gz) = 704548 +TIMESTAMP = 1692640050 +SHA256 (jupyter_server-2.7.2.tar.gz) = d64fb4e593907290e5df916e3c9399c15ab2cd7bdb71cbcd1d36452dbfb30523 +SIZE (jupyter_server-2.7.2.tar.gz) = 705360 diff --git a/devel/py-line-profiler/Makefile b/devel/py-line-profiler/Makefile index b29b9d21c21..b1c209db02a 100644 --- a/devel/py-line-profiler/Makefile +++ b/devel/py-line-profiler/Makefile @@ -1,5 +1,5 @@ PORTNAME= line-profiler -DISTVERSION= 4.0.3 +DISTVERSION= 4.1.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-line-profiler/distinfo b/devel/py-line-profiler/distinfo index de61b35e517..83e5e27ffcf 100644 --- a/devel/py-line-profiler/distinfo +++ b/devel/py-line-profiler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678093979 -SHA256 (line_profiler-4.0.3.tar.gz) = deb2eb9e9119d911debe23edcec8ea68a2cd70c9e3f753c96aaf4a86ca497e7e -SIZE (line_profiler-4.0.3.tar.gz) = 151336 +TIMESTAMP = 1692682209 +SHA256 (line_profiler-4.1.1.tar.gz) = 2fa73d2ac736902e0a6d1e74cf663244218d9c238a7aa5b5acfd6ac6d4672830 +SIZE (line_profiler-4.1.1.tar.gz) = 77207 diff --git a/devel/py-llfuse/Makefile b/devel/py-llfuse/Makefile index ced357284ff..20a8c9c8e7f 100644 --- a/devel/py-llfuse/Makefile +++ b/devel/py-llfuse/Makefile @@ -1,5 +1,5 @@ PORTNAME= llfuse -PORTVERSION= 1.4.4 +PORTVERSION= 1.5.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +11,11 @@ WWW= https://github.com/python-llfuse/python-llfuse LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} USES= compiler:c++11-lang fuse pkgconfig python -USE_PYTHON= autoplist concurrent pep517 pytest +USE_PYTHON= autoplist concurrent cython pep517 pytest TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} diff --git a/devel/py-llfuse/distinfo b/devel/py-llfuse/distinfo index bd6d7a74428..c30cfb0c823 100644 --- a/devel/py-llfuse/distinfo +++ b/devel/py-llfuse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162150 -SHA256 (llfuse-1.4.4.tar.gz) = 92044c8f3fe5dd5b4028005bb3374ab10039530e72d10e061a1bacbd556264c9 -SIZE (llfuse-1.4.4.tar.gz) = 293728 +TIMESTAMP = 1692211741 +SHA256 (llfuse-1.5.0.tar.gz) = d094448bb4eb20099537be53dc2b5b2c0369d36bde09207a9bb228cc3cd58ee1 +SIZE (llfuse-1.5.0.tar.gz) = 869259 diff --git a/devel/py-mediapy/Makefile b/devel/py-mediapy/Makefile index 77b14e85473..3dff9033205 100644 --- a/devel/py-mediapy/Makefile +++ b/devel/py-mediapy/Makefile @@ -1,5 +1,5 @@ PORTNAME= mediapy -PORTVERSION= 1.1.8 +PORTVERSION= 1.1.9 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-mediapy/distinfo b/devel/py-mediapy/distinfo index df68fdf4bcb..89f625500de 100644 --- a/devel/py-mediapy/distinfo +++ b/devel/py-mediapy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166212 -SHA256 (mediapy-1.1.8.tar.gz) = 99584133e3501242d8072a7f9023c5242018dba2dae425a370f97a3e072503d0 -SIZE (mediapy-1.1.8.tar.gz) = 26254 +TIMESTAMP = 1692211743 +SHA256 (mediapy-1.1.9.tar.gz) = 5943b1b44d0d7d78b47e975ab194ea8b13e1555dbe45e7dab6f7fa76009bd19f +SIZE (mediapy-1.1.9.tar.gz) = 26303 diff --git a/devel/py-nbconvert/Makefile b/devel/py-nbconvert/Makefile index dbd6cd9fa8f..a79e46fcdbd 100644 --- a/devel/py-nbconvert/Makefile +++ b/devel/py-nbconvert/Makefile @@ -1,5 +1,5 @@ PORTNAME= nbconvert -PORTVERSION= 7.7.3 +PORTVERSION= 7.7.4 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-nbconvert/distinfo b/devel/py-nbconvert/distinfo index 5f7ecd58520..213bd78d7bb 100644 --- a/devel/py-nbconvert/distinfo +++ b/devel/py-nbconvert/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070476 -SHA256 (nbconvert-7.7.3.tar.gz) = 4a5996bf5f3cd16aa0431897ba1aa4c64842c2079f434b3dc6b8c4b252ef3355 -SIZE (nbconvert-7.7.3.tar.gz) = 849762 +TIMESTAMP = 1692212113 +SHA256 (nbconvert-7.7.4.tar.gz) = 1113d039fa3fc3a846ffa5a3b0a019e85aaa94c566a09fa0c400fb7638e46087 +SIZE (nbconvert-7.7.4.tar.gz) = 849858 diff --git a/devel/py-openstacksdk/Makefile b/devel/py-openstacksdk/Makefile index dbc67550d19..d7aa9059832 100644 --- a/devel/py-openstacksdk/Makefile +++ b/devel/py-openstacksdk/Makefile @@ -1,5 +1,5 @@ PORTNAME= openstacksdk -PORTVERSION= 1.3.1 +PORTVERSION= 1.4.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-openstacksdk/distinfo b/devel/py-openstacksdk/distinfo index 8e722fa66fa..88a19d93eac 100644 --- a/devel/py-openstacksdk/distinfo +++ b/devel/py-openstacksdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166222 -SHA256 (openstacksdk-1.3.1.tar.gz) = fa0fd8386bf7d7549a3aceb9c4e29a8b7049a7819b8640f56b01052f8a102cca -SIZE (openstacksdk-1.3.1.tar.gz) = 1158149 +TIMESTAMP = 1692211749 +SHA256 (openstacksdk-1.4.0.tar.gz) = 3615129edb67c82afbd1a1706e915ffa68e0eebfc99c903c343aac6517dd5858 +SIZE (openstacksdk-1.4.0.tar.gz) = 1173316 diff --git a/devel/py-overrides/Makefile b/devel/py-overrides/Makefile index c6c3cf17b05..662f2ea0633 100644 --- a/devel/py-overrides/Makefile +++ b/devel/py-overrides/Makefile @@ -1,5 +1,5 @@ PORTNAME= overrides -PORTVERSION= 7.3.1 +PORTVERSION= 7.4.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-overrides/distinfo b/devel/py-overrides/distinfo index 2fa05aeafaa..ccba199fda7 100644 --- a/devel/py-overrides/distinfo +++ b/devel/py-overrides/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162014 -SHA256 (overrides-7.3.1.tar.gz) = 8b97c6c1e1681b78cbc9424b138d880f0803c2254c5ebaabdde57bb6c62093f2 -SIZE (overrides-7.3.1.tar.gz) = 24766 +TIMESTAMP = 1692211751 +SHA256 (overrides-7.4.0.tar.gz) = 9502a3cca51f4fac40b5feca985b6703a5c1f6ad815588a7ca9e285b9dca6757 +SIZE (overrides-7.4.0.tar.gz) = 24804 diff --git a/devel/py-pdm-backend/Makefile b/devel/py-pdm-backend/Makefile index 9650c6ef5a9..f468072b481 100644 --- a/devel/py-pdm-backend/Makefile +++ b/devel/py-pdm-backend/Makefile @@ -1,5 +1,5 @@ PORTNAME= pdm-backend -PORTVERSION= 2.1.4 +PORTVERSION= 2.1.5 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pdm-backend/distinfo b/devel/py-pdm-backend/distinfo index f410271e7ed..43533b8aec4 100644 --- a/devel/py-pdm-backend/distinfo +++ b/devel/py-pdm-backend/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398873 -SHA256 (pdm_backend-2.1.4.tar.gz) = f39637cafd739213459a41d27421bad8601eed5262ac828c2519b023a0ffbf14 -SIZE (pdm_backend-2.1.4.tar.gz) = 97638 +TIMESTAMP = 1692211753 +SHA256 (pdm_backend-2.1.5.tar.gz) = 38ea0b3888293d99407928fe3ab841cca2785ce951decc7c96bfa9be7314f9ed +SIZE (pdm_backend-2.1.5.tar.gz) = 97661 diff --git a/devel/py-pycocotools/Makefile b/devel/py-pycocotools/Makefile index cb396b66596..a12d8dca057 100644 --- a/devel/py-pycocotools/Makefile +++ b/devel/py-pycocotools/Makefile @@ -1,5 +1,5 @@ PORTNAME= pycocotools -PORTVERSION= 2.0.6 +PORTVERSION= 2.0.7 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pycocotools/distinfo b/devel/py-pycocotools/distinfo index 2debc1a8cf6..b8eb70d8dc0 100644 --- a/devel/py-pycocotools/distinfo +++ b/devel/py-pycocotools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069896 -SHA256 (pycocotools-2.0.6.tar.gz) = 7fe089b05cc18e806dcf3bd764708d86dab922a100f3734eb77fb77a70a1d18c -SIZE (pycocotools-2.0.6.tar.gz) = 24100 +TIMESTAMP = 1692211759 +SHA256 (pycocotools-2.0.7.tar.gz) = da8b7815196eebf0adabf67fcc459126cbc6498bbc6ab1fd144c371465d86879 +SIZE (pycocotools-2.0.7.tar.gz) = 24965 diff --git a/devel/py-pydantic-core/Makefile b/devel/py-pydantic-core/Makefile index 96fb064d63d..50888885d19 100644 --- a/devel/py-pydantic-core/Makefile +++ b/devel/py-pydantic-core/Makefile @@ -1,5 +1,5 @@ PORTNAME= pydantic-core -PORTVERSION= 2.4.0 +PORTVERSION= 2.6.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pydantic-core/Makefile.crates b/devel/py-pydantic-core/Makefile.crates index 7c7af82c487..792c7685f1c 100644 --- a/devel/py-pydantic-core/Makefile.crates +++ b/devel/py-pydantic-core/Makefile.crates @@ -29,29 +29,29 @@ CARGO_CRATES= ahash-0.8.3 \ parking_lot_core-0.9.8 \ percent-encoding-2.3.0 \ proc-macro2-1.0.64 \ - pyo3-0.19.1 \ - pyo3-build-config-0.19.1 \ - pyo3-ffi-0.19.1 \ - pyo3-macros-0.19.1 \ - pyo3-macros-backend-0.19.1 \ + pyo3-0.19.2 \ + pyo3-build-config-0.19.2 \ + pyo3-ffi-0.19.2 \ + pyo3-macros-0.19.2 \ + pyo3-macros-backend-0.19.2 \ python3-dll-a-0.2.9 \ quote-1.0.29 \ redox_syscall-0.3.5 \ - regex-1.9.1 \ - regex-automata-0.3.2 \ + regex-1.9.3 \ + regex-automata-0.3.6 \ regex-syntax-0.7.4 \ rustversion-1.0.13 \ ryu-1.0.14 \ scopeguard-1.1.0 \ - serde-1.0.175 \ - serde_derive-1.0.175 \ - serde_json-1.0.103 \ + serde-1.0.183 \ + serde_derive-1.0.183 \ + serde_json-1.0.104 \ smallvec-1.11.0 \ - speedate-0.11.0 \ + speedate-0.12.0 \ strum-0.25.0 \ - strum_macros-0.25.1 \ + strum_macros-0.25.2 \ syn-1.0.109 \ - syn-2.0.25 \ + syn-2.0.28 \ target-lexicon-0.12.9 \ tinyvec-1.6.0 \ tinyvec_macros-0.1.1 \ diff --git a/devel/py-pydantic-core/distinfo b/devel/py-pydantic-core/distinfo index efa8427eb0e..f6c8a4f28c5 100644 --- a/devel/py-pydantic-core/distinfo +++ b/devel/py-pydantic-core/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1691070096 -SHA256 (pydantic_core-2.4.0.tar.gz) = ec3473c9789cc00c7260d840c3db2c16dbfc816ca70ec87a00cddfa3e1a1cdd5 -SIZE (pydantic_core-2.4.0.tar.gz) = 322367 +TIMESTAMP = 1692640054 +SHA256 (pydantic_core-2.6.0.tar.gz) = e50513d8dd8ea67259d45986e314f545f219ebb2496eea52269e457cdc7419f4 +SIZE (pydantic_core-2.6.0.tar.gz) = 334615 SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f SIZE (rust/crates/ahash-0.8.3.crate) = 42416 SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41 @@ -63,26 +63,26 @@ SHA256 (rust/crates/percent-encoding-2.3.0.crate) = 9b2a4787296e9989611394c33f19 SIZE (rust/crates/percent-encoding-2.3.0.crate) = 10196 SHA256 (rust/crates/proc-macro2-1.0.64.crate) = 78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da SIZE (rust/crates/proc-macro2-1.0.64.crate) = 44848 -SHA256 (rust/crates/pyo3-0.19.1.crate) = ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59 -SIZE (rust/crates/pyo3-0.19.1.crate) = 418297 -SHA256 (rust/crates/pyo3-build-config-0.19.1.crate) = 554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0 -SIZE (rust/crates/pyo3-build-config-0.19.1.crate) = 29205 -SHA256 (rust/crates/pyo3-ffi-0.19.1.crate) = 922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4 -SIZE (rust/crates/pyo3-ffi-0.19.1.crate) = 64837 -SHA256 (rust/crates/pyo3-macros-0.19.1.crate) = 8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2 -SIZE (rust/crates/pyo3-macros-0.19.1.crate) = 7173 -SHA256 (rust/crates/pyo3-macros-backend-0.19.1.crate) = e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b -SIZE (rust/crates/pyo3-macros-backend-0.19.1.crate) = 49916 +SHA256 (rust/crates/pyo3-0.19.2.crate) = e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38 +SIZE (rust/crates/pyo3-0.19.2.crate) = 418228 +SHA256 (rust/crates/pyo3-build-config-0.19.2.crate) = 076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5 +SIZE (rust/crates/pyo3-build-config-0.19.2.crate) = 29206 +SHA256 (rust/crates/pyo3-ffi-0.19.2.crate) = e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9 +SIZE (rust/crates/pyo3-ffi-0.19.2.crate) = 66500 +SHA256 (rust/crates/pyo3-macros-0.19.2.crate) = dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1 +SIZE (rust/crates/pyo3-macros-0.19.2.crate) = 7173 +SHA256 (rust/crates/pyo3-macros-backend-0.19.2.crate) = 947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536 +SIZE (rust/crates/pyo3-macros-backend-0.19.2.crate) = 49962 SHA256 (rust/crates/python3-dll-a-0.2.9.crate) = d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f SIZE (rust/crates/python3-dll-a-0.2.9.crate) = 66092 SHA256 (rust/crates/quote-1.0.29.crate) = 573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105 SIZE (rust/crates/quote-1.0.29.crate) = 28345 SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29 SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 -SHA256 (rust/crates/regex-1.9.1.crate) = b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575 -SIZE (rust/crates/regex-1.9.1.crate) = 251978 -SHA256 (rust/crates/regex-automata-0.3.2.crate) = 83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf -SIZE (rust/crates/regex-automata-0.3.2.crate) = 603895 +SHA256 (rust/crates/regex-1.9.3.crate) = 81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a +SIZE (rust/crates/regex-1.9.3.crate) = 252676 +SHA256 (rust/crates/regex-automata-0.3.6.crate) = fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69 +SIZE (rust/crates/regex-automata-0.3.6.crate) = 607174 SHA256 (rust/crates/regex-syntax-0.7.4.crate) = e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2 SIZE (rust/crates/regex-syntax-0.7.4.crate) = 343365 SHA256 (rust/crates/rustversion-1.0.13.crate) = dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f @@ -91,24 +91,24 @@ SHA256 (rust/crates/ryu-1.0.14.crate) = fe232bdf6be8c8de797b22184ee71118d63780ea SIZE (rust/crates/ryu-1.0.14.crate) = 46861 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 -SHA256 (rust/crates/serde-1.0.175.crate) = 5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b -SIZE (rust/crates/serde-1.0.175.crate) = 77599 -SHA256 (rust/crates/serde_derive-1.0.175.crate) = b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4 -SIZE (rust/crates/serde_derive-1.0.175.crate) = 379830 -SHA256 (rust/crates/serde_json-1.0.103.crate) = d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b -SIZE (rust/crates/serde_json-1.0.103.crate) = 146095 +SHA256 (rust/crates/serde-1.0.183.crate) = 32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c +SIZE (rust/crates/serde-1.0.183.crate) = 77210 +SHA256 (rust/crates/serde_derive-1.0.183.crate) = aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816 +SIZE (rust/crates/serde_derive-1.0.183.crate) = 377265 +SHA256 (rust/crates/serde_json-1.0.104.crate) = 076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c +SIZE (rust/crates/serde_json-1.0.104.crate) = 146130 SHA256 (rust/crates/smallvec-1.11.0.crate) = 62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9 SIZE (rust/crates/smallvec-1.11.0.crate) = 34680 -SHA256 (rust/crates/speedate-0.11.0.crate) = e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2 -SIZE (rust/crates/speedate-0.11.0.crate) = 30352 +SHA256 (rust/crates/speedate-0.12.0.crate) = c028e117e67c1f3224f5f834b3e48d4133dc11ec509aa19fdfa6c0987efed332 +SIZE (rust/crates/speedate-0.12.0.crate) = 30792 SHA256 (rust/crates/strum-0.25.0.crate) = 290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125 SIZE (rust/crates/strum-0.25.0.crate) = 5539 -SHA256 (rust/crates/strum_macros-0.25.1.crate) = 6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232 -SIZE (rust/crates/strum_macros-0.25.1.crate) = 21700 +SHA256 (rust/crates/strum_macros-0.25.2.crate) = ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059 +SIZE (rust/crates/strum_macros-0.25.2.crate) = 21964 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 SIZE (rust/crates/syn-1.0.109.crate) = 237611 -SHA256 (rust/crates/syn-2.0.25.crate) = 15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2 -SIZE (rust/crates/syn-2.0.25.crate) = 241421 +SHA256 (rust/crates/syn-2.0.28.crate) = 04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567 +SIZE (rust/crates/syn-2.0.28.crate) = 241635 SHA256 (rust/crates/target-lexicon-0.12.9.crate) = df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0 SIZE (rust/crates/target-lexicon-0.12.9.crate) = 24532 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50 diff --git a/devel/py-pydantic2/Makefile b/devel/py-pydantic2/Makefile index 202abda87b1..1791a236d0c 100644 --- a/devel/py-pydantic2/Makefile +++ b/devel/py-pydantic2/Makefile @@ -1,5 +1,5 @@ PORTNAME= pydantic -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=22.5.0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}annotated-types>=0.4.0:devel/py-annotated-types@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pydantic-core>=2.4.0<2.4.0_99:devel/py-pydantic-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pydantic-core>=2.6.0<2.6.0_99:devel/py-pydantic-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.1:devel/py-typing-extensions@${PY_FLAVOR} USES= python diff --git a/devel/py-pydantic2/distinfo b/devel/py-pydantic2/distinfo index aab2ac2e408..d3a6877a545 100644 --- a/devel/py-pydantic2/distinfo +++ b/devel/py-pydantic2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070098 -SHA256 (pydantic-2.1.1.tar.gz) = 22d63db5ce4831afd16e7c58b3192d3faf8f79154980d9397d9867254310ba4b -SIZE (pydantic-2.1.1.tar.gz) = 611057 +TIMESTAMP = 1692640056 +SHA256 (pydantic-2.2.0.tar.gz) = 5f30f37a75bca15930e256da6a401f1cb953eb3bc578d454c0876f4e1459a7fa +SIZE (pydantic-2.2.0.tar.gz) = 620963 diff --git a/devel/py-pykdtree/Makefile b/devel/py-pykdtree/Makefile new file mode 100644 index 00000000000..152d9fb520d --- /dev/null +++ b/devel/py-pykdtree/Makefile @@ -0,0 +1,23 @@ +PORTNAME= pykdtree +PORTVERSION= 1.3.7.post0 +CATEGORIES= devel python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Fast kd-tree implementation with OpenMP-enabled queries +WWW= https://github.com/storpipfugl/pykdtree + +LICENSE= LGPL3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +post-install: + ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + + +.include diff --git a/devel/py-pykdtree/distinfo b/devel/py-pykdtree/distinfo new file mode 100644 index 00000000000..16b8c479e9f --- /dev/null +++ b/devel/py-pykdtree/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211615 +SHA256 (pykdtree-1.3.7.post0.tar.gz) = eca1d61d33db621ef8027eb691ae88db9c65d196aba4b2cc90c190cb90bb508e +SIZE (pykdtree-1.3.7.post0.tar.gz) = 84509 diff --git a/devel/py-pykdtree/pkg-descr b/devel/py-pykdtree/pkg-descr new file mode 100644 index 00000000000..aaae7459c71 --- /dev/null +++ b/devel/py-pykdtree/pkg-descr @@ -0,0 +1,12 @@ +pykdtree is a kd-tree implementation for fast nearest neighbour search in +Python. The aim is to be the fastest implementation around for common use cases +(low dimensions and low number of neighbours) for both tree construction and +queries. + +The implementation is based on scipy.spatial.cKDTree and libANN by combining the +best features from both and focus on implementation efficiency. + +The interface is similar to that of scipy.spatial.cKDTree except only Euclidean +distance measure is supported. + +Queries are optionally multithreaded using OpenMP. diff --git a/devel/py-pyproject-fmt/Makefile b/devel/py-pyproject-fmt/Makefile index aeabfcb3e8a..6409bdcce1c 100644 --- a/devel/py-pyproject-fmt/Makefile +++ b/devel/py-pyproject-fmt/Makefile @@ -1,5 +1,5 @@ PORTNAME= pyproject-fmt -PORTVERSION= 0.13.0 +PORTVERSION= 0.13.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0.3:devel/py-hatch-vcs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>=1.17.1:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}natsort>=8.3.1:devel/py-natsort@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}natsort>=8.4:devel/py-natsort@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=23.1:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11.8:textproc/py-tomlkit@${PY_FLAVOR} diff --git a/devel/py-pyproject-fmt/distinfo b/devel/py-pyproject-fmt/distinfo index 89c8d5b0f26..0c015266726 100644 --- a/devel/py-pyproject-fmt/distinfo +++ b/devel/py-pyproject-fmt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902149 -SHA256 (pyproject_fmt-0.13.0.tar.gz) = aaad7398fe810c9087b33c1cc74d49b51a746bb05e9999371719b577139d0c49 -SIZE (pyproject_fmt-0.13.0.tar.gz) = 13021 +TIMESTAMP = 1692211761 +SHA256 (pyproject_fmt-0.13.1.tar.gz) = ab56708a4bb3d8aa946abf9d5477b11441a23bcc574e5cf39fa758926e222805 +SIZE (pyproject_fmt-0.13.1.tar.gz) = 13938 diff --git a/devel/py-pyright/Makefile b/devel/py-pyright/Makefile index 312236df020..a2ab1285e99 100644 --- a/devel/py-pyright/Makefile +++ b/devel/py-pyright/Makefile @@ -1,5 +1,5 @@ PORTNAME= pyright -PORTVERSION= 1.1.318 +PORTVERSION= 1.1.323 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pyright/distinfo b/devel/py-pyright/distinfo index 94a00e9ed42..442ef764c45 100644 --- a/devel/py-pyright/distinfo +++ b/devel/py-pyright/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070106 -SHA256 (pyright-1.1.318.tar.gz) = 69dcf9c32d5be27d531750de627e76a7cadc741d333b547c09044278b508db7b -SIZE (pyright-1.1.318.tar.gz) = 16823 +TIMESTAMP = 1692211755 +SHA256 (pyright-1.1.323.tar.gz) = f3029bfe96a3436a505464d28e3433fafe23ac5f86f52edab9a26cd66685825e +SIZE (pyright-1.1.323.tar.gz) = 16844 diff --git a/devel/py-pytest-freezegun/Makefile b/devel/py-pytest-freezegun/Makefile deleted file mode 100644 index 2c3174149d2..00000000000 --- a/devel/py-pytest-freezegun/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PORTNAME= pytest-freezegun -PORTVERSION= 0.4.2 -CATEGORIES= devel python -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Wrap tests with fixtures in freeze_time -WWW= https://github.com/ktosiek/pytest-freezegun - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Use devel/py-pytest-freezer as upstream is unmaintained -EXPIRATION_DATE= 2023-08-16 -# unless the upstream fixes the problem, this port should be probably deprecated, see https://github.com/ktosiek/pytest-freezegun/issues/43 -BROKEN= causes INTERNALERROR failures in PyTest in many python-based ports, based on the assessment in this comment: https://github.com/pytest-dev/pytest/issues/10846#issuecomment-1487971534 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>0.3:devel/py-freezegun@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR} - -USES= python zip -USE_PYTHON= autoplist distutils - -NO_ARCH= yes - -.include diff --git a/devel/py-pytest-freezegun/distinfo b/devel/py-pytest-freezegun/distinfo deleted file mode 100644 index 45e3fa135f5..00000000000 --- a/devel/py-pytest-freezegun/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1595297485 -SHA256 (pytest-freezegun-0.4.2.zip) = 19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949 -SIZE (pytest-freezegun-0.4.2.zip) = 9059 diff --git a/devel/py-pytest-freezegun/pkg-descr b/devel/py-pytest-freezegun/pkg-descr deleted file mode 100644 index 69d4af7344e..00000000000 --- a/devel/py-pytest-freezegun/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Wrap tests with fixtures in freeze_time diff --git a/devel/py-pytest-regtest/Makefile b/devel/py-pytest-regtest/Makefile index 9e3d0f39e81..95a9db681fb 100644 --- a/devel/py-pytest-regtest/Makefile +++ b/devel/py-pytest-regtest/Makefile @@ -1,5 +1,5 @@ PORTNAME= pytest-regtest -PORTVERSION= 1.5.0 +PORTVERSION= 1.5.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-pytest-regtest/distinfo b/devel/py-pytest-regtest/distinfo index 46e3ef1a07a..5c68df18660 100644 --- a/devel/py-pytest-regtest/distinfo +++ b/devel/py-pytest-regtest/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657909846 -SHA256 (pytest-regtest-1.5.0.tar.gz) = 348f9f23b45d5a674fbdf2a70429221242063baf6a1521f30fb0aa03f7bea5db -SIZE (pytest-regtest-1.5.0.tar.gz) = 9948 +TIMESTAMP = 1692617143 +SHA256 (pytest-regtest-1.5.1.tar.gz) = 8deec797dcfd9313756e078bb82410c71a84c6571086bcf74f05d9064e659b57 +SIZE (pytest-regtest-1.5.1.tar.gz) = 10108 diff --git a/devel/py-robotframework-seleniumlibrary/Makefile b/devel/py-robotframework-seleniumlibrary/Makefile index 13c39109eb8..b1a684aec97 100644 --- a/devel/py-robotframework-seleniumlibrary/Makefile +++ b/devel/py-robotframework-seleniumlibrary/Makefile @@ -1,5 +1,5 @@ PORTNAME= robotframework-seleniumlibrary -PORTVERSION= 6.1.0 +PORTVERSION= 6.1.1 CATEGORIES= devel www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-robotframework-seleniumlibrary/distinfo b/devel/py-robotframework-seleniumlibrary/distinfo index 159da0dfdf7..1e653a795a9 100644 --- a/devel/py-robotframework-seleniumlibrary/distinfo +++ b/devel/py-robotframework-seleniumlibrary/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684104466 -SHA256 (robotframework-seleniumlibrary-6.1.0.tar.gz) = 64686f6aa98b1fd1c340715c0adf8c09b6b405564086fbe672de31498a26ff0e -SIZE (robotframework-seleniumlibrary-6.1.0.tar.gz) = 162301 +TIMESTAMP = 1692211765 +SHA256 (robotframework-seleniumlibrary-6.1.1.tar.gz) = a62262f1e2f9cba34537fe391d06e7253504efd31fe3914c417a63aa9919a7ee +SIZE (robotframework-seleniumlibrary-6.1.1.tar.gz) = 163006 diff --git a/devel/py-robotframework-seleniumlibrary/files/patch-requirements.txt b/devel/py-robotframework-seleniumlibrary/files/patch-requirements.txt index 0e1a5dc19fa..12dbfa48090 100644 --- a/devel/py-robotframework-seleniumlibrary/files/patch-requirements.txt +++ b/devel/py-robotframework-seleniumlibrary/files/patch-requirements.txt @@ -1,7 +1,7 @@ --- requirements.txt.orig 2023-03-29 16:43:23 UTC +++ requirements.txt @@ -1,3 +1,3 @@ --selenium >= 4.0.0 +-selenium >= 4.3.0 +selenium >= 3.141.0 robotframework >= 4.1.3 robotframework-pythonlibcore >= 3.0.0 diff --git a/devel/py-scikit-base/Makefile b/devel/py-scikit-base/Makefile index ca0bd34e293..86ff64196ea 100644 --- a/devel/py-scikit-base/Makefile +++ b/devel/py-scikit-base/Makefile @@ -1,5 +1,5 @@ PORTNAME= scikit-base -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR} \ - ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} diff --git a/devel/py-scikit-base/distinfo b/devel/py-scikit-base/distinfo index 423e96209e7..0d20fe70b2c 100644 --- a/devel/py-scikit-base/distinfo +++ b/devel/py-scikit-base/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166024 -SHA256 (scikit-base-0.5.0.tar.gz) = 9092ff791492d2135ff7008b6900cfd7b202daa798624e284102669aed4118a7 -SIZE (scikit-base-0.5.0.tar.gz) = 99182 +TIMESTAMP = 1692211769 +SHA256 (scikit-base-0.5.1.tar.gz) = b8620ece5641153c69a30ed60fc77fd92c2888ebac96d1fee5dae3f857132179 +SIZE (scikit-base-0.5.1.tar.gz) = 99650 diff --git a/devel/py-scikit-build-core/Makefile b/devel/py-scikit-build-core/Makefile index ed7be5b7cde..9c15188ac7e 100644 --- a/devel/py-scikit-build-core/Makefile +++ b/devel/py-scikit-build-core/Makefile @@ -1,5 +1,5 @@ PORTNAME= scikit-build-core -DISTVERSION= 0.4.8 +DISTVERSION= 0.5.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-scikit-build-core/distinfo b/devel/py-scikit-build-core/distinfo index 94ca2c76aad..5ffadd40aac 100644 --- a/devel/py-scikit-build-core/distinfo +++ b/devel/py-scikit-build-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690831427 -SHA256 (scikit_build_core-0.4.8.tar.gz) = 9fac1cac1a38ba1168190b7bd98f62aecf06cd46db7185ec8c27b27e0da4ad4b -SIZE (scikit_build_core-0.4.8.tar.gz) = 163396 +TIMESTAMP = 1692771880 +SHA256 (scikit_build_core-0.5.0.tar.gz) = a42a95029b34b5cf892855342d9b9445c774cb797fcb24c8fc4c2fb42b18dfca +SIZE (scikit_build_core-0.5.0.tar.gz) = 177478 diff --git a/devel/py-simple-parsing/Makefile b/devel/py-simple-parsing/Makefile index eeccbfd8923..5ec6c4dccfc 100644 --- a/devel/py-simple-parsing/Makefile +++ b/devel/py-simple-parsing/Makefile @@ -1,5 +1,5 @@ PORTNAME= simple-parsing -PORTVERSION= 0.1.3 +PORTVERSION= 0.1.4 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -7,7 +7,7 @@ DISTNAME= simple_parsing-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Small utility for simplifying and cleaning up argument parsing scripts -WWW= https://pypi.org/project/simple-parsing/ +WWW= https://github.com/lebrice/SimpleParsing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/devel/py-simple-parsing/distinfo b/devel/py-simple-parsing/distinfo index 6fb65764acc..f4e88e58cfa 100644 --- a/devel/py-simple-parsing/distinfo +++ b/devel/py-simple-parsing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069898 -SHA256 (simple_parsing-0.1.3.tar.gz) = 14970728f11bdb084044f678035ce753c0860418282d7a4c49edfcd7f447c4b0 -SIZE (simple_parsing-0.1.3.tar.gz) = 172509 +TIMESTAMP = 1692211771 +SHA256 (simple_parsing-0.1.4.tar.gz) = 312300327d8f0beb61b6419500423bd335be8b83da66f733e9c67c6c18341ae8 +SIZE (simple_parsing-0.1.4.tar.gz) = 174863 diff --git a/devel/py-tenacity/Makefile b/devel/py-tenacity/Makefile index 49989deaf85..6ab9619835f 100644 --- a/devel/py-tenacity/Makefile +++ b/devel/py-tenacity/Makefile @@ -1,20 +1,23 @@ PORTNAME= tenacity -PORTVERSION= 8.2.2 +PORTVERSION= 8.2.3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Retry code until it succeeds -WWW= https://github.com/jd/tenacity +WWW= https://tenacity.readthedocs.io/en/latest/ \ + https://github.com/jd/tenacity LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=21.0.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/devel/py-tenacity/distinfo b/devel/py-tenacity/distinfo index b70c5eaaf04..cd840000973 100644 --- a/devel/py-tenacity/distinfo +++ b/devel/py-tenacity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679498746 -SHA256 (tenacity-8.2.2.tar.gz) = 43af037822bd0029025877f3b2d97cc4d7bb0c2991000a3d59d71517c5c969e0 -SIZE (tenacity-8.2.2.tar.gz) = 40186 +TIMESTAMP = 1692211773 +SHA256 (tenacity-8.2.3.tar.gz) = 5398ef0d78e63f40007c1fb4c0bff96e1911394d2fa8d194f77619c05ff6cc8a +SIZE (tenacity-8.2.3.tar.gz) = 40651 diff --git a/devel/py-treelib/Makefile b/devel/py-treelib/Makefile index 541920b3d90..32f1ad7178c 100644 --- a/devel/py-treelib/Makefile +++ b/devel/py-treelib/Makefile @@ -1,5 +1,5 @@ PORTNAME= treelib -DISTVERSION= 1.6.4 +DISTVERSION= 1.7.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-treelib/distinfo b/devel/py-treelib/distinfo index 119c8a476fe..79b832e733d 100644 --- a/devel/py-treelib/distinfo +++ b/devel/py-treelib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680029628 -SHA256 (treelib-1.6.4.tar.gz) = 1a2e838f6b99e2690bc3d992d5a1f04cdb4af6564bd7688883c23d17257bbb2a -SIZE (treelib-1.6.4.tar.gz) = 25506 +TIMESTAMP = 1692636103 +SHA256 (treelib-1.7.0.tar.gz) = 9bff1af416b9e642a6cd0e0431d15edf26a24b8d0c8ae68afbd3801b5e30fb61 +SIZE (treelib-1.7.0.tar.gz) = 25198 diff --git a/devel/py-types-docutils/Makefile b/devel/py-types-docutils/Makefile index 9c7c82395ab..97e88584dd5 100644 --- a/devel/py-types-docutils/Makefile +++ b/devel/py-types-docutils/Makefile @@ -1,5 +1,5 @@ PORTNAME= types-docutils -PORTVERSION= 0.20.0.1 +PORTVERSION= 0.20.0.3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-types-docutils/distinfo b/devel/py-types-docutils/distinfo index 616fcbe7156..86b19479deb 100644 --- a/devel/py-types-docutils/distinfo +++ b/devel/py-types-docutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685792302 -SHA256 (types-docutils-0.20.0.1.tar.gz) = f682b5459a1e6e28208742adb0be8573d1ecbddd442f00d202b0278c1c4418a2 -SIZE (types-docutils-0.20.0.1.tar.gz) = 9796 +TIMESTAMP = 1692211777 +SHA256 (types-docutils-0.20.0.3.tar.gz) = 4928e790f42b99d5833990f99c8dd9fa9f16825f6ed30380ca981846d36870cd +SIZE (types-docutils-0.20.0.3.tar.gz) = 10207 diff --git a/devel/py-types-protobuf/Makefile b/devel/py-types-protobuf/Makefile index 68fd7cf96df..2c10c2a8c36 100644 --- a/devel/py-types-protobuf/Makefile +++ b/devel/py-types-protobuf/Makefile @@ -1,5 +1,5 @@ PORTNAME= types-protobuf -PORTVERSION= 4.23.0.2 +PORTVERSION= 4.24.0.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-types-protobuf/distinfo b/devel/py-types-protobuf/distinfo index 808e259d311..6c3c0fcd4aa 100644 --- a/devel/py-types-protobuf/distinfo +++ b/devel/py-types-protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690305780 -SHA256 (types-protobuf-4.23.0.2.tar.gz) = 1066b069d4f0e09bdebb64ca4f35cc6b8accf52f808368046ccec96744af0375 -SIZE (types-protobuf-4.23.0.2.tar.gz) = 47502 +TIMESTAMP = 1692617244 +SHA256 (types-protobuf-4.24.0.1.tar.gz) = 90adea3b693d6a40d8ef075c58fe6b5cc6e01fe1496301a7e6fc70398dcff92e +SIZE (types-protobuf-4.24.0.1.tar.gz) = 47648 diff --git a/devel/py-vulture/Makefile b/devel/py-vulture/Makefile index ca08e59e944..765403dec2f 100644 --- a/devel/py-vulture/Makefile +++ b/devel/py-vulture/Makefile @@ -1,5 +1,5 @@ PORTNAME= vulture -PORTVERSION= 2.7 +PORTVERSION= 2.8 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-vulture/distinfo b/devel/py-vulture/distinfo index 94b07e918d6..4f69c302522 100644 --- a/devel/py-vulture/distinfo +++ b/devel/py-vulture/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589916 -SHA256 (vulture-2.7.tar.gz) = 67fb80a014ed9fdb599dd44bb96cb54311032a104106fc2e706ef7a6dad88032 -SIZE (vulture-2.7.tar.gz) = 54001 +TIMESTAMP = 1692211781 +SHA256 (vulture-2.8.tar.gz) = 393293f183508064294b0feb4c8579e7f1f27e5bf74c9def6a3d52f38b29b599 +SIZE (vulture-2.8.tar.gz) = 54838 diff --git a/devel/py-watchfiles/Makefile b/devel/py-watchfiles/Makefile index 6c176ff90d8..93751175d1a 100644 --- a/devel/py-watchfiles/Makefile +++ b/devel/py-watchfiles/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= watchfiles-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Simple, modern and high performance file watching and code reload in python diff --git a/devel/py-yaspin/Makefile b/devel/py-yaspin/Makefile index a00175aa01b..a33e8f6c003 100644 --- a/devel/py-yaspin/Makefile +++ b/devel/py-yaspin/Makefile @@ -1,6 +1,5 @@ PORTNAME= yaspin -PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTVERSION= 2.5.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,10 +11,11 @@ WWW= https://github.com/pavdmyt/yaspin LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>=2.2<3.0:devel/py-termcolor@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>=2.3<3:devel/py-termcolor@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils pytest +USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes diff --git a/devel/py-yaspin/distinfo b/devel/py-yaspin/distinfo index 579ac4dcab7..381e570345c 100644 --- a/devel/py-yaspin/distinfo +++ b/devel/py-yaspin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589922 -SHA256 (yaspin-2.3.0.tar.gz) = 547afd1a9700ac3a29a9f5591c70343bef186ed5dfb5e545a9bb0c77e561a1c9 -SIZE (yaspin-2.3.0.tar.gz) = 35361 +TIMESTAMP = 1692211783 +SHA256 (yaspin-2.5.0.tar.gz) = f96ab3b5c42e1eaa6af3193508082309d9dc43f6963339f9aa606003ee8d7e63 +SIZE (yaspin-2.5.0.tar.gz) = 34589 diff --git a/devel/py-zarr/Makefile b/devel/py-zarr/Makefile index 1e231470fd8..9e2b6af9d24 100644 --- a/devel/py-zarr/Makefile +++ b/devel/py-zarr/Makefile @@ -1,5 +1,5 @@ PORTNAME= zarr -DISTVERSION= 2.16.0 +DISTVERSION= 2.16.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-zarr/distinfo b/devel/py-zarr/distinfo index 4c5d860902a..78c0069cb95 100644 --- a/devel/py-zarr/distinfo +++ b/devel/py-zarr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689920448 -SHA256 (zarr-2.16.0.tar.gz) = 84e36b695bda0ecea52af9861271984cb22a5c864679907b7b9ba3f79b684f7e -SIZE (zarr-2.16.0.tar.gz) = 3596961 +TIMESTAMP = 1692637330 +SHA256 (zarr-2.16.1.tar.gz) = 4276cf4b4a653431042cd53ff2282bc4d292a6842411e88529964504fb073286 +SIZE (zarr-2.16.1.tar.gz) = 3597771 diff --git a/devel/py-zarr/files/patch-pyproject.toml b/devel/py-zarr/files/patch-pyproject.toml index bd1f3aeaa96..2237e9a0f1d 100644 --- a/devel/py-zarr/files/patch-pyproject.toml +++ b/devel/py-zarr/files/patch-pyproject.toml @@ -1,9 +1,9 @@ ---- pyproject.toml.orig 2023-02-26 08:32:53 UTC +--- pyproject.toml.orig 2023-08-18 14:28:45 UTC +++ pyproject.toml @@ -1,5 +1,5 @@ [build-system] --requires = ["setuptools>=64.0.0", "setuptools-scm"] -+requires = ["setuptools", "setuptools-scm"] +-requires = ["setuptools>=64.0.0", "setuptools-scm>1.5.4"] ++requires = ["setuptools>0", "setuptools-scm>1.5.4"] build-backend = "setuptools.build_meta" diff --git a/devel/rubygem-actionview70/Makefile b/devel/rubygem-actionview70/Makefile index 8c1f2373c5e..34f7e9ff5a6 100644 --- a/devel/rubygem-actionview70/Makefile +++ b/devel/rubygem-actionview70/Makefile @@ -1,5 +1,5 @@ PORTNAME= actionview -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/devel/rubygem-actionview70/distinfo b/devel/rubygem-actionview70/distinfo index 554a68e2d3e..6346839ecc0 100644 --- a/devel/rubygem-actionview70/distinfo +++ b/devel/rubygem-actionview70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167204 -SHA256 (rubygem/actionview-7.0.6.gem) = a7224aca85e7be32997a3e6f12cf96fb529b14b6ec00fbaf4aa25df96e828ec5 -SIZE (rubygem/actionview-7.0.6.gem) = 179712 +TIMESTAMP = 1692212033 +SHA256 (rubygem/actionview-7.0.7.gem) = 0a2d74ad36f62bd2d920434f11e9b7c1a205324dc7e8cea713bb757dcb0cc2da +SIZE (rubygem/actionview-7.0.7.gem) = 179712 diff --git a/devel/rubygem-activejob70/Makefile b/devel/rubygem-activejob70/Makefile index e48338c3866..3f4f0204743 100644 --- a/devel/rubygem-activejob70/Makefile +++ b/devel/rubygem-activejob70/Makefile @@ -1,5 +1,5 @@ PORTNAME= activejob -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/devel/rubygem-activejob70/distinfo b/devel/rubygem-activejob70/distinfo index 9e844dcf42f..7aaeae1667b 100644 --- a/devel/rubygem-activejob70/distinfo +++ b/devel/rubygem-activejob70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167206 -SHA256 (rubygem/activejob-7.0.6.gem) = 78148bf1f0f011b5d9c8ed66d787728a174cb01a20cebc5e0f2a8352cce25cbd -SIZE (rubygem/activejob-7.0.6.gem) = 33792 +TIMESTAMP = 1692212035 +SHA256 (rubygem/activejob-7.0.7.gem) = fe53f5e05a376962bd7f9866f1917d2a3479f3104870049792f2942ad32fb968 +SIZE (rubygem/activejob-7.0.7.gem) = 33792 diff --git a/devel/rubygem-activesupport70/Makefile b/devel/rubygem-activesupport70/Makefile index 02bb2977ecd..476c417c93c 100644 --- a/devel/rubygem-activesupport70/Makefile +++ b/devel/rubygem-activesupport70/Makefile @@ -1,5 +1,5 @@ PORTNAME= activesupport -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/devel/rubygem-activesupport70/distinfo b/devel/rubygem-activesupport70/distinfo index 6a44356e2c4..fcffb17e99b 100644 --- a/devel/rubygem-activesupport70/distinfo +++ b/devel/rubygem-activesupport70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167208 -SHA256 (rubygem/activesupport-7.0.6.gem) = d3abba6b15d8fd7af07f3322c370f00eb8ce6715fb714436342999628c705ab2 -SIZE (rubygem/activesupport-7.0.6.gem) = 225280 +TIMESTAMP = 1692212037 +SHA256 (rubygem/activesupport-7.0.7.gem) = 293b492bf3808eed3bcc915f6a4599609d0664c1a306f8168f1e680bc7b6ebf3 +SIZE (rubygem/activesupport-7.0.7.gem) = 225792 diff --git a/devel/rubygem-aws-partitions/Makefile b/devel/rubygem-aws-partitions/Makefile index 10bae00a47e..6dac6335f26 100644 --- a/devel/rubygem-aws-partitions/Makefile +++ b/devel/rubygem-aws-partitions/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-partitions -PORTVERSION= 1.796.0 +PORTVERSION= 1.805.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-partitions/distinfo b/devel/rubygem-aws-partitions/distinfo index c77d54880fd..8089d64f66a 100644 --- a/devel/rubygem-aws-partitions/distinfo +++ b/devel/rubygem-aws-partitions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070204 -SHA256 (rubygem/aws-partitions-1.796.0.gem) = 20b5a5ffdafcb4500b9a6e0bfbe0cfda10daccaf47613b135cafa4488e1db5cf -SIZE (rubygem/aws-partitions-1.796.0.gem) = 57856 +TIMESTAMP = 1692211839 +SHA256 (rubygem/aws-partitions-1.805.0.gem) = caca228d484a9fc56aeb7ee6d0045337801b0d4e3ccfc51a53955dd31191b11a +SIZE (rubygem/aws-partitions-1.805.0.gem) = 57856 diff --git a/devel/rubygem-aws-sdk-acmpca/Makefile b/devel/rubygem-aws-sdk-acmpca/Makefile index 1a3ff4938b1..c56522745b7 100644 --- a/devel/rubygem-aws-sdk-acmpca/Makefile +++ b/devel/rubygem-aws-sdk-acmpca/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-acmpca -PORTVERSION= 1.59.0 +PORTVERSION= 1.60.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-acmpca/distinfo b/devel/rubygem-aws-sdk-acmpca/distinfo index 941d7d84148..52826aa1eab 100644 --- a/devel/rubygem-aws-sdk-acmpca/distinfo +++ b/devel/rubygem-aws-sdk-acmpca/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398925 -SHA256 (rubygem/aws-sdk-acmpca-1.59.0.gem) = 9a9ddad981c29b741c3a963630dda775c07e08a4ce49efd4efd6ce48b8cf857f -SIZE (rubygem/aws-sdk-acmpca-1.59.0.gem) = 62464 +TIMESTAMP = 1692211841 +SHA256 (rubygem/aws-sdk-acmpca-1.60.0.gem) = c507d3cc9f48b013f433c17bfb60838780f79885d4556264e4fb26dc8045a2c9 +SIZE (rubygem/aws-sdk-acmpca-1.60.0.gem) = 62464 diff --git a/devel/rubygem-aws-sdk-amplifybackend/Makefile b/devel/rubygem-aws-sdk-amplifybackend/Makefile index 418f79745e0..54581b5a891 100644 --- a/devel/rubygem-aws-sdk-amplifybackend/Makefile +++ b/devel/rubygem-aws-sdk-amplifybackend/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-amplifybackend -PORTVERSION= 1.25.0 +PORTVERSION= 1.26.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-amplifybackend/distinfo b/devel/rubygem-aws-sdk-amplifybackend/distinfo index 119b310e706..b1e23942f97 100644 --- a/devel/rubygem-aws-sdk-amplifybackend/distinfo +++ b/devel/rubygem-aws-sdk-amplifybackend/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398931 -SHA256 (rubygem/aws-sdk-amplifybackend-1.25.0.gem) = faa9572d2854f658009456a2a71e37098c44a85d400c542b8772352dad6ca449 -SIZE (rubygem/aws-sdk-amplifybackend-1.25.0.gem) = 40960 +TIMESTAMP = 1692211843 +SHA256 (rubygem/aws-sdk-amplifybackend-1.26.0.gem) = fe334df843aff3cc489f9d393afd8b017443294aaf35a62c70d2f15d1f112a65 +SIZE (rubygem/aws-sdk-amplifybackend-1.26.0.gem) = 40960 diff --git a/devel/rubygem-aws-sdk-autoscaling/Makefile b/devel/rubygem-aws-sdk-autoscaling/Makefile index 51e6ca93e49..fac9f727f95 100644 --- a/devel/rubygem-aws-sdk-autoscaling/Makefile +++ b/devel/rubygem-aws-sdk-autoscaling/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-autoscaling -PORTVERSION= 1.96.0 +PORTVERSION= 1.97.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-autoscaling/distinfo b/devel/rubygem-aws-sdk-autoscaling/distinfo index 1224baa8a88..6139f989f54 100644 --- a/devel/rubygem-aws-sdk-autoscaling/distinfo +++ b/devel/rubygem-aws-sdk-autoscaling/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070212 -SHA256 (rubygem/aws-sdk-autoscaling-1.96.0.gem) = b0bb3cb02802ea11aab087f0225d8e14e82e074b780629f4552e45af5dff5517 -SIZE (rubygem/aws-sdk-autoscaling-1.96.0.gem) = 165376 +TIMESTAMP = 1692211845 +SHA256 (rubygem/aws-sdk-autoscaling-1.97.0.gem) = 3917d90613f19981fbb4f724ff5b68a658f7b5826f03a212f6eec66b9a7349d6 +SIZE (rubygem/aws-sdk-autoscaling-1.97.0.gem) = 165376 diff --git a/devel/rubygem-aws-sdk-backup/Makefile b/devel/rubygem-aws-sdk-backup/Makefile index 945387d6e0d..4ab1e34f42b 100644 --- a/devel/rubygem-aws-sdk-backup/Makefile +++ b/devel/rubygem-aws-sdk-backup/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-backup -PORTVERSION= 1.56.0 +PORTVERSION= 1.57.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-backup/distinfo b/devel/rubygem-aws-sdk-backup/distinfo index 85241650132..09fdc8a389b 100644 --- a/devel/rubygem-aws-sdk-backup/distinfo +++ b/devel/rubygem-aws-sdk-backup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689398981 -SHA256 (rubygem/aws-sdk-backup-1.56.0.gem) = d7e884d5265ee94f9d449439f28efab867aa1a5082602eb5d8a9d9cff4aa8d7a -SIZE (rubygem/aws-sdk-backup-1.56.0.gem) = 89600 +TIMESTAMP = 1692211847 +SHA256 (rubygem/aws-sdk-backup-1.57.0.gem) = f6dead42746b9c4909bd35c5322666f68b405dfc247a28a0b622c818b6cd389b +SIZE (rubygem/aws-sdk-backup-1.57.0.gem) = 92160 diff --git a/devel/rubygem-aws-sdk-chimesdkmeetings/Makefile b/devel/rubygem-aws-sdk-chimesdkmeetings/Makefile index a5c6e2ef23c..d6d0e645c22 100644 --- a/devel/rubygem-aws-sdk-chimesdkmeetings/Makefile +++ b/devel/rubygem-aws-sdk-chimesdkmeetings/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-chimesdkmeetings -PORTVERSION= 1.23.0 +PORTVERSION= 1.24.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-chimesdkmeetings/distinfo b/devel/rubygem-aws-sdk-chimesdkmeetings/distinfo index 085a5976c81..827752d9877 100644 --- a/devel/rubygem-aws-sdk-chimesdkmeetings/distinfo +++ b/devel/rubygem-aws-sdk-chimesdkmeetings/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399001 -SHA256 (rubygem/aws-sdk-chimesdkmeetings-1.23.0.gem) = 9e26b021ddac7597830f95f0351e330044e16459d38209eb51d7a52882468b87 -SIZE (rubygem/aws-sdk-chimesdkmeetings-1.23.0.gem) = 36864 +TIMESTAMP = 1692211849 +SHA256 (rubygem/aws-sdk-chimesdkmeetings-1.24.0.gem) = d5cfd8ebb31fab0726d32d266b6e56952c2ecd64e26b5109306389c73f986359 +SIZE (rubygem/aws-sdk-chimesdkmeetings-1.24.0.gem) = 36864 diff --git a/devel/rubygem-aws-sdk-chimesdkvoice/Makefile b/devel/rubygem-aws-sdk-chimesdkvoice/Makefile index 1ead9dc7829..91f419963e9 100644 --- a/devel/rubygem-aws-sdk-chimesdkvoice/Makefile +++ b/devel/rubygem-aws-sdk-chimesdkvoice/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-chimesdkvoice -PORTVERSION= 1.11.0 +PORTVERSION= 1.12.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-chimesdkvoice/distinfo b/devel/rubygem-aws-sdk-chimesdkvoice/distinfo index e6c9e52661f..db63bd38f5a 100644 --- a/devel/rubygem-aws-sdk-chimesdkvoice/distinfo +++ b/devel/rubygem-aws-sdk-chimesdkvoice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399005 -SHA256 (rubygem/aws-sdk-chimesdkvoice-1.11.0.gem) = dd39eaf085e0281287eb2953044cdf4e5ace315bb37b66b7e64d6a6bc3157a36 -SIZE (rubygem/aws-sdk-chimesdkvoice-1.11.0.gem) = 67072 +TIMESTAMP = 1692211851 +SHA256 (rubygem/aws-sdk-chimesdkvoice-1.12.0.gem) = ee8fb522c1a085d8c7021ec72c619e8ef70cf60006505344836deb43f2437b7d +SIZE (rubygem/aws-sdk-chimesdkvoice-1.12.0.gem) = 67584 diff --git a/devel/rubygem-aws-sdk-cloud9/Makefile b/devel/rubygem-aws-sdk-cloud9/Makefile index 1afc6b2ad0e..8274ba5b9fc 100644 --- a/devel/rubygem-aws-sdk-cloud9/Makefile +++ b/devel/rubygem-aws-sdk-cloud9/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-cloud9 -PORTVERSION= 1.54.0 +PORTVERSION= 1.55.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-cloud9/distinfo b/devel/rubygem-aws-sdk-cloud9/distinfo index 432d0bc6373..28901c61929 100644 --- a/devel/rubygem-aws-sdk-cloud9/distinfo +++ b/devel/rubygem-aws-sdk-cloud9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399009 -SHA256 (rubygem/aws-sdk-cloud9-1.54.0.gem) = 80a16192b1239a8ec18f9193dbc532925e930b85800bae983ba8aaffd02a2ae4 -SIZE (rubygem/aws-sdk-cloud9-1.54.0.gem) = 29696 +TIMESTAMP = 1692211853 +SHA256 (rubygem/aws-sdk-cloud9-1.55.0.gem) = 38943a4a4e6150dfbf83f13232090824684c7592888de129d43ab8a4ef51b219 +SIZE (rubygem/aws-sdk-cloud9-1.55.0.gem) = 29696 diff --git a/devel/rubygem-aws-sdk-cloudtrail/Makefile b/devel/rubygem-aws-sdk-cloudtrail/Makefile index 57ebee15e73..179870b11ac 100644 --- a/devel/rubygem-aws-sdk-cloudtrail/Makefile +++ b/devel/rubygem-aws-sdk-cloudtrail/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-cloudtrail -PORTVERSION= 1.66.0 +PORTVERSION= 1.67.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-cloudtrail/distinfo b/devel/rubygem-aws-sdk-cloudtrail/distinfo index 8a4a26706a6..756833034ae 100644 --- a/devel/rubygem-aws-sdk-cloudtrail/distinfo +++ b/devel/rubygem-aws-sdk-cloudtrail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399025 -SHA256 (rubygem/aws-sdk-cloudtrail-1.66.0.gem) = fd43dc478711951fae6ccbe4a98ce87d2dbd2d94cf2986d4cc9e22dfdf175dc8 -SIZE (rubygem/aws-sdk-cloudtrail-1.66.0.gem) = 80896 +TIMESTAMP = 1692211855 +SHA256 (rubygem/aws-sdk-cloudtrail-1.67.0.gem) = 5da041eccfbb4afbe03eeca43761848ffbb4c2e80c2be18c505f42e7ec8be58b +SIZE (rubygem/aws-sdk-cloudtrail-1.67.0.gem) = 81920 diff --git a/devel/rubygem-aws-sdk-cloudwatch/Makefile b/devel/rubygem-aws-sdk-cloudwatch/Makefile index 707e72f4330..e1de7cb80c0 100644 --- a/devel/rubygem-aws-sdk-cloudwatch/Makefile +++ b/devel/rubygem-aws-sdk-cloudwatch/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-cloudwatch -PORTVERSION= 1.78.0 +PORTVERSION= 1.79.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-cloudwatch/distinfo b/devel/rubygem-aws-sdk-cloudwatch/distinfo index 5e05f1eedc3..aae26ea5e26 100644 --- a/devel/rubygem-aws-sdk-cloudwatch/distinfo +++ b/devel/rubygem-aws-sdk-cloudwatch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399029 -SHA256 (rubygem/aws-sdk-cloudwatch-1.78.0.gem) = 5b1d6ba01d1c84e5f9ecec23cc969e13e3f1ceba542e20a68093ab48ca909600 -SIZE (rubygem/aws-sdk-cloudwatch-1.78.0.gem) = 105984 +TIMESTAMP = 1692211857 +SHA256 (rubygem/aws-sdk-cloudwatch-1.79.0.gem) = 29c49496f9d97e369462423de3016263e9f866207c05ffa57fba632349ecc9b4 +SIZE (rubygem/aws-sdk-cloudwatch-1.79.0.gem) = 106496 diff --git a/devel/rubygem-aws-sdk-codecommit/Makefile b/devel/rubygem-aws-sdk-codecommit/Makefile index 4a1d8cd6c74..63f7f7057b6 100644 --- a/devel/rubygem-aws-sdk-codecommit/Makefile +++ b/devel/rubygem-aws-sdk-codecommit/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-codecommit -PORTVERSION= 1.58.0 +PORTVERSION= 1.59.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-codecommit/distinfo b/devel/rubygem-aws-sdk-codecommit/distinfo index ce411d3e904..b84ad1af246 100644 --- a/devel/rubygem-aws-sdk-codecommit/distinfo +++ b/devel/rubygem-aws-sdk-codecommit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399045 -SHA256 (rubygem/aws-sdk-codecommit-1.58.0.gem) = 8bd0814ae0a829834e2441f85d305d3786d4d238b8327c8c0fd29d4895e1a01b -SIZE (rubygem/aws-sdk-codecommit-1.58.0.gem) = 100352 +TIMESTAMP = 1692640070 +SHA256 (rubygem/aws-sdk-codecommit-1.59.0.gem) = c8f61ed187ebe41551794b5fbad239722870d61127114ff1bb1e435162df65e1 +SIZE (rubygem/aws-sdk-codecommit-1.59.0.gem) = 101888 diff --git a/devel/rubygem-aws-sdk-configservice/Makefile b/devel/rubygem-aws-sdk-configservice/Makefile index 31bab8d7622..8def6ecb377 100644 --- a/devel/rubygem-aws-sdk-configservice/Makefile +++ b/devel/rubygem-aws-sdk-configservice/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-configservice -PORTVERSION= 1.96.0 +PORTVERSION= 1.97.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-configservice/distinfo b/devel/rubygem-aws-sdk-configservice/distinfo index bd20e9ecee2..4a8226d214f 100644 --- a/devel/rubygem-aws-sdk-configservice/distinfo +++ b/devel/rubygem-aws-sdk-configservice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399075 -SHA256 (rubygem/aws-sdk-configservice-1.96.0.gem) = 982052b720f22261432512715b9cc446b147a27a69df1b3295e683308a91a904 -SIZE (rubygem/aws-sdk-configservice-1.96.0.gem) = 148480 +TIMESTAMP = 1692211859 +SHA256 (rubygem/aws-sdk-configservice-1.97.0.gem) = 4eae7d0f7556da89e59bfb12b1929e4e37ef7716731c6eab48f991743c0c96bb +SIZE (rubygem/aws-sdk-configservice-1.97.0.gem) = 155136 diff --git a/devel/rubygem-aws-sdk-connect/Makefile b/devel/rubygem-aws-sdk-connect/Makefile index 4a4b9d1bced..6fc70a7ddb6 100644 --- a/devel/rubygem-aws-sdk-connect/Makefile +++ b/devel/rubygem-aws-sdk-connect/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-connect -PORTVERSION= 1.122.0 +PORTVERSION= 1.124.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-connect/distinfo b/devel/rubygem-aws-sdk-connect/distinfo index c1142ef58ef..ee4755ea4cd 100644 --- a/devel/rubygem-aws-sdk-connect/distinfo +++ b/devel/rubygem-aws-sdk-connect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070240 -SHA256 (rubygem/aws-sdk-connect-1.122.0.gem) = 51dc32fdcce5f4daebc40060ada940529df2176cf54d5eeee6f841f2966d2d01 -SIZE (rubygem/aws-sdk-connect-1.122.0.gem) = 181248 +TIMESTAMP = 1692211861 +SHA256 (rubygem/aws-sdk-connect-1.124.0.gem) = 41f40e710bb582ea05396a1ad50b1d6f7214b402a8d3f805b0a1d3e7e7d5af9b +SIZE (rubygem/aws-sdk-connect-1.124.0.gem) = 184832 diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 761465567e5..8030cb7a69f 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-core -PORTVERSION= 3.180.0 +PORTVERSION= 3.180.3 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index e7e1a9e88c7..6ae44b553d6 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070246 -SHA256 (rubygem/aws-sdk-core-3.180.0.gem) = 56cd5f109982ccde02d9639abfd64c4f6c6dda61dda0a87755d0ff35187111bf -SIZE (rubygem/aws-sdk-core-3.180.0.gem) = 348160 +TIMESTAMP = 1692211863 +SHA256 (rubygem/aws-sdk-core-3.180.3.gem) = 829915d511bb018acab0905d860c1831c4a7f7e8daba1afd546225b2c9918351 +SIZE (rubygem/aws-sdk-core-3.180.3.gem) = 348160 diff --git a/devel/rubygem-aws-sdk-databasemigrationservice/Makefile b/devel/rubygem-aws-sdk-databasemigrationservice/Makefile index 72392de6f50..298469b92cb 100644 --- a/devel/rubygem-aws-sdk-databasemigrationservice/Makefile +++ b/devel/rubygem-aws-sdk-databasemigrationservice/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-databasemigrationservice -PORTVERSION= 1.85.0 +PORTVERSION= 1.86.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-databasemigrationservice/distinfo b/devel/rubygem-aws-sdk-databasemigrationservice/distinfo index 9147ea10aaf..869db929448 100644 --- a/devel/rubygem-aws-sdk-databasemigrationservice/distinfo +++ b/devel/rubygem-aws-sdk-databasemigrationservice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070252 -SHA256 (rubygem/aws-sdk-databasemigrationservice-1.85.0.gem) = f856d4f0f1280b3f5c81474ef5384892a68b08c3498f8a55ab5829fb22f7a28d -SIZE (rubygem/aws-sdk-databasemigrationservice-1.85.0.gem) = 172544 +TIMESTAMP = 1692211865 +SHA256 (rubygem/aws-sdk-databasemigrationservice-1.86.0.gem) = b9a18a109f84ec41959f98e696a3d27ba0bc35e6f583d8432d02729487084e0c +SIZE (rubygem/aws-sdk-databasemigrationservice-1.86.0.gem) = 194560 diff --git a/devel/rubygem-aws-sdk-datasync/Makefile b/devel/rubygem-aws-sdk-datasync/Makefile index 325269b8e13..2b19684e53c 100644 --- a/devel/rubygem-aws-sdk-datasync/Makefile +++ b/devel/rubygem-aws-sdk-datasync/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-datasync -PORTVERSION= 1.63.0 +PORTVERSION= 1.64.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-datasync/distinfo b/devel/rubygem-aws-sdk-datasync/distinfo index 4f339486dc4..4863d39a9ac 100644 --- a/devel/rubygem-aws-sdk-datasync/distinfo +++ b/devel/rubygem-aws-sdk-datasync/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070254 -SHA256 (rubygem/aws-sdk-datasync-1.63.0.gem) = 7409dc5bf9ffd88f1af0a6e30c173cf4dea5ba1d1594f89c3235b10bdcae5da2 -SIZE (rubygem/aws-sdk-datasync-1.63.0.gem) = 87552 +TIMESTAMP = 1692211867 +SHA256 (rubygem/aws-sdk-datasync-1.64.0.gem) = 0ba3c90c5b5bcf9bd126f5931e6ddaf0bf45ae05e43b3c0501f1e330c3fc668c +SIZE (rubygem/aws-sdk-datasync-1.64.0.gem) = 86528 diff --git a/devel/rubygem-aws-sdk-detective/Makefile b/devel/rubygem-aws-sdk-detective/Makefile index 2fd73de3ea9..9f59ff8c710 100644 --- a/devel/rubygem-aws-sdk-detective/Makefile +++ b/devel/rubygem-aws-sdk-detective/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-detective -PORTVERSION= 1.38.0 +PORTVERSION= 1.39.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-detective/distinfo b/devel/rubygem-aws-sdk-detective/distinfo index 80e0a21ab9f..53bd3bb2de0 100644 --- a/devel/rubygem-aws-sdk-detective/distinfo +++ b/devel/rubygem-aws-sdk-detective/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399109 -SHA256 (rubygem/aws-sdk-detective-1.38.0.gem) = a0461e9e877c7d672e49c179b43fc40d9cfee4b566238484821ba95cc8681c2b -SIZE (rubygem/aws-sdk-detective-1.38.0.gem) = 33792 +TIMESTAMP = 1692211869 +SHA256 (rubygem/aws-sdk-detective-1.39.0.gem) = 40dd9513db6bbf132c231f67ace3016d8876a3b4a57b1fb1241822a365a3e61b +SIZE (rubygem/aws-sdk-detective-1.39.0.gem) = 33792 diff --git a/devel/rubygem-aws-sdk-dynamodb/Makefile b/devel/rubygem-aws-sdk-dynamodb/Makefile index 77b41209f0a..dd17df3ab32 100644 --- a/devel/rubygem-aws-sdk-dynamodb/Makefile +++ b/devel/rubygem-aws-sdk-dynamodb/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-dynamodb -PORTVERSION= 1.93.0 +PORTVERSION= 1.93.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-dynamodb/distinfo b/devel/rubygem-aws-sdk-dynamodb/distinfo index 3f991c54720..178beff316a 100644 --- a/devel/rubygem-aws-sdk-dynamodb/distinfo +++ b/devel/rubygem-aws-sdk-dynamodb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070260 -SHA256 (rubygem/aws-sdk-dynamodb-1.93.0.gem) = b17aaa8e72290683c79268f045d09513f6338d4e08c9ad2f70387534fc0d10fe -SIZE (rubygem/aws-sdk-dynamodb-1.93.0.gem) = 186368 +TIMESTAMP = 1692211871 +SHA256 (rubygem/aws-sdk-dynamodb-1.93.1.gem) = 8481dc3942f49e5657d56d333c2bd46dd1e61ecd26c8beddd2a9342f95f251a3 +SIZE (rubygem/aws-sdk-dynamodb-1.93.1.gem) = 186880 diff --git a/devel/rubygem-aws-sdk-ec2/Makefile b/devel/rubygem-aws-sdk-ec2/Makefile index 8f405c48658..ecba30417f5 100644 --- a/devel/rubygem-aws-sdk-ec2/Makefile +++ b/devel/rubygem-aws-sdk-ec2/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-ec2 -PORTVERSION= 1.395.0 +PORTVERSION= 1.398.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-ec2/distinfo b/devel/rubygem-aws-sdk-ec2/distinfo index a44346e8c0c..b6e3ea0134a 100644 --- a/devel/rubygem-aws-sdk-ec2/distinfo +++ b/devel/rubygem-aws-sdk-ec2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070264 -SHA256 (rubygem/aws-sdk-ec2-1.395.0.gem) = c7af3ec855e2d9eccb1e9c610dbcd9d9454d09210aecb3fdc2f5201cf835ba05 -SIZE (rubygem/aws-sdk-ec2-1.395.0.gem) = 992256 +TIMESTAMP = 1692211873 +SHA256 (rubygem/aws-sdk-ec2-1.398.0.gem) = b9c1429b0f967b4febc4050c35c32b65e7b2ab17c8000c44fd83d7b60aff79e6 +SIZE (rubygem/aws-sdk-ec2-1.398.0.gem) = 1003008 diff --git a/devel/rubygem-aws-sdk-ecs/Makefile b/devel/rubygem-aws-sdk-ecs/Makefile index 9a9f07ed572..6ec11532fe3 100644 --- a/devel/rubygem-aws-sdk-ecs/Makefile +++ b/devel/rubygem-aws-sdk-ecs/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-ecs -PORTVERSION= 1.126.0 +PORTVERSION= 1.127.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-ecs/distinfo b/devel/rubygem-aws-sdk-ecs/distinfo index 1c6b4a2be43..5797140161a 100644 --- a/devel/rubygem-aws-sdk-ecs/distinfo +++ b/devel/rubygem-aws-sdk-ecs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399141 -SHA256 (rubygem/aws-sdk-ecs-1.126.0.gem) = d7f234dca6731eaeeb80c0df24bd6fe3c66655dd49774dbd8a1d603065599039 -SIZE (rubygem/aws-sdk-ecs-1.126.0.gem) = 192000 +TIMESTAMP = 1692211875 +SHA256 (rubygem/aws-sdk-ecs-1.127.0.gem) = c4b55c82bae28a6831511bf26da7c42873b2a73e454e2c96dbb209b9790957b4 +SIZE (rubygem/aws-sdk-ecs-1.127.0.gem) = 192512 diff --git a/devel/rubygem-aws-sdk-elasticache/Makefile b/devel/rubygem-aws-sdk-elasticache/Makefile index 49b021b0629..2c4404418d7 100644 --- a/devel/rubygem-aws-sdk-elasticache/Makefile +++ b/devel/rubygem-aws-sdk-elasticache/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-elasticache -PORTVERSION= 1.90.0 +PORTVERSION= 1.91.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-elasticache/distinfo b/devel/rubygem-aws-sdk-elasticache/distinfo index 814b2fd1ef9..fc867e787be 100644 --- a/devel/rubygem-aws-sdk-elasticache/distinfo +++ b/devel/rubygem-aws-sdk-elasticache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399147 -SHA256 (rubygem/aws-sdk-elasticache-1.90.0.gem) = d639f3173bc49ee16aea1be43dc2d37c9b765e10c2e21a8a773e5a18e9f175ca -SIZE (rubygem/aws-sdk-elasticache-1.90.0.gem) = 145920 +TIMESTAMP = 1692211877 +SHA256 (rubygem/aws-sdk-elasticache-1.91.0.gem) = 0d08564001519fad64e8a7e97ebad06aa3373541a7418640ded2d2449adc8409 +SIZE (rubygem/aws-sdk-elasticache-1.91.0.gem) = 146432 diff --git a/devel/rubygem-aws-sdk-elasticloadbalancingv2/Makefile b/devel/rubygem-aws-sdk-elasticloadbalancingv2/Makefile index a4404508788..0d5ebdc6f3a 100644 --- a/devel/rubygem-aws-sdk-elasticloadbalancingv2/Makefile +++ b/devel/rubygem-aws-sdk-elasticloadbalancingv2/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-elasticloadbalancingv2 -PORTVERSION= 1.89.0 +PORTVERSION= 1.90.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-elasticloadbalancingv2/distinfo b/devel/rubygem-aws-sdk-elasticloadbalancingv2/distinfo index 484f9aa9fa9..182ca1c1db3 100644 --- a/devel/rubygem-aws-sdk-elasticloadbalancingv2/distinfo +++ b/devel/rubygem-aws-sdk-elasticloadbalancingv2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399155 -SHA256 (rubygem/aws-sdk-elasticloadbalancingv2-1.89.0.gem) = 14c917a5a022dac7c9fb54128de673f3e83e5c2670bd71ff638894b56101013d -SIZE (rubygem/aws-sdk-elasticloadbalancingv2-1.89.0.gem) = 72192 +TIMESTAMP = 1692211879 +SHA256 (rubygem/aws-sdk-elasticloadbalancingv2-1.90.0.gem) = 995da208ee63f6e621e631872e3dfbae1c55911b60d533bfd228585d6f45c06b +SIZE (rubygem/aws-sdk-elasticloadbalancingv2-1.90.0.gem) = 73216 diff --git a/devel/rubygem-aws-sdk-fsx/Makefile b/devel/rubygem-aws-sdk-fsx/Makefile index e4e2492d6d2..3a21ef106bf 100644 --- a/devel/rubygem-aws-sdk-fsx/Makefile +++ b/devel/rubygem-aws-sdk-fsx/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-fsx -PORTVERSION= 1.73.0 +PORTVERSION= 1.74.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-fsx/distinfo b/devel/rubygem-aws-sdk-fsx/distinfo index f62d1e73fe7..03c3115eb51 100644 --- a/devel/rubygem-aws-sdk-fsx/distinfo +++ b/devel/rubygem-aws-sdk-fsx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399185 -SHA256 (rubygem/aws-sdk-fsx-1.73.0.gem) = 4b4f42a0021cf2b13146189ab7f89734a9ee32a3a2219164eb051525dd59b4a0 -SIZE (rubygem/aws-sdk-fsx-1.73.0.gem) = 159744 +TIMESTAMP = 1692211881 +SHA256 (rubygem/aws-sdk-fsx-1.74.0.gem) = b9474fae6aca13e6909839799f5ff63128e3b4a37cdd8aab24cea9d50284c60e +SIZE (rubygem/aws-sdk-fsx-1.74.0.gem) = 164352 diff --git a/devel/rubygem-aws-sdk-gamelift/Makefile b/devel/rubygem-aws-sdk-gamelift/Makefile index a3386d6519f..b324cd9eaac 100644 --- a/devel/rubygem-aws-sdk-gamelift/Makefile +++ b/devel/rubygem-aws-sdk-gamelift/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-gamelift -PORTVERSION= 1.69.0 +PORTVERSION= 1.70.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-gamelift/distinfo b/devel/rubygem-aws-sdk-gamelift/distinfo index a47832cd430..4367697e97f 100644 --- a/devel/rubygem-aws-sdk-gamelift/distinfo +++ b/devel/rubygem-aws-sdk-gamelift/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399187 -SHA256 (rubygem/aws-sdk-gamelift-1.69.0.gem) = 5164a94ef1ffaf34cb687b68b6f2e35760d1ede576cea433443a136f7c25816f -SIZE (rubygem/aws-sdk-gamelift-1.69.0.gem) = 174592 +TIMESTAMP = 1692640072 +SHA256 (rubygem/aws-sdk-gamelift-1.70.0.gem) = fc018c0b98d06121d3d86de802b48d345ee3422bfd41122316d1d51269d88f1b +SIZE (rubygem/aws-sdk-gamelift-1.70.0.gem) = 177152 diff --git a/devel/rubygem-aws-sdk-globalaccelerator/Makefile b/devel/rubygem-aws-sdk-globalaccelerator/Makefile index f2e8731c1c6..b81308d0b77 100644 --- a/devel/rubygem-aws-sdk-globalaccelerator/Makefile +++ b/devel/rubygem-aws-sdk-globalaccelerator/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-globalaccelerator -PORTVERSION= 1.48.0 +PORTVERSION= 1.49.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-globalaccelerator/distinfo b/devel/rubygem-aws-sdk-globalaccelerator/distinfo index 5fca90b4457..2ab76e04041 100644 --- a/devel/rubygem-aws-sdk-globalaccelerator/distinfo +++ b/devel/rubygem-aws-sdk-globalaccelerator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399193 -SHA256 (rubygem/aws-sdk-globalaccelerator-1.48.0.gem) = 5635002d7ae5b634ad18cd17664c67ca41db054a7c43d98f86a6b18c3e6c8b28 -SIZE (rubygem/aws-sdk-globalaccelerator-1.48.0.gem) = 55808 +TIMESTAMP = 1692211883 +SHA256 (rubygem/aws-sdk-globalaccelerator-1.49.0.gem) = b2329c0be399421a3910c148414dcb1ec4637bfd46e2e337c787fdaaf03ac8eb +SIZE (rubygem/aws-sdk-globalaccelerator-1.49.0.gem) = 56320 diff --git a/devel/rubygem-aws-sdk-glue/Makefile b/devel/rubygem-aws-sdk-glue/Makefile index 0988b2d9a21..e67f18b7275 100644 --- a/devel/rubygem-aws-sdk-glue/Makefile +++ b/devel/rubygem-aws-sdk-glue/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-glue -PORTVERSION= 1.152.0 +PORTVERSION= 1.154.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-glue/distinfo b/devel/rubygem-aws-sdk-glue/distinfo index cee7ef15302..6f00eb55777 100644 --- a/devel/rubygem-aws-sdk-glue/distinfo +++ b/devel/rubygem-aws-sdk-glue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070272 -SHA256 (rubygem/aws-sdk-glue-1.152.0.gem) = 4de52bd72d907d2ea20629995e1229a0436a8e06fce7b3cc37f73f94e915b154 -SIZE (rubygem/aws-sdk-glue-1.152.0.gem) = 284672 +TIMESTAMP = 1692211885 +SHA256 (rubygem/aws-sdk-glue-1.154.0.gem) = 6152a76d9982f24c4c4551c5766613565c6be1b874f0ff9fdca9710cff2eb2af +SIZE (rubygem/aws-sdk-glue-1.154.0.gem) = 285184 diff --git a/devel/rubygem-aws-sdk-guardduty/Makefile b/devel/rubygem-aws-sdk-guardduty/Makefile index 1540ccd19ae..113768d5288 100644 --- a/devel/rubygem-aws-sdk-guardduty/Makefile +++ b/devel/rubygem-aws-sdk-guardduty/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-guardduty -PORTVERSION= 1.76.0 +PORTVERSION= 1.77.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-guardduty/distinfo b/devel/rubygem-aws-sdk-guardduty/distinfo index 35223f15a94..2f0cd09ce95 100644 --- a/devel/rubygem-aws-sdk-guardduty/distinfo +++ b/devel/rubygem-aws-sdk-guardduty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399205 -SHA256 (rubygem/aws-sdk-guardduty-1.76.0.gem) = 1a451eaa865847f0c7688176ff72778ac381234d5ec0e192c7519555ea7dad67 -SIZE (rubygem/aws-sdk-guardduty-1.76.0.gem) = 92160 +TIMESTAMP = 1692211887 +SHA256 (rubygem/aws-sdk-guardduty-1.77.0.gem) = 62aeb94bf806143286526e593219dbdafece5999d0883db91ca9e6ccabb79fbb +SIZE (rubygem/aws-sdk-guardduty-1.77.0.gem) = 93184 diff --git a/devel/rubygem-aws-sdk-ivsrealtime/Makefile b/devel/rubygem-aws-sdk-ivsrealtime/Makefile index 0a0a303d3e3..fb1c3accf5c 100644 --- a/devel/rubygem-aws-sdk-ivsrealtime/Makefile +++ b/devel/rubygem-aws-sdk-ivsrealtime/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-ivsrealtime -PORTVERSION= 1.7.0 +PORTVERSION= 1.8.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-ivsrealtime/distinfo b/devel/rubygem-aws-sdk-ivsrealtime/distinfo index 707161ed9db..4107d48e855 100644 --- a/devel/rubygem-aws-sdk-ivsrealtime/distinfo +++ b/devel/rubygem-aws-sdk-ivsrealtime/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399265 -SHA256 (rubygem/aws-sdk-ivsrealtime-1.7.0.gem) = f3626f0d35c847768f5a20f547d980570cde2618d455039d41f73afa9b6d7b58 -SIZE (rubygem/aws-sdk-ivsrealtime-1.7.0.gem) = 27648 +TIMESTAMP = 1692211889 +SHA256 (rubygem/aws-sdk-ivsrealtime-1.8.0.gem) = 57a46a1823b7dbf3b72c117c82ff4bf1b47e59f6dcc02daa94c7e7d097fad274 +SIZE (rubygem/aws-sdk-ivsrealtime-1.8.0.gem) = 28160 diff --git a/devel/rubygem-aws-sdk-kinesisvideo/Makefile b/devel/rubygem-aws-sdk-kinesisvideo/Makefile index 04c0f9b75c2..f2c83c42844 100644 --- a/devel/rubygem-aws-sdk-kinesisvideo/Makefile +++ b/devel/rubygem-aws-sdk-kinesisvideo/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-kinesisvideo -PORTVERSION= 1.52.0 +PORTVERSION= 1.53.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-kinesisvideo/distinfo b/devel/rubygem-aws-sdk-kinesisvideo/distinfo index 97c8f075c00..a56a546a3c4 100644 --- a/devel/rubygem-aws-sdk-kinesisvideo/distinfo +++ b/devel/rubygem-aws-sdk-kinesisvideo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399283 -SHA256 (rubygem/aws-sdk-kinesisvideo-1.52.0.gem) = cdbc9b0064fc29eab41a84b3d04f4d6f4b1e5e7d6f69d9ddd0895b7ce11936b1 -SIZE (rubygem/aws-sdk-kinesisvideo-1.52.0.gem) = 45568 +TIMESTAMP = 1692211891 +SHA256 (rubygem/aws-sdk-kinesisvideo-1.53.0.gem) = cd8b85774a9aa04a171823dc1f71d1729a2116ce1f3f83734e0dad6e12213c0f +SIZE (rubygem/aws-sdk-kinesisvideo-1.53.0.gem) = 45568 diff --git a/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/Makefile b/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/Makefile index e3a66a101b6..e09be67ef79 100644 --- a/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/Makefile +++ b/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-kinesisvideoarchivedmedia -PORTVERSION= 1.51.0 +PORTVERSION= 1.52.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/distinfo b/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/distinfo index 395b3d72495..afb651b4802 100644 --- a/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/distinfo +++ b/devel/rubygem-aws-sdk-kinesisvideoarchivedmedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399285 -SHA256 (rubygem/aws-sdk-kinesisvideoarchivedmedia-1.51.0.gem) = 9fda256490895dcefdd552a13c7a82541794aa3f46da1d433e2edbdf2dd9ae0d -SIZE (rubygem/aws-sdk-kinesisvideoarchivedmedia-1.51.0.gem) = 39424 +TIMESTAMP = 1692211893 +SHA256 (rubygem/aws-sdk-kinesisvideoarchivedmedia-1.52.0.gem) = 32f3df5a0f15710c7085f6aac684fa3fe8739474b004544bea7e4067a7773b32 +SIZE (rubygem/aws-sdk-kinesisvideoarchivedmedia-1.52.0.gem) = 39936 diff --git a/devel/rubygem-aws-sdk-lexmodelsv2/Makefile b/devel/rubygem-aws-sdk-lexmodelsv2/Makefile index 81d1ae7000a..21d3b3d3ccf 100644 --- a/devel/rubygem-aws-sdk-lexmodelsv2/Makefile +++ b/devel/rubygem-aws-sdk-lexmodelsv2/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-lexmodelsv2 -PORTVERSION= 1.40.0 +PORTVERSION= 1.41.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-lexmodelsv2/distinfo b/devel/rubygem-aws-sdk-lexmodelsv2/distinfo index 69398857ff8..02fb2953eb4 100644 --- a/devel/rubygem-aws-sdk-lexmodelsv2/distinfo +++ b/devel/rubygem-aws-sdk-lexmodelsv2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070288 -SHA256 (rubygem/aws-sdk-lexmodelsv2-1.40.0.gem) = 0e82164f5df5652101f6df1cf2a4503cf61a4374582e6f98a6997863f0a3829b -SIZE (rubygem/aws-sdk-lexmodelsv2-1.40.0.gem) = 175104 +TIMESTAMP = 1692211895 +SHA256 (rubygem/aws-sdk-lexmodelsv2-1.41.0.gem) = 41e5caf2443091f8aa0e1c00f16a80e9eed72d1fd5c582c9fe005d9234f8a8ef +SIZE (rubygem/aws-sdk-lexmodelsv2-1.41.0.gem) = 175104 diff --git a/devel/rubygem-aws-sdk-mediapackage/Makefile b/devel/rubygem-aws-sdk-mediapackage/Makefile index c7b6109b485..c1a47de1938 100644 --- a/devel/rubygem-aws-sdk-mediapackage/Makefile +++ b/devel/rubygem-aws-sdk-mediapackage/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-mediapackage -PORTVERSION= 1.64.0 +PORTVERSION= 1.65.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-mediapackage/distinfo b/devel/rubygem-aws-sdk-mediapackage/distinfo index 749c3ba3a43..ad9aa1e0570 100644 --- a/devel/rubygem-aws-sdk-mediapackage/distinfo +++ b/devel/rubygem-aws-sdk-mediapackage/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399351 -SHA256 (rubygem/aws-sdk-mediapackage-1.64.0.gem) = d7e3142cb33d40513f3cf131a1b480ef83ffc2976eb09130b08cf941f37bb07d -SIZE (rubygem/aws-sdk-mediapackage-1.64.0.gem) = 39936 +TIMESTAMP = 1692211897 +SHA256 (rubygem/aws-sdk-mediapackage-1.65.0.gem) = 98f06e408a099f500a3cc8970dcda7a8dcac062ce247ff92e5918a3051243528 +SIZE (rubygem/aws-sdk-mediapackage-1.65.0.gem) = 39936 diff --git a/devel/rubygem-aws-sdk-omics/Makefile b/devel/rubygem-aws-sdk-omics/Makefile index d67572db746..082c93530c7 100644 --- a/devel/rubygem-aws-sdk-omics/Makefile +++ b/devel/rubygem-aws-sdk-omics/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-omics -PORTVERSION= 1.11.0 +PORTVERSION= 1.13.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-omics/distinfo b/devel/rubygem-aws-sdk-omics/distinfo index 588e64c410c..500ece18dba 100644 --- a/devel/rubygem-aws-sdk-omics/distinfo +++ b/devel/rubygem-aws-sdk-omics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070300 -SHA256 (rubygem/aws-sdk-omics-1.11.0.gem) = eddba6ca0280a74c2ced0b5bd4247db3143e9efac78ad1729cefc16dafaf9339 -SIZE (rubygem/aws-sdk-omics-1.11.0.gem) = 67584 +TIMESTAMP = 1692211899 +SHA256 (rubygem/aws-sdk-omics-1.13.0.gem) = 474992c74377a3e74b07846b16c316fe9d629d425d96a88ea44c64819901d4c1 +SIZE (rubygem/aws-sdk-omics-1.13.0.gem) = 75264 diff --git a/devel/rubygem-aws-sdk-pi/Makefile b/devel/rubygem-aws-sdk-pi/Makefile index bc9ea561adf..d28276b9803 100644 --- a/devel/rubygem-aws-sdk-pi/Makefile +++ b/devel/rubygem-aws-sdk-pi/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-pi -PORTVERSION= 1.48.0 +PORTVERSION= 1.49.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-pi/distinfo b/devel/rubygem-aws-sdk-pi/distinfo index b393e108b37..40a41aeff32 100644 --- a/devel/rubygem-aws-sdk-pi/distinfo +++ b/devel/rubygem-aws-sdk-pi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399423 -SHA256 (rubygem/aws-sdk-pi-1.48.0.gem) = a26b5ca1af6707415983d3836df35aec4758bf293738537ba9d8b3b12dfb4322 -SIZE (rubygem/aws-sdk-pi-1.48.0.gem) = 31232 +TIMESTAMP = 1692211901 +SHA256 (rubygem/aws-sdk-pi-1.49.0.gem) = 6341212f5a63579797630159fc8de96590f75c99a4058d897c3e00477769ad0e +SIZE (rubygem/aws-sdk-pi-1.49.0.gem) = 37888 diff --git a/devel/rubygem-aws-sdk-quicksight/Makefile b/devel/rubygem-aws-sdk-quicksight/Makefile index d19ce453477..7491896e288 100644 --- a/devel/rubygem-aws-sdk-quicksight/Makefile +++ b/devel/rubygem-aws-sdk-quicksight/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-quicksight -PORTVERSION= 1.87.0 +PORTVERSION= 1.88.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-quicksight/distinfo b/devel/rubygem-aws-sdk-quicksight/distinfo index 48eb5b737e8..cd515f2342f 100644 --- a/devel/rubygem-aws-sdk-quicksight/distinfo +++ b/devel/rubygem-aws-sdk-quicksight/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070308 -SHA256 (rubygem/aws-sdk-quicksight-1.87.0.gem) = b0f82ca7541d24023a76089b276285ed1784a5588e1eec7944b65824dabe8420 -SIZE (rubygem/aws-sdk-quicksight-1.87.0.gem) = 299520 +TIMESTAMP = 1692211903 +SHA256 (rubygem/aws-sdk-quicksight-1.88.0.gem) = 3424b8054c94e5521f4dc6490027b1306f2bb8d04d25b4659a561414529d2568 +SIZE (rubygem/aws-sdk-quicksight-1.88.0.gem) = 300544 diff --git a/devel/rubygem-aws-sdk-rds/Makefile b/devel/rubygem-aws-sdk-rds/Makefile index 581bd66da57..98e52962fa6 100644 --- a/devel/rubygem-aws-sdk-rds/Makefile +++ b/devel/rubygem-aws-sdk-rds/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-rds -PORTVERSION= 1.188.0 +PORTVERSION= 1.189.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-rds/distinfo b/devel/rubygem-aws-sdk-rds/distinfo index 2a76c55411b..86a3f5e5b57 100644 --- a/devel/rubygem-aws-sdk-rds/distinfo +++ b/devel/rubygem-aws-sdk-rds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070312 -SHA256 (rubygem/aws-sdk-rds-1.188.0.gem) = 8bb653ff296446e16d149194547b530580be8d6f8f923bbc92c17eee54724e25 -SIZE (rubygem/aws-sdk-rds-1.188.0.gem) = 497664 +TIMESTAMP = 1692211905 +SHA256 (rubygem/aws-sdk-rds-1.189.0.gem) = 7f4ccd1cc871ee61e0478b2868bcf5afab248796bbde253daca1aae0254f9bff +SIZE (rubygem/aws-sdk-rds-1.189.0.gem) = 500736 diff --git a/devel/rubygem-aws-sdk-rekognition/Makefile b/devel/rubygem-aws-sdk-rekognition/Makefile index e8d8a191efc..54e7ed71e10 100644 --- a/devel/rubygem-aws-sdk-rekognition/Makefile +++ b/devel/rubygem-aws-sdk-rekognition/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-rekognition -PORTVERSION= 1.85.0 +PORTVERSION= 1.86.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-rekognition/distinfo b/devel/rubygem-aws-sdk-rekognition/distinfo index 8efd3ed15f6..96213d3bf3c 100644 --- a/devel/rubygem-aws-sdk-rekognition/distinfo +++ b/devel/rubygem-aws-sdk-rekognition/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399465 -SHA256 (rubygem/aws-sdk-rekognition-1.85.0.gem) = d3cebcb2b08c04f70af2fb32ce3b53c055bda50b37702e100c967cc8fd1f8fa1 -SIZE (rubygem/aws-sdk-rekognition-1.85.0.gem) = 144384 +TIMESTAMP = 1692211907 +SHA256 (rubygem/aws-sdk-rekognition-1.86.0.gem) = 4baccabe39361774eb039b6dfaf00519bc78b47731528f8ca6f2400ad637cf8a +SIZE (rubygem/aws-sdk-rekognition-1.86.0.gem) = 146944 diff --git a/devel/rubygem-aws-sdk-route53domains/Makefile b/devel/rubygem-aws-sdk-route53domains/Makefile index 5618c2d10fa..01465193f0e 100644 --- a/devel/rubygem-aws-sdk-route53domains/Makefile +++ b/devel/rubygem-aws-sdk-route53domains/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-route53domains -PORTVERSION= 1.49.0 +PORTVERSION= 1.50.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-route53domains/distinfo b/devel/rubygem-aws-sdk-route53domains/distinfo index b2de74bc0cc..79e0e738a20 100644 --- a/devel/rubygem-aws-sdk-route53domains/distinfo +++ b/devel/rubygem-aws-sdk-route53domains/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399481 -SHA256 (rubygem/aws-sdk-route53domains-1.49.0.gem) = 37f73ada7ab2800e5fa343898251f989df7b209887fe006422d01fd5090831d3 -SIZE (rubygem/aws-sdk-route53domains-1.49.0.gem) = 55808 +TIMESTAMP = 1692211909 +SHA256 (rubygem/aws-sdk-route53domains-1.50.0.gem) = 195824f16a75e548233895c8098f480010eb3207278f736d0c6a1dee415e4b37 +SIZE (rubygem/aws-sdk-route53domains-1.50.0.gem) = 56320 diff --git a/devel/rubygem-aws-sdk-s3/Makefile b/devel/rubygem-aws-sdk-s3/Makefile index b4007ee1328..6af84b54f90 100644 --- a/devel/rubygem-aws-sdk-s3/Makefile +++ b/devel/rubygem-aws-sdk-s3/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-s3 -PORTVERSION= 1.132.0 +PORTVERSION= 1.132.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-s3/distinfo b/devel/rubygem-aws-sdk-s3/distinfo index 7bdf740a31f..4c5822c939f 100644 --- a/devel/rubygem-aws-sdk-s3/distinfo +++ b/devel/rubygem-aws-sdk-s3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070322 -SHA256 (rubygem/aws-sdk-s3-1.132.0.gem) = eec42306e6df54bacf5045a366c69acac8b02834b745b9562a90708838204b32 -SIZE (rubygem/aws-sdk-s3-1.132.0.gem) = 343040 +TIMESTAMP = 1692211911 +SHA256 (rubygem/aws-sdk-s3-1.132.1.gem) = cac01fbba5d717907b8df7b4e482447678c8392c7a4707ba09956d10e3549145 +SIZE (rubygem/aws-sdk-s3-1.132.1.gem) = 343552 diff --git a/devel/rubygem-aws-sdk-sagemaker/Makefile b/devel/rubygem-aws-sdk-sagemaker/Makefile index 5f9b9b00f15..3da1038618b 100644 --- a/devel/rubygem-aws-sdk-sagemaker/Makefile +++ b/devel/rubygem-aws-sdk-sagemaker/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-sagemaker -PORTVERSION= 1.201.0 +PORTVERSION= 1.206.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-sagemaker/distinfo b/devel/rubygem-aws-sdk-sagemaker/distinfo index 15a04c22c87..2c5b85b30d7 100644 --- a/devel/rubygem-aws-sdk-sagemaker/distinfo +++ b/devel/rubygem-aws-sdk-sagemaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070324 -SHA256 (rubygem/aws-sdk-sagemaker-1.201.0.gem) = a2ac69200172ca9f1e4fc00edaa12644c71cf4c5baae6138cf8445514664d5f8 -SIZE (rubygem/aws-sdk-sagemaker-1.201.0.gem) = 514560 +TIMESTAMP = 1692211913 +SHA256 (rubygem/aws-sdk-sagemaker-1.206.0.gem) = ef486dd46a1679e9147a7fe0ff5af73f3afbe95a94408a94744d6a47dd822440 +SIZE (rubygem/aws-sdk-sagemaker-1.206.0.gem) = 518656 diff --git a/devel/rubygem-aws-sdk-secretsmanager/Makefile b/devel/rubygem-aws-sdk-secretsmanager/Makefile index 6d1b4dc65f8..45ae0e1de56 100644 --- a/devel/rubygem-aws-sdk-secretsmanager/Makefile +++ b/devel/rubygem-aws-sdk-secretsmanager/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-secretsmanager -PORTVERSION= 1.81.0 +PORTVERSION= 1.82.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-secretsmanager/distinfo b/devel/rubygem-aws-sdk-secretsmanager/distinfo index 79691751141..4c7f4b50d58 100644 --- a/devel/rubygem-aws-sdk-secretsmanager/distinfo +++ b/devel/rubygem-aws-sdk-secretsmanager/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399515 -SHA256 (rubygem/aws-sdk-secretsmanager-1.81.0.gem) = 44fde96e2d6383c8993dcc8cf599a6edb6a22dae18bc57d7c08a32f149e623b9 -SIZE (rubygem/aws-sdk-secretsmanager-1.81.0.gem) = 56832 +TIMESTAMP = 1692211915 +SHA256 (rubygem/aws-sdk-secretsmanager-1.82.0.gem) = 69b212c0d290a450c25957ae94366efda815d2082e8e530db76331fb55a89d27 +SIZE (rubygem/aws-sdk-secretsmanager-1.82.0.gem) = 56832 diff --git a/devel/rubygem-aws-sdk-securityhub/Makefile b/devel/rubygem-aws-sdk-securityhub/Makefile index 5cbc0ca34ce..8baa6627ac2 100644 --- a/devel/rubygem-aws-sdk-securityhub/Makefile +++ b/devel/rubygem-aws-sdk-securityhub/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-securityhub -PORTVERSION= 1.90.0 +PORTVERSION= 1.91.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-securityhub/distinfo b/devel/rubygem-aws-sdk-securityhub/distinfo index 59d9534606e..2049de459a7 100644 --- a/devel/rubygem-aws-sdk-securityhub/distinfo +++ b/devel/rubygem-aws-sdk-securityhub/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070332 -SHA256 (rubygem/aws-sdk-securityhub-1.90.0.gem) = 7e05d2266d04e7fd41116895af0d8cc1aab8cbba80c284c90a5c69633157284f -SIZE (rubygem/aws-sdk-securityhub-1.90.0.gem) = 263680 +TIMESTAMP = 1692640074 +SHA256 (rubygem/aws-sdk-securityhub-1.91.0.gem) = d0df563c34219c5275aae24ee76a7a36e2d07ca4c32861e407e5d2026aa0790a +SIZE (rubygem/aws-sdk-securityhub-1.91.0.gem) = 265216 diff --git a/devel/rubygem-aws-sdk-servicecatalog/Makefile b/devel/rubygem-aws-sdk-servicecatalog/Makefile index f6079c0f339..8f0cc458bc5 100644 --- a/devel/rubygem-aws-sdk-servicecatalog/Makefile +++ b/devel/rubygem-aws-sdk-servicecatalog/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-servicecatalog -PORTVERSION= 1.85.0 +PORTVERSION= 1.86.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-servicecatalog/distinfo b/devel/rubygem-aws-sdk-servicecatalog/distinfo index 8059b09dcd0..5efd1a971a4 100644 --- a/devel/rubygem-aws-sdk-servicecatalog/distinfo +++ b/devel/rubygem-aws-sdk-servicecatalog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399523 -SHA256 (rubygem/aws-sdk-servicecatalog-1.85.0.gem) = 3423dbe4f5ec2a6d44abb04590f008a87ad222138cad6188caf07b691786638e -SIZE (rubygem/aws-sdk-servicecatalog-1.85.0.gem) = 98816 +TIMESTAMP = 1692211917 +SHA256 (rubygem/aws-sdk-servicecatalog-1.86.0.gem) = 03e5a03410e726d8272727bedd0f38c0226490a0ea36e8b956a265c13c3d04b4 +SIZE (rubygem/aws-sdk-servicecatalog-1.86.0.gem) = 99328 diff --git a/devel/rubygem-aws-sdk-ses/Makefile b/devel/rubygem-aws-sdk-ses/Makefile index 20e4a0c4fb1..7762d397690 100644 --- a/devel/rubygem-aws-sdk-ses/Makefile +++ b/devel/rubygem-aws-sdk-ses/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-ses -PORTVERSION= 1.54.0 +PORTVERSION= 1.55.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-ses/distinfo b/devel/rubygem-aws-sdk-ses/distinfo index 95e8b7628e3..df6b58ccabb 100644 --- a/devel/rubygem-aws-sdk-ses/distinfo +++ b/devel/rubygem-aws-sdk-ses/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399529 -SHA256 (rubygem/aws-sdk-ses-1.54.0.gem) = 606e820257c0961ccb552fd3d6f3c4f5169aaceaf62c3f01398623d3dca0696d -SIZE (rubygem/aws-sdk-ses-1.54.0.gem) = 87552 +TIMESTAMP = 1692211919 +SHA256 (rubygem/aws-sdk-ses-1.55.0.gem) = 4f69b92880dbb7638e4910f4d3d1b70eb43e6881f3dfaa578025f6364c975311 +SIZE (rubygem/aws-sdk-ses-1.55.0.gem) = 88576 diff --git a/devel/rubygem-aws-sdk-swf/Makefile b/devel/rubygem-aws-sdk-swf/Makefile index a06f065c018..67d17680955 100644 --- a/devel/rubygem-aws-sdk-swf/Makefile +++ b/devel/rubygem-aws-sdk-swf/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-swf -PORTVERSION= 1.45.0 +PORTVERSION= 1.46.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-swf/distinfo b/devel/rubygem-aws-sdk-swf/distinfo index 6c297b7c90c..58802f67f90 100644 --- a/devel/rubygem-aws-sdk-swf/distinfo +++ b/devel/rubygem-aws-sdk-swf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399569 -SHA256 (rubygem/aws-sdk-swf-1.45.0.gem) = 1d459871d59e6176f605ba6f3f03aa3d88d05547735758d6685ec18f2e711a1e -SIZE (rubygem/aws-sdk-swf-1.45.0.gem) = 78848 +TIMESTAMP = 1692211921 +SHA256 (rubygem/aws-sdk-swf-1.46.0.gem) = 972714de3db4d1c7c16bf2b722126a15a1be5bf10990a06532b22f16a6755e83 +SIZE (rubygem/aws-sdk-swf-1.46.0.gem) = 80384 diff --git a/devel/rubygem-aws-sdk-transfer/Makefile b/devel/rubygem-aws-sdk-transfer/Makefile index 928696bcd76..a27f840fe5a 100644 --- a/devel/rubygem-aws-sdk-transfer/Makefile +++ b/devel/rubygem-aws-sdk-transfer/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-transfer -PORTVERSION= 1.76.0 +PORTVERSION= 1.78.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-transfer/distinfo b/devel/rubygem-aws-sdk-transfer/distinfo index 06c9b2f9602..50e8b5f5f13 100644 --- a/devel/rubygem-aws-sdk-transfer/distinfo +++ b/devel/rubygem-aws-sdk-transfer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070344 -SHA256 (rubygem/aws-sdk-transfer-1.76.0.gem) = 32f14b685229c245b557747fd7a2d8fe8364f7b360c233eaee52bbcb04906dc6 -SIZE (rubygem/aws-sdk-transfer-1.76.0.gem) = 107008 +TIMESTAMP = 1692211923 +SHA256 (rubygem/aws-sdk-transfer-1.78.0.gem) = 53f20d0f50df9c66fde5df84ba286f89915bc53d1f3cd3c04575feca7da126ad +SIZE (rubygem/aws-sdk-transfer-1.78.0.gem) = 108544 diff --git a/devel/rubygem-aws-sdk-translate/Makefile b/devel/rubygem-aws-sdk-translate/Makefile index 2c9fab0ecc9..3bcbb746ff1 100644 --- a/devel/rubygem-aws-sdk-translate/Makefile +++ b/devel/rubygem-aws-sdk-translate/Makefile @@ -1,5 +1,5 @@ PORTNAME= aws-sdk-translate -PORTVERSION= 1.57.0 +PORTVERSION= 1.58.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-translate/distinfo b/devel/rubygem-aws-sdk-translate/distinfo index 01173007ec1..c7ccb28a402 100644 --- a/devel/rubygem-aws-sdk-translate/distinfo +++ b/devel/rubygem-aws-sdk-translate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070346 -SHA256 (rubygem/aws-sdk-translate-1.57.0.gem) = 3e186d864c054d5d10e078736daa2c9117e87b1d2d47d6cc1c2b29ef8fe2be6b -SIZE (rubygem/aws-sdk-translate-1.57.0.gem) = 42496 +TIMESTAMP = 1692211925 +SHA256 (rubygem/aws-sdk-translate-1.58.0.gem) = 0b0ebdd822fae9d8b3ca0c8eaa5b53b6669db8402cf45e3c128b45c087e41a9b +SIZE (rubygem/aws-sdk-translate-1.58.0.gem) = 43008 diff --git a/devel/rubygem-cairo-gobject/Makefile b/devel/rubygem-cairo-gobject/Makefile index 100eaeb3176..86a146b323d 100644 --- a/devel/rubygem-cairo-gobject/Makefile +++ b/devel/rubygem-cairo-gobject/Makefile @@ -1,5 +1,5 @@ PORTNAME= cairo-gobject -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-cairo-gobject/distinfo b/devel/rubygem-cairo-gobject/distinfo index 502af4a506b..724dd53a109 100644 --- a/devel/rubygem-cairo-gobject/distinfo +++ b/devel/rubygem-cairo-gobject/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167228 -SHA256 (rubygem/cairo-gobject-4.1.8.gem) = 0ec360a925c730a15f799c4f3303370deaedaae2f030193bb52aa595ef4378ed -SIZE (rubygem/cairo-gobject-4.1.8.gem) = 19456 +TIMESTAMP = 1692212057 +SHA256 (rubygem/cairo-gobject-4.1.9.gem) = 53819b47285b60d22bb9201039f88614e1780fef90c932e8f35c54715204f854 +SIZE (rubygem/cairo-gobject-4.1.9.gem) = 19456 diff --git a/devel/rubygem-console/Makefile b/devel/rubygem-console/Makefile index dedc0d97d8b..2e3853e2d0d 100644 --- a/devel/rubygem-console/Makefile +++ b/devel/rubygem-console/Makefile @@ -1,5 +1,5 @@ PORTNAME= console -PORTVERSION= 1.19.0 +PORTVERSION= 1.23.2 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-console/distinfo b/devel/rubygem-console/distinfo index 7dc22ea0c1b..1dd46850c81 100644 --- a/devel/rubygem-console/distinfo +++ b/devel/rubygem-console/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070352 -SHA256 (rubygem/console-1.19.0.gem) = 4079c0b53d747edb9735e7e7335bc3db3bd093cbd73b5830dd6383282ec71a35 -SIZE (rubygem/console-1.19.0.gem) = 19456 +TIMESTAMP = 1692211927 +SHA256 (rubygem/console-1.23.2.gem) = 1ca817f6c2e9a69f61bc9459e53a4f25bca4ca54e7859d56490c3d4c926c1c94 +SIZE (rubygem/console-1.23.2.gem) = 20992 diff --git a/devel/rubygem-cool.io/Makefile b/devel/rubygem-cool.io/Makefile index fbafd0c0237..5dc1b33f175 100644 --- a/devel/rubygem-cool.io/Makefile +++ b/devel/rubygem-cool.io/Makefile @@ -1,5 +1,5 @@ PORTNAME= cool.io -PORTVERSION= 1.7.1 +PORTVERSION= 1.8.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-cool.io/distinfo b/devel/rubygem-cool.io/distinfo index 548672c185c..17faccf2ca3 100644 --- a/devel/rubygem-cool.io/distinfo +++ b/devel/rubygem-cool.io/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635181681 -SHA256 (rubygem/cool.io-1.7.1.gem) = 6714204c33978c19d1156acb77cd48745a8f8841b50abb59d2fb73640224d835 -SIZE (rubygem/cool.io-1.7.1.gem) = 112640 +TIMESTAMP = 1692211929 +SHA256 (rubygem/cool.io-1.8.0.gem) = 365d48d9ed5ad57fbae6d275a0c4f24a601ac6d9a66618766dddbfe126dd1ce0 +SIZE (rubygem/cool.io-1.8.0.gem) = 113152 diff --git a/devel/rubygem-cool.io/files/patch-clang16 b/devel/rubygem-cool.io/files/patch-clang16 deleted file mode 100644 index dada59c2cba..00000000000 --- a/devel/rubygem-cool.io/files/patch-clang16 +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/libev/ev.c.orig 2023-07-03 15:07:15 UTC -+++ ext/libev/ev.c -@@ -3768,7 +3768,7 @@ rb_thread_unsafe_dangerous_crazy_blocking_region_end(. - #if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) - poll_args.loop = loop; - poll_args.waittime = waittime; -- rb_thread_call_without_gvl(ev_backend_poll, (void *)&poll_args, RUBY_UBF_IO, 0); -+ rb_thread_call_without_gvl((void *(*)(void *)) ev_backend_poll, (void *)&poll_args, RUBY_UBF_IO, 0); - #else - backend_poll (EV_A_ waittime); - #endif diff --git a/devel/rubygem-cucumber-tag-expressions/Makefile b/devel/rubygem-cucumber-tag-expressions/Makefile index aef6b453719..594dd004fd6 100644 --- a/devel/rubygem-cucumber-tag-expressions/Makefile +++ b/devel/rubygem-cucumber-tag-expressions/Makefile @@ -1,5 +1,5 @@ PORTNAME= cucumber-tag-expressions -PORTVERSION= 5.0.2 +PORTVERSION= 5.0.6 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-cucumber-tag-expressions/distinfo b/devel/rubygem-cucumber-tag-expressions/distinfo index 1e6b0b56adc..628c25c6481 100644 --- a/devel/rubygem-cucumber-tag-expressions/distinfo +++ b/devel/rubygem-cucumber-tag-expressions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070354 -SHA256 (rubygem/cucumber-tag-expressions-5.0.2.gem) = bf73bdb9ec9182f2478b4e89b51803e32630c102cb37a6f03b36094f3c8a870b -SIZE (rubygem/cucumber-tag-expressions-5.0.2.gem) = 6656 +TIMESTAMP = 1692211931 +SHA256 (rubygem/cucumber-tag-expressions-5.0.6.gem) = 4e98a9f78691cbd59c6a1aca6033dfb8bba5905719dbeb4d39c2374708e0ab66 +SIZE (rubygem/cucumber-tag-expressions-5.0.6.gem) = 6656 diff --git a/devel/rubygem-ddtrace/Makefile b/devel/rubygem-ddtrace/Makefile index df20580c307..824d802233c 100644 --- a/devel/rubygem-ddtrace/Makefile +++ b/devel/rubygem-ddtrace/Makefile @@ -1,5 +1,5 @@ PORTNAME= ddtrace -PORTVERSION= 1.13.0 +PORTVERSION= 1.13.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-ddtrace/distinfo b/devel/rubygem-ddtrace/distinfo index f8fc1ab38af..0daf0daf769 100644 --- a/devel/rubygem-ddtrace/distinfo +++ b/devel/rubygem-ddtrace/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070356 -SHA256 (rubygem/ddtrace-1.13.0.gem) = ff78060fa263de64505d213ca4abb3e8fd6af8f8dfa4f7d9f6ee861a78a9a718 -SIZE (rubygem/ddtrace-1.13.0.gem) = 513536 +TIMESTAMP = 1692211933 +SHA256 (rubygem/ddtrace-1.13.1.gem) = 7aec1f9837574f5bc52be598bd796c0c5389b2c8e93bd69a23136fa49e566fd9 +SIZE (rubygem/ddtrace-1.13.1.gem) = 514048 diff --git a/devel/rubygem-device_detector/Makefile b/devel/rubygem-device_detector/Makefile index 41028856ed7..76c3eb5f8d6 100644 --- a/devel/rubygem-device_detector/Makefile +++ b/devel/rubygem-device_detector/Makefile @@ -1,5 +1,5 @@ PORTNAME= device_detector -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-device_detector/distinfo b/devel/rubygem-device_detector/distinfo index 5a5a6e555ff..dccd5d0fb42 100644 --- a/devel/rubygem-device_detector/distinfo +++ b/devel/rubygem-device_detector/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590356 -SHA256 (rubygem/device_detector-1.1.0.gem) = 78374c0294ec2a6442be227a0d4387ca40761b4b29a6802d7fea4e138aec8a51 -SIZE (rubygem/device_detector-1.1.0.gem) = 314880 +TIMESTAMP = 1692211935 +SHA256 (rubygem/device_detector-1.1.1.gem) = f5a8e29537d5273b0592b81ad6afd3d63f4c5d4a33fd766999f8b012151dafa6 +SIZE (rubygem/device_detector-1.1.1.gem) = 340992 diff --git a/devel/rubygem-dry-core/Makefile b/devel/rubygem-dry-core/Makefile index 81375f19571..0cb98e13204 100644 --- a/devel/rubygem-dry-core/Makefile +++ b/devel/rubygem-dry-core/Makefile @@ -1,5 +1,5 @@ PORTNAME= dry-core -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-dry-core/distinfo b/devel/rubygem-dry-core/distinfo index 26a1ddf6c10..d4ddf5961ab 100644 --- a/devel/rubygem-dry-core/distinfo +++ b/devel/rubygem-dry-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669058049 -SHA256 (rubygem/dry-core-1.0.0.gem) = 7a92099870967f0d2c9997950608cb8bb622dafeea20b2fe1dd49e9ba1d0f305 -SIZE (rubygem/dry-core-1.0.0.gem) = 23552 +TIMESTAMP = 1692211937 +SHA256 (rubygem/dry-core-1.0.1.gem) = f32f4245e0f54e787f3708584ed8f7545aaf8dd99072e36f169312468ec5450d +SIZE (rubygem/dry-core-1.0.1.gem) = 23040 diff --git a/devel/rubygem-faker/Makefile b/devel/rubygem-faker/Makefile index fd453f730d5..2c92e4d7c11 100644 --- a/devel/rubygem-faker/Makefile +++ b/devel/rubygem-faker/Makefile @@ -1,5 +1,5 @@ PORTNAME= faker -PORTVERSION= 3.2.0 +PORTVERSION= 3.2.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-faker/distinfo b/devel/rubygem-faker/distinfo index 4886284b6d2..83ddc5f22d2 100644 --- a/devel/rubygem-faker/distinfo +++ b/devel/rubygem-faker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684104654 -SHA256 (rubygem/faker-3.2.0.gem) = a76eb8c16e492aa539285401910208412ea3490799ebb1c1b9f32a96252a74c4 -SIZE (rubygem/faker-3.2.0.gem) = 1547776 +TIMESTAMP = 1692211939 +SHA256 (rubygem/faker-3.2.1.gem) = d6b201b520213f6d985ac9f9f810154397a146ca22c1d3ff0a6504ef37c5517b +SIZE (rubygem/faker-3.2.1.gem) = 1593856 diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile index ccd0d782409..0f6b0cebb1d 100644 --- a/devel/rubygem-gettext/Makefile +++ b/devel/rubygem-gettext/Makefile @@ -1,11 +1,12 @@ PORTNAME= gettext -PORTVERSION= 3.4.6 +PORTVERSION= 3.4.7 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org COMMENT= Ruby implementation of the gettext library -WWW= https://ruby-gettext.github.io/ +WWW= https://ruby-gettext.github.io/ \ + https://github.com/ruby-gettext/gettext LICENSE= LGPL3 RUBY LICENSE_COMB= dual diff --git a/devel/rubygem-gettext/distinfo b/devel/rubygem-gettext/distinfo index 5ad9da7d0f9..413fb6da7f9 100644 --- a/devel/rubygem-gettext/distinfo +++ b/devel/rubygem-gettext/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399617 -SHA256 (rubygem/gettext-3.4.6.gem) = 2782d019fbdc1e8d9dcee0fd3dadeea162407173755bbd3770270721bbc9e970 -SIZE (rubygem/gettext-3.4.6.gem) = 232960 +TIMESTAMP = 1692640076 +SHA256 (rubygem/gettext-3.4.7.gem) = 0a2770db1abaf7c800c4ae7dd7d1a4a01ef6da5c95dea2edc822f01e41c6e5df +SIZE (rubygem/gettext-3.4.7.gem) = 233472 diff --git a/devel/rubygem-gio2/Makefile b/devel/rubygem-gio2/Makefile index ba95ef82dbb..d8fe74db97a 100644 --- a/devel/rubygem-gio2/Makefile +++ b/devel/rubygem-gio2/Makefile @@ -1,5 +1,5 @@ PORTNAME= gio2 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-gio2/distinfo b/devel/rubygem-gio2/distinfo index bf7fc845235..02ea4463481 100644 --- a/devel/rubygem-gio2/distinfo +++ b/devel/rubygem-gio2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167230 -SHA256 (rubygem/gio2-4.1.8.gem) = e02ee0de6ceda68a8784a764b6f91c889c1c0c4be6eed6bc512a9ad5c8b381ca -SIZE (rubygem/gio2-4.1.8.gem) = 39936 +TIMESTAMP = 1692212059 +SHA256 (rubygem/gio2-4.1.9.gem) = 3b82a0d3017502cedd33413a6e72c31318760fc306b90e8fea488e3c6d60673a +SIZE (rubygem/gio2-4.1.9.gem) = 39936 diff --git a/devel/rubygem-git-version-bump/Makefile b/devel/rubygem-git-version-bump/Makefile index 23d6e953d2c..67576b46141 100644 --- a/devel/rubygem-git-version-bump/Makefile +++ b/devel/rubygem-git-version-bump/Makefile @@ -1,5 +1,5 @@ PORTNAME= git-version-bump -PORTVERSION= 0.18.0 +PORTVERSION= 0.19.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-git-version-bump/distinfo b/devel/rubygem-git-version-bump/distinfo index b4efefc01ed..b0aee916f90 100644 --- a/devel/rubygem-git-version-bump/distinfo +++ b/devel/rubygem-git-version-bump/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590398 -SHA256 (rubygem/git-version-bump-0.18.0.gem) = bd96fcb089eef15d86bcc9152ac766cbce6a83c76a7b42fbe54de2b36e9adfb3 -SIZE (rubygem/git-version-bump-0.18.0.gem) = 24064 +TIMESTAMP = 1692211941 +SHA256 (rubygem/git-version-bump-0.19.0.gem) = 0d101e4c8f74c6bf311b83ea381e45c4e7a82d15c8c8e58376b84618e36c1367 +SIZE (rubygem/git-version-bump-0.19.0.gem) = 24576 diff --git a/devel/rubygem-glib2/Makefile b/devel/rubygem-glib2/Makefile index 2d04784774a..7f49e2c34a8 100644 --- a/devel/rubygem-glib2/Makefile +++ b/devel/rubygem-glib2/Makefile @@ -1,5 +1,5 @@ PORTNAME= glib2 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-glib2/distinfo b/devel/rubygem-glib2/distinfo index e804635ddb3..2c1fe3bb5e4 100644 --- a/devel/rubygem-glib2/distinfo +++ b/devel/rubygem-glib2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167232 -SHA256 (rubygem/glib2-4.1.8.gem) = c41a68cd0ef1bd2a7ee60dbd4591e34f1218f75e23c51ebc86bbb9534f192303 -SIZE (rubygem/glib2-4.1.8.gem) = 140800 +TIMESTAMP = 1692212061 +SHA256 (rubygem/glib2-4.1.9.gem) = f2db7332a1420a64127451274c8ab452858644e6fe871e150aca91466fc21bdc +SIZE (rubygem/glib2-4.1.9.gem) = 140800 diff --git a/devel/rubygem-gobject-introspection/Makefile b/devel/rubygem-gobject-introspection/Makefile index 34321795850..8a74d88e38d 100644 --- a/devel/rubygem-gobject-introspection/Makefile +++ b/devel/rubygem-gobject-introspection/Makefile @@ -1,5 +1,5 @@ PORTNAME= gobject-introspection -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-gobject-introspection/distinfo b/devel/rubygem-gobject-introspection/distinfo index 8d4963a1b83..62f63ffe16b 100644 --- a/devel/rubygem-gobject-introspection/distinfo +++ b/devel/rubygem-gobject-introspection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167234 -SHA256 (rubygem/gobject-introspection-4.1.8.gem) = 6beea795bfbf58dca58b077cc0b3fc9e2f834603dcf2ac5b9cc68bf445888a02 -SIZE (rubygem/gobject-introspection-4.1.8.gem) = 74240 +TIMESTAMP = 1692212063 +SHA256 (rubygem/gobject-introspection-4.1.9.gem) = a8667a4b7fb1ecd4f9daf480dd576381ea5132dec2e93faf05214185c5cc5af3 +SIZE (rubygem/gobject-introspection-4.1.9.gem) = 74240 diff --git a/devel/rubygem-google-apis-androidpublisher_v3/Makefile b/devel/rubygem-google-apis-androidpublisher_v3/Makefile index 93b17967918..4741ab8941c 100644 --- a/devel/rubygem-google-apis-androidpublisher_v3/Makefile +++ b/devel/rubygem-google-apis-androidpublisher_v3/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-apis-androidpublisher_v3 -PORTVERSION= 0.46.0 +PORTVERSION= 0.48.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-apis-androidpublisher_v3/distinfo b/devel/rubygem-google-apis-androidpublisher_v3/distinfo index 0ac19275007..4004bfe2dc4 100644 --- a/devel/rubygem-google-apis-androidpublisher_v3/distinfo +++ b/devel/rubygem-google-apis-androidpublisher_v3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070372 -SHA256 (rubygem/google-apis-androidpublisher_v3-0.46.0.gem) = cd3c60092fb2c024867113f698750ea79391c19bb97d9a9e19bc2200cb0d7c7d -SIZE (rubygem/google-apis-androidpublisher_v3-0.46.0.gem) = 71680 +TIMESTAMP = 1692211943 +SHA256 (rubygem/google-apis-androidpublisher_v3-0.48.0.gem) = 920b03d0b975ae35b2233fb5c3add3eb8c556ea9c754a4f5f3c66400713b0dcd +SIZE (rubygem/google-apis-androidpublisher_v3-0.48.0.gem) = 72192 diff --git a/devel/rubygem-google-apis-bigquery_v2/Makefile b/devel/rubygem-google-apis-bigquery_v2/Makefile index cae310147f9..459865b56a8 100644 --- a/devel/rubygem-google-apis-bigquery_v2/Makefile +++ b/devel/rubygem-google-apis-bigquery_v2/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-apis-bigquery_v2 -PORTVERSION= 0.57.0 +PORTVERSION= 0.58.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-apis-bigquery_v2/distinfo b/devel/rubygem-google-apis-bigquery_v2/distinfo index c3b85e104b6..c0434530f9d 100644 --- a/devel/rubygem-google-apis-bigquery_v2/distinfo +++ b/devel/rubygem-google-apis-bigquery_v2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070374 -SHA256 (rubygem/google-apis-bigquery_v2-0.57.0.gem) = 28a5da3862e50da50638ec7b44ac32e61d9cd46998269bd934cb43e55a244325 -SIZE (rubygem/google-apis-bigquery_v2-0.57.0.gem) = 106496 +TIMESTAMP = 1692211945 +SHA256 (rubygem/google-apis-bigquery_v2-0.58.0.gem) = 6be755ab9540166c1a9b0c23555c33f6b876a1305db23beb30262100ecb89993 +SIZE (rubygem/google-apis-bigquery_v2-0.58.0.gem) = 108032 diff --git a/devel/rubygem-google-apis-compute_v1/Makefile b/devel/rubygem-google-apis-compute_v1/Makefile index 5cece464f18..9cf3cde8ba9 100644 --- a/devel/rubygem-google-apis-compute_v1/Makefile +++ b/devel/rubygem-google-apis-compute_v1/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-apis-compute_v1 -PORTVERSION= 0.74.0 +PORTVERSION= 0.75.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-apis-compute_v1/distinfo b/devel/rubygem-google-apis-compute_v1/distinfo index 9af157fe6c6..7fceea6c860 100644 --- a/devel/rubygem-google-apis-compute_v1/distinfo +++ b/devel/rubygem-google-apis-compute_v1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070378 -SHA256 (rubygem/google-apis-compute_v1-0.74.0.gem) = 50fab3a44847b6bbe309b94cdc60827b3045abd67170b228fa1e55192da0c00b -SIZE (rubygem/google-apis-compute_v1-0.74.0.gem) = 411136 +TIMESTAMP = 1692211947 +SHA256 (rubygem/google-apis-compute_v1-0.75.0.gem) = ddb5891686e5d922bd6eb86234bbd553e60583464db63eff90e2e903a29fcff3 +SIZE (rubygem/google-apis-compute_v1-0.75.0.gem) = 414720 diff --git a/devel/rubygem-google-apis-iam_v2/Makefile b/devel/rubygem-google-apis-iam_v2/Makefile index dd0954e5036..3de97b79d92 100644 --- a/devel/rubygem-google-apis-iam_v2/Makefile +++ b/devel/rubygem-google-apis-iam_v2/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-apis-iam_v2 -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-apis-iam_v2/distinfo b/devel/rubygem-google-apis-iam_v2/distinfo index e2b3ca27be5..0dd95eaac78 100644 --- a/devel/rubygem-google-apis-iam_v2/distinfo +++ b/devel/rubygem-google-apis-iam_v2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070384 -SHA256 (rubygem/google-apis-iam_v2-0.3.0.gem) = 1e91455f80c8704ece0f7d78ff6bc0e3b6bad646a1fd402f2af2409b6c20c9a7 -SIZE (rubygem/google-apis-iam_v2-0.3.0.gem) = 19456 +TIMESTAMP = 1692211949 +SHA256 (rubygem/google-apis-iam_v2-0.4.0.gem) = 579f35016fdece8550f6d5e50d56f30500e62280b478d676c168581e9d771f58 +SIZE (rubygem/google-apis-iam_v2-0.4.0.gem) = 19456 diff --git a/devel/rubygem-google-apis-monitoring_v3/Makefile b/devel/rubygem-google-apis-monitoring_v3/Makefile index b521ed2b409..c1ccb9a89cb 100644 --- a/devel/rubygem-google-apis-monitoring_v3/Makefile +++ b/devel/rubygem-google-apis-monitoring_v3/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-apis-monitoring_v3 -PORTVERSION= 0.48.0 +PORTVERSION= 0.49.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-apis-monitoring_v3/distinfo b/devel/rubygem-google-apis-monitoring_v3/distinfo index 5791c21cfe2..2de969bf9db 100644 --- a/devel/rubygem-google-apis-monitoring_v3/distinfo +++ b/devel/rubygem-google-apis-monitoring_v3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070388 -SHA256 (rubygem/google-apis-monitoring_v3-0.48.0.gem) = 9075ad1f49d6056d06b906a7c2f14162235fdb699086c7a3282dc711dd83dfe1 -SIZE (rubygem/google-apis-monitoring_v3-0.48.0.gem) = 78848 +TIMESTAMP = 1692211951 +SHA256 (rubygem/google-apis-monitoring_v3-0.49.0.gem) = f33f370174645be26b8e3ca34fbdbb6aacb2747869b9a39338263bf8681a14d0 +SIZE (rubygem/google-apis-monitoring_v3-0.49.0.gem) = 78848 diff --git a/devel/rubygem-google-apis-sheets_v4/Makefile b/devel/rubygem-google-apis-sheets_v4/Makefile index 62baf2afa20..d11df32a95d 100644 --- a/devel/rubygem-google-apis-sheets_v4/Makefile +++ b/devel/rubygem-google-apis-sheets_v4/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-apis-sheets_v4 -PORTVERSION= 0.24.0 +PORTVERSION= 0.25.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-apis-sheets_v4/distinfo b/devel/rubygem-google-apis-sheets_v4/distinfo index 947fa7462ce..7a1c68fada8 100644 --- a/devel/rubygem-google-apis-sheets_v4/distinfo +++ b/devel/rubygem-google-apis-sheets_v4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167094 -SHA256 (rubygem/google-apis-sheets_v4-0.24.0.gem) = 8fde291cb3f4f1409b2e7adc6e7cd5335559d3cefb094cc459d2e9062851390d -SIZE (rubygem/google-apis-sheets_v4-0.24.0.gem) = 99328 +TIMESTAMP = 1692211953 +SHA256 (rubygem/google-apis-sheets_v4-0.25.0.gem) = 6847e422db877fcb55a4a9d6e73e294dfd1c0c4aa58e8e32c44a8f76fc28709b +SIZE (rubygem/google-apis-sheets_v4-0.25.0.gem) = 99328 diff --git a/devel/rubygem-google-apis-sqladmin_v1beta4/Makefile b/devel/rubygem-google-apis-sqladmin_v1beta4/Makefile index 7dfce1a6884..64f503e0aa2 100644 --- a/devel/rubygem-google-apis-sqladmin_v1beta4/Makefile +++ b/devel/rubygem-google-apis-sqladmin_v1beta4/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-apis-sqladmin_v1beta4 -PORTVERSION= 0.53.0 +PORTVERSION= 0.54.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-apis-sqladmin_v1beta4/distinfo b/devel/rubygem-google-apis-sqladmin_v1beta4/distinfo index 9ef727e8de1..6a51bbc6865 100644 --- a/devel/rubygem-google-apis-sqladmin_v1beta4/distinfo +++ b/devel/rubygem-google-apis-sqladmin_v1beta4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070390 -SHA256 (rubygem/google-apis-sqladmin_v1beta4-0.53.0.gem) = 531ba65bf5acb09c2945721dfc1166a01bc084388c0fad402d2d9fd27a3f57e2 -SIZE (rubygem/google-apis-sqladmin_v1beta4-0.53.0.gem) = 51712 +TIMESTAMP = 1692211955 +SHA256 (rubygem/google-apis-sqladmin_v1beta4-0.54.0.gem) = 11219c29ce57d97f3e473cfa586d13bbea6e218e5301cfa2fa971ef07ef6272a +SIZE (rubygem/google-apis-sqladmin_v1beta4-0.54.0.gem) = 52224 diff --git a/devel/rubygem-google-iam-v1/Makefile b/devel/rubygem-google-iam-v1/Makefile index 76a558c2a60..33ccf99fdc6 100644 --- a/devel/rubygem-google-iam-v1/Makefile +++ b/devel/rubygem-google-iam-v1/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-iam-v1 -PORTVERSION= 0.5.1 +PORTVERSION= 0.5.2 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-iam-v1/distinfo b/devel/rubygem-google-iam-v1/distinfo index 9eccb67f3ff..b182af0164f 100644 --- a/devel/rubygem-google-iam-v1/distinfo +++ b/devel/rubygem-google-iam-v1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686496864 -SHA256 (rubygem/google-iam-v1-0.5.1.gem) = 97daa49de2ed389a727887626c064c650c42e1a2728d6ef4753c6bcc4181f5af -SIZE (rubygem/google-iam-v1-0.5.1.gem) = 38912 +TIMESTAMP = 1692211957 +SHA256 (rubygem/google-iam-v1-0.5.2.gem) = 39468bcc0fe5d57918427d0741c831eef076507e8ad44cba995908f2721756f6 +SIZE (rubygem/google-iam-v1-0.5.2.gem) = 38912 diff --git a/devel/rubygem-google-protobuf/Makefile b/devel/rubygem-google-protobuf/Makefile index fd578a80fd1..a82c80b6340 100644 --- a/devel/rubygem-google-protobuf/Makefile +++ b/devel/rubygem-google-protobuf/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-protobuf -PORTVERSION= 3.23.4 +PORTVERSION= 3.24.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-google-protobuf/distinfo b/devel/rubygem-google-protobuf/distinfo index 5ef4bfc902e..2997d5875c6 100644 --- a/devel/rubygem-google-protobuf/distinfo +++ b/devel/rubygem-google-protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902921 -SHA256 (rubygem/google-protobuf-3.23.4.gem) = f239ea4b2009976d102e55e808b778abd18ce20721f32c3fcaf829d8e7a305b7 -SIZE (rubygem/google-protobuf-3.23.4.gem) = 217088 +TIMESTAMP = 1692640078 +SHA256 (rubygem/google-protobuf-3.24.1.gem) = ed1056067164059b53010f4e996811b76df8f678939ab0444b03434dafb9d8f3 +SIZE (rubygem/google-protobuf-3.24.1.gem) = 224256 diff --git a/devel/rubygem-googleapis-common-protos-types/Makefile b/devel/rubygem-googleapis-common-protos-types/Makefile index 06659aea434..1a6947c4392 100644 --- a/devel/rubygem-googleapis-common-protos-types/Makefile +++ b/devel/rubygem-googleapis-common-protos-types/Makefile @@ -1,5 +1,5 @@ PORTNAME= googleapis-common-protos-types -PORTVERSION= 1.7.0 +PORTVERSION= 1.8.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -10,7 +10,7 @@ WWW= https://github.com/googleapis/common-protos-ruby/tree/main/googleapis-comm LICENSE= APACHE20 -RUN_DEPENDS= rubygem-google-protobuf>=3.14<4:devel/rubygem-google-protobuf +RUN_DEPENDS= rubygem-google-protobuf>=3.18<4:devel/rubygem-google-protobuf USES= gem diff --git a/devel/rubygem-googleapis-common-protos-types/distinfo b/devel/rubygem-googleapis-common-protos-types/distinfo index 78bf5a18399..4252b493d59 100644 --- a/devel/rubygem-googleapis-common-protos-types/distinfo +++ b/devel/rubygem-googleapis-common-protos-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070394 -SHA256 (rubygem/googleapis-common-protos-types-1.7.0.gem) = 19e16e5b46dfab1797a85de225369b2d27e0819b067c18f995ae6c7b3bf8513f -SIZE (rubygem/googleapis-common-protos-types-1.7.0.gem) = 16896 +TIMESTAMP = 1692211961 +SHA256 (rubygem/googleapis-common-protos-types-1.8.0.gem) = 51fdf3a8e07cdc11edde68ef8be0ae835185966ce2405fedbf4e50483e4e712e +SIZE (rubygem/googleapis-common-protos-types-1.8.0.gem) = 94720 diff --git a/devel/rubygem-grpc-google-iam-v1/Makefile b/devel/rubygem-grpc-google-iam-v1/Makefile index afbaa6f6918..f4feca7d548 100644 --- a/devel/rubygem-grpc-google-iam-v1/Makefile +++ b/devel/rubygem-grpc-google-iam-v1/Makefile @@ -1,17 +1,18 @@ PORTNAME= grpc-google-iam-v1 -PORTVERSION= 1.2.0 +PORTVERSION= 1.3.0 CATEGORIES= devel rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org COMMENT= Common protos and gRPC services for Google IAM -WWW= https://github.com/googleapis/common-protos-ruby/tree/main/grpc-google-iam-v1 +WWW= https://github.com/googleapis/common-protos-ruby \ + https://github.com/googleapis/common-protos-ruby/tree/main/grpc-google-iam-v1 LICENSE= APACHE20 -RUN_DEPENDS= rubygem-google-protobuf>=3.14<4:devel/rubygem-google-protobuf \ - rubygem-googleapis-common-protos>=1.3.12<2.0:devel/rubygem-googleapis-common-protos \ - rubygem-grpc>=1.27<2:net/rubygem-grpc +RUN_DEPENDS= rubygem-google-protobuf>=3.18<4:devel/rubygem-google-protobuf \ + rubygem-googleapis-common-protos>=1.4<2:devel/rubygem-googleapis-common-protos \ + rubygem-grpc>=1.41<2:net/rubygem-grpc USES= gem diff --git a/devel/rubygem-grpc-google-iam-v1/distinfo b/devel/rubygem-grpc-google-iam-v1/distinfo index 31ced853acd..f9aa7360d90 100644 --- a/devel/rubygem-grpc-google-iam-v1/distinfo +++ b/devel/rubygem-grpc-google-iam-v1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661599489 -SHA256 (rubygem/grpc-google-iam-v1-1.2.0.gem) = 7da7c082f6054eacd86d98c8ec686e202694a20c7f060ce4c74f64c876f57045 -SIZE (rubygem/grpc-google-iam-v1-1.2.0.gem) = 7680 +TIMESTAMP = 1692211963 +SHA256 (rubygem/grpc-google-iam-v1-1.3.0.gem) = d1914c54fdc2136def30ec3d8e9cd64b36866bcba8e5c5a717d25036078f776f +SIZE (rubygem/grpc-google-iam-v1-1.3.0.gem) = 13312 diff --git a/devel/rubygem-grpc-google-iam-v1/pkg-descr b/devel/rubygem-grpc-google-iam-v1/pkg-descr index be4d5da7e64..d90c9d174fe 100644 --- a/devel/rubygem-grpc-google-iam-v1/pkg-descr +++ b/devel/rubygem-grpc-google-iam-v1/pkg-descr @@ -1,3 +1 @@ Google IAM gRPC client library - -See also: https://github.com/googleapis/common-protos-ruby diff --git a/devel/rubygem-icalendar/Makefile b/devel/rubygem-icalendar/Makefile index 59bed89d6a2..4e7c6f65768 100644 --- a/devel/rubygem-icalendar/Makefile +++ b/devel/rubygem-icalendar/Makefile @@ -1,5 +1,5 @@ PORTNAME= icalendar -PORTVERSION= 2.8.0 +PORTVERSION= 2.9.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-icalendar/distinfo b/devel/rubygem-icalendar/distinfo index 2f4125f3afc..2d1c1ed038d 100644 --- a/devel/rubygem-icalendar/distinfo +++ b/devel/rubygem-icalendar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657555695 -SHA256 (rubygem/icalendar-2.8.0.gem) = e404f970c7572bdebf6f09f9890970b68aab400ba9e609dc7d46098f28d0ee87 -SIZE (rubygem/icalendar-2.8.0.gem) = 41984 +TIMESTAMP = 1692212115 +SHA256 (rubygem/icalendar-2.9.0.gem) = 457f771f01eba9fcc946d02ed5c33a7dd905d052b154055d8403a95a11cf3a0e +SIZE (rubygem/icalendar-2.9.0.gem) = 43008 diff --git a/devel/rubygem-mongo/Makefile b/devel/rubygem-mongo/Makefile index f9d1264313e..ddaa39966c9 100644 --- a/devel/rubygem-mongo/Makefile +++ b/devel/rubygem-mongo/Makefile @@ -1,5 +1,5 @@ PORTNAME= mongo -PORTVERSION= 2.19.0 +PORTVERSION= 2.19.1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -18,4 +18,10 @@ NO_ARCH= yes PLIST_FILES= bin/mongo_console +post-patch: + @${TOUCH} ${WRKSRC}/spec/support/ocsp + +post-install: + @${RM} ${STAGEDIR}${PREFIX}${GEM_LIB_DIR}/spec/support/ocsp + .include diff --git a/devel/rubygem-mongo/distinfo b/devel/rubygem-mongo/distinfo index 2866d8af57a..6760a4ee143 100644 --- a/devel/rubygem-mongo/distinfo +++ b/devel/rubygem-mongo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167292 -SHA256 (rubygem/mongo-2.19.0.gem) = 70d990671b93994f98dc8dc8e758799255e46f9055617e4c946e371f3793dab7 -SIZE (rubygem/mongo-2.19.0.gem) = 1443840 +TIMESTAMP = 1692212117 +SHA256 (rubygem/mongo-2.19.1.gem) = 6096e917fae8f76239449132f6b658734d29bff17a02ac7900f8317ae0264c9f +SIZE (rubygem/mongo-2.19.1.gem) = 1445376 diff --git a/devel/rubygem-mongo/files/patch-gemspec b/devel/rubygem-mongo/files/patch-gemspec deleted file mode 100644 index b87bafa0d6c..00000000000 --- a/devel/rubygem-mongo/files/patch-gemspec +++ /dev/null @@ -1,20 +0,0 @@ -% sed -i .orig 's|"spec/support/ocsp".freeze, ||' mongo.gemspec - ---- mongo.gemspec.orig 2023-06-30 16:20:12 UTC -+++ mongo.gemspec -@@ -14,13 +14,13 @@ Gem::Specification.new do |s| - s.description = "A Ruby driver for MongoDB".freeze - s.email = "dbx-ruby@mongodb.com".freeze - s.executables = ["mongo_console".freeze] -- s.files = ["CONTRIBUTING.md".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/mongo_console".freeze, "lib/mongo.rb".freeze, "lib/mongo/active_support.rb".freeze, "lib/mongo/address.rb".freeze, "lib/mongo/address/ipv4.rb".freeze, "lib/mongo/address/ipv6.rb".freeze, "lib/mongo/address/unix.rb".freeze, "lib/mongo/address/validator.rb".freeze, "lib/mongo/auth.rb".freeze, "lib/mongo/auth/aws.rb".freeze, "lib/mongo/auth/aws/conversation.rb".freeze, "lib/mongo/auth/aws/credentials.rb".freeze, "lib/mongo/auth/aws/credentials_cache.rb".freeze, "lib/mongo/auth/aws/credentials_retriever.rb".freeze, "lib/mongo/auth/aws/request.rb".freeze, "lib/mongo/auth/base.rb".freeze, "lib/mongo/auth/conversation_base.rb".freeze, "lib/mongo/auth/cr.rb".freeze, "lib/mongo/auth/cr/conversation.rb".freeze, "lib/mongo/auth/credential_cache.rb".freeze, "lib/mongo/auth/gssapi.rb".freeze, "lib/mongo/auth/gssapi/conversation.rb".freeze, "lib/mongo/auth/ldap.rb".freeze, "lib/mongo/auth/ldap/conversation.rb".freeze, "lib/mongo/auth/roles.rb".freeze, "lib/mongo/auth/sasl_conversation_base.rb".freeze, "lib/mongo/auth/scram.rb".freeze, "lib/mongo/auth/scram/conversation.rb".freeze, "lib/mongo/auth/scram256.rb".freeze, "lib/mongo/auth/scram256/conversation.rb".freeze, "lib/mongo/auth/scram_conversation_base.rb".freeze, "lib/mongo/auth/stringprep.rb".freeze, "lib/mongo/auth/stringprep/profiles/sasl.rb".freeze, "lib/mongo/auth/stringprep/tables.rb".freeze, "lib/mongo/auth/stringprep/unicode_normalize/normalize.rb".freeze, "lib/mongo/auth/stringprep/unicode_normalize/tables.rb".freeze, "lib/mongo/auth/user.rb".freeze, "lib/mongo/auth/user/view.rb".freeze, "lib/mongo/auth/x509.rb".freeze, "lib/mongo/auth/x509/conversation.rb".freeze, "lib/mongo/background_thread.rb".freeze, "lib/mongo/bson.rb".freeze, "lib/mongo/bulk_write.rb".freeze, "lib/mongo/bulk_write/combineable.rb".freeze, "lib/mongo/bulk_write/ordered_combiner.rb".freeze, "lib/mongo/bulk_write/result.rb".freeze, "lib/mongo/bulk_write/result_combiner.rb".freeze, "lib/mongo/bulk_write/transformable.rb".freeze, "lib/mongo/bulk_write/unordered_combiner.rb".freeze, "lib/mongo/bulk_write/validatable.rb".freeze, "lib/mongo/caching_cursor.rb".freeze, "lib/mongo/client.rb".freeze, "lib/mongo/client_encryption.rb".freeze, "lib/mongo/cluster.rb".freeze, "lib/mongo/cluster/periodic_executor.rb".freeze, "lib/mongo/cluster/reapers/cursor_reaper.rb".freeze, "lib/mongo/cluster/reapers/socket_reaper.rb".freeze, "lib/mongo/cluster/sdam_flow.rb".freeze, "lib/mongo/cluster/topology.rb".freeze, "lib/mongo/cluster/topology/base.rb".freeze, "lib/mongo/cluster/topology/load_balanced.rb".freeze, "lib/mongo/cluster/topology/no_replica_set_options.rb".freeze, "lib/mongo/cluster/topology/replica_set_no_primary.rb".freeze, "lib/mongo/cluster/topology/replica_set_with_primary.rb".freeze, "lib/mongo/cluster/topology/sharded.rb".freeze, "lib/mongo/cluster/topology/single.rb".freeze, "lib/mongo/cluster/topology/unknown.rb".freeze, "lib/mongo/cluster_time.rb".freeze, "lib/mongo/collection.rb".freeze, "lib/mongo/collection/helpers.rb".freeze, "lib/mongo/collection/queryable_encryption.rb".freeze, "lib/mongo/collection/view.rb".freeze, "lib/mongo/collection/view/aggregation.rb".freeze, "lib/mongo/collection/view/builder.rb".freeze, "lib/mongo/collection/view/builder/aggregation.rb".freeze, "lib/mongo/collection/view/builder/map_reduce.rb".freeze, "lib/mongo/collection/view/change_stream.rb".freeze, "lib/mongo/collection/view/change_stream/retryable.rb".freeze, "lib/mongo/collection/view/explainable.rb".freeze, "lib/mongo/collection/view/immutable.rb".freeze, "lib/mongo/collection/view/iterable.rb".freeze, "lib/mongo/collection/view/map_reduce.rb".freeze, "lib/mongo/collection/view/readable.rb".freeze, "lib/mongo/collection/view/writable.rb".freeze, "lib/mongo/condition_variable.rb".freeze, "lib/mongo/config.rb".freeze, "lib/mongo/config/options.rb".freeze, "lib/mongo/config/validators/option.rb".freeze, "lib/mongo/crypt.rb".freeze, "lib/mongo/crypt/auto_decryption_context.rb".freeze, "lib/mongo/crypt/auto_encrypter.rb".freeze, "lib/mongo/crypt/auto_encryption_context.rb".freeze, "lib/mongo/crypt/binary.rb".freeze, "lib/mongo/crypt/binding.rb".freeze, "lib/mongo/crypt/context.rb".freeze, "lib/mongo/crypt/data_key_context.rb".freeze, "lib/mongo/crypt/encryption_io.rb".freeze, "lib/mongo/crypt/explicit_decryption_context.rb".freeze, "lib/mongo/crypt/explicit_encrypter.rb".freeze, "lib/mongo/crypt/explicit_encryption_context.rb".freeze, "lib/mongo/crypt/explicit_encryption_expression_context.rb".freeze, "lib/mongo/crypt/handle.rb".freeze, "lib/mongo/crypt/hooks.rb".freeze, "lib/mongo/crypt/kms.rb".freeze, "lib/mongo/crypt/kms/aws.rb".freeze, "lib/mongo/crypt/kms/aws/credentials.rb".freeze, "lib/mongo/crypt/kms/aws/master_document.rb".freeze, "lib/mongo/crypt/kms/azure.rb".freeze, "lib/mongo/crypt/kms/azure/access_token.rb".freeze, "lib/mongo/crypt/kms/azure/credentials.rb".freeze, "lib/mongo/crypt/kms/azure/credentials_retriever.rb".freeze, "lib/mongo/crypt/kms/azure/master_document.rb".freeze, "lib/mongo/crypt/kms/credentials.rb".freeze, "lib/mongo/crypt/kms/gcp.rb".freeze, "lib/mongo/crypt/kms/gcp/credentials.rb".freeze, "lib/mongo/crypt/kms/gcp/credentials_retriever.rb".freeze, "lib/mongo/crypt/kms/gcp/master_document.rb".freeze, "lib/mongo/crypt/kms/kmip.rb".freeze, "lib/mongo/crypt/kms/kmip/credentials.rb".freeze, "lib/mongo/crypt/kms/kmip/master_document.rb".freeze, "lib/mongo/crypt/kms/local.rb".freeze, "lib/mongo/crypt/kms/local/credentials.rb".freeze, "lib/mongo/crypt/kms/local/master_document.rb".freeze, "lib/mongo/crypt/kms/master_key_document.rb".freeze, "lib/mongo/crypt/kms_context.rb".freeze, "lib/mongo/crypt/rewrap_many_data_key_context.rb".freeze, "lib/mongo/crypt/rewrap_many_data_key_result.rb".freeze, "lib/mongo/crypt/status.rb".freeze, "lib/mongo/cursor.rb".freeze, "lib/mongo/cursor/kill_spec.rb".freeze, "lib/mongo/database.rb".freeze, "lib/mongo/database/view.rb".freeze, "lib/mongo/dbref.rb".freeze, "lib/mongo/distinguishing_semaphore.rb".freeze, "lib/mongo/error.rb".freeze, "lib/mongo/error/auth_error.rb".freeze, "lib/mongo/error/bad_load_balancer_target.rb".freeze, "lib/mongo/error/bulk_write_error.rb".freeze, "lib/mongo/error/change_stream_resumable.rb".freeze, "lib/mongo/error/client_closed.rb".freeze, "lib/mongo/error/closed_stream.rb".freeze, "lib/mongo/error/connection_check_out_timeout.rb".freeze, "lib/mongo/error/connection_perished.rb".freeze, "lib/mongo/error/connection_unavailable.rb".freeze, "lib/mongo/error/credential_check_error.rb".freeze, "lib/mongo/error/crypt_error.rb".freeze, "lib/mongo/error/extra_file_chunk.rb".freeze, "lib/mongo/error/failed_string_prep_validation.rb".freeze, "lib/mongo/error/file_not_found.rb".freeze, "lib/mongo/error/handshake_error.rb".freeze, "lib/mongo/error/insufficient_iteration_count.rb".freeze, "lib/mongo/error/internal_driver_error.rb".freeze, "lib/mongo/error/invalid_address.rb".freeze, "lib/mongo/error/invalid_application_name.rb".freeze, "lib/mongo/error/invalid_bulk_operation.rb".freeze, "lib/mongo/error/invalid_bulk_operation_type.rb".freeze, "lib/mongo/error/invalid_collection_name.rb".freeze, "lib/mongo/error/invalid_config_option.rb".freeze, "lib/mongo/error/invalid_cursor_operation.rb".freeze, "lib/mongo/error/invalid_database_name.rb".freeze, "lib/mongo/error/invalid_document.rb".freeze, "lib/mongo/error/invalid_file.rb".freeze, "lib/mongo/error/invalid_file_revision.rb".freeze, "lib/mongo/error/invalid_min_pool_size.rb".freeze, "lib/mongo/error/invalid_nonce.rb".freeze, "lib/mongo/error/invalid_read_concern.rb".freeze, "lib/mongo/error/invalid_read_option.rb".freeze, "lib/mongo/error/invalid_replacement_document.rb".freeze, "lib/mongo/error/invalid_server_auth_host.rb".freeze, "lib/mongo/error/invalid_server_auth_response.rb".freeze, "lib/mongo/error/invalid_server_preference.rb".freeze, "lib/mongo/error/invalid_session.rb".freeze, "lib/mongo/error/invalid_signature.rb".freeze, "lib/mongo/error/invalid_transaction_operation.rb".freeze, "lib/mongo/error/invalid_txt_record.rb".freeze, "lib/mongo/error/invalid_update_document.rb".freeze, "lib/mongo/error/invalid_uri.rb".freeze, "lib/mongo/error/invalid_write_concern.rb".freeze, "lib/mongo/error/kms_error.rb".freeze, "lib/mongo/error/labelable.rb".freeze, "lib/mongo/error/lint_error.rb".freeze, "lib/mongo/error/max_bson_size.rb".freeze, "lib/mongo/error/max_message_size.rb".freeze, "lib/mongo/error/mismatched_domain.rb".freeze, "lib/mongo/error/missing_connection.rb".freeze, "lib/mongo/error/missing_file_chunk.rb".freeze, "lib/mongo/error/missing_password.rb".freeze, "lib/mongo/error/missing_resume_token.rb".freeze, "lib/mongo/error/missing_scram_server_signature.rb".freeze, "lib/mongo/error/missing_service_id.rb".freeze, "lib/mongo/error/mongocryptd_spawn_error.rb".freeze, "lib/mongo/error/multi_index_drop.rb".freeze, "lib/mongo/error/need_primary_server.rb".freeze, "lib/mongo/error/no_server_available.rb".freeze, "lib/mongo/error/no_service_connection_available.rb".freeze, "lib/mongo/error/no_srv_records.rb".freeze, "lib/mongo/error/notable.rb".freeze, "lib/mongo/error/operation_failure.rb".freeze, "lib/mongo/error/parser.rb".freeze, "lib/mongo/error/pool_cleared_error.rb".freeze, "lib/mongo/error/pool_closed_error.rb".freeze, "lib/mongo/error/pool_error.rb".freeze, "lib/mongo/error/pool_paused_error.rb".freeze, "lib/mongo/error/raise_original_error.rb".freeze, "lib/mongo/error/read_write_retryable.rb".freeze, "lib/mongo/error/sdam_error_detection.rb".freeze, "lib/mongo/error/server_api_conflict.rb".freeze, "lib/mongo/error/server_api_not_supported.rb".freeze, "lib/mongo/error/server_certificate_revoked.rb".freeze, "lib/mongo/error/server_not_usable.rb".freeze, "lib/mongo/error/session_ended.rb".freeze, "lib/mongo/error/session_not_materialized.rb".freeze, "lib/mongo/error/sessions_not_supported.rb".freeze, "lib/mongo/error/snapshot_session_invalid_server_version.rb".freeze, "lib/mongo/error/snapshot_session_transaction_prohibited.rb".freeze, "lib/mongo/error/socket_error.rb".freeze, "lib/mongo/error/socket_timeout_error.rb".freeze, "lib/mongo/error/unchangeable_collection_option.rb".freeze, "lib/mongo/error/unexpected_chunk_length.rb".freeze, "lib/mongo/error/unexpected_response.rb".freeze, "lib/mongo/error/unknown_payload_type.rb".freeze, "lib/mongo/error/unmet_dependency.rb".freeze, "lib/mongo/error/unsupported_array_filters.rb".freeze, "lib/mongo/error/unsupported_collation.rb".freeze, "lib/mongo/error/unsupported_features.rb".freeze, "lib/mongo/error/unsupported_message_type.rb".freeze, "lib/mongo/error/unsupported_option.rb".freeze, "lib/mongo/error/write_retryable.rb".freeze, "lib/mongo/event.rb".freeze, "lib/mongo/event/base.rb".freeze, "lib/mongo/event/listeners.rb".freeze, "lib/mongo/event/publisher.rb".freeze, "lib/mongo/event/subscriber.rb".freeze, "lib/mongo/grid.rb".freeze, "lib/mongo/grid/file.rb".freeze, "lib/mongo/grid/file/chunk.rb".freeze, "lib/mongo/grid/file/info.rb".freeze, "lib/mongo/grid/fs_bucket.rb".freeze, "lib/mongo/grid/stream.rb".freeze, "lib/mongo/grid/stream/read.rb".freeze, "lib/mongo/grid/stream/write.rb".freeze, "lib/mongo/id.rb".freeze, "lib/mongo/index.rb".freeze, "lib/mongo/index/view.rb".freeze, "lib/mongo/lint.rb".freeze, "lib/mongo/loggable.rb".freeze, "lib/mongo/logger.rb".freeze, "lib/mongo/monitoring.rb".freeze, "lib/mongo/monitoring/cmap_log_subscriber.rb".freeze, "lib/mongo/monitoring/command_log_subscriber.rb".freeze, "lib/mongo/monitoring/event.rb".freeze, "lib/mongo/monitoring/event/cmap.rb".freeze, "lib/mongo/monitoring/event/cmap/base.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_check_out_failed.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_check_out_started.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_checked_in.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_checked_out.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_closed.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_created.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_ready.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_cleared.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_closed.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_created.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_ready.rb".freeze, "lib/mongo/monitoring/event/command_failed.rb".freeze, "lib/mongo/monitoring/event/command_started.rb".freeze, "lib/mongo/monitoring/event/command_succeeded.rb".freeze, "lib/mongo/monitoring/event/secure.rb".freeze, "lib/mongo/monitoring/event/server_closed.rb".freeze, "lib/mongo/monitoring/event/server_description_changed.rb".freeze, "lib/mongo/monitoring/event/server_heartbeat_failed.rb".freeze, "lib/mongo/monitoring/event/server_heartbeat_started.rb".freeze, "lib/mongo/monitoring/event/server_heartbeat_succeeded.rb".freeze, "lib/mongo/monitoring/event/server_opening.rb".freeze, "lib/mongo/monitoring/event/topology_changed.rb".freeze, "lib/mongo/monitoring/event/topology_closed.rb".freeze, "lib/mongo/monitoring/event/topology_opening.rb".freeze, "lib/mongo/monitoring/publishable.rb".freeze, "lib/mongo/monitoring/sdam_log_subscriber.rb".freeze, "lib/mongo/monitoring/server_closed_log_subscriber.rb".freeze, "lib/mongo/monitoring/server_description_changed_log_subscriber.rb".freeze, "lib/mongo/monitoring/server_opening_log_subscriber.rb".freeze, "lib/mongo/monitoring/topology_changed_log_subscriber.rb".freeze, "lib/mongo/monitoring/topology_closed_log_subscriber.rb".freeze, "lib/mongo/monitoring/topology_opening_log_subscriber.rb".freeze, "lib/mongo/monitoring/unified_sdam_log_subscriber.rb".freeze, "lib/mongo/operation.rb".freeze, "lib/mongo/operation/aggregate.rb".freeze, "lib/mongo/operation/aggregate/op_msg.rb".freeze, "lib/mongo/operation/aggregate/result.rb".freeze, "lib/mongo/operation/collections_info.rb".freeze, "lib/mongo/operation/collections_info/result.rb".freeze, "lib/mongo/operation/command.rb".freeze, "lib/mongo/operation/command/op_msg.rb".freeze, "lib/mongo/operation/context.rb".freeze, "lib/mongo/operation/count.rb".freeze, "lib/mongo/operation/count/op_msg.rb".freeze, "lib/mongo/operation/create.rb".freeze, "lib/mongo/operation/create/op_msg.rb".freeze, "lib/mongo/operation/create_index.rb".freeze, "lib/mongo/operation/create_index/op_msg.rb".freeze, "lib/mongo/operation/create_user.rb".freeze, "lib/mongo/operation/create_user/op_msg.rb".freeze, "lib/mongo/operation/delete.rb".freeze, "lib/mongo/operation/delete/bulk_result.rb".freeze, "lib/mongo/operation/delete/op_msg.rb".freeze, "lib/mongo/operation/delete/result.rb".freeze, "lib/mongo/operation/distinct.rb".freeze, "lib/mongo/operation/distinct/op_msg.rb".freeze, "lib/mongo/operation/drop.rb".freeze, "lib/mongo/operation/drop/op_msg.rb".freeze, "lib/mongo/operation/drop_database.rb".freeze, "lib/mongo/operation/drop_database/op_msg.rb".freeze, "lib/mongo/operation/drop_index.rb".freeze, "lib/mongo/operation/drop_index/op_msg.rb".freeze, "lib/mongo/operation/explain.rb".freeze, "lib/mongo/operation/explain/op_msg.rb".freeze, "lib/mongo/operation/explain/result.rb".freeze, "lib/mongo/operation/find.rb".freeze, "lib/mongo/operation/find/builder.rb".freeze, "lib/mongo/operation/find/builder/command.rb".freeze, "lib/mongo/operation/find/builder/flags.rb".freeze, "lib/mongo/operation/find/builder/modifiers.rb".freeze, "lib/mongo/operation/find/op_msg.rb".freeze, "lib/mongo/operation/find/result.rb".freeze, "lib/mongo/operation/get_more.rb".freeze, "lib/mongo/operation/get_more/command_builder.rb".freeze, "lib/mongo/operation/get_more/op_msg.rb".freeze, "lib/mongo/operation/get_more/result.rb".freeze, "lib/mongo/operation/indexes.rb".freeze, "lib/mongo/operation/indexes/op_msg.rb".freeze, "lib/mongo/operation/indexes/result.rb".freeze, "lib/mongo/operation/insert.rb".freeze, "lib/mongo/operation/insert/bulk_result.rb".freeze, "lib/mongo/operation/insert/op_msg.rb".freeze, "lib/mongo/operation/insert/result.rb".freeze, "lib/mongo/operation/kill_cursors.rb".freeze, "lib/mongo/operation/kill_cursors/command_builder.rb".freeze, "lib/mongo/operation/kill_cursors/op_msg.rb".freeze, "lib/mongo/operation/list_collections.rb".freeze, "lib/mongo/operation/list_collections/op_msg.rb".freeze, "lib/mongo/operation/list_collections/result.rb".freeze, "lib/mongo/operation/map_reduce.rb".freeze, "lib/mongo/operation/map_reduce/op_msg.rb".freeze, "lib/mongo/operation/map_reduce/result.rb".freeze, "lib/mongo/operation/op_msg_base.rb".freeze, "lib/mongo/operation/parallel_scan.rb".freeze, "lib/mongo/operation/parallel_scan/op_msg.rb".freeze, "lib/mongo/operation/parallel_scan/result.rb".freeze, "lib/mongo/operation/remove_user.rb".freeze, "lib/mongo/operation/remove_user/op_msg.rb".freeze, "lib/mongo/operation/result.rb".freeze, "lib/mongo/operation/shared/bypass_document_validation.rb".freeze, "lib/mongo/operation/shared/causal_consistency_supported.rb".freeze, "lib/mongo/operation/shared/executable.rb".freeze, "lib/mongo/operation/shared/executable_no_validate.rb".freeze, "lib/mongo/operation/shared/executable_transaction_label.rb".freeze, "lib/mongo/operation/shared/idable.rb".freeze, "lib/mongo/operation/shared/limited.rb".freeze, "lib/mongo/operation/shared/object_id_generator.rb".freeze, "lib/mongo/operation/shared/op_msg_executable.rb".freeze, "lib/mongo/operation/shared/polymorphic_lookup.rb".freeze, "lib/mongo/operation/shared/polymorphic_result.rb".freeze, "lib/mongo/operation/shared/read_preference_supported.rb".freeze, "lib/mongo/operation/shared/response_handling.rb".freeze, "lib/mongo/operation/shared/result/aggregatable.rb".freeze, "lib/mongo/operation/shared/result/use_legacy_error_parser.rb".freeze, "lib/mongo/operation/shared/sessions_supported.rb".freeze, "lib/mongo/operation/shared/specifiable.rb".freeze, "lib/mongo/operation/shared/validatable.rb".freeze, "lib/mongo/operation/shared/write.rb".freeze, "lib/mongo/operation/shared/write_concern_supported.rb".freeze, "lib/mongo/operation/update.rb".freeze, "lib/mongo/operation/update/bulk_result.rb".freeze, "lib/mongo/operation/update/op_msg.rb".freeze, "lib/mongo/operation/update/result.rb".freeze, "lib/mongo/operation/update_user.rb".freeze, "lib/mongo/operation/update_user/op_msg.rb".freeze, "lib/mongo/operation/users_info.rb".freeze, "lib/mongo/operation/users_info/op_msg.rb".freeze, "lib/mongo/operation/users_info/result.rb".freeze, "lib/mongo/operation/write_command.rb".freeze, "lib/mongo/operation/write_command/op_msg.rb".freeze, "lib/mongo/options.rb".freeze, "lib/mongo/options/mapper.rb".freeze, "lib/mongo/options/redacted.rb".freeze, "lib/mongo/protocol.rb".freeze, "lib/mongo/protocol/bit_vector.rb".freeze, "lib/mongo/protocol/caching_hash.rb".freeze, "lib/mongo/protocol/compressed.rb".freeze, "lib/mongo/protocol/get_more.rb".freeze, "lib/mongo/protocol/kill_cursors.rb".freeze, "lib/mongo/protocol/message.rb".freeze, "lib/mongo/protocol/msg.rb".freeze, "lib/mongo/protocol/query.rb".freeze, "lib/mongo/protocol/registry.rb".freeze, "lib/mongo/protocol/reply.rb".freeze, "lib/mongo/protocol/serializers.rb".freeze, "lib/mongo/query_cache.rb".freeze, "lib/mongo/retryable.rb".freeze, "lib/mongo/retryable/base_worker.rb".freeze, "lib/mongo/retryable/read_worker.rb".freeze, "lib/mongo/retryable/write_worker.rb".freeze, "lib/mongo/semaphore.rb".freeze, "lib/mongo/server.rb".freeze, "lib/mongo/server/app_metadata.rb".freeze, "lib/mongo/server/app_metadata/environment.rb".freeze, "lib/mongo/server/app_metadata/platform.rb".freeze, "lib/mongo/server/app_metadata/truncator.rb".freeze, "lib/mongo/server/connection.rb".freeze, "lib/mongo/server/connection_base.rb".freeze, "lib/mongo/server/connection_common.rb".freeze, "lib/mongo/server/connection_pool.rb".freeze, "lib/mongo/server/connection_pool/generation_manager.rb".freeze, "lib/mongo/server/connection_pool/populator.rb".freeze, "lib/mongo/server/description.rb".freeze, "lib/mongo/server/description/features.rb".freeze, "lib/mongo/server/description/load_balancer.rb".freeze, "lib/mongo/server/monitor.rb".freeze, "lib/mongo/server/monitor/app_metadata.rb".freeze, "lib/mongo/server/monitor/connection.rb".freeze, "lib/mongo/server/pending_connection.rb".freeze, "lib/mongo/server/push_monitor.rb".freeze, "lib/mongo/server/push_monitor/connection.rb".freeze, "lib/mongo/server/round_trip_time_averager.rb".freeze, "lib/mongo/server_selector.rb".freeze, "lib/mongo/server_selector/base.rb".freeze, "lib/mongo/server_selector/nearest.rb".freeze, "lib/mongo/server_selector/primary.rb".freeze, "lib/mongo/server_selector/primary_preferred.rb".freeze, "lib/mongo/server_selector/secondary.rb".freeze, "lib/mongo/server_selector/secondary_preferred.rb".freeze, "lib/mongo/session.rb".freeze, "lib/mongo/session/server_session.rb".freeze, "lib/mongo/session/session_pool.rb".freeze, "lib/mongo/socket.rb".freeze, "lib/mongo/socket/ocsp_cache.rb".freeze, "lib/mongo/socket/ocsp_verifier.rb".freeze, "lib/mongo/socket/ssl.rb".freeze, "lib/mongo/socket/tcp.rb".freeze, "lib/mongo/socket/unix.rb".freeze, "lib/mongo/srv.rb".freeze, "lib/mongo/srv/monitor.rb".freeze, "lib/mongo/srv/resolver.rb".freeze, "lib/mongo/srv/result.rb".freeze, "lib/mongo/timeout.rb".freeze, "lib/mongo/topology_version.rb".freeze, "lib/mongo/uri.rb".freeze, "lib/mongo/uri/options_mapper.rb".freeze, "lib/mongo/uri/srv_protocol.rb".freeze, "lib/mongo/utils.rb".freeze, "lib/mongo/version.rb".freeze, "lib/mongo/write_concern.rb".freeze, "lib/mongo/write_concern/acknowledged.rb".freeze, "lib/mongo/write_concern/base.rb".freeze, "lib/mongo/write_concern/unacknowledged.rb".freeze, "mongo.gemspec".freeze, "spec/NOTES.aws-auth.md".freeze, "spec/README.aws-auth.md".freeze, "spec/README.md".freeze, "spec/USERS.md".freeze, "spec/atlas/atlas_connectivity_spec.rb".freeze, "spec/atlas/operations_spec.rb".freeze, "spec/integration/auth_spec.rb".freeze, "spec/integration/awaited_ismaster_spec.rb".freeze, "spec/integration/aws_auth_credentials_cache_spec.rb".freeze, "spec/integration/aws_auth_request_spec.rb".freeze, "spec/integration/aws_credentials_retriever_spec.rb".freeze, "spec/integration/aws_lambda_examples_spec.rb".freeze, "spec/integration/bson_symbol_spec.rb".freeze, "spec/integration/bulk_insert_spec.rb".freeze, "spec/integration/bulk_write_error_message_spec.rb".freeze, "spec/integration/bulk_write_spec.rb".freeze, "spec/integration/change_stream_examples_spec.rb".freeze, "spec/integration/change_stream_spec.rb".freeze, "spec/integration/check_clean_slate_spec.rb".freeze, "spec/integration/client_authentication_options_spec.rb".freeze, "spec/integration/client_connectivity_spec.rb".freeze, "spec/integration/client_construction_aws_auth_spec.rb".freeze, "spec/integration/client_construction_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_old_wire_version_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/automatic_data_encryption_keys_prose_spec.rb".freeze, "spec/integration/client_side_encryption/bson_size_limit_spec.rb".freeze, "spec/integration/client_side_encryption/bypass_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/client_close_spec.rb".freeze, "spec/integration/client_side_encryption/corpus_spec.rb".freeze, "spec/integration/client_side_encryption/custom_endpoint_spec.rb".freeze, "spec/integration/client_side_encryption/data_key_spec.rb".freeze, "spec/integration/client_side_encryption/decryption_events_prose_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_queryable_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/external_key_vault_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_options_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_spec.rb".freeze, "spec/integration/client_side_encryption/mongocryptd_prose_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_aws_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_azure_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_gcp_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/queryable_encryption_examples_spec.rb".freeze, "spec/integration/client_side_encryption/range_explicit_encryption_prose_spec.rb".freeze, "spec/integration/client_side_encryption/rewrap_prose_spec.rb".freeze, "spec/integration/client_side_encryption/unique_index_on_key_alt_names_prose_spec.rb".freeze, "spec/integration/client_side_encryption/views_spec.rb".freeze, "spec/integration/client_spec.rb".freeze, "spec/integration/client_update_spec.rb".freeze, "spec/integration/collection_indexes_prose_spec.rb".freeze, "spec/integration/command_monitoring_spec.rb".freeze, "spec/integration/command_spec.rb".freeze, "spec/integration/connect_single_rs_name_spec.rb".freeze, "spec/integration/connection/faas_env_spec.rb".freeze, "spec/integration/connection_pool_populator_spec.rb".freeze, "spec/integration/connection_spec.rb".freeze, "spec/integration/crud_spec.rb".freeze, "spec/integration/cursor_pinning_spec.rb".freeze, "spec/integration/cursor_reaping_spec.rb".freeze, "spec/integration/docs_examples_spec.rb".freeze, "spec/integration/error_detection_spec.rb".freeze, "spec/integration/fork_reconnect_spec.rb".freeze, "spec/integration/get_more_spec.rb".freeze, "spec/integration/grid_fs_bucket_spec.rb".freeze, "spec/integration/heartbeat_events_spec.rb".freeze, "spec/integration/map_reduce_spec.rb".freeze, "spec/integration/mmapv1_spec.rb".freeze, "spec/integration/mongos_pinning_spec.rb".freeze, "spec/integration/ocsp_connectivity_spec.rb".freeze, "spec/integration/ocsp_verifier_cache_spec.rb".freeze, "spec/integration/ocsp_verifier_spec.rb".freeze, "spec/integration/operation_failure_code_spec.rb".freeze, "spec/integration/operation_failure_message_spec.rb".freeze, "spec/integration/query_cache_spec.rb".freeze, "spec/integration/query_cache_transactions_spec.rb".freeze, "spec/integration/read_concern_spec.rb".freeze, "spec/integration/read_preference_spec.rb".freeze, "spec/integration/reconnect_spec.rb".freeze, "spec/integration/retryable_errors_spec.rb".freeze, "spec/integration/retryable_reads_errors_spec.rb".freeze, "spec/integration/retryable_writes/retryable_writes_36_and_older_spec.rb".freeze, "spec/integration/retryable_writes/retryable_writes_40_and_newer_spec.rb".freeze, "spec/integration/retryable_writes/shared/adds_diagnostics.rb".freeze, "spec/integration/retryable_writes/shared/does_not_support_retries.rb".freeze, "spec/integration/retryable_writes/shared/only_supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_modern_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_no_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_modern_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_retries.rb".freeze, "spec/integration/retryable_writes_errors_spec.rb".freeze, "spec/integration/sdam_error_handling_spec.rb".freeze, "spec/integration/sdam_events_spec.rb".freeze, "spec/integration/sdam_prose_spec.rb".freeze, "spec/integration/secondary_reads_spec.rb".freeze, "spec/integration/server_description_spec.rb".freeze, "spec/integration/server_monitor_spec.rb".freeze, "spec/integration/server_selection_spec.rb".freeze, "spec/integration/server_selector_spec.rb".freeze, "spec/integration/server_spec.rb".freeze, "spec/integration/shell_examples_spec.rb".freeze, "spec/integration/size_limit_spec.rb".freeze, "spec/integration/snappy_compression_spec.rb".freeze, "spec/integration/snapshot_query_examples_spec.rb".freeze, "spec/integration/srv_monitoring_spec.rb".freeze, "spec/integration/srv_spec.rb".freeze, "spec/integration/ssl_uri_options_spec.rb".freeze, "spec/integration/step_down_spec.rb".freeze, "spec/integration/time_zone_querying_spec.rb".freeze, "spec/integration/transaction_pinning_spec.rb".freeze, "spec/integration/transactions_api_examples_spec.rb".freeze, "spec/integration/transactions_examples_spec.rb".freeze, "spec/integration/truncated_utf8_spec.rb".freeze, "spec/integration/versioned_api_examples_spec.rb".freeze, "spec/integration/x509_auth_spec.rb".freeze, "spec/integration/zlib_compression_spec.rb".freeze, "spec/integration/zstd_compression_spec.rb".freeze, "spec/kerberos/kerberos_spec.rb".freeze, "spec/lite_spec_helper.rb".freeze, "spec/mongo/address/ipv4_spec.rb".freeze, "spec/mongo/address/ipv6_spec.rb".freeze, "spec/mongo/address/unix_spec.rb".freeze, "spec/mongo/address/validator_spec.rb".freeze, "spec/mongo/address_spec.rb".freeze, "spec/mongo/auth/aws/credential_cache_spec.rb".freeze, "spec/mongo/auth/aws/credentials_retriever_spec.rb".freeze, "spec/mongo/auth/aws/credentials_spec.rb".freeze, "spec/mongo/auth/aws/request_region_spec.rb".freeze, "spec/mongo/auth/aws/request_spec.rb".freeze, "spec/mongo/auth/cr_spec.rb".freeze, "spec/mongo/auth/gssapi/conversation_spec.rb".freeze, "spec/mongo/auth/invalid_mechanism_spec.rb".freeze, "spec/mongo/auth/ldap/conversation_spec.rb".freeze, "spec/mongo/auth/ldap_spec.rb".freeze, "spec/mongo/auth/scram/conversation_spec.rb".freeze, "spec/mongo/auth/scram256/conversation_spec.rb".freeze, "spec/mongo/auth/scram_negotiation_spec.rb".freeze, "spec/mongo/auth/scram_spec.rb".freeze, "spec/mongo/auth/stringprep/profiles/sasl_spec.rb".freeze, "spec/mongo/auth/stringprep_spec.rb".freeze, "spec/mongo/auth/user/view_spec.rb".freeze, "spec/mongo/auth/user_spec.rb".freeze, "spec/mongo/auth/x509/conversation_spec.rb".freeze, "spec/mongo/auth/x509_spec.rb".freeze, "spec/mongo/auth_spec.rb".freeze, "spec/mongo/bson_spec.rb".freeze, "spec/mongo/bulk_write/ordered_combiner_spec.rb".freeze, "spec/mongo/bulk_write/result_spec.rb".freeze, "spec/mongo/bulk_write/unordered_combiner_spec.rb".freeze, "spec/mongo/bulk_write_spec.rb".freeze, "spec/mongo/caching_cursor_spec.rb".freeze, "spec/mongo/client_construction_spec.rb".freeze, "spec/mongo/client_encryption_spec.rb".freeze, "spec/mongo/client_spec.rb".freeze, "spec/mongo/cluster/cursor_reaper_spec.rb".freeze, "spec/mongo/cluster/periodic_executor_spec.rb".freeze, "spec/mongo/cluster/socket_reaper_spec.rb".freeze, "spec/mongo/cluster/topology/replica_set_spec.rb".freeze, "spec/mongo/cluster/topology/sharded_spec.rb".freeze, "spec/mongo/cluster/topology/single_spec.rb".freeze, "spec/mongo/cluster/topology/unknown_spec.rb".freeze, "spec/mongo/cluster/topology_spec.rb".freeze, "spec/mongo/cluster_spec.rb".freeze, "spec/mongo/cluster_time_spec.rb".freeze, "spec/mongo/collection/view/aggregation_spec.rb".freeze, "spec/mongo/collection/view/builder/find_command_spec.rb".freeze, "spec/mongo/collection/view/builder/op_query_spec.rb".freeze, "spec/mongo/collection/view/change_stream_resume_spec.rb".freeze, "spec/mongo/collection/view/change_stream_spec.rb".freeze, "spec/mongo/collection/view/explainable_spec.rb".freeze, "spec/mongo/collection/view/immutable_spec.rb".freeze, "spec/mongo/collection/view/iterable_spec.rb".freeze, "spec/mongo/collection/view/map_reduce_spec.rb".freeze, "spec/mongo/collection/view/readable_spec.rb".freeze, "spec/mongo/collection/view/writable_spec.rb".freeze, "spec/mongo/collection/view_spec.rb".freeze, "spec/mongo/collection_crud_spec.rb".freeze, "spec/mongo/collection_ddl_spec.rb".freeze, "spec/mongo/collection_spec.rb".freeze, "spec/mongo/condition_variable_spec.rb".freeze, "spec/mongo/config/options_spec.rb".freeze, "spec/mongo/config_spec.rb".freeze, "spec/mongo/crypt/auto_decryption_context_spec.rb".freeze, "spec/mongo/crypt/auto_encrypter_spec.rb".freeze, "spec/mongo/crypt/auto_encryption_context_spec.rb".freeze, "spec/mongo/crypt/binary_spec.rb".freeze, "spec/mongo/crypt/binding/binary_spec.rb".freeze, "spec/mongo/crypt/binding/context_spec.rb".freeze, "spec/mongo/crypt/binding/helpers_spec.rb".freeze, "spec/mongo/crypt/binding/mongocrypt_spec.rb".freeze, "spec/mongo/crypt/binding/status_spec.rb".freeze, "spec/mongo/crypt/binding/version_spec.rb".freeze, "spec/mongo/crypt/binding_unloaded_spec.rb".freeze, "spec/mongo/crypt/data_key_context_spec.rb".freeze, "spec/mongo/crypt/encryption_io_spec.rb".freeze, "spec/mongo/crypt/explicit_decryption_context_spec.rb".freeze, "spec/mongo/crypt/explicit_encryption_context_spec.rb".freeze, "spec/mongo/crypt/handle_spec.rb".freeze, "spec/mongo/crypt/helpers/mongo_crypt_spec_helper.rb".freeze, "spec/mongo/crypt/hooks_spec.rb".freeze, "spec/mongo/crypt/kms/azure/credentials_retriever_spec.rb".freeze, "spec/mongo/crypt/kms/credentials_spec.rb".freeze, "spec/mongo/crypt/kms_spec.rb".freeze, "spec/mongo/crypt/status_spec.rb".freeze, "spec/mongo/crypt_spec.rb".freeze, "spec/mongo/cursor/builder/get_more_command_spec.rb".freeze, "spec/mongo/cursor/builder/op_get_more_spec.rb".freeze, "spec/mongo/cursor_spec.rb".freeze, "spec/mongo/database_spec.rb".freeze, "spec/mongo/distinguishing_semaphore_spec.rb".freeze, "spec/mongo/error/bulk_write_error_spec.rb".freeze, "spec/mongo/error/crypt_error_spec.rb".freeze, "spec/mongo/error/max_bson_size_spec.rb".freeze, "spec/mongo/error/no_server_available_spec.rb".freeze, "spec/mongo/error/notable_spec.rb".freeze, "spec/mongo/error/operation_failure_heavy_spec.rb".freeze, "spec/mongo/error/operation_failure_spec.rb".freeze, "spec/mongo/error/parser_spec.rb".freeze, "spec/mongo/error/unsupported_option_spec.rb".freeze, "spec/mongo/event/publisher_spec.rb".freeze, "spec/mongo/event/subscriber_spec.rb".freeze, "spec/mongo/grid/file/chunk_spec.rb".freeze, "spec/mongo/grid/file/info_spec.rb".freeze, "spec/mongo/grid/file_spec.rb".freeze, "spec/mongo/grid/fs_bucket_spec.rb".freeze, "spec/mongo/grid/stream/read_spec.rb".freeze, "spec/mongo/grid/stream/write_spec.rb".freeze, "spec/mongo/grid/stream_spec.rb".freeze, "spec/mongo/id_spec.rb".freeze, "spec/mongo/index/view_spec.rb".freeze, "spec/mongo/lint_spec.rb".freeze, "spec/mongo/logger_spec.rb".freeze, "spec/mongo/monitoring/command_log_subscriber_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_failed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_started_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_in_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_out_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_created_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_ready_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_cleared_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_created_spec.rb".freeze, "spec/mongo/monitoring/event/command_failed_spec.rb".freeze, "spec/mongo/monitoring/event/command_started_spec.rb".freeze, "spec/mongo/monitoring/event/command_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/secure_spec.rb".freeze, "spec/mongo/monitoring/event/server_closed_spec.rb".freeze, "spec/mongo/monitoring/event/server_description_changed_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_failed_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_started_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/server_opening_spec.rb".freeze, "spec/mongo/monitoring/event/topology_changed_spec.rb".freeze, "spec/mongo/monitoring/event/topology_closed_spec.rb".freeze, "spec/mongo/monitoring/event/topology_opening_spec.rb".freeze, "spec/mongo/monitoring_spec.rb".freeze, "spec/mongo/operation/aggregate/result_spec.rb".freeze, "spec/mongo/operation/aggregate_spec.rb".freeze, "spec/mongo/operation/collections_info_spec.rb".freeze, "spec/mongo/operation/command_spec.rb".freeze, "spec/mongo/operation/create/op_msg_spec.rb".freeze, "spec/mongo/operation/create_index_spec.rb".freeze, "spec/mongo/operation/create_user_spec.rb".freeze, "spec/mongo/operation/delete/bulk_spec.rb".freeze, "spec/mongo/operation/delete/op_msg_spec.rb".freeze, "spec/mongo/operation/delete_spec.rb".freeze, "spec/mongo/operation/drop_index_spec.rb".freeze, "spec/mongo/operation/find/builder/flags_spec.rb".freeze, "spec/mongo/operation/find/builder/modifiers_spec.rb".freeze, "spec/mongo/operation/indexes_spec.rb".freeze, "spec/mongo/operation/insert/bulk_spec.rb".freeze, "spec/mongo/operation/insert/op_msg_spec.rb".freeze, "spec/mongo/operation/insert_spec.rb".freeze, "spec/mongo/operation/limited_spec.rb".freeze, "spec/mongo/operation/map_reduce_spec.rb".freeze, "spec/mongo/operation/read_preference_legacy_spec.rb".freeze, "spec/mongo/operation/read_preference_op_msg_spec.rb".freeze, "spec/mongo/operation/remove_user_spec.rb".freeze, "spec/mongo/operation/result_spec.rb".freeze, "spec/mongo/operation/specifiable_spec.rb".freeze, "spec/mongo/operation/update/bulk_spec.rb".freeze, "spec/mongo/operation/update/op_msg_spec.rb".freeze, "spec/mongo/operation/update_spec.rb".freeze, "spec/mongo/operation/update_user_spec.rb".freeze, "spec/mongo/options/redacted_spec.rb".freeze, "spec/mongo/protocol/caching_hash_spec.rb".freeze, "spec/mongo/protocol/compressed_spec.rb".freeze, "spec/mongo/protocol/get_more_spec.rb".freeze, "spec/mongo/protocol/kill_cursors_spec.rb".freeze, "spec/mongo/protocol/msg_spec.rb".freeze, "spec/mongo/protocol/query_spec.rb".freeze, "spec/mongo/protocol/registry_spec.rb".freeze, "spec/mongo/protocol/reply_spec.rb".freeze, "spec/mongo/query_cache_middleware_spec.rb".freeze, "spec/mongo/query_cache_spec.rb".freeze, "spec/mongo/retryable_spec.rb".freeze, "spec/mongo/semaphore_spec.rb".freeze, "spec/mongo/server/app_metadata/environment_spec.rb".freeze, "spec/mongo/server/app_metadata/truncator_spec.rb".freeze, "spec/mongo/server/app_metadata_spec.rb".freeze, "spec/mongo/server/connection_auth_spec.rb".freeze, "spec/mongo/server/connection_common_spec.rb".freeze, "spec/mongo/server/connection_pool/populator_spec.rb".freeze, "spec/mongo/server/connection_pool_spec.rb".freeze, "spec/mongo/server/connection_spec.rb".freeze, "spec/mongo/server/description/features_spec.rb".freeze, "spec/mongo/server/description_query_methods_spec.rb".freeze, "spec/mongo/server/description_spec.rb".freeze, "spec/mongo/server/monitor/app_metadata_spec.rb".freeze, "spec/mongo/server/monitor/connection_spec.rb".freeze, "spec/mongo/server/monitor_spec.rb".freeze, "spec/mongo/server/push_monitor_spec.rb".freeze, "spec/mongo/server/round_trip_time_averager_spec.rb".freeze, "spec/mongo/server_selector/nearest_spec.rb".freeze, "spec/mongo/server_selector/primary_preferred_spec.rb".freeze, "spec/mongo/server_selector/primary_spec.rb".freeze, "spec/mongo/server_selector/secondary_preferred_spec.rb".freeze, "spec/mongo/server_selector/secondary_spec.rb".freeze, "spec/mongo/server_selector_spec.rb".freeze, "spec/mongo/server_spec.rb".freeze, "spec/mongo/session/server_session_spec.rb".freeze, "spec/mongo/session/session_pool_spec.rb".freeze, "spec/mongo/session_spec.rb".freeze, "spec/mongo/session_transaction_spec.rb".freeze, "spec/mongo/socket/ssl_spec.rb".freeze, "spec/mongo/socket/tcp_spec.rb".freeze, "spec/mongo/socket/unix_spec.rb".freeze, "spec/mongo/socket_spec.rb".freeze, "spec/mongo/srv/monitor_spec.rb".freeze, "spec/mongo/srv/result_spec.rb".freeze, "spec/mongo/timeout_spec.rb".freeze, "spec/mongo/tls_context_hooks_spec.rb".freeze, "spec/mongo/uri/options_mapper_spec.rb".freeze, "spec/mongo/uri/srv_protocol_spec.rb".freeze, "spec/mongo/uri_option_parsing_spec.rb".freeze, "spec/mongo/uri_spec.rb".freeze, "spec/mongo/utils_spec.rb".freeze, "spec/mongo/write_concern/acknowledged_spec.rb".freeze, "spec/mongo/write_concern/unacknowledged_spec.rb".freeze, "spec/mongo/write_concern_spec.rb".freeze, "spec/runners/auth.rb".freeze, "spec/runners/change_streams/outcome.rb".freeze, "spec/runners/change_streams/spec.rb".freeze, "spec/runners/change_streams/test.rb".freeze, "spec/runners/cmap.rb".freeze, "spec/runners/cmap/verifier.rb".freeze, "spec/runners/command_monitoring.rb".freeze, "spec/runners/connection_string.rb".freeze, "spec/runners/crud.rb".freeze, "spec/runners/crud/context.rb".freeze, "spec/runners/crud/operation.rb".freeze, "spec/runners/crud/outcome.rb".freeze, "spec/runners/crud/requirement.rb".freeze, "spec/runners/crud/spec.rb".freeze, "spec/runners/crud/test.rb".freeze, "spec/runners/crud/test_base.rb".freeze, "spec/runners/crud/verifier.rb".freeze, "spec/runners/gridfs.rb".freeze, "spec/runners/read_write_concern_document.rb".freeze, "spec/runners/sdam.rb".freeze, "spec/runners/sdam/verifier.rb".freeze, "spec/runners/server_selection.rb".freeze, "spec/runners/server_selection_rtt.rb".freeze, "spec/runners/transactions.rb".freeze, "spec/runners/transactions/operation.rb".freeze, "spec/runners/transactions/spec.rb".freeze, "spec/runners/transactions/test.rb".freeze, "spec/runners/unified.rb".freeze, "spec/runners/unified/assertions.rb".freeze, "spec/runners/unified/change_stream_operations.rb".freeze, "spec/runners/unified/client_side_encryption_operations.rb".freeze, "spec/runners/unified/crud_operations.rb".freeze, "spec/runners/unified/ddl_operations.rb".freeze, "spec/runners/unified/entity_map.rb".freeze, "spec/runners/unified/error.rb".freeze, "spec/runners/unified/event_subscriber.rb".freeze, "spec/runners/unified/exceptions.rb".freeze, "spec/runners/unified/grid_fs_operations.rb".freeze, "spec/runners/unified/support_operations.rb".freeze, "spec/runners/unified/test.rb".freeze, "spec/runners/unified/test_group.rb".freeze, "spec/runners/unified/thread_operations.rb".freeze, "spec/shared/LICENSE".freeze, "spec/shared/bin/get-mongodb-download-url".freeze, "spec/shared/bin/s3-copy".freeze, "spec/shared/bin/s3-upload".freeze, "spec/shared/lib/mrss/child_process_helper.rb".freeze, "spec/shared/lib/mrss/cluster_config.rb".freeze, "spec/shared/lib/mrss/constraints.rb".freeze, "spec/shared/lib/mrss/docker_runner.rb".freeze, "spec/shared/lib/mrss/eg_config_utils.rb".freeze, "spec/shared/lib/mrss/event_subscriber.rb".freeze, "spec/shared/lib/mrss/lite_constraints.rb".freeze, "spec/shared/lib/mrss/server_version_registry.rb".freeze, "spec/shared/lib/mrss/session_registry.rb".freeze, "spec/shared/lib/mrss/session_registry_legacy.rb".freeze, "spec/shared/lib/mrss/spec_organizer.rb".freeze, "spec/shared/lib/mrss/utils.rb".freeze, "spec/shared/share/Dockerfile.erb".freeze, "spec/shared/share/haproxy-1.conf".freeze, "spec/shared/share/haproxy-2.conf".freeze, "spec/shared/shlib/config.sh".freeze, "spec/shared/shlib/distro.sh".freeze, "spec/shared/shlib/server.sh".freeze, "spec/shared/shlib/set_env.sh".freeze, "spec/solo/clean_exit_spec.rb".freeze, "spec/spec_helper.rb".freeze, "spec/spec_tests/auth_spec.rb".freeze, "spec/spec_tests/change_streams_unified_spec.rb".freeze, "spec/spec_tests/client_side_encryption_spec.rb".freeze, "spec/spec_tests/client_side_encryption_unified_spec.rb".freeze, "spec/spec_tests/cmap_spec.rb".freeze, "spec/spec_tests/collection_management_spec.rb".freeze, "spec/spec_tests/command_monitoring_unified_spec.rb".freeze, "spec/spec_tests/connection_string_spec.rb".freeze, "spec/spec_tests/crud_spec.rb".freeze, "spec/spec_tests/crud_unified_spec.rb".freeze, "spec/spec_tests/data/auth/connection-string.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-clusterTime.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-disambiguatedPaths.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-errors.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-errorLabels.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams.yml".freeze, "spec/spec_tests/data/client_side_encryption/aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/awsTemporary.yml".freeze, "spec/spec_tests/data/client_side_encryption/azureKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/badQueries.yml".freeze, "spec/spec_tests/data/client_side_encryption/badSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/basic.yml".freeze, "spec/spec_tests/data/client_side_encryption/bulk.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassAutoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/count.yml".freeze, "spec/spec_tests/data/client_side_encryption/countDocuments.yml".freeze, "spec/spec_tests/data/client_side_encryption/create-and-createIndexes.yml".freeze, "spec/spec_tests/data/client_side_encryption/delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/distinct.yml".freeze, "spec/spec_tests/data/client_side_encryption/explain.yml".freeze, "spec/spec_tests/data/client_side_encryption/find.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndDelete.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndReplace.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-BypassQueryAnalysis.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Compact.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection-OldServer.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-DecryptExistingData.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-jsonSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFieldsMap-defaults.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Indexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Unindexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-MissingKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-NoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-WrongType.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/client_side_encryption/gcpKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/getMore.yml".freeze, "spec/spec_tests/data/client_side_encryption/insert.yml".freeze, "spec/spec_tests/data/client_side_encryption/keyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/localKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/localSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/malformedCiphertext.yml".freeze, "spec/spec_tests/data/client_side_encryption/maxWireVersion.yml".freeze, "spec/spec_tests/data/client_side_encryption/missingKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/noSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/replaceOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/types.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/addKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey-kms_providers-invalid.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/deleteKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeyByAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeys.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/removeKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-decrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-encrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unsupportedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateMany.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/cmap/connection-must-have-id.yml".freeze, "spec/spec_tests/data/cmap/connection-must-order-ids.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-stale.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-make-available.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-connection.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-custom-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-error-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-timeout.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-minPoolSize-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-multiple.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-idle.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-stale.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-returned-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupt-immediately.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupting-pending-connections.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-paused.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-schedule-run-interruptInUseConnections-false.yml".freeze, "spec/spec_tests/data/cmap/pool-close-destroy-conns.yml".freeze, "spec/spec_tests/data/cmap/pool-close.yml".freeze, "spec/spec_tests/data/cmap/pool-create-max-size.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size-error.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-create-with-options.yml".freeze, "spec/spec_tests/data/cmap/pool-create.yml".freeze, "spec/spec_tests/data/cmap/pool-ready-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-ready.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-fairness.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-timeout.yml".freeze, "spec/spec_tests/data/collection_management/clustered-indexes.yml".freeze, "spec/spec_tests/data/collection_management/createCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-errorResponse.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/timeseries-collection.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/bulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/command.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/find.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/pre-42-server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/unacknowledgedBulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/writeConcernError.yml".freeze, "spec/spec_tests/data/connection_string/invalid-uris.yml".freeze, "spec/spec_tests/data/connection_string/valid-auth.yml".freeze, "spec/spec_tests/data/connection_string/valid-db-with-dotted-name.yml".freeze, "spec/spec_tests/data/connection_string/valid-host_identifiers.yml".freeze, "spec/spec_tests/data/connection_string/valid-options.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-absolute.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-relative.yml".freeze, "spec/spec_tests/data/connection_string/valid-warnings.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-collation.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-out.yml".freeze, "spec/spec_tests/data/crud/read/aggregate.yml".freeze, "spec/spec_tests/data/crud/read/count-collation.yml".freeze, "spec/spec_tests/data/crud/read/count-empty.yml".freeze, "spec/spec_tests/data/crud/read/count.yml".freeze, "spec/spec_tests/data/crud/read/distinct-collation.yml".freeze, "spec/spec_tests/data/crud/read/distinct.yml".freeze, "spec/spec_tests/data/crud/read/find-collation.yml".freeze, "spec/spec_tests/data/crud/read/find.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-collation.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert_pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/crud/write/insertMany.yml".freeze, "spec/spec_tests/data/crud/write/insertOne.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-upsert.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/updateMany.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/updateOne.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-let.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-out-readConcern.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-comment.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-validation.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/countDocuments-comment.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/distinct-comment.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount-comment.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/find-comment.yml".freeze, "spec/spec_tests/data/crud_unified/find-let.yml".freeze, "spec/spec_tests/data/crud_unified/find.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-let.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-validation.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/updateWithPipelines.yml".freeze, "spec/spec_tests/data/gridfs/delete.yml".freeze, "spec/spec_tests/data/gridfs/download.yml".freeze, "spec/spec_tests/data/gridfs/download_by_name.yml".freeze, "spec/spec_tests/data/gridfs/upload.yml".freeze, "spec/spec_tests/data/gridfs_unified/delete.yml".freeze, "spec/spec_tests/data/gridfs_unified/download.yml".freeze, "spec/spec_tests/data/gridfs_unified/downloadByName.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload-disableMD5.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload.yml".freeze, "spec/spec_tests/data/load_balancers/event-monitoring.yml".freeze, "spec/spec_tests/data/load_balancers/lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/non-lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/server-selection.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Secondary.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Single/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/Single/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Unknown/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/document/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/document/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-2.6.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.2.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.4.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-4.2.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-merge.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/mapReduce.yml".freeze, "spec/spec_tests/data/retryable_reads/unified/handshakeError.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/handshakeError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-noWritesPerformedError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/sdam/errors/error_handling_handshake.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-error.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/prefer-error-code.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/write_errors_ignored.yml".freeze, "spec/spec_tests/data/sdam/load-balanced/discover_load_balancer.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible_unknown.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discovery.yml".freeze, "spec/spec_tests/data/sdam/rs/electionId_precedence_setVersion.yml".freeze, "spec/spec_tests/data/sdam/rs/equal_electionids.yml".freeze, "spec/spec_tests/data/sdam/rs/hosts_differ_from_seeds.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_arbiter.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_other.yml".freeze, "spec/spec_tests/data/sdam/rs/ls_timeout.yml".freeze, "spec/spec_tests/data/sdam/rs/member_reconfig.yml".freeze, "spec/spec_tests/data/sdam/rs/member_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/non_rs_member.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case_me.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_changes_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_hint_from_secondary_with_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me_not_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_reports_new_member.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/repeated.yml".freeze, "spec/spec_tests/data/sdam/rs/replicaset_rsnp.yml".freeze, "spec/spec_tests/data/sdam/rs/response_from_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_secondary_wrong_set_name_with_primary_second.yml".freeze, "spec/spec_tests/data/sdam/rs/sec_not_auth.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name_with_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/set_version_can_rollback.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_equal_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_greaterthan_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/stepdown_change_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/too_new.yml".freeze, "spec/spec_tests/data/sdam/rs/too_old.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_equal.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_greater.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_less.yml".freeze, "spec/spec_tests/data/sdam/rs/unexpected_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/sharded/compatible.yml".freeze, "spec/spec_tests/data/sdam/sharded/discover_single_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/ls_timeout_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/mongos_disconnect.yml".freeze, "spec/spec_tests/data/sdam/sharded/multiple_mongoses.yml".freeze, "spec/spec_tests/data/sdam/sharded/non_mongos_removed.yml".freeze, "spec/spec_tests/data/sdam/sharded/normalize_uri_case.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_new.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_old.yml".freeze, "spec/spec_tests/data/sdam/single/compatible.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_external_ip.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_mongos.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_replicaset.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsarbiter.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsprimary.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rssecondary.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/single/discover_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/discover_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/ls_timeout_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/not_ok_response.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_removed.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_using_legacy_hello.yml".freeze, "spec/spec_tests/data/sdam/single/too_new.yml".freeze, "spec/spec_tests/data/sdam/single/too_old.yml".freeze, "spec/spec_tests/data/sdam/single/too_old_then_upgraded.yml".freeze, "spec/spec_tests/data/sdam_monitoring/discovered_standalone.yml".freeze, "spec/spec_tests/data/sdam_monitoring/load_balancer.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_chain.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_no_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_and_secondary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_second_seed_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/required_replica_set.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_repeated.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_suppress_equal_description_changes.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_to_rs_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-misc-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/cancel-server-check.yml".freeze, "spec/spec_tests/data/sdam_unified/connectTimeoutMS.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-timeout.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/interruptInUse-pool-clear.yml".freeze, "spec/spec_tests/data/sdam_unified/minPoolSize-error.yml".freeze, "spec/spec_tests/data/sdam_unified/pool-cleared-error.yml".freeze, "spec/spec_tests/data/sdam_unified/rediscover-quickly-after-step-down.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-directConnection.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-replicaSet-errors.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-multiple-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-false.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/encoded-userinfo-and-db.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/loadBalanced-false-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/longer-parent-in-return.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/misformatted-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/not-enough-parts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-result-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record-multiple-strings.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch1.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch2.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch3.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch4.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch5.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-too-short.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-wrong.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srv-service-name.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-nonstandard-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-txt-records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-not-allowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-ssl-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-uri-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-unallowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-admin-database.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-auth.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-two-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Single/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/ghost.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/write/ghost.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value_zero.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_1.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_2.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_3.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_4.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_5.yml".freeze, "spec/spec_tests/data/sessions_unified/driver-sessions-server-support.yml".freeze, "spec/spec_tests/data/sessions_unified/implicit-sessions-default-causal-consistency.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-client-error.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-server-error.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-unsupported-ops.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions.yml".freeze, "spec/spec_tests/data/transactions/abort.yml".freeze, "spec/spec_tests/data/transactions/bulk.yml".freeze, "spec/spec_tests/data/transactions/causal-consistency.yml".freeze, "spec/spec_tests/data/transactions/commit.yml".freeze, "spec/spec_tests/data/transactions/count.yml".freeze, "spec/spec_tests/data/transactions/create-collection.yml".freeze, "spec/spec_tests/data/transactions/create-index.yml".freeze, "spec/spec_tests/data/transactions/delete.yml".freeze, "spec/spec_tests/data/transactions/error-labels.yml".freeze, "spec/spec_tests/data/transactions/errors-client.yml".freeze, "spec/spec_tests/data/transactions/errors.yml".freeze, "spec/spec_tests/data/transactions/findOneAndDelete.yml".freeze, "spec/spec_tests/data/transactions/findOneAndReplace.yml".freeze, "spec/spec_tests/data/transactions/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/transactions/insert.yml".freeze, "spec/spec_tests/data/transactions/isolation.yml".freeze, "spec/spec_tests/data/transactions/mongos-pin-auto.yml".freeze, "spec/spec_tests/data/transactions/mongos-recovery-token.yml".freeze, "spec/spec_tests/data/transactions/pin-mongos.yml".freeze, "spec/spec_tests/data/transactions/read-concern.yml".freeze, "spec/spec_tests/data/transactions/read-pref.yml".freeze, "spec/spec_tests/data/transactions/reads.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort-errorLabels.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit-errorLabels.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit.yml".freeze, "spec/spec_tests/data/transactions/retryable-writes.yml".freeze, "spec/spec_tests/data/transactions/run-command.yml".freeze, "spec/spec_tests/data/transactions/transaction-options-repl.yml".freeze, "spec/spec_tests/data/transactions/transaction-options.yml".freeze, "spec/spec_tests/data/transactions/update.yml".freeze, "spec/spec_tests/data/transactions/write-concern.yml".freeze, "spec/spec_tests/data/transactions_api/callback-aborts.yml".freeze, "spec/spec_tests/data/transactions_api/callback-commits.yml".freeze, "spec/spec_tests/data/transactions_api/callback-retry.yml".freeze, "spec/spec_tests/data/transactions_api/commit-retry.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror-4.2.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror.yml".freeze, "spec/spec_tests/data/transactions_api/commit-writeconcernerror.yml".freeze, "spec/spec_tests/data/transactions_api/commit.yml".freeze, "spec/spec_tests/data/transactions_api/transaction-options.yml".freeze, "spec/spec_tests/data/transactions_unified/do-not-retry-read-in-transaction.yml".freeze, "spec/spec_tests/data/transactions_unified/mongos-unpin.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-abort-handshake.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-commit-handshake.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-failure.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-unsupported.yml".freeze, "spec/spec_tests/data/unified/valid-pass/assertNumberConnectionsCheckedOut.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-cmap-events.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-storeEventsAsEntities.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedError-errorResponse.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-eventType.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml".freeze, "spec/spec_tests/data/unified/valid-pass/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-pass/observeSensitiveCommands.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-change-streams.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-command-monitoring.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-crud.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-gridfs.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-reads.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-sessions.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions.yml".freeze, "spec/spec_tests/data/uri_options/auth-options.yml".freeze, "spec/spec_tests/data/uri_options/compression-options.yml".freeze, "spec/spec_tests/data/uri_options/concern-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-pool-options.yml".freeze, "spec/spec_tests/data/uri_options/read-preference-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-auth-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-connection-options.yml".freeze, "spec/spec_tests/data/uri_options/srv-options.yml".freeze, "spec/spec_tests/data/uri_options/tls-options.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1.yml".freeze, "spec/spec_tests/data/versioned_api/runcommand-helper-no-api-version-declared.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-deprecation-errors.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-strict-mode.yml".freeze, "spec/spec_tests/data/versioned_api/transaction-handling.yml".freeze, "spec/spec_tests/gridfs_spec.rb".freeze, "spec/spec_tests/gridfs_unified_spec.rb".freeze, "spec/spec_tests/load_balancers_spec.rb".freeze, "spec/spec_tests/max_staleness_spec.rb".freeze, "spec/spec_tests/read_write_concern_connection_string_spec.rb".freeze, "spec/spec_tests/read_write_concern_document_spec.rb".freeze, "spec/spec_tests/read_write_concern_operaton_spec.rb".freeze, "spec/spec_tests/retryable_reads_spec.rb".freeze, "spec/spec_tests/retryable_reads_unified_spec.rb".freeze, "spec/spec_tests/retryable_writes_spec.rb".freeze, "spec/spec_tests/retryable_writes_unified_spec.rb".freeze, "spec/spec_tests/sdam_monitoring_spec.rb".freeze, "spec/spec_tests/sdam_spec.rb".freeze, "spec/spec_tests/sdam_unified_spec.rb".freeze, "spec/spec_tests/seed_list_discovery_spec.rb".freeze, "spec/spec_tests/server_selection_rtt_spec.rb".freeze, "spec/spec_tests/server_selection_spec.rb".freeze, "spec/spec_tests/sessions_unified_spec.rb".freeze, "spec/spec_tests/transactions_api_spec.rb".freeze, "spec/spec_tests/transactions_spec.rb".freeze, "spec/spec_tests/transactions_unified_spec.rb".freeze, "spec/spec_tests/unified_spec.rb".freeze, "spec/spec_tests/uri_options_spec.rb".freeze, "spec/spec_tests/versioned_api_spec.rb".freeze, "spec/stress/cleanup_spec.rb".freeze, "spec/stress/connection_pool_stress_spec.rb".freeze, "spec/stress/connection_pool_timing_spec.rb".freeze, "spec/stress/fork_reconnect_stress_spec.rb".freeze, "spec/stress/push_monitor_close_spec.rb".freeze, "spec/support/authorization.rb".freeze, "spec/support/aws_utils.rb".freeze, "spec/support/aws_utils/base.rb".freeze, "spec/support/aws_utils/inspector.rb".freeze, "spec/support/aws_utils/orchestrator.rb".freeze, "spec/support/aws_utils/provisioner.rb".freeze, "spec/support/background_thread_registry.rb".freeze, "spec/support/certificates/README.md".freeze, "spec/support/certificates/atlas-ocsp-ca.crt".freeze, "spec/support/certificates/atlas-ocsp.crt".freeze, "spec/support/certificates/ca.crt".freeze, "spec/support/certificates/client-encrypted.key".freeze, "spec/support/certificates/client-int.crt".freeze, "spec/support/certificates/client-second-level-bundle.pem".freeze, "spec/support/certificates/client-second-level.crt".freeze, "spec/support/certificates/client-second-level.key".freeze, "spec/support/certificates/client-second-level.pem".freeze, "spec/support/certificates/client-x509.crt".freeze, "spec/support/certificates/client-x509.key".freeze, "spec/support/certificates/client-x509.pem".freeze, "spec/support/certificates/client.crt".freeze, "spec/support/certificates/client.key".freeze, "spec/support/certificates/client.pem".freeze, "spec/support/certificates/crl.pem".freeze, "spec/support/certificates/crl_client_revoked.pem".freeze, "spec/support/certificates/multi-ca.crt".freeze, "spec/support/certificates/python-ca.crt".freeze, "spec/support/certificates/retrieve-atlas-cert".freeze, "spec/support/certificates/server-int.crt".freeze, "spec/support/certificates/server-second-level-bundle.pem".freeze, "spec/support/certificates/server-second-level.crt".freeze, "spec/support/certificates/server-second-level.key".freeze, "spec/support/certificates/server-second-level.pem".freeze, "spec/support/certificates/server.pem".freeze, "spec/support/client_registry.rb".freeze, "spec/support/client_registry_macros.rb".freeze, "spec/support/cluster_tools.rb".freeze, "spec/support/common_shortcuts.rb".freeze, "spec/support/constraints.rb".freeze, "spec/support/crypt.rb".freeze, "spec/support/crypt/corpus/corpus-encrypted.json".freeze, "spec/support/crypt/corpus/corpus-key-aws.json".freeze, "spec/support/crypt/corpus/corpus-key-azure.json".freeze, "spec/support/crypt/corpus/corpus-key-gcp.json".freeze, "spec/support/crypt/corpus/corpus-key-kmip.json".freeze, "spec/support/crypt/corpus/corpus-key-local.json".freeze, "spec/support/crypt/corpus/corpus-schema.json".freeze, "spec/support/crypt/corpus/corpus.json".freeze, "spec/support/crypt/data_keys/key_document_aws.json".freeze, "spec/support/crypt/data_keys/key_document_azure.json".freeze, "spec/support/crypt/data_keys/key_document_gcp.json".freeze, "spec/support/crypt/data_keys/key_document_kmip.json".freeze, "spec/support/crypt/data_keys/key_document_local.json".freeze, "spec/support/crypt/encrypted_fields/encryptedFields.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Date.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoubleNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoublePrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Int.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Long.json".freeze, "spec/support/crypt/external/external-key.json".freeze, "spec/support/crypt/external/external-schema.json".freeze, "spec/support/crypt/keys/key1-document.json".freeze, "spec/support/crypt/limits/limits-doc.json".freeze, "spec/support/crypt/limits/limits-key.json".freeze, "spec/support/crypt/limits/limits-schema.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_local.json".freeze, "spec/support/crypt/schema_maps/schema_map_local_key_alt_names.json".freeze, "spec/support/dns.rb".freeze, "spec/support/json_ext_formatter.rb".freeze, "spec/support/keyword_struct.rb".freeze, "spec/support/local_resource_registry.rb".freeze, "spec/support/macros.rb".freeze, "spec/support/matchers.rb".freeze, "spec/support/mongos_macros.rb".freeze, "spec/support/monitoring_ext.rb".freeze, "spec/support/ocsp".freeze, "spec/support/primary_socket.rb".freeze, "spec/support/sdam_formatter_integration.rb".freeze, "spec/support/shared/app_metadata.rb".freeze, "spec/support/shared/auth_context.rb".freeze, "spec/support/shared/protocol.rb".freeze, "spec/support/shared/scram_conversation.rb".freeze, "spec/support/shared/server_selector.rb".freeze, "spec/support/shared/session.rb".freeze, "spec/support/spec_config.rb".freeze, "spec/support/spec_setup.rb".freeze, "spec/support/using_hash.rb".freeze, "spec/support/utils.rb".freeze] -+ s.files = ["CONTRIBUTING.md".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/mongo_console".freeze, "lib/mongo.rb".freeze, "lib/mongo/active_support.rb".freeze, "lib/mongo/address.rb".freeze, "lib/mongo/address/ipv4.rb".freeze, "lib/mongo/address/ipv6.rb".freeze, "lib/mongo/address/unix.rb".freeze, "lib/mongo/address/validator.rb".freeze, "lib/mongo/auth.rb".freeze, "lib/mongo/auth/aws.rb".freeze, "lib/mongo/auth/aws/conversation.rb".freeze, "lib/mongo/auth/aws/credentials.rb".freeze, "lib/mongo/auth/aws/credentials_cache.rb".freeze, "lib/mongo/auth/aws/credentials_retriever.rb".freeze, "lib/mongo/auth/aws/request.rb".freeze, "lib/mongo/auth/base.rb".freeze, "lib/mongo/auth/conversation_base.rb".freeze, "lib/mongo/auth/cr.rb".freeze, "lib/mongo/auth/cr/conversation.rb".freeze, "lib/mongo/auth/credential_cache.rb".freeze, "lib/mongo/auth/gssapi.rb".freeze, "lib/mongo/auth/gssapi/conversation.rb".freeze, "lib/mongo/auth/ldap.rb".freeze, "lib/mongo/auth/ldap/conversation.rb".freeze, "lib/mongo/auth/roles.rb".freeze, "lib/mongo/auth/sasl_conversation_base.rb".freeze, "lib/mongo/auth/scram.rb".freeze, "lib/mongo/auth/scram/conversation.rb".freeze, "lib/mongo/auth/scram256.rb".freeze, "lib/mongo/auth/scram256/conversation.rb".freeze, "lib/mongo/auth/scram_conversation_base.rb".freeze, "lib/mongo/auth/stringprep.rb".freeze, "lib/mongo/auth/stringprep/profiles/sasl.rb".freeze, "lib/mongo/auth/stringprep/tables.rb".freeze, "lib/mongo/auth/stringprep/unicode_normalize/normalize.rb".freeze, "lib/mongo/auth/stringprep/unicode_normalize/tables.rb".freeze, "lib/mongo/auth/user.rb".freeze, "lib/mongo/auth/user/view.rb".freeze, "lib/mongo/auth/x509.rb".freeze, "lib/mongo/auth/x509/conversation.rb".freeze, "lib/mongo/background_thread.rb".freeze, "lib/mongo/bson.rb".freeze, "lib/mongo/bulk_write.rb".freeze, "lib/mongo/bulk_write/combineable.rb".freeze, "lib/mongo/bulk_write/ordered_combiner.rb".freeze, "lib/mongo/bulk_write/result.rb".freeze, "lib/mongo/bulk_write/result_combiner.rb".freeze, "lib/mongo/bulk_write/transformable.rb".freeze, "lib/mongo/bulk_write/unordered_combiner.rb".freeze, "lib/mongo/bulk_write/validatable.rb".freeze, "lib/mongo/caching_cursor.rb".freeze, "lib/mongo/client.rb".freeze, "lib/mongo/client_encryption.rb".freeze, "lib/mongo/cluster.rb".freeze, "lib/mongo/cluster/periodic_executor.rb".freeze, "lib/mongo/cluster/reapers/cursor_reaper.rb".freeze, "lib/mongo/cluster/reapers/socket_reaper.rb".freeze, "lib/mongo/cluster/sdam_flow.rb".freeze, "lib/mongo/cluster/topology.rb".freeze, "lib/mongo/cluster/topology/base.rb".freeze, "lib/mongo/cluster/topology/load_balanced.rb".freeze, "lib/mongo/cluster/topology/no_replica_set_options.rb".freeze, "lib/mongo/cluster/topology/replica_set_no_primary.rb".freeze, "lib/mongo/cluster/topology/replica_set_with_primary.rb".freeze, "lib/mongo/cluster/topology/sharded.rb".freeze, "lib/mongo/cluster/topology/single.rb".freeze, "lib/mongo/cluster/topology/unknown.rb".freeze, "lib/mongo/cluster_time.rb".freeze, "lib/mongo/collection.rb".freeze, "lib/mongo/collection/helpers.rb".freeze, "lib/mongo/collection/queryable_encryption.rb".freeze, "lib/mongo/collection/view.rb".freeze, "lib/mongo/collection/view/aggregation.rb".freeze, "lib/mongo/collection/view/builder.rb".freeze, "lib/mongo/collection/view/builder/aggregation.rb".freeze, "lib/mongo/collection/view/builder/map_reduce.rb".freeze, "lib/mongo/collection/view/change_stream.rb".freeze, "lib/mongo/collection/view/change_stream/retryable.rb".freeze, "lib/mongo/collection/view/explainable.rb".freeze, "lib/mongo/collection/view/immutable.rb".freeze, "lib/mongo/collection/view/iterable.rb".freeze, "lib/mongo/collection/view/map_reduce.rb".freeze, "lib/mongo/collection/view/readable.rb".freeze, "lib/mongo/collection/view/writable.rb".freeze, "lib/mongo/condition_variable.rb".freeze, "lib/mongo/config.rb".freeze, "lib/mongo/config/options.rb".freeze, "lib/mongo/config/validators/option.rb".freeze, "lib/mongo/crypt.rb".freeze, "lib/mongo/crypt/auto_decryption_context.rb".freeze, "lib/mongo/crypt/auto_encrypter.rb".freeze, "lib/mongo/crypt/auto_encryption_context.rb".freeze, "lib/mongo/crypt/binary.rb".freeze, "lib/mongo/crypt/binding.rb".freeze, "lib/mongo/crypt/context.rb".freeze, "lib/mongo/crypt/data_key_context.rb".freeze, "lib/mongo/crypt/encryption_io.rb".freeze, "lib/mongo/crypt/explicit_decryption_context.rb".freeze, "lib/mongo/crypt/explicit_encrypter.rb".freeze, "lib/mongo/crypt/explicit_encryption_context.rb".freeze, "lib/mongo/crypt/explicit_encryption_expression_context.rb".freeze, "lib/mongo/crypt/handle.rb".freeze, "lib/mongo/crypt/hooks.rb".freeze, "lib/mongo/crypt/kms.rb".freeze, "lib/mongo/crypt/kms/aws.rb".freeze, "lib/mongo/crypt/kms/aws/credentials.rb".freeze, "lib/mongo/crypt/kms/aws/master_document.rb".freeze, "lib/mongo/crypt/kms/azure.rb".freeze, "lib/mongo/crypt/kms/azure/access_token.rb".freeze, "lib/mongo/crypt/kms/azure/credentials.rb".freeze, "lib/mongo/crypt/kms/azure/credentials_retriever.rb".freeze, "lib/mongo/crypt/kms/azure/master_document.rb".freeze, "lib/mongo/crypt/kms/credentials.rb".freeze, "lib/mongo/crypt/kms/gcp.rb".freeze, "lib/mongo/crypt/kms/gcp/credentials.rb".freeze, "lib/mongo/crypt/kms/gcp/credentials_retriever.rb".freeze, "lib/mongo/crypt/kms/gcp/master_document.rb".freeze, "lib/mongo/crypt/kms/kmip.rb".freeze, "lib/mongo/crypt/kms/kmip/credentials.rb".freeze, "lib/mongo/crypt/kms/kmip/master_document.rb".freeze, "lib/mongo/crypt/kms/local.rb".freeze, "lib/mongo/crypt/kms/local/credentials.rb".freeze, "lib/mongo/crypt/kms/local/master_document.rb".freeze, "lib/mongo/crypt/kms/master_key_document.rb".freeze, "lib/mongo/crypt/kms_context.rb".freeze, "lib/mongo/crypt/rewrap_many_data_key_context.rb".freeze, "lib/mongo/crypt/rewrap_many_data_key_result.rb".freeze, "lib/mongo/crypt/status.rb".freeze, "lib/mongo/cursor.rb".freeze, "lib/mongo/cursor/kill_spec.rb".freeze, "lib/mongo/database.rb".freeze, "lib/mongo/database/view.rb".freeze, "lib/mongo/dbref.rb".freeze, "lib/mongo/distinguishing_semaphore.rb".freeze, "lib/mongo/error.rb".freeze, "lib/mongo/error/auth_error.rb".freeze, "lib/mongo/error/bad_load_balancer_target.rb".freeze, "lib/mongo/error/bulk_write_error.rb".freeze, "lib/mongo/error/change_stream_resumable.rb".freeze, "lib/mongo/error/client_closed.rb".freeze, "lib/mongo/error/closed_stream.rb".freeze, "lib/mongo/error/connection_check_out_timeout.rb".freeze, "lib/mongo/error/connection_perished.rb".freeze, "lib/mongo/error/connection_unavailable.rb".freeze, "lib/mongo/error/credential_check_error.rb".freeze, "lib/mongo/error/crypt_error.rb".freeze, "lib/mongo/error/extra_file_chunk.rb".freeze, "lib/mongo/error/failed_string_prep_validation.rb".freeze, "lib/mongo/error/file_not_found.rb".freeze, "lib/mongo/error/handshake_error.rb".freeze, "lib/mongo/error/insufficient_iteration_count.rb".freeze, "lib/mongo/error/internal_driver_error.rb".freeze, "lib/mongo/error/invalid_address.rb".freeze, "lib/mongo/error/invalid_application_name.rb".freeze, "lib/mongo/error/invalid_bulk_operation.rb".freeze, "lib/mongo/error/invalid_bulk_operation_type.rb".freeze, "lib/mongo/error/invalid_collection_name.rb".freeze, "lib/mongo/error/invalid_config_option.rb".freeze, "lib/mongo/error/invalid_cursor_operation.rb".freeze, "lib/mongo/error/invalid_database_name.rb".freeze, "lib/mongo/error/invalid_document.rb".freeze, "lib/mongo/error/invalid_file.rb".freeze, "lib/mongo/error/invalid_file_revision.rb".freeze, "lib/mongo/error/invalid_min_pool_size.rb".freeze, "lib/mongo/error/invalid_nonce.rb".freeze, "lib/mongo/error/invalid_read_concern.rb".freeze, "lib/mongo/error/invalid_read_option.rb".freeze, "lib/mongo/error/invalid_replacement_document.rb".freeze, "lib/mongo/error/invalid_server_auth_host.rb".freeze, "lib/mongo/error/invalid_server_auth_response.rb".freeze, "lib/mongo/error/invalid_server_preference.rb".freeze, "lib/mongo/error/invalid_session.rb".freeze, "lib/mongo/error/invalid_signature.rb".freeze, "lib/mongo/error/invalid_transaction_operation.rb".freeze, "lib/mongo/error/invalid_txt_record.rb".freeze, "lib/mongo/error/invalid_update_document.rb".freeze, "lib/mongo/error/invalid_uri.rb".freeze, "lib/mongo/error/invalid_write_concern.rb".freeze, "lib/mongo/error/kms_error.rb".freeze, "lib/mongo/error/labelable.rb".freeze, "lib/mongo/error/lint_error.rb".freeze, "lib/mongo/error/max_bson_size.rb".freeze, "lib/mongo/error/max_message_size.rb".freeze, "lib/mongo/error/mismatched_domain.rb".freeze, "lib/mongo/error/missing_connection.rb".freeze, "lib/mongo/error/missing_file_chunk.rb".freeze, "lib/mongo/error/missing_password.rb".freeze, "lib/mongo/error/missing_resume_token.rb".freeze, "lib/mongo/error/missing_scram_server_signature.rb".freeze, "lib/mongo/error/missing_service_id.rb".freeze, "lib/mongo/error/mongocryptd_spawn_error.rb".freeze, "lib/mongo/error/multi_index_drop.rb".freeze, "lib/mongo/error/need_primary_server.rb".freeze, "lib/mongo/error/no_server_available.rb".freeze, "lib/mongo/error/no_service_connection_available.rb".freeze, "lib/mongo/error/no_srv_records.rb".freeze, "lib/mongo/error/notable.rb".freeze, "lib/mongo/error/operation_failure.rb".freeze, "lib/mongo/error/parser.rb".freeze, "lib/mongo/error/pool_cleared_error.rb".freeze, "lib/mongo/error/pool_closed_error.rb".freeze, "lib/mongo/error/pool_error.rb".freeze, "lib/mongo/error/pool_paused_error.rb".freeze, "lib/mongo/error/raise_original_error.rb".freeze, "lib/mongo/error/read_write_retryable.rb".freeze, "lib/mongo/error/sdam_error_detection.rb".freeze, "lib/mongo/error/server_api_conflict.rb".freeze, "lib/mongo/error/server_api_not_supported.rb".freeze, "lib/mongo/error/server_certificate_revoked.rb".freeze, "lib/mongo/error/server_not_usable.rb".freeze, "lib/mongo/error/session_ended.rb".freeze, "lib/mongo/error/session_not_materialized.rb".freeze, "lib/mongo/error/sessions_not_supported.rb".freeze, "lib/mongo/error/snapshot_session_invalid_server_version.rb".freeze, "lib/mongo/error/snapshot_session_transaction_prohibited.rb".freeze, "lib/mongo/error/socket_error.rb".freeze, "lib/mongo/error/socket_timeout_error.rb".freeze, "lib/mongo/error/unchangeable_collection_option.rb".freeze, "lib/mongo/error/unexpected_chunk_length.rb".freeze, "lib/mongo/error/unexpected_response.rb".freeze, "lib/mongo/error/unknown_payload_type.rb".freeze, "lib/mongo/error/unmet_dependency.rb".freeze, "lib/mongo/error/unsupported_array_filters.rb".freeze, "lib/mongo/error/unsupported_collation.rb".freeze, "lib/mongo/error/unsupported_features.rb".freeze, "lib/mongo/error/unsupported_message_type.rb".freeze, "lib/mongo/error/unsupported_option.rb".freeze, "lib/mongo/error/write_retryable.rb".freeze, "lib/mongo/event.rb".freeze, "lib/mongo/event/base.rb".freeze, "lib/mongo/event/listeners.rb".freeze, "lib/mongo/event/publisher.rb".freeze, "lib/mongo/event/subscriber.rb".freeze, "lib/mongo/grid.rb".freeze, "lib/mongo/grid/file.rb".freeze, "lib/mongo/grid/file/chunk.rb".freeze, "lib/mongo/grid/file/info.rb".freeze, "lib/mongo/grid/fs_bucket.rb".freeze, "lib/mongo/grid/stream.rb".freeze, "lib/mongo/grid/stream/read.rb".freeze, "lib/mongo/grid/stream/write.rb".freeze, "lib/mongo/id.rb".freeze, "lib/mongo/index.rb".freeze, "lib/mongo/index/view.rb".freeze, "lib/mongo/lint.rb".freeze, "lib/mongo/loggable.rb".freeze, "lib/mongo/logger.rb".freeze, "lib/mongo/monitoring.rb".freeze, "lib/mongo/monitoring/cmap_log_subscriber.rb".freeze, "lib/mongo/monitoring/command_log_subscriber.rb".freeze, "lib/mongo/monitoring/event.rb".freeze, "lib/mongo/monitoring/event/cmap.rb".freeze, "lib/mongo/monitoring/event/cmap/base.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_check_out_failed.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_check_out_started.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_checked_in.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_checked_out.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_closed.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_created.rb".freeze, "lib/mongo/monitoring/event/cmap/connection_ready.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_cleared.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_closed.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_created.rb".freeze, "lib/mongo/monitoring/event/cmap/pool_ready.rb".freeze, "lib/mongo/monitoring/event/command_failed.rb".freeze, "lib/mongo/monitoring/event/command_started.rb".freeze, "lib/mongo/monitoring/event/command_succeeded.rb".freeze, "lib/mongo/monitoring/event/secure.rb".freeze, "lib/mongo/monitoring/event/server_closed.rb".freeze, "lib/mongo/monitoring/event/server_description_changed.rb".freeze, "lib/mongo/monitoring/event/server_heartbeat_failed.rb".freeze, "lib/mongo/monitoring/event/server_heartbeat_started.rb".freeze, "lib/mongo/monitoring/event/server_heartbeat_succeeded.rb".freeze, "lib/mongo/monitoring/event/server_opening.rb".freeze, "lib/mongo/monitoring/event/topology_changed.rb".freeze, "lib/mongo/monitoring/event/topology_closed.rb".freeze, "lib/mongo/monitoring/event/topology_opening.rb".freeze, "lib/mongo/monitoring/publishable.rb".freeze, "lib/mongo/monitoring/sdam_log_subscriber.rb".freeze, "lib/mongo/monitoring/server_closed_log_subscriber.rb".freeze, "lib/mongo/monitoring/server_description_changed_log_subscriber.rb".freeze, "lib/mongo/monitoring/server_opening_log_subscriber.rb".freeze, "lib/mongo/monitoring/topology_changed_log_subscriber.rb".freeze, "lib/mongo/monitoring/topology_closed_log_subscriber.rb".freeze, "lib/mongo/monitoring/topology_opening_log_subscriber.rb".freeze, "lib/mongo/monitoring/unified_sdam_log_subscriber.rb".freeze, "lib/mongo/operation.rb".freeze, "lib/mongo/operation/aggregate.rb".freeze, "lib/mongo/operation/aggregate/op_msg.rb".freeze, "lib/mongo/operation/aggregate/result.rb".freeze, "lib/mongo/operation/collections_info.rb".freeze, "lib/mongo/operation/collections_info/result.rb".freeze, "lib/mongo/operation/command.rb".freeze, "lib/mongo/operation/command/op_msg.rb".freeze, "lib/mongo/operation/context.rb".freeze, "lib/mongo/operation/count.rb".freeze, "lib/mongo/operation/count/op_msg.rb".freeze, "lib/mongo/operation/create.rb".freeze, "lib/mongo/operation/create/op_msg.rb".freeze, "lib/mongo/operation/create_index.rb".freeze, "lib/mongo/operation/create_index/op_msg.rb".freeze, "lib/mongo/operation/create_user.rb".freeze, "lib/mongo/operation/create_user/op_msg.rb".freeze, "lib/mongo/operation/delete.rb".freeze, "lib/mongo/operation/delete/bulk_result.rb".freeze, "lib/mongo/operation/delete/op_msg.rb".freeze, "lib/mongo/operation/delete/result.rb".freeze, "lib/mongo/operation/distinct.rb".freeze, "lib/mongo/operation/distinct/op_msg.rb".freeze, "lib/mongo/operation/drop.rb".freeze, "lib/mongo/operation/drop/op_msg.rb".freeze, "lib/mongo/operation/drop_database.rb".freeze, "lib/mongo/operation/drop_database/op_msg.rb".freeze, "lib/mongo/operation/drop_index.rb".freeze, "lib/mongo/operation/drop_index/op_msg.rb".freeze, "lib/mongo/operation/explain.rb".freeze, "lib/mongo/operation/explain/op_msg.rb".freeze, "lib/mongo/operation/explain/result.rb".freeze, "lib/mongo/operation/find.rb".freeze, "lib/mongo/operation/find/builder.rb".freeze, "lib/mongo/operation/find/builder/command.rb".freeze, "lib/mongo/operation/find/builder/flags.rb".freeze, "lib/mongo/operation/find/builder/modifiers.rb".freeze, "lib/mongo/operation/find/op_msg.rb".freeze, "lib/mongo/operation/find/result.rb".freeze, "lib/mongo/operation/get_more.rb".freeze, "lib/mongo/operation/get_more/command_builder.rb".freeze, "lib/mongo/operation/get_more/op_msg.rb".freeze, "lib/mongo/operation/get_more/result.rb".freeze, "lib/mongo/operation/indexes.rb".freeze, "lib/mongo/operation/indexes/op_msg.rb".freeze, "lib/mongo/operation/indexes/result.rb".freeze, "lib/mongo/operation/insert.rb".freeze, "lib/mongo/operation/insert/bulk_result.rb".freeze, "lib/mongo/operation/insert/op_msg.rb".freeze, "lib/mongo/operation/insert/result.rb".freeze, "lib/mongo/operation/kill_cursors.rb".freeze, "lib/mongo/operation/kill_cursors/command_builder.rb".freeze, "lib/mongo/operation/kill_cursors/op_msg.rb".freeze, "lib/mongo/operation/list_collections.rb".freeze, "lib/mongo/operation/list_collections/op_msg.rb".freeze, "lib/mongo/operation/list_collections/result.rb".freeze, "lib/mongo/operation/map_reduce.rb".freeze, "lib/mongo/operation/map_reduce/op_msg.rb".freeze, "lib/mongo/operation/map_reduce/result.rb".freeze, "lib/mongo/operation/op_msg_base.rb".freeze, "lib/mongo/operation/parallel_scan.rb".freeze, "lib/mongo/operation/parallel_scan/op_msg.rb".freeze, "lib/mongo/operation/parallel_scan/result.rb".freeze, "lib/mongo/operation/remove_user.rb".freeze, "lib/mongo/operation/remove_user/op_msg.rb".freeze, "lib/mongo/operation/result.rb".freeze, "lib/mongo/operation/shared/bypass_document_validation.rb".freeze, "lib/mongo/operation/shared/causal_consistency_supported.rb".freeze, "lib/mongo/operation/shared/executable.rb".freeze, "lib/mongo/operation/shared/executable_no_validate.rb".freeze, "lib/mongo/operation/shared/executable_transaction_label.rb".freeze, "lib/mongo/operation/shared/idable.rb".freeze, "lib/mongo/operation/shared/limited.rb".freeze, "lib/mongo/operation/shared/object_id_generator.rb".freeze, "lib/mongo/operation/shared/op_msg_executable.rb".freeze, "lib/mongo/operation/shared/polymorphic_lookup.rb".freeze, "lib/mongo/operation/shared/polymorphic_result.rb".freeze, "lib/mongo/operation/shared/read_preference_supported.rb".freeze, "lib/mongo/operation/shared/response_handling.rb".freeze, "lib/mongo/operation/shared/result/aggregatable.rb".freeze, "lib/mongo/operation/shared/result/use_legacy_error_parser.rb".freeze, "lib/mongo/operation/shared/sessions_supported.rb".freeze, "lib/mongo/operation/shared/specifiable.rb".freeze, "lib/mongo/operation/shared/validatable.rb".freeze, "lib/mongo/operation/shared/write.rb".freeze, "lib/mongo/operation/shared/write_concern_supported.rb".freeze, "lib/mongo/operation/update.rb".freeze, "lib/mongo/operation/update/bulk_result.rb".freeze, "lib/mongo/operation/update/op_msg.rb".freeze, "lib/mongo/operation/update/result.rb".freeze, "lib/mongo/operation/update_user.rb".freeze, "lib/mongo/operation/update_user/op_msg.rb".freeze, "lib/mongo/operation/users_info.rb".freeze, "lib/mongo/operation/users_info/op_msg.rb".freeze, "lib/mongo/operation/users_info/result.rb".freeze, "lib/mongo/operation/write_command.rb".freeze, "lib/mongo/operation/write_command/op_msg.rb".freeze, "lib/mongo/options.rb".freeze, "lib/mongo/options/mapper.rb".freeze, "lib/mongo/options/redacted.rb".freeze, "lib/mongo/protocol.rb".freeze, "lib/mongo/protocol/bit_vector.rb".freeze, "lib/mongo/protocol/caching_hash.rb".freeze, "lib/mongo/protocol/compressed.rb".freeze, "lib/mongo/protocol/get_more.rb".freeze, "lib/mongo/protocol/kill_cursors.rb".freeze, "lib/mongo/protocol/message.rb".freeze, "lib/mongo/protocol/msg.rb".freeze, "lib/mongo/protocol/query.rb".freeze, "lib/mongo/protocol/registry.rb".freeze, "lib/mongo/protocol/reply.rb".freeze, "lib/mongo/protocol/serializers.rb".freeze, "lib/mongo/query_cache.rb".freeze, "lib/mongo/retryable.rb".freeze, "lib/mongo/retryable/base_worker.rb".freeze, "lib/mongo/retryable/read_worker.rb".freeze, "lib/mongo/retryable/write_worker.rb".freeze, "lib/mongo/semaphore.rb".freeze, "lib/mongo/server.rb".freeze, "lib/mongo/server/app_metadata.rb".freeze, "lib/mongo/server/app_metadata/environment.rb".freeze, "lib/mongo/server/app_metadata/platform.rb".freeze, "lib/mongo/server/app_metadata/truncator.rb".freeze, "lib/mongo/server/connection.rb".freeze, "lib/mongo/server/connection_base.rb".freeze, "lib/mongo/server/connection_common.rb".freeze, "lib/mongo/server/connection_pool.rb".freeze, "lib/mongo/server/connection_pool/generation_manager.rb".freeze, "lib/mongo/server/connection_pool/populator.rb".freeze, "lib/mongo/server/description.rb".freeze, "lib/mongo/server/description/features.rb".freeze, "lib/mongo/server/description/load_balancer.rb".freeze, "lib/mongo/server/monitor.rb".freeze, "lib/mongo/server/monitor/app_metadata.rb".freeze, "lib/mongo/server/monitor/connection.rb".freeze, "lib/mongo/server/pending_connection.rb".freeze, "lib/mongo/server/push_monitor.rb".freeze, "lib/mongo/server/push_monitor/connection.rb".freeze, "lib/mongo/server/round_trip_time_averager.rb".freeze, "lib/mongo/server_selector.rb".freeze, "lib/mongo/server_selector/base.rb".freeze, "lib/mongo/server_selector/nearest.rb".freeze, "lib/mongo/server_selector/primary.rb".freeze, "lib/mongo/server_selector/primary_preferred.rb".freeze, "lib/mongo/server_selector/secondary.rb".freeze, "lib/mongo/server_selector/secondary_preferred.rb".freeze, "lib/mongo/session.rb".freeze, "lib/mongo/session/server_session.rb".freeze, "lib/mongo/session/session_pool.rb".freeze, "lib/mongo/socket.rb".freeze, "lib/mongo/socket/ocsp_cache.rb".freeze, "lib/mongo/socket/ocsp_verifier.rb".freeze, "lib/mongo/socket/ssl.rb".freeze, "lib/mongo/socket/tcp.rb".freeze, "lib/mongo/socket/unix.rb".freeze, "lib/mongo/srv.rb".freeze, "lib/mongo/srv/monitor.rb".freeze, "lib/mongo/srv/resolver.rb".freeze, "lib/mongo/srv/result.rb".freeze, "lib/mongo/timeout.rb".freeze, "lib/mongo/topology_version.rb".freeze, "lib/mongo/uri.rb".freeze, "lib/mongo/uri/options_mapper.rb".freeze, "lib/mongo/uri/srv_protocol.rb".freeze, "lib/mongo/utils.rb".freeze, "lib/mongo/version.rb".freeze, "lib/mongo/write_concern.rb".freeze, "lib/mongo/write_concern/acknowledged.rb".freeze, "lib/mongo/write_concern/base.rb".freeze, "lib/mongo/write_concern/unacknowledged.rb".freeze, "mongo.gemspec".freeze, "spec/NOTES.aws-auth.md".freeze, "spec/README.aws-auth.md".freeze, "spec/README.md".freeze, "spec/USERS.md".freeze, "spec/atlas/atlas_connectivity_spec.rb".freeze, "spec/atlas/operations_spec.rb".freeze, "spec/integration/auth_spec.rb".freeze, "spec/integration/awaited_ismaster_spec.rb".freeze, "spec/integration/aws_auth_credentials_cache_spec.rb".freeze, "spec/integration/aws_auth_request_spec.rb".freeze, "spec/integration/aws_credentials_retriever_spec.rb".freeze, "spec/integration/aws_lambda_examples_spec.rb".freeze, "spec/integration/bson_symbol_spec.rb".freeze, "spec/integration/bulk_insert_spec.rb".freeze, "spec/integration/bulk_write_error_message_spec.rb".freeze, "spec/integration/bulk_write_spec.rb".freeze, "spec/integration/change_stream_examples_spec.rb".freeze, "spec/integration/change_stream_spec.rb".freeze, "spec/integration/check_clean_slate_spec.rb".freeze, "spec/integration/client_authentication_options_spec.rb".freeze, "spec/integration/client_connectivity_spec.rb".freeze, "spec/integration/client_construction_aws_auth_spec.rb".freeze, "spec/integration/client_construction_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_old_wire_version_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/automatic_data_encryption_keys_prose_spec.rb".freeze, "spec/integration/client_side_encryption/bson_size_limit_spec.rb".freeze, "spec/integration/client_side_encryption/bypass_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/client_close_spec.rb".freeze, "spec/integration/client_side_encryption/corpus_spec.rb".freeze, "spec/integration/client_side_encryption/custom_endpoint_spec.rb".freeze, "spec/integration/client_side_encryption/data_key_spec.rb".freeze, "spec/integration/client_side_encryption/decryption_events_prose_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_queryable_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/external_key_vault_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_options_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_spec.rb".freeze, "spec/integration/client_side_encryption/mongocryptd_prose_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_aws_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_azure_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_gcp_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/queryable_encryption_examples_spec.rb".freeze, "spec/integration/client_side_encryption/range_explicit_encryption_prose_spec.rb".freeze, "spec/integration/client_side_encryption/rewrap_prose_spec.rb".freeze, "spec/integration/client_side_encryption/unique_index_on_key_alt_names_prose_spec.rb".freeze, "spec/integration/client_side_encryption/views_spec.rb".freeze, "spec/integration/client_spec.rb".freeze, "spec/integration/client_update_spec.rb".freeze, "spec/integration/collection_indexes_prose_spec.rb".freeze, "spec/integration/command_monitoring_spec.rb".freeze, "spec/integration/command_spec.rb".freeze, "spec/integration/connect_single_rs_name_spec.rb".freeze, "spec/integration/connection/faas_env_spec.rb".freeze, "spec/integration/connection_pool_populator_spec.rb".freeze, "spec/integration/connection_spec.rb".freeze, "spec/integration/crud_spec.rb".freeze, "spec/integration/cursor_pinning_spec.rb".freeze, "spec/integration/cursor_reaping_spec.rb".freeze, "spec/integration/docs_examples_spec.rb".freeze, "spec/integration/error_detection_spec.rb".freeze, "spec/integration/fork_reconnect_spec.rb".freeze, "spec/integration/get_more_spec.rb".freeze, "spec/integration/grid_fs_bucket_spec.rb".freeze, "spec/integration/heartbeat_events_spec.rb".freeze, "spec/integration/map_reduce_spec.rb".freeze, "spec/integration/mmapv1_spec.rb".freeze, "spec/integration/mongos_pinning_spec.rb".freeze, "spec/integration/ocsp_connectivity_spec.rb".freeze, "spec/integration/ocsp_verifier_cache_spec.rb".freeze, "spec/integration/ocsp_verifier_spec.rb".freeze, "spec/integration/operation_failure_code_spec.rb".freeze, "spec/integration/operation_failure_message_spec.rb".freeze, "spec/integration/query_cache_spec.rb".freeze, "spec/integration/query_cache_transactions_spec.rb".freeze, "spec/integration/read_concern_spec.rb".freeze, "spec/integration/read_preference_spec.rb".freeze, "spec/integration/reconnect_spec.rb".freeze, "spec/integration/retryable_errors_spec.rb".freeze, "spec/integration/retryable_reads_errors_spec.rb".freeze, "spec/integration/retryable_writes/retryable_writes_36_and_older_spec.rb".freeze, "spec/integration/retryable_writes/retryable_writes_40_and_newer_spec.rb".freeze, "spec/integration/retryable_writes/shared/adds_diagnostics.rb".freeze, "spec/integration/retryable_writes/shared/does_not_support_retries.rb".freeze, "spec/integration/retryable_writes/shared/only_supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_modern_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_no_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_modern_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_retries.rb".freeze, "spec/integration/retryable_writes_errors_spec.rb".freeze, "spec/integration/sdam_error_handling_spec.rb".freeze, "spec/integration/sdam_events_spec.rb".freeze, "spec/integration/sdam_prose_spec.rb".freeze, "spec/integration/secondary_reads_spec.rb".freeze, "spec/integration/server_description_spec.rb".freeze, "spec/integration/server_monitor_spec.rb".freeze, "spec/integration/server_selection_spec.rb".freeze, "spec/integration/server_selector_spec.rb".freeze, "spec/integration/server_spec.rb".freeze, "spec/integration/shell_examples_spec.rb".freeze, "spec/integration/size_limit_spec.rb".freeze, "spec/integration/snappy_compression_spec.rb".freeze, "spec/integration/snapshot_query_examples_spec.rb".freeze, "spec/integration/srv_monitoring_spec.rb".freeze, "spec/integration/srv_spec.rb".freeze, "spec/integration/ssl_uri_options_spec.rb".freeze, "spec/integration/step_down_spec.rb".freeze, "spec/integration/time_zone_querying_spec.rb".freeze, "spec/integration/transaction_pinning_spec.rb".freeze, "spec/integration/transactions_api_examples_spec.rb".freeze, "spec/integration/transactions_examples_spec.rb".freeze, "spec/integration/truncated_utf8_spec.rb".freeze, "spec/integration/versioned_api_examples_spec.rb".freeze, "spec/integration/x509_auth_spec.rb".freeze, "spec/integration/zlib_compression_spec.rb".freeze, "spec/integration/zstd_compression_spec.rb".freeze, "spec/kerberos/kerberos_spec.rb".freeze, "spec/lite_spec_helper.rb".freeze, "spec/mongo/address/ipv4_spec.rb".freeze, "spec/mongo/address/ipv6_spec.rb".freeze, "spec/mongo/address/unix_spec.rb".freeze, "spec/mongo/address/validator_spec.rb".freeze, "spec/mongo/address_spec.rb".freeze, "spec/mongo/auth/aws/credential_cache_spec.rb".freeze, "spec/mongo/auth/aws/credentials_retriever_spec.rb".freeze, "spec/mongo/auth/aws/credentials_spec.rb".freeze, "spec/mongo/auth/aws/request_region_spec.rb".freeze, "spec/mongo/auth/aws/request_spec.rb".freeze, "spec/mongo/auth/cr_spec.rb".freeze, "spec/mongo/auth/gssapi/conversation_spec.rb".freeze, "spec/mongo/auth/invalid_mechanism_spec.rb".freeze, "spec/mongo/auth/ldap/conversation_spec.rb".freeze, "spec/mongo/auth/ldap_spec.rb".freeze, "spec/mongo/auth/scram/conversation_spec.rb".freeze, "spec/mongo/auth/scram256/conversation_spec.rb".freeze, "spec/mongo/auth/scram_negotiation_spec.rb".freeze, "spec/mongo/auth/scram_spec.rb".freeze, "spec/mongo/auth/stringprep/profiles/sasl_spec.rb".freeze, "spec/mongo/auth/stringprep_spec.rb".freeze, "spec/mongo/auth/user/view_spec.rb".freeze, "spec/mongo/auth/user_spec.rb".freeze, "spec/mongo/auth/x509/conversation_spec.rb".freeze, "spec/mongo/auth/x509_spec.rb".freeze, "spec/mongo/auth_spec.rb".freeze, "spec/mongo/bson_spec.rb".freeze, "spec/mongo/bulk_write/ordered_combiner_spec.rb".freeze, "spec/mongo/bulk_write/result_spec.rb".freeze, "spec/mongo/bulk_write/unordered_combiner_spec.rb".freeze, "spec/mongo/bulk_write_spec.rb".freeze, "spec/mongo/caching_cursor_spec.rb".freeze, "spec/mongo/client_construction_spec.rb".freeze, "spec/mongo/client_encryption_spec.rb".freeze, "spec/mongo/client_spec.rb".freeze, "spec/mongo/cluster/cursor_reaper_spec.rb".freeze, "spec/mongo/cluster/periodic_executor_spec.rb".freeze, "spec/mongo/cluster/socket_reaper_spec.rb".freeze, "spec/mongo/cluster/topology/replica_set_spec.rb".freeze, "spec/mongo/cluster/topology/sharded_spec.rb".freeze, "spec/mongo/cluster/topology/single_spec.rb".freeze, "spec/mongo/cluster/topology/unknown_spec.rb".freeze, "spec/mongo/cluster/topology_spec.rb".freeze, "spec/mongo/cluster_spec.rb".freeze, "spec/mongo/cluster_time_spec.rb".freeze, "spec/mongo/collection/view/aggregation_spec.rb".freeze, "spec/mongo/collection/view/builder/find_command_spec.rb".freeze, "spec/mongo/collection/view/builder/op_query_spec.rb".freeze, "spec/mongo/collection/view/change_stream_resume_spec.rb".freeze, "spec/mongo/collection/view/change_stream_spec.rb".freeze, "spec/mongo/collection/view/explainable_spec.rb".freeze, "spec/mongo/collection/view/immutable_spec.rb".freeze, "spec/mongo/collection/view/iterable_spec.rb".freeze, "spec/mongo/collection/view/map_reduce_spec.rb".freeze, "spec/mongo/collection/view/readable_spec.rb".freeze, "spec/mongo/collection/view/writable_spec.rb".freeze, "spec/mongo/collection/view_spec.rb".freeze, "spec/mongo/collection_crud_spec.rb".freeze, "spec/mongo/collection_ddl_spec.rb".freeze, "spec/mongo/collection_spec.rb".freeze, "spec/mongo/condition_variable_spec.rb".freeze, "spec/mongo/config/options_spec.rb".freeze, "spec/mongo/config_spec.rb".freeze, "spec/mongo/crypt/auto_decryption_context_spec.rb".freeze, "spec/mongo/crypt/auto_encrypter_spec.rb".freeze, "spec/mongo/crypt/auto_encryption_context_spec.rb".freeze, "spec/mongo/crypt/binary_spec.rb".freeze, "spec/mongo/crypt/binding/binary_spec.rb".freeze, "spec/mongo/crypt/binding/context_spec.rb".freeze, "spec/mongo/crypt/binding/helpers_spec.rb".freeze, "spec/mongo/crypt/binding/mongocrypt_spec.rb".freeze, "spec/mongo/crypt/binding/status_spec.rb".freeze, "spec/mongo/crypt/binding/version_spec.rb".freeze, "spec/mongo/crypt/binding_unloaded_spec.rb".freeze, "spec/mongo/crypt/data_key_context_spec.rb".freeze, "spec/mongo/crypt/encryption_io_spec.rb".freeze, "spec/mongo/crypt/explicit_decryption_context_spec.rb".freeze, "spec/mongo/crypt/explicit_encryption_context_spec.rb".freeze, "spec/mongo/crypt/handle_spec.rb".freeze, "spec/mongo/crypt/helpers/mongo_crypt_spec_helper.rb".freeze, "spec/mongo/crypt/hooks_spec.rb".freeze, "spec/mongo/crypt/kms/azure/credentials_retriever_spec.rb".freeze, "spec/mongo/crypt/kms/credentials_spec.rb".freeze, "spec/mongo/crypt/kms_spec.rb".freeze, "spec/mongo/crypt/status_spec.rb".freeze, "spec/mongo/crypt_spec.rb".freeze, "spec/mongo/cursor/builder/get_more_command_spec.rb".freeze, "spec/mongo/cursor/builder/op_get_more_spec.rb".freeze, "spec/mongo/cursor_spec.rb".freeze, "spec/mongo/database_spec.rb".freeze, "spec/mongo/distinguishing_semaphore_spec.rb".freeze, "spec/mongo/error/bulk_write_error_spec.rb".freeze, "spec/mongo/error/crypt_error_spec.rb".freeze, "spec/mongo/error/max_bson_size_spec.rb".freeze, "spec/mongo/error/no_server_available_spec.rb".freeze, "spec/mongo/error/notable_spec.rb".freeze, "spec/mongo/error/operation_failure_heavy_spec.rb".freeze, "spec/mongo/error/operation_failure_spec.rb".freeze, "spec/mongo/error/parser_spec.rb".freeze, "spec/mongo/error/unsupported_option_spec.rb".freeze, "spec/mongo/event/publisher_spec.rb".freeze, "spec/mongo/event/subscriber_spec.rb".freeze, "spec/mongo/grid/file/chunk_spec.rb".freeze, "spec/mongo/grid/file/info_spec.rb".freeze, "spec/mongo/grid/file_spec.rb".freeze, "spec/mongo/grid/fs_bucket_spec.rb".freeze, "spec/mongo/grid/stream/read_spec.rb".freeze, "spec/mongo/grid/stream/write_spec.rb".freeze, "spec/mongo/grid/stream_spec.rb".freeze, "spec/mongo/id_spec.rb".freeze, "spec/mongo/index/view_spec.rb".freeze, "spec/mongo/lint_spec.rb".freeze, "spec/mongo/logger_spec.rb".freeze, "spec/mongo/monitoring/command_log_subscriber_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_failed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_started_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_in_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_out_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_created_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_ready_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_cleared_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_created_spec.rb".freeze, "spec/mongo/monitoring/event/command_failed_spec.rb".freeze, "spec/mongo/monitoring/event/command_started_spec.rb".freeze, "spec/mongo/monitoring/event/command_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/secure_spec.rb".freeze, "spec/mongo/monitoring/event/server_closed_spec.rb".freeze, "spec/mongo/monitoring/event/server_description_changed_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_failed_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_started_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/server_opening_spec.rb".freeze, "spec/mongo/monitoring/event/topology_changed_spec.rb".freeze, "spec/mongo/monitoring/event/topology_closed_spec.rb".freeze, "spec/mongo/monitoring/event/topology_opening_spec.rb".freeze, "spec/mongo/monitoring_spec.rb".freeze, "spec/mongo/operation/aggregate/result_spec.rb".freeze, "spec/mongo/operation/aggregate_spec.rb".freeze, "spec/mongo/operation/collections_info_spec.rb".freeze, "spec/mongo/operation/command_spec.rb".freeze, "spec/mongo/operation/create/op_msg_spec.rb".freeze, "spec/mongo/operation/create_index_spec.rb".freeze, "spec/mongo/operation/create_user_spec.rb".freeze, "spec/mongo/operation/delete/bulk_spec.rb".freeze, "spec/mongo/operation/delete/op_msg_spec.rb".freeze, "spec/mongo/operation/delete_spec.rb".freeze, "spec/mongo/operation/drop_index_spec.rb".freeze, "spec/mongo/operation/find/builder/flags_spec.rb".freeze, "spec/mongo/operation/find/builder/modifiers_spec.rb".freeze, "spec/mongo/operation/indexes_spec.rb".freeze, "spec/mongo/operation/insert/bulk_spec.rb".freeze, "spec/mongo/operation/insert/op_msg_spec.rb".freeze, "spec/mongo/operation/insert_spec.rb".freeze, "spec/mongo/operation/limited_spec.rb".freeze, "spec/mongo/operation/map_reduce_spec.rb".freeze, "spec/mongo/operation/read_preference_legacy_spec.rb".freeze, "spec/mongo/operation/read_preference_op_msg_spec.rb".freeze, "spec/mongo/operation/remove_user_spec.rb".freeze, "spec/mongo/operation/result_spec.rb".freeze, "spec/mongo/operation/specifiable_spec.rb".freeze, "spec/mongo/operation/update/bulk_spec.rb".freeze, "spec/mongo/operation/update/op_msg_spec.rb".freeze, "spec/mongo/operation/update_spec.rb".freeze, "spec/mongo/operation/update_user_spec.rb".freeze, "spec/mongo/options/redacted_spec.rb".freeze, "spec/mongo/protocol/caching_hash_spec.rb".freeze, "spec/mongo/protocol/compressed_spec.rb".freeze, "spec/mongo/protocol/get_more_spec.rb".freeze, "spec/mongo/protocol/kill_cursors_spec.rb".freeze, "spec/mongo/protocol/msg_spec.rb".freeze, "spec/mongo/protocol/query_spec.rb".freeze, "spec/mongo/protocol/registry_spec.rb".freeze, "spec/mongo/protocol/reply_spec.rb".freeze, "spec/mongo/query_cache_middleware_spec.rb".freeze, "spec/mongo/query_cache_spec.rb".freeze, "spec/mongo/retryable_spec.rb".freeze, "spec/mongo/semaphore_spec.rb".freeze, "spec/mongo/server/app_metadata/environment_spec.rb".freeze, "spec/mongo/server/app_metadata/truncator_spec.rb".freeze, "spec/mongo/server/app_metadata_spec.rb".freeze, "spec/mongo/server/connection_auth_spec.rb".freeze, "spec/mongo/server/connection_common_spec.rb".freeze, "spec/mongo/server/connection_pool/populator_spec.rb".freeze, "spec/mongo/server/connection_pool_spec.rb".freeze, "spec/mongo/server/connection_spec.rb".freeze, "spec/mongo/server/description/features_spec.rb".freeze, "spec/mongo/server/description_query_methods_spec.rb".freeze, "spec/mongo/server/description_spec.rb".freeze, "spec/mongo/server/monitor/app_metadata_spec.rb".freeze, "spec/mongo/server/monitor/connection_spec.rb".freeze, "spec/mongo/server/monitor_spec.rb".freeze, "spec/mongo/server/push_monitor_spec.rb".freeze, "spec/mongo/server/round_trip_time_averager_spec.rb".freeze, "spec/mongo/server_selector/nearest_spec.rb".freeze, "spec/mongo/server_selector/primary_preferred_spec.rb".freeze, "spec/mongo/server_selector/primary_spec.rb".freeze, "spec/mongo/server_selector/secondary_preferred_spec.rb".freeze, "spec/mongo/server_selector/secondary_spec.rb".freeze, "spec/mongo/server_selector_spec.rb".freeze, "spec/mongo/server_spec.rb".freeze, "spec/mongo/session/server_session_spec.rb".freeze, "spec/mongo/session/session_pool_spec.rb".freeze, "spec/mongo/session_spec.rb".freeze, "spec/mongo/session_transaction_spec.rb".freeze, "spec/mongo/socket/ssl_spec.rb".freeze, "spec/mongo/socket/tcp_spec.rb".freeze, "spec/mongo/socket/unix_spec.rb".freeze, "spec/mongo/socket_spec.rb".freeze, "spec/mongo/srv/monitor_spec.rb".freeze, "spec/mongo/srv/result_spec.rb".freeze, "spec/mongo/timeout_spec.rb".freeze, "spec/mongo/tls_context_hooks_spec.rb".freeze, "spec/mongo/uri/options_mapper_spec.rb".freeze, "spec/mongo/uri/srv_protocol_spec.rb".freeze, "spec/mongo/uri_option_parsing_spec.rb".freeze, "spec/mongo/uri_spec.rb".freeze, "spec/mongo/utils_spec.rb".freeze, "spec/mongo/write_concern/acknowledged_spec.rb".freeze, "spec/mongo/write_concern/unacknowledged_spec.rb".freeze, "spec/mongo/write_concern_spec.rb".freeze, "spec/runners/auth.rb".freeze, "spec/runners/change_streams/outcome.rb".freeze, "spec/runners/change_streams/spec.rb".freeze, "spec/runners/change_streams/test.rb".freeze, "spec/runners/cmap.rb".freeze, "spec/runners/cmap/verifier.rb".freeze, "spec/runners/command_monitoring.rb".freeze, "spec/runners/connection_string.rb".freeze, "spec/runners/crud.rb".freeze, "spec/runners/crud/context.rb".freeze, "spec/runners/crud/operation.rb".freeze, "spec/runners/crud/outcome.rb".freeze, "spec/runners/crud/requirement.rb".freeze, "spec/runners/crud/spec.rb".freeze, "spec/runners/crud/test.rb".freeze, "spec/runners/crud/test_base.rb".freeze, "spec/runners/crud/verifier.rb".freeze, "spec/runners/gridfs.rb".freeze, "spec/runners/read_write_concern_document.rb".freeze, "spec/runners/sdam.rb".freeze, "spec/runners/sdam/verifier.rb".freeze, "spec/runners/server_selection.rb".freeze, "spec/runners/server_selection_rtt.rb".freeze, "spec/runners/transactions.rb".freeze, "spec/runners/transactions/operation.rb".freeze, "spec/runners/transactions/spec.rb".freeze, "spec/runners/transactions/test.rb".freeze, "spec/runners/unified.rb".freeze, "spec/runners/unified/assertions.rb".freeze, "spec/runners/unified/change_stream_operations.rb".freeze, "spec/runners/unified/client_side_encryption_operations.rb".freeze, "spec/runners/unified/crud_operations.rb".freeze, "spec/runners/unified/ddl_operations.rb".freeze, "spec/runners/unified/entity_map.rb".freeze, "spec/runners/unified/error.rb".freeze, "spec/runners/unified/event_subscriber.rb".freeze, "spec/runners/unified/exceptions.rb".freeze, "spec/runners/unified/grid_fs_operations.rb".freeze, "spec/runners/unified/support_operations.rb".freeze, "spec/runners/unified/test.rb".freeze, "spec/runners/unified/test_group.rb".freeze, "spec/runners/unified/thread_operations.rb".freeze, "spec/shared/LICENSE".freeze, "spec/shared/bin/get-mongodb-download-url".freeze, "spec/shared/bin/s3-copy".freeze, "spec/shared/bin/s3-upload".freeze, "spec/shared/lib/mrss/child_process_helper.rb".freeze, "spec/shared/lib/mrss/cluster_config.rb".freeze, "spec/shared/lib/mrss/constraints.rb".freeze, "spec/shared/lib/mrss/docker_runner.rb".freeze, "spec/shared/lib/mrss/eg_config_utils.rb".freeze, "spec/shared/lib/mrss/event_subscriber.rb".freeze, "spec/shared/lib/mrss/lite_constraints.rb".freeze, "spec/shared/lib/mrss/server_version_registry.rb".freeze, "spec/shared/lib/mrss/session_registry.rb".freeze, "spec/shared/lib/mrss/session_registry_legacy.rb".freeze, "spec/shared/lib/mrss/spec_organizer.rb".freeze, "spec/shared/lib/mrss/utils.rb".freeze, "spec/shared/share/Dockerfile.erb".freeze, "spec/shared/share/haproxy-1.conf".freeze, "spec/shared/share/haproxy-2.conf".freeze, "spec/shared/shlib/config.sh".freeze, "spec/shared/shlib/distro.sh".freeze, "spec/shared/shlib/server.sh".freeze, "spec/shared/shlib/set_env.sh".freeze, "spec/solo/clean_exit_spec.rb".freeze, "spec/spec_helper.rb".freeze, "spec/spec_tests/auth_spec.rb".freeze, "spec/spec_tests/change_streams_unified_spec.rb".freeze, "spec/spec_tests/client_side_encryption_spec.rb".freeze, "spec/spec_tests/client_side_encryption_unified_spec.rb".freeze, "spec/spec_tests/cmap_spec.rb".freeze, "spec/spec_tests/collection_management_spec.rb".freeze, "spec/spec_tests/command_monitoring_unified_spec.rb".freeze, "spec/spec_tests/connection_string_spec.rb".freeze, "spec/spec_tests/crud_spec.rb".freeze, "spec/spec_tests/crud_unified_spec.rb".freeze, "spec/spec_tests/data/auth/connection-string.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-clusterTime.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-disambiguatedPaths.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-errors.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-errorLabels.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams.yml".freeze, "spec/spec_tests/data/client_side_encryption/aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/awsTemporary.yml".freeze, "spec/spec_tests/data/client_side_encryption/azureKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/badQueries.yml".freeze, "spec/spec_tests/data/client_side_encryption/badSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/basic.yml".freeze, "spec/spec_tests/data/client_side_encryption/bulk.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassAutoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/count.yml".freeze, "spec/spec_tests/data/client_side_encryption/countDocuments.yml".freeze, "spec/spec_tests/data/client_side_encryption/create-and-createIndexes.yml".freeze, "spec/spec_tests/data/client_side_encryption/delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/distinct.yml".freeze, "spec/spec_tests/data/client_side_encryption/explain.yml".freeze, "spec/spec_tests/data/client_side_encryption/find.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndDelete.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndReplace.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-BypassQueryAnalysis.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Compact.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection-OldServer.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-DecryptExistingData.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-jsonSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFieldsMap-defaults.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Indexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Unindexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-MissingKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-NoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-WrongType.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/client_side_encryption/gcpKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/getMore.yml".freeze, "spec/spec_tests/data/client_side_encryption/insert.yml".freeze, "spec/spec_tests/data/client_side_encryption/keyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/localKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/localSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/malformedCiphertext.yml".freeze, "spec/spec_tests/data/client_side_encryption/maxWireVersion.yml".freeze, "spec/spec_tests/data/client_side_encryption/missingKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/noSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/replaceOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/types.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/addKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey-kms_providers-invalid.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/deleteKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeyByAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeys.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/removeKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-decrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-encrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unsupportedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateMany.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/cmap/connection-must-have-id.yml".freeze, "spec/spec_tests/data/cmap/connection-must-order-ids.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-stale.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-make-available.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-connection.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-custom-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-error-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-timeout.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-minPoolSize-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-multiple.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-idle.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-stale.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-returned-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupt-immediately.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupting-pending-connections.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-paused.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-schedule-run-interruptInUseConnections-false.yml".freeze, "spec/spec_tests/data/cmap/pool-close-destroy-conns.yml".freeze, "spec/spec_tests/data/cmap/pool-close.yml".freeze, "spec/spec_tests/data/cmap/pool-create-max-size.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size-error.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-create-with-options.yml".freeze, "spec/spec_tests/data/cmap/pool-create.yml".freeze, "spec/spec_tests/data/cmap/pool-ready-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-ready.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-fairness.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-timeout.yml".freeze, "spec/spec_tests/data/collection_management/clustered-indexes.yml".freeze, "spec/spec_tests/data/collection_management/createCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-errorResponse.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/timeseries-collection.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/bulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/command.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/find.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/pre-42-server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/unacknowledgedBulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/writeConcernError.yml".freeze, "spec/spec_tests/data/connection_string/invalid-uris.yml".freeze, "spec/spec_tests/data/connection_string/valid-auth.yml".freeze, "spec/spec_tests/data/connection_string/valid-db-with-dotted-name.yml".freeze, "spec/spec_tests/data/connection_string/valid-host_identifiers.yml".freeze, "spec/spec_tests/data/connection_string/valid-options.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-absolute.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-relative.yml".freeze, "spec/spec_tests/data/connection_string/valid-warnings.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-collation.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-out.yml".freeze, "spec/spec_tests/data/crud/read/aggregate.yml".freeze, "spec/spec_tests/data/crud/read/count-collation.yml".freeze, "spec/spec_tests/data/crud/read/count-empty.yml".freeze, "spec/spec_tests/data/crud/read/count.yml".freeze, "spec/spec_tests/data/crud/read/distinct-collation.yml".freeze, "spec/spec_tests/data/crud/read/distinct.yml".freeze, "spec/spec_tests/data/crud/read/find-collation.yml".freeze, "spec/spec_tests/data/crud/read/find.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-collation.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert_pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/crud/write/insertMany.yml".freeze, "spec/spec_tests/data/crud/write/insertOne.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-upsert.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/updateMany.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/updateOne.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-let.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-out-readConcern.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-comment.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-validation.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/countDocuments-comment.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/distinct-comment.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount-comment.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/find-comment.yml".freeze, "spec/spec_tests/data/crud_unified/find-let.yml".freeze, "spec/spec_tests/data/crud_unified/find.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-let.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-validation.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/updateWithPipelines.yml".freeze, "spec/spec_tests/data/gridfs/delete.yml".freeze, "spec/spec_tests/data/gridfs/download.yml".freeze, "spec/spec_tests/data/gridfs/download_by_name.yml".freeze, "spec/spec_tests/data/gridfs/upload.yml".freeze, "spec/spec_tests/data/gridfs_unified/delete.yml".freeze, "spec/spec_tests/data/gridfs_unified/download.yml".freeze, "spec/spec_tests/data/gridfs_unified/downloadByName.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload-disableMD5.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload.yml".freeze, "spec/spec_tests/data/load_balancers/event-monitoring.yml".freeze, "spec/spec_tests/data/load_balancers/lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/non-lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/server-selection.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Secondary.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Single/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/Single/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Unknown/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/document/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/document/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-2.6.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.2.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.4.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-4.2.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-merge.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/mapReduce.yml".freeze, "spec/spec_tests/data/retryable_reads/unified/handshakeError.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/handshakeError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-noWritesPerformedError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/sdam/errors/error_handling_handshake.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-error.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/prefer-error-code.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/write_errors_ignored.yml".freeze, "spec/spec_tests/data/sdam/load-balanced/discover_load_balancer.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible_unknown.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discovery.yml".freeze, "spec/spec_tests/data/sdam/rs/electionId_precedence_setVersion.yml".freeze, "spec/spec_tests/data/sdam/rs/equal_electionids.yml".freeze, "spec/spec_tests/data/sdam/rs/hosts_differ_from_seeds.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_arbiter.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_other.yml".freeze, "spec/spec_tests/data/sdam/rs/ls_timeout.yml".freeze, "spec/spec_tests/data/sdam/rs/member_reconfig.yml".freeze, "spec/spec_tests/data/sdam/rs/member_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/non_rs_member.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case_me.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_changes_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_hint_from_secondary_with_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me_not_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_reports_new_member.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/repeated.yml".freeze, "spec/spec_tests/data/sdam/rs/replicaset_rsnp.yml".freeze, "spec/spec_tests/data/sdam/rs/response_from_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_secondary_wrong_set_name_with_primary_second.yml".freeze, "spec/spec_tests/data/sdam/rs/sec_not_auth.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name_with_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/set_version_can_rollback.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_equal_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_greaterthan_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/stepdown_change_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/too_new.yml".freeze, "spec/spec_tests/data/sdam/rs/too_old.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_equal.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_greater.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_less.yml".freeze, "spec/spec_tests/data/sdam/rs/unexpected_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/sharded/compatible.yml".freeze, "spec/spec_tests/data/sdam/sharded/discover_single_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/ls_timeout_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/mongos_disconnect.yml".freeze, "spec/spec_tests/data/sdam/sharded/multiple_mongoses.yml".freeze, "spec/spec_tests/data/sdam/sharded/non_mongos_removed.yml".freeze, "spec/spec_tests/data/sdam/sharded/normalize_uri_case.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_new.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_old.yml".freeze, "spec/spec_tests/data/sdam/single/compatible.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_external_ip.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_mongos.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_replicaset.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsarbiter.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsprimary.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rssecondary.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/single/discover_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/discover_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/ls_timeout_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/not_ok_response.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_removed.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_using_legacy_hello.yml".freeze, "spec/spec_tests/data/sdam/single/too_new.yml".freeze, "spec/spec_tests/data/sdam/single/too_old.yml".freeze, "spec/spec_tests/data/sdam/single/too_old_then_upgraded.yml".freeze, "spec/spec_tests/data/sdam_monitoring/discovered_standalone.yml".freeze, "spec/spec_tests/data/sdam_monitoring/load_balancer.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_chain.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_no_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_and_secondary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_second_seed_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/required_replica_set.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_repeated.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_suppress_equal_description_changes.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_to_rs_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-misc-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/cancel-server-check.yml".freeze, "spec/spec_tests/data/sdam_unified/connectTimeoutMS.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-timeout.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/interruptInUse-pool-clear.yml".freeze, "spec/spec_tests/data/sdam_unified/minPoolSize-error.yml".freeze, "spec/spec_tests/data/sdam_unified/pool-cleared-error.yml".freeze, "spec/spec_tests/data/sdam_unified/rediscover-quickly-after-step-down.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-directConnection.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-replicaSet-errors.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-multiple-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-false.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/encoded-userinfo-and-db.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/loadBalanced-false-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/longer-parent-in-return.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/misformatted-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/not-enough-parts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-result-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record-multiple-strings.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch1.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch2.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch3.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch4.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch5.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-too-short.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-wrong.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srv-service-name.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-nonstandard-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-txt-records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-not-allowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-ssl-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-uri-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-unallowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-admin-database.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-auth.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-two-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Single/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/ghost.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/write/ghost.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value_zero.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_1.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_2.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_3.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_4.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_5.yml".freeze, "spec/spec_tests/data/sessions_unified/driver-sessions-server-support.yml".freeze, "spec/spec_tests/data/sessions_unified/implicit-sessions-default-causal-consistency.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-client-error.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-server-error.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-unsupported-ops.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions.yml".freeze, "spec/spec_tests/data/transactions/abort.yml".freeze, "spec/spec_tests/data/transactions/bulk.yml".freeze, "spec/spec_tests/data/transactions/causal-consistency.yml".freeze, "spec/spec_tests/data/transactions/commit.yml".freeze, "spec/spec_tests/data/transactions/count.yml".freeze, "spec/spec_tests/data/transactions/create-collection.yml".freeze, "spec/spec_tests/data/transactions/create-index.yml".freeze, "spec/spec_tests/data/transactions/delete.yml".freeze, "spec/spec_tests/data/transactions/error-labels.yml".freeze, "spec/spec_tests/data/transactions/errors-client.yml".freeze, "spec/spec_tests/data/transactions/errors.yml".freeze, "spec/spec_tests/data/transactions/findOneAndDelete.yml".freeze, "spec/spec_tests/data/transactions/findOneAndReplace.yml".freeze, "spec/spec_tests/data/transactions/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/transactions/insert.yml".freeze, "spec/spec_tests/data/transactions/isolation.yml".freeze, "spec/spec_tests/data/transactions/mongos-pin-auto.yml".freeze, "spec/spec_tests/data/transactions/mongos-recovery-token.yml".freeze, "spec/spec_tests/data/transactions/pin-mongos.yml".freeze, "spec/spec_tests/data/transactions/read-concern.yml".freeze, "spec/spec_tests/data/transactions/read-pref.yml".freeze, "spec/spec_tests/data/transactions/reads.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort-errorLabels.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit-errorLabels.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit.yml".freeze, "spec/spec_tests/data/transactions/retryable-writes.yml".freeze, "spec/spec_tests/data/transactions/run-command.yml".freeze, "spec/spec_tests/data/transactions/transaction-options-repl.yml".freeze, "spec/spec_tests/data/transactions/transaction-options.yml".freeze, "spec/spec_tests/data/transactions/update.yml".freeze, "spec/spec_tests/data/transactions/write-concern.yml".freeze, "spec/spec_tests/data/transactions_api/callback-aborts.yml".freeze, "spec/spec_tests/data/transactions_api/callback-commits.yml".freeze, "spec/spec_tests/data/transactions_api/callback-retry.yml".freeze, "spec/spec_tests/data/transactions_api/commit-retry.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror-4.2.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror.yml".freeze, "spec/spec_tests/data/transactions_api/commit-writeconcernerror.yml".freeze, "spec/spec_tests/data/transactions_api/commit.yml".freeze, "spec/spec_tests/data/transactions_api/transaction-options.yml".freeze, "spec/spec_tests/data/transactions_unified/do-not-retry-read-in-transaction.yml".freeze, "spec/spec_tests/data/transactions_unified/mongos-unpin.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-abort-handshake.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-commit-handshake.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-failure.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-unsupported.yml".freeze, "spec/spec_tests/data/unified/valid-pass/assertNumberConnectionsCheckedOut.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-cmap-events.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-storeEventsAsEntities.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedError-errorResponse.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-eventType.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml".freeze, "spec/spec_tests/data/unified/valid-pass/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-pass/observeSensitiveCommands.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-change-streams.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-command-monitoring.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-crud.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-gridfs.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-reads.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-sessions.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions.yml".freeze, "spec/spec_tests/data/uri_options/auth-options.yml".freeze, "spec/spec_tests/data/uri_options/compression-options.yml".freeze, "spec/spec_tests/data/uri_options/concern-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-pool-options.yml".freeze, "spec/spec_tests/data/uri_options/read-preference-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-auth-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-connection-options.yml".freeze, "spec/spec_tests/data/uri_options/srv-options.yml".freeze, "spec/spec_tests/data/uri_options/tls-options.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1.yml".freeze, "spec/spec_tests/data/versioned_api/runcommand-helper-no-api-version-declared.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-deprecation-errors.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-strict-mode.yml".freeze, "spec/spec_tests/data/versioned_api/transaction-handling.yml".freeze, "spec/spec_tests/gridfs_spec.rb".freeze, "spec/spec_tests/gridfs_unified_spec.rb".freeze, "spec/spec_tests/load_balancers_spec.rb".freeze, "spec/spec_tests/max_staleness_spec.rb".freeze, "spec/spec_tests/read_write_concern_connection_string_spec.rb".freeze, "spec/spec_tests/read_write_concern_document_spec.rb".freeze, "spec/spec_tests/read_write_concern_operaton_spec.rb".freeze, "spec/spec_tests/retryable_reads_spec.rb".freeze, "spec/spec_tests/retryable_reads_unified_spec.rb".freeze, "spec/spec_tests/retryable_writes_spec.rb".freeze, "spec/spec_tests/retryable_writes_unified_spec.rb".freeze, "spec/spec_tests/sdam_monitoring_spec.rb".freeze, "spec/spec_tests/sdam_spec.rb".freeze, "spec/spec_tests/sdam_unified_spec.rb".freeze, "spec/spec_tests/seed_list_discovery_spec.rb".freeze, "spec/spec_tests/server_selection_rtt_spec.rb".freeze, "spec/spec_tests/server_selection_spec.rb".freeze, "spec/spec_tests/sessions_unified_spec.rb".freeze, "spec/spec_tests/transactions_api_spec.rb".freeze, "spec/spec_tests/transactions_spec.rb".freeze, "spec/spec_tests/transactions_unified_spec.rb".freeze, "spec/spec_tests/unified_spec.rb".freeze, "spec/spec_tests/uri_options_spec.rb".freeze, "spec/spec_tests/versioned_api_spec.rb".freeze, "spec/stress/cleanup_spec.rb".freeze, "spec/stress/connection_pool_stress_spec.rb".freeze, "spec/stress/connection_pool_timing_spec.rb".freeze, "spec/stress/fork_reconnect_stress_spec.rb".freeze, "spec/stress/push_monitor_close_spec.rb".freeze, "spec/support/authorization.rb".freeze, "spec/support/aws_utils.rb".freeze, "spec/support/aws_utils/base.rb".freeze, "spec/support/aws_utils/inspector.rb".freeze, "spec/support/aws_utils/orchestrator.rb".freeze, "spec/support/aws_utils/provisioner.rb".freeze, "spec/support/background_thread_registry.rb".freeze, "spec/support/certificates/README.md".freeze, "spec/support/certificates/atlas-ocsp-ca.crt".freeze, "spec/support/certificates/atlas-ocsp.crt".freeze, "spec/support/certificates/ca.crt".freeze, "spec/support/certificates/client-encrypted.key".freeze, "spec/support/certificates/client-int.crt".freeze, "spec/support/certificates/client-second-level-bundle.pem".freeze, "spec/support/certificates/client-second-level.crt".freeze, "spec/support/certificates/client-second-level.key".freeze, "spec/support/certificates/client-second-level.pem".freeze, "spec/support/certificates/client-x509.crt".freeze, "spec/support/certificates/client-x509.key".freeze, "spec/support/certificates/client-x509.pem".freeze, "spec/support/certificates/client.crt".freeze, "spec/support/certificates/client.key".freeze, "spec/support/certificates/client.pem".freeze, "spec/support/certificates/crl.pem".freeze, "spec/support/certificates/crl_client_revoked.pem".freeze, "spec/support/certificates/multi-ca.crt".freeze, "spec/support/certificates/python-ca.crt".freeze, "spec/support/certificates/retrieve-atlas-cert".freeze, "spec/support/certificates/server-int.crt".freeze, "spec/support/certificates/server-second-level-bundle.pem".freeze, "spec/support/certificates/server-second-level.crt".freeze, "spec/support/certificates/server-second-level.key".freeze, "spec/support/certificates/server-second-level.pem".freeze, "spec/support/certificates/server.pem".freeze, "spec/support/client_registry.rb".freeze, "spec/support/client_registry_macros.rb".freeze, "spec/support/cluster_tools.rb".freeze, "spec/support/common_shortcuts.rb".freeze, "spec/support/constraints.rb".freeze, "spec/support/crypt.rb".freeze, "spec/support/crypt/corpus/corpus-encrypted.json".freeze, "spec/support/crypt/corpus/corpus-key-aws.json".freeze, "spec/support/crypt/corpus/corpus-key-azure.json".freeze, "spec/support/crypt/corpus/corpus-key-gcp.json".freeze, "spec/support/crypt/corpus/corpus-key-kmip.json".freeze, "spec/support/crypt/corpus/corpus-key-local.json".freeze, "spec/support/crypt/corpus/corpus-schema.json".freeze, "spec/support/crypt/corpus/corpus.json".freeze, "spec/support/crypt/data_keys/key_document_aws.json".freeze, "spec/support/crypt/data_keys/key_document_azure.json".freeze, "spec/support/crypt/data_keys/key_document_gcp.json".freeze, "spec/support/crypt/data_keys/key_document_kmip.json".freeze, "spec/support/crypt/data_keys/key_document_local.json".freeze, "spec/support/crypt/encrypted_fields/encryptedFields.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Date.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoubleNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoublePrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Int.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Long.json".freeze, "spec/support/crypt/external/external-key.json".freeze, "spec/support/crypt/external/external-schema.json".freeze, "spec/support/crypt/keys/key1-document.json".freeze, "spec/support/crypt/limits/limits-doc.json".freeze, "spec/support/crypt/limits/limits-key.json".freeze, "spec/support/crypt/limits/limits-schema.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_local.json".freeze, "spec/support/crypt/schema_maps/schema_map_local_key_alt_names.json".freeze, "spec/support/dns.rb".freeze, "spec/support/json_ext_formatter.rb".freeze, "spec/support/keyword_struct.rb".freeze, "spec/support/local_resource_registry.rb".freeze, "spec/support/macros.rb".freeze, "spec/support/matchers.rb".freeze, "spec/support/mongos_macros.rb".freeze, "spec/support/monitoring_ext.rb".freeze, "spec/support/primary_socket.rb".freeze, "spec/support/sdam_formatter_integration.rb".freeze, "spec/support/shared/app_metadata.rb".freeze, "spec/support/shared/auth_context.rb".freeze, "spec/support/shared/protocol.rb".freeze, "spec/support/shared/scram_conversation.rb".freeze, "spec/support/shared/server_selector.rb".freeze, "spec/support/shared/session.rb".freeze, "spec/support/spec_config.rb".freeze, "spec/support/spec_setup.rb".freeze, "spec/support/using_hash.rb".freeze, "spec/support/utils.rb".freeze] - s.homepage = "https://mongodb.com/docs/ruby-driver/".freeze - s.licenses = ["Apache-2.0".freeze] - s.required_ruby_version = Gem::Requirement.new(">= 2.5".freeze) - s.rubygems_version = "3.4.18".freeze - s.summary = "Ruby driver for MongoDB".freeze -- s.test_files = ["spec/mongo/session_spec.rb".freeze, "spec/mongo/socket_spec.rb".freeze, "spec/mongo/cluster_spec.rb".freeze, "spec/mongo/auth/stringprep_spec.rb".freeze, "spec/mongo/auth/aws/credential_cache_spec.rb".freeze, "spec/mongo/auth/aws/credentials_spec.rb".freeze, "spec/mongo/auth/aws/credentials_retriever_spec.rb".freeze, "spec/mongo/auth/aws/request_region_spec.rb".freeze, "spec/mongo/auth/aws/request_spec.rb".freeze, "spec/mongo/auth/scram_negotiation_spec.rb".freeze, "spec/mongo/auth/ldap/conversation_spec.rb".freeze, "spec/mongo/auth/scram_spec.rb".freeze, "spec/mongo/auth/cr_spec.rb".freeze, "spec/mongo/auth/stringprep/profiles/sasl_spec.rb".freeze, "spec/mongo/auth/ldap_spec.rb".freeze, "spec/mongo/auth/user_spec.rb".freeze, "spec/mongo/auth/scram/conversation_spec.rb".freeze, "spec/mongo/auth/x509/conversation_spec.rb".freeze, "spec/mongo/auth/gssapi/conversation_spec.rb".freeze, "spec/mongo/auth/x509_spec.rb".freeze, "spec/mongo/auth/scram256/conversation_spec.rb".freeze, "spec/mongo/auth/user/view_spec.rb".freeze, "spec/mongo/auth/invalid_mechanism_spec.rb".freeze, "spec/mongo/collection/view_spec.rb".freeze, "spec/mongo/collection/view/explainable_spec.rb".freeze, "spec/mongo/collection/view/map_reduce_spec.rb".freeze, "spec/mongo/collection/view/immutable_spec.rb".freeze, "spec/mongo/collection/view/writable_spec.rb".freeze, "spec/mongo/collection/view/change_stream_resume_spec.rb".freeze, "spec/mongo/collection/view/builder/op_query_spec.rb".freeze, "spec/mongo/collection/view/builder/find_command_spec.rb".freeze, "spec/mongo/collection/view/aggregation_spec.rb".freeze, "spec/mongo/collection/view/readable_spec.rb".freeze, "spec/mongo/collection/view/iterable_spec.rb".freeze, "spec/mongo/collection/view/change_stream_spec.rb".freeze, "spec/mongo/grid/file/info_spec.rb".freeze, "spec/mongo/grid/file/chunk_spec.rb".freeze, "spec/mongo/grid/stream_spec.rb".freeze, "spec/mongo/grid/fs_bucket_spec.rb".freeze, "spec/mongo/grid/stream/write_spec.rb".freeze, "spec/mongo/grid/stream/read_spec.rb".freeze, "spec/mongo/grid/file_spec.rb".freeze, "spec/mongo/database_spec.rb".freeze, "spec/mongo/uri_spec.rb".freeze, "spec/mongo/protocol/get_more_spec.rb".freeze, "spec/mongo/protocol/query_spec.rb".freeze, "spec/mongo/protocol/msg_spec.rb".freeze, "spec/mongo/protocol/registry_spec.rb".freeze, "spec/mongo/protocol/caching_hash_spec.rb".freeze, "spec/mongo/protocol/reply_spec.rb".freeze, "spec/mongo/protocol/kill_cursors_spec.rb".freeze, "spec/mongo/protocol/compressed_spec.rb".freeze, "spec/mongo/srv/monitor_spec.rb".freeze, "spec/mongo/srv/result_spec.rb".freeze, "spec/mongo/cluster/topology/replica_set_spec.rb".freeze, "spec/mongo/cluster/topology/unknown_spec.rb".freeze, "spec/mongo/cluster/topology/sharded_spec.rb".freeze, "spec/mongo/cluster/topology/single_spec.rb".freeze, "spec/mongo/cluster/topology_spec.rb".freeze, "spec/mongo/cluster/periodic_executor_spec.rb".freeze, "spec/mongo/cluster/socket_reaper_spec.rb".freeze, "spec/mongo/cluster/cursor_reaper_spec.rb".freeze, "spec/mongo/session_transaction_spec.rb".freeze, "spec/mongo/cursor_spec.rb".freeze, "spec/mongo/collection_crud_spec.rb".freeze, "spec/mongo/semaphore_spec.rb".freeze, "spec/mongo/bson_spec.rb".freeze, "spec/mongo/collection_ddl_spec.rb".freeze, "spec/mongo/crypt/binary_spec.rb".freeze, "spec/mongo/crypt/helpers/mongo_crypt_spec_helper.rb".freeze, "spec/mongo/crypt/kms_spec.rb".freeze, "spec/mongo/crypt/binding/mongocrypt_spec.rb".freeze, "spec/mongo/crypt/binding/binary_spec.rb".freeze, "spec/mongo/crypt/binding/context_spec.rb".freeze, "spec/mongo/crypt/binding/helpers_spec.rb".freeze, "spec/mongo/crypt/binding/status_spec.rb".freeze, "spec/mongo/crypt/binding/version_spec.rb".freeze, "spec/mongo/crypt/kms/azure/credentials_retriever_spec.rb".freeze, "spec/mongo/crypt/kms/credentials_spec.rb".freeze, "spec/mongo/crypt/explicit_decryption_context_spec.rb".freeze, "spec/mongo/crypt/auto_decryption_context_spec.rb".freeze, "spec/mongo/crypt/handle_spec.rb".freeze, "spec/mongo/crypt/data_key_context_spec.rb".freeze, "spec/mongo/crypt/auto_encrypter_spec.rb".freeze, "spec/mongo/crypt/encryption_io_spec.rb".freeze, "spec/mongo/crypt/status_spec.rb".freeze, "spec/mongo/crypt/binding_unloaded_spec.rb".freeze, "spec/mongo/crypt/hooks_spec.rb".freeze, "spec/mongo/crypt/auto_encryption_context_spec.rb".freeze, "spec/mongo/crypt/explicit_encryption_context_spec.rb".freeze, "spec/mongo/cursor/builder/op_get_more_spec.rb".freeze, "spec/mongo/cursor/builder/get_more_command_spec.rb".freeze, "spec/mongo/address/ipv4_spec.rb".freeze, "spec/mongo/address/ipv6_spec.rb".freeze, "spec/mongo/address/unix_spec.rb".freeze, "spec/mongo/address/validator_spec.rb".freeze, "spec/mongo/client_spec.rb".freeze, "spec/mongo/uri/srv_protocol_spec.rb".freeze, "spec/mongo/uri/options_mapper_spec.rb".freeze, "spec/mongo/session/session_pool_spec.rb".freeze, "spec/mongo/session/server_session_spec.rb".freeze, "spec/mongo/address_spec.rb".freeze, "spec/mongo/condition_variable_spec.rb".freeze, "spec/mongo/event/subscriber_spec.rb".freeze, "spec/mongo/event/publisher_spec.rb".freeze, "spec/mongo/lint_spec.rb".freeze, "spec/mongo/auth_spec.rb".freeze, "spec/mongo/index/view_spec.rb".freeze, "spec/mongo/client_encryption_spec.rb".freeze, "spec/mongo/server_selector_spec.rb".freeze, "spec/mongo/operation/collections_info_spec.rb".freeze, "spec/mongo/operation/delete_spec.rb".freeze, "spec/mongo/operation/create/op_msg_spec.rb".freeze, "spec/mongo/operation/indexes_spec.rb".freeze, "spec/mongo/operation/insert/bulk_spec.rb".freeze, "spec/mongo/operation/insert/op_msg_spec.rb".freeze, "spec/mongo/operation/map_reduce_spec.rb".freeze, "spec/mongo/operation/delete/bulk_spec.rb".freeze, "spec/mongo/operation/delete/op_msg_spec.rb".freeze, "spec/mongo/operation/aggregate_spec.rb".freeze, "spec/mongo/operation/update_user_spec.rb".freeze, "spec/mongo/operation/limited_spec.rb".freeze, "spec/mongo/operation/create_index_spec.rb".freeze, "spec/mongo/operation/drop_index_spec.rb".freeze, "spec/mongo/operation/read_preference_legacy_spec.rb".freeze, "spec/mongo/operation/read_preference_op_msg_spec.rb".freeze, "spec/mongo/operation/create_user_spec.rb".freeze, "spec/mongo/operation/result_spec.rb".freeze, "spec/mongo/operation/insert_spec.rb".freeze, "spec/mongo/operation/find/builder/modifiers_spec.rb".freeze, "spec/mongo/operation/find/builder/flags_spec.rb".freeze, "spec/mongo/operation/command_spec.rb".freeze, "spec/mongo/operation/specifiable_spec.rb".freeze, "spec/mongo/operation/aggregate/result_spec.rb".freeze, "spec/mongo/operation/update/bulk_spec.rb".freeze, "spec/mongo/operation/update/op_msg_spec.rb".freeze, "spec/mongo/operation/update_spec.rb".freeze, "spec/mongo/operation/remove_user_spec.rb".freeze, "spec/mongo/monitoring/event/topology_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_failed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_out_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_created_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_created_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_ready_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_started_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_cleared_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_in_spec.rb".freeze, "spec/mongo/monitoring/event/topology_changed_spec.rb".freeze, "spec/mongo/monitoring/event/command_started_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/topology_opening_spec.rb".freeze, "spec/mongo/monitoring/event/server_closed_spec.rb".freeze, "spec/mongo/monitoring/event/command_failed_spec.rb".freeze, "spec/mongo/monitoring/event/secure_spec.rb".freeze, "spec/mongo/monitoring/event/server_opening_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_started_spec.rb".freeze, "spec/mongo/monitoring/event/command_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_failed_spec.rb".freeze, "spec/mongo/monitoring/event/server_description_changed_spec.rb".freeze, "spec/mongo/monitoring/command_log_subscriber_spec.rb".freeze, "spec/mongo/server_spec.rb".freeze, "spec/mongo/cluster_time_spec.rb".freeze, "spec/mongo/tls_context_hooks_spec.rb".freeze, "spec/mongo/crypt_spec.rb".freeze, "spec/mongo/monitoring_spec.rb".freeze, "spec/mongo/distinguishing_semaphore_spec.rb".freeze, "spec/mongo/retryable_spec.rb".freeze, "spec/mongo/socket/ssl_spec.rb".freeze, "spec/mongo/socket/unix_spec.rb".freeze, "spec/mongo/socket/tcp_spec.rb".freeze, "spec/mongo/caching_cursor_spec.rb".freeze, "spec/mongo/query_cache_spec.rb".freeze, "spec/mongo/bulk_write_spec.rb".freeze, "spec/mongo/error/notable_spec.rb".freeze, "spec/mongo/error/operation_failure_spec.rb".freeze, "spec/mongo/error/parser_spec.rb".freeze, "spec/mongo/error/bulk_write_error_spec.rb".freeze, "spec/mongo/error/crypt_error_spec.rb".freeze, "spec/mongo/error/max_bson_size_spec.rb".freeze, "spec/mongo/error/no_server_available_spec.rb".freeze, "spec/mongo/error/operation_failure_heavy_spec.rb".freeze, "spec/mongo/error/unsupported_option_spec.rb".freeze, "spec/mongo/query_cache_middleware_spec.rb".freeze, "spec/mongo/config_spec.rb".freeze, "spec/mongo/utils_spec.rb".freeze, "spec/mongo/write_concern_spec.rb".freeze, "spec/mongo/logger_spec.rb".freeze, "spec/mongo/write_concern/acknowledged_spec.rb".freeze, "spec/mongo/write_concern/unacknowledged_spec.rb".freeze, "spec/mongo/options/redacted_spec.rb".freeze, "spec/mongo/server/monitor_spec.rb".freeze, "spec/mongo/server/description_query_methods_spec.rb".freeze, "spec/mongo/server/description_spec.rb".freeze, "spec/mongo/server/app_metadata_spec.rb".freeze, "spec/mongo/server/push_monitor_spec.rb".freeze, "spec/mongo/server/connection_common_spec.rb".freeze, "spec/mongo/server/connection_pool/populator_spec.rb".freeze, "spec/mongo/server/app_metadata/environment_spec.rb".freeze, "spec/mongo/server/app_metadata/truncator_spec.rb".freeze, "spec/mongo/server/description/features_spec.rb".freeze, "spec/mongo/server/round_trip_time_averager_spec.rb".freeze, "spec/mongo/server/monitor/app_metadata_spec.rb".freeze, "spec/mongo/server/monitor/connection_spec.rb".freeze, "spec/mongo/server/connection_auth_spec.rb".freeze, "spec/mongo/server/connection_spec.rb".freeze, "spec/mongo/server/connection_pool_spec.rb".freeze, "spec/mongo/config/options_spec.rb".freeze, "spec/mongo/collection_spec.rb".freeze, "spec/mongo/timeout_spec.rb".freeze, "spec/mongo/bulk_write/unordered_combiner_spec.rb".freeze, "spec/mongo/bulk_write/result_spec.rb".freeze, "spec/mongo/bulk_write/ordered_combiner_spec.rb".freeze, "spec/mongo/client_construction_spec.rb".freeze, "spec/mongo/uri_option_parsing_spec.rb".freeze, "spec/mongo/server_selector/nearest_spec.rb".freeze, "spec/mongo/server_selector/primary_preferred_spec.rb".freeze, "spec/mongo/server_selector/secondary_preferred_spec.rb".freeze, "spec/mongo/server_selector/secondary_spec.rb".freeze, "spec/mongo/server_selector/primary_spec.rb".freeze, "spec/mongo/id_spec.rb".freeze, "spec/README.aws-auth.md".freeze, "spec/shared/LICENSE".freeze, "spec/shared/bin/s3-upload".freeze, "spec/shared/bin/s3-copy".freeze, "spec/shared/bin/get-mongodb-download-url".freeze, "spec/shared/share/haproxy-2.conf".freeze, "spec/shared/share/haproxy-1.conf".freeze, "spec/shared/share/Dockerfile.erb".freeze, "spec/shared/lib/mrss/constraints.rb".freeze, "spec/shared/lib/mrss/utils.rb".freeze, "spec/shared/lib/mrss/spec_organizer.rb".freeze, "spec/shared/lib/mrss/lite_constraints.rb".freeze, "spec/shared/lib/mrss/server_version_registry.rb".freeze, "spec/shared/lib/mrss/eg_config_utils.rb".freeze, "spec/shared/lib/mrss/session_registry.rb".freeze, "spec/shared/lib/mrss/docker_runner.rb".freeze, "spec/shared/lib/mrss/cluster_config.rb".freeze, "spec/shared/lib/mrss/child_process_helper.rb".freeze, "spec/shared/lib/mrss/event_subscriber.rb".freeze, "spec/shared/lib/mrss/session_registry_legacy.rb".freeze, "spec/shared/shlib/server.sh".freeze, "spec/shared/shlib/distro.sh".freeze, "spec/shared/shlib/set_env.sh".freeze, "spec/shared/shlib/config.sh".freeze, "spec/support/client_registry.rb".freeze, "spec/support/authorization.rb".freeze, "spec/support/dns.rb".freeze, "spec/support/matchers.rb".freeze, "spec/support/using_hash.rb".freeze, "spec/support/shared/server_selector.rb".freeze, "spec/support/shared/session.rb".freeze, "spec/support/shared/protocol.rb".freeze, "spec/support/shared/scram_conversation.rb".freeze, "spec/support/shared/auth_context.rb".freeze, "spec/support/shared/app_metadata.rb".freeze, "spec/support/constraints.rb".freeze, "spec/support/keyword_struct.rb".freeze, "spec/support/utils.rb".freeze, "spec/support/spec_setup.rb".freeze, "spec/support/json_ext_formatter.rb".freeze, "spec/support/client_registry_macros.rb".freeze, "spec/support/aws_utils/orchestrator.rb".freeze, "spec/support/aws_utils/base.rb".freeze, "spec/support/aws_utils/inspector.rb".freeze, "spec/support/aws_utils/provisioner.rb".freeze, "spec/support/crypt/data_keys/key_document_azure.json".freeze, "spec/support/crypt/data_keys/key_document_gcp.json".freeze, "spec/support/crypt/data_keys/key_document_aws.json".freeze, "spec/support/crypt/data_keys/key_document_local.json".freeze, "spec/support/crypt/data_keys/key_document_kmip.json".freeze, "spec/support/crypt/limits/limits-doc.json".freeze, "spec/support/crypt/limits/limits-schema.json".freeze, "spec/support/crypt/limits/limits-key.json".freeze, "spec/support/crypt/external/external-key.json".freeze, "spec/support/crypt/external/external-schema.json".freeze, "spec/support/crypt/corpus/corpus-key-azure.json".freeze, "spec/support/crypt/corpus/corpus-encrypted.json".freeze, "spec/support/crypt/corpus/corpus-key-local.json".freeze, "spec/support/crypt/corpus/corpus-key-aws.json".freeze, "spec/support/crypt/corpus/corpus.json".freeze, "spec/support/crypt/corpus/corpus-key-gcp.json".freeze, "spec/support/crypt/corpus/corpus-schema.json".freeze, "spec/support/crypt/corpus/corpus-key-kmip.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoublePrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Date.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoubleNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Long.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Int.json".freeze, "spec/support/crypt/encrypted_fields/encryptedFields.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_local_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp.json".freeze, "spec/support/crypt/schema_maps/schema_map_local.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure_key_alt_names.json".freeze, "spec/support/crypt/keys/key1-document.json".freeze, "spec/support/crypt.rb".freeze, "spec/support/monitoring_ext.rb".freeze, "spec/support/common_shortcuts.rb".freeze, "spec/support/mongos_macros.rb".freeze, "spec/support/sdam_formatter_integration.rb".freeze, "spec/support/ocsp".freeze, "spec/support/macros.rb".freeze, "spec/support/cluster_tools.rb".freeze, "spec/support/background_thread_registry.rb".freeze, "spec/support/certificates/multi-ca.crt".freeze, "spec/support/certificates/crl_client_revoked.pem".freeze, "spec/support/certificates/client-encrypted.key".freeze, "spec/support/certificates/atlas-ocsp.crt".freeze, "spec/support/certificates/client-second-level.key".freeze, "spec/support/certificates/client-x509.key".freeze, "spec/support/certificates/README.md".freeze, "spec/support/certificates/server-second-level.pem".freeze, "spec/support/certificates/client-second-level.pem".freeze, "spec/support/certificates/python-ca.crt".freeze, "spec/support/certificates/ca.crt".freeze, "spec/support/certificates/server-second-level.key".freeze, "spec/support/certificates/server-second-level.crt".freeze, "spec/support/certificates/client.crt".freeze, "spec/support/certificates/client-second-level.crt".freeze, "spec/support/certificates/client-int.crt".freeze, "spec/support/certificates/client-second-level-bundle.pem".freeze, "spec/support/certificates/client.key".freeze, "spec/support/certificates/client-x509.crt".freeze, "spec/support/certificates/server-int.crt".freeze, "spec/support/certificates/retrieve-atlas-cert".freeze, "spec/support/certificates/client-x509.pem".freeze, "spec/support/certificates/server-second-level-bundle.pem".freeze, "spec/support/certificates/crl.pem".freeze, "spec/support/certificates/client.pem".freeze, "spec/support/certificates/server.pem".freeze, "spec/support/certificates/atlas-ocsp-ca.crt".freeze, "spec/support/aws_utils.rb".freeze, "spec/support/local_resource_registry.rb".freeze, "spec/support/spec_config.rb".freeze, "spec/support/primary_socket.rb".freeze, "spec/README.md".freeze, "spec/NOTES.aws-auth.md".freeze, "spec/spec_helper.rb".freeze, "spec/kerberos/kerberos_spec.rb".freeze, "spec/runners/unified.rb".freeze, "spec/runners/connection_string.rb".freeze, "spec/runners/cmap/verifier.rb".freeze, "spec/runners/sdam.rb".freeze, "spec/runners/crud.rb".freeze, "spec/runners/transactions.rb".freeze, "spec/runners/read_write_concern_document.rb".freeze, "spec/runners/server_selection.rb".freeze, "spec/runners/server_selection_rtt.rb".freeze, "spec/runners/change_streams/outcome.rb".freeze, "spec/runners/change_streams/spec.rb".freeze, "spec/runners/change_streams/test.rb".freeze, "spec/runners/gridfs.rb".freeze, "spec/runners/transactions/operation.rb".freeze, "spec/runners/transactions/spec.rb".freeze, "spec/runners/transactions/test.rb".freeze, "spec/runners/command_monitoring.rb".freeze, "spec/runners/crud/requirement.rb".freeze, "spec/runners/crud/verifier.rb".freeze, "spec/runners/crud/outcome.rb".freeze, "spec/runners/crud/context.rb".freeze, "spec/runners/crud/operation.rb".freeze, "spec/runners/crud/test_base.rb".freeze, "spec/runners/crud/spec.rb".freeze, "spec/runners/crud/test.rb".freeze, "spec/runners/unified/error.rb".freeze, "spec/runners/unified/exceptions.rb".freeze, "spec/runners/unified/entity_map.rb".freeze, "spec/runners/unified/thread_operations.rb".freeze, "spec/runners/unified/grid_fs_operations.rb".freeze, "spec/runners/unified/ddl_operations.rb".freeze, "spec/runners/unified/support_operations.rb".freeze, "spec/runners/unified/test_group.rb".freeze, "spec/runners/unified/client_side_encryption_operations.rb".freeze, "spec/runners/unified/assertions.rb".freeze, "spec/runners/unified/event_subscriber.rb".freeze, "spec/runners/unified/change_stream_operations.rb".freeze, "spec/runners/unified/crud_operations.rb".freeze, "spec/runners/unified/test.rb".freeze, "spec/runners/auth.rb".freeze, "spec/runners/cmap.rb".freeze, "spec/runners/sdam/verifier.rb".freeze, "spec/solo/clean_exit_spec.rb".freeze, "spec/integration/ocsp_verifier_spec.rb".freeze, "spec/integration/step_down_spec.rb".freeze, "spec/integration/versioned_api_examples_spec.rb".freeze, "spec/integration/client_update_spec.rb".freeze, "spec/integration/cursor_pinning_spec.rb".freeze, "spec/integration/grid_fs_bucket_spec.rb".freeze, "spec/integration/get_more_spec.rb".freeze, "spec/integration/size_limit_spec.rb".freeze, "spec/integration/mmapv1_spec.rb".freeze, "spec/integration/secondary_reads_spec.rb".freeze, "spec/integration/bson_symbol_spec.rb".freeze, "spec/integration/bulk_write_error_message_spec.rb".freeze, "spec/integration/sdam_error_handling_spec.rb".freeze, "spec/integration/read_preference_spec.rb".freeze, "spec/integration/retryable_writes/shared/supports_retries.rb".freeze, "spec/integration/retryable_writes/shared/adds_diagnostics.rb".freeze, "spec/integration/retryable_writes/shared/only_supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_modern_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_no_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/does_not_support_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_modern_retries.rb".freeze, "spec/integration/retryable_writes/retryable_writes_36_and_older_spec.rb".freeze, "spec/integration/retryable_writes/retryable_writes_40_and_newer_spec.rb".freeze, "spec/integration/transactions_examples_spec.rb".freeze, "spec/integration/crud_spec.rb".freeze, "spec/integration/srv_monitoring_spec.rb".freeze, "spec/integration/server_description_spec.rb".freeze, "spec/integration/query_cache_transactions_spec.rb".freeze, "spec/integration/connect_single_rs_name_spec.rb".freeze, "spec/integration/mongos_pinning_spec.rb".freeze, "spec/integration/read_concern_spec.rb".freeze, "spec/integration/zstd_compression_spec.rb".freeze, "spec/integration/bulk_insert_spec.rb".freeze, "spec/integration/map_reduce_spec.rb".freeze, "spec/integration/operation_failure_code_spec.rb".freeze, "spec/integration/server_monitor_spec.rb".freeze, "spec/integration/client_spec.rb".freeze, "spec/integration/retryable_errors_spec.rb".freeze, "spec/integration/srv_spec.rb".freeze, "spec/integration/check_clean_slate_spec.rb".freeze, "spec/integration/aws_lambda_examples_spec.rb".freeze, "spec/integration/operation_failure_message_spec.rb".freeze, "spec/integration/time_zone_querying_spec.rb".freeze, "spec/integration/retryable_writes_errors_spec.rb".freeze, "spec/integration/command_monitoring_spec.rb".freeze, "spec/integration/client_construction_aws_auth_spec.rb".freeze, "spec/integration/x509_auth_spec.rb".freeze, "spec/integration/auth_spec.rb".freeze, "spec/integration/connection/faas_env_spec.rb".freeze, "spec/integration/server_selector_spec.rb".freeze, "spec/integration/fork_reconnect_spec.rb".freeze, "spec/integration/heartbeat_events_spec.rb".freeze, "spec/integration/connection_pool_populator_spec.rb".freeze, "spec/integration/aws_auth_credentials_cache_spec.rb".freeze, "spec/integration/server_spec.rb".freeze, "spec/integration/docs_examples_spec.rb".freeze, "spec/integration/snapshot_query_examples_spec.rb".freeze, "spec/integration/ocsp_verifier_cache_spec.rb".freeze, "spec/integration/client_authentication_options_spec.rb".freeze, "spec/integration/client_connectivity_spec.rb".freeze, "spec/integration/sdam_prose_spec.rb".freeze, "spec/integration/shell_examples_spec.rb".freeze, "spec/integration/collection_indexes_prose_spec.rb".freeze, "spec/integration/ssl_uri_options_spec.rb".freeze, "spec/integration/zlib_compression_spec.rb".freeze, "spec/integration/cursor_reaping_spec.rb".freeze, "spec/integration/snappy_compression_spec.rb".freeze, "spec/integration/query_cache_spec.rb".freeze, "spec/integration/bulk_write_spec.rb".freeze, "spec/integration/truncated_utf8_spec.rb".freeze, "spec/integration/command_spec.rb".freeze, "spec/integration/client_side_encryption/bson_size_limit_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/bypass_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/queryable_encryption_examples_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/unique_index_on_key_alt_names_prose_spec.rb".freeze, "spec/integration/client_side_encryption/views_spec.rb".freeze, "spec/integration/client_side_encryption/decryption_events_prose_spec.rb".freeze, "spec/integration/client_side_encryption/rewrap_prose_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_old_wire_version_spec.rb".freeze, "spec/integration/client_side_encryption/mongocryptd_prose_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_options_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_azure_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/external_key_vault_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_queryable_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/custom_endpoint_spec.rb".freeze, "spec/integration/client_side_encryption/automatic_data_encryption_keys_prose_spec.rb".freeze, "spec/integration/client_side_encryption/corpus_spec.rb".freeze, "spec/integration/client_side_encryption/range_explicit_encryption_prose_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_gcp_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/client_close_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb".freeze, "spec/integration/client_side_encryption/data_key_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_aws_credentials_spec.rb".freeze, "spec/integration/server_selection_spec.rb".freeze, "spec/integration/ocsp_connectivity_spec.rb".freeze, "spec/integration/error_detection_spec.rb".freeze, "spec/integration/aws_auth_request_spec.rb".freeze, "spec/integration/change_stream_examples_spec.rb".freeze, "spec/integration/reconnect_spec.rb".freeze, "spec/integration/retryable_reads_errors_spec.rb".freeze, "spec/integration/transaction_pinning_spec.rb".freeze, "spec/integration/connection_spec.rb".freeze, "spec/integration/awaited_ismaster_spec.rb".freeze, "spec/integration/transactions_api_examples_spec.rb".freeze, "spec/integration/client_construction_spec.rb".freeze, "spec/integration/aws_credentials_retriever_spec.rb".freeze, "spec/integration/sdam_events_spec.rb".freeze, "spec/integration/change_stream_spec.rb".freeze, "spec/stress/connection_pool_stress_spec.rb".freeze, "spec/stress/cleanup_spec.rb".freeze, "spec/stress/push_monitor_close_spec.rb".freeze, "spec/stress/connection_pool_timing_spec.rb".freeze, "spec/stress/fork_reconnect_stress_spec.rb".freeze, "spec/atlas/operations_spec.rb".freeze, "spec/atlas/atlas_connectivity_spec.rb".freeze, "spec/USERS.md".freeze, "spec/lite_spec_helper.rb".freeze, "spec/spec_tests/retryable_writes_spec.rb".freeze, "spec/spec_tests/sdam_unified_spec.rb".freeze, "spec/spec_tests/retryable_reads_unified_spec.rb".freeze, "spec/spec_tests/max_staleness_spec.rb".freeze, "spec/spec_tests/uri_options_spec.rb".freeze, "spec/spec_tests/connection_string_spec.rb".freeze, "spec/spec_tests/change_streams_unified_spec.rb".freeze, "spec/spec_tests/collection_management_spec.rb".freeze, "spec/spec_tests/crud_spec.rb".freeze, "spec/spec_tests/gridfs_unified_spec.rb".freeze, "spec/spec_tests/load_balancers_spec.rb".freeze, "spec/spec_tests/client_side_encryption_spec.rb".freeze, "spec/spec_tests/unified_spec.rb".freeze, "spec/spec_tests/read_write_concern_document_spec.rb".freeze, "spec/spec_tests/seed_list_discovery_spec.rb".freeze, "spec/spec_tests/versioned_api_spec.rb".freeze, "spec/spec_tests/command_monitoring_unified_spec.rb".freeze, "spec/spec_tests/server_selection_rtt_spec.rb".freeze, "spec/spec_tests/sdam_monitoring_spec.rb".freeze, "spec/spec_tests/sessions_unified_spec.rb".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-client-error.yml".freeze, "spec/spec_tests/data/sessions_unified/driver-sessions-server-support.yml".freeze, "spec/spec_tests/data/sessions_unified/implicit-sessions-default-causal-consistency.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-unsupported-ops.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-server-error.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-strict-mode.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml".freeze, "spec/spec_tests/data/versioned_api/transaction-handling.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1.yml".freeze, "spec/spec_tests/data/versioned_api/runcommand-helper-no-api-version-declared.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-deprecation-errors.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-make-available.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-returned-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin.yml".freeze, "spec/spec_tests/data/cmap/pool-ready-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-idle.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-fairness.yml".freeze, "spec/spec_tests/data/cmap/pool-create-max-size.yml".freeze, "spec/spec_tests/data/cmap/connection-must-have-id.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-minPoolSize-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupting-pending-connections.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-schedule-run-interruptInUseConnections-false.yml".freeze, "spec/spec_tests/data/cmap/pool-create-with-options.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-stale.yml".freeze, "spec/spec_tests/data/cmap/pool-create.yml".freeze, "spec/spec_tests/data/cmap/pool-close-destroy-conns.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-error-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-close.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-timeout.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-paused.yml".freeze, "spec/spec_tests/data/cmap/connection-must-order-ids.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-multiple.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-custom-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size-error.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupt-immediately.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-connection.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-stale.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-timeout.yml".freeze, "spec/spec_tests/data/auth/connection-string.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-noWritesPerformedError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/handshakeError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/server_selection/Single/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/write/ghost.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/ghost.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/transactions_api/callback-commits.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror-4.2.yml".freeze, "spec/spec_tests/data/transactions_api/callback-aborts.yml".freeze, "spec/spec_tests/data/transactions_api/commit-writeconcernerror.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror.yml".freeze, "spec/spec_tests/data/transactions_api/callback-retry.yml".freeze, "spec/spec_tests/data/transactions_api/commit.yml".freeze, "spec/spec_tests/data/transactions_api/transaction-options.yml".freeze, "spec/spec_tests/data/transactions_api/commit-retry.yml".freeze, "spec/spec_tests/data/uri_options/compression-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-auth-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-pool-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-connection-options.yml".freeze, "spec/spec_tests/data/uri_options/srv-options.yml".freeze, "spec/spec_tests/data/uri_options/tls-options.yml".freeze, "spec/spec_tests/data/uri_options/auth-options.yml".freeze, "spec/spec_tests/data/uri_options/concern-options.yml".freeze, "spec/spec_tests/data/uri_options/read-preference-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-options.yml".freeze, "spec/spec_tests/data/connection_string/valid-host_identifiers.yml".freeze, "spec/spec_tests/data/connection_string/valid-db-with-dotted-name.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-absolute.yml".freeze, "spec/spec_tests/data/connection_string/valid-auth.yml".freeze, "spec/spec_tests/data/connection_string/valid-warnings.yml".freeze, "spec/spec_tests/data/connection_string/valid-options.yml".freeze, "spec/spec_tests/data/connection_string/invalid-uris.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-relative.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_chain.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_second_seed_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/required_replica_set.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone.yml".freeze, "spec/spec_tests/data/sdam_monitoring/load_balancer.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_suppress_equal_description_changes.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_repeated.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_no_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_to_rs_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_and_secondary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/discovered_standalone.yml".freeze, "spec/spec_tests/data/max_staleness/Single/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Single/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Secondary.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/Unknown/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateWithPipelines.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/distinct-comment.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-validation.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-validation.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/countDocuments-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-out-readConcern.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-let.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/find-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/find.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/find-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount-comment.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-comment.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-clientError.yml".freeze, "spec/spec_tests/data/load_balancers/non-lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/server-selection.yml".freeze, "spec/spec_tests/data/load_balancers/event-monitoring.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/writeConcernError.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/pre-42-server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/bulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/command.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/find.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/unacknowledgedBulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteOne.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-errorLabels.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-errors.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-disambiguatedPaths.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-clusterTime.yml".freeze, "spec/spec_tests/data/read_write_concern/document/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/document/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-4.2.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.4.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-2.6.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.2.yml".freeze, "spec/spec_tests/data/gridfs_unified/downloadByName.yml".freeze, "spec/spec_tests/data/gridfs_unified/delete.yml".freeze, "spec/spec_tests/data/gridfs_unified/download.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload-disableMD5.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-multiple-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-replicaSet-errors.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-directConnection.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/longer-parent-in-return.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch4.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/misformatted-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch3.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/encoded-userinfo-and-db.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/loadBalanced-false-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-wrong.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-unallowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-admin-database.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-false.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-nonstandard-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/not-enough-parts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-ssl-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-txt-records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-not-allowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-two-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch2.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch1.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch5.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-too-short.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srv-service-name.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-uri-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-result-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record-multiple-strings.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-auth.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort.yml".freeze, "spec/spec_tests/data/transactions/create-collection.yml".freeze, "spec/spec_tests/data/transactions/count.yml".freeze, "spec/spec_tests/data/transactions/update.yml".freeze, "spec/spec_tests/data/transactions/isolation.yml".freeze, "spec/spec_tests/data/transactions/errors-client.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit-errorLabels.yml".freeze, "spec/spec_tests/data/transactions/delete.yml".freeze, "spec/spec_tests/data/transactions/mongos-recovery-token.yml".freeze, "spec/spec_tests/data/transactions/mongos-pin-auto.yml".freeze, "spec/spec_tests/data/transactions/read-concern.yml".freeze, "spec/spec_tests/data/transactions/insert.yml".freeze, "spec/spec_tests/data/transactions/transaction-options-repl.yml".freeze, "spec/spec_tests/data/transactions/read-pref.yml".freeze, "spec/spec_tests/data/transactions/retryable-writes.yml".freeze, "spec/spec_tests/data/transactions/reads.yml".freeze, "spec/spec_tests/data/transactions/bulk.yml".freeze, "spec/spec_tests/data/transactions/errors.yml".freeze, "spec/spec_tests/data/transactions/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit.yml".freeze, "spec/spec_tests/data/transactions/create-index.yml".freeze, "spec/spec_tests/data/transactions/pin-mongos.yml".freeze, "spec/spec_tests/data/transactions/write-concern.yml".freeze, "spec/spec_tests/data/transactions/findOneAndDelete.yml".freeze, "spec/spec_tests/data/transactions/run-command.yml".freeze, "spec/spec_tests/data/transactions/abort.yml".freeze, "spec/spec_tests/data/transactions/error-labels.yml".freeze, "spec/spec_tests/data/transactions/causal-consistency.yml".freeze, "spec/spec_tests/data/transactions/findOneAndReplace.yml".freeze, "spec/spec_tests/data/transactions/commit.yml".freeze, "spec/spec_tests/data/transactions/transaction-options.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort-errorLabels.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_2.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_3.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_5.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_4.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value_zero.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_1.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-collation.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/insertOne.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert_pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateMany.yml".freeze, "spec/spec_tests/data/crud/write/updateOne.yml".freeze, "spec/spec_tests/data/crud/write/insertMany.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-upsert.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-collation.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-collation.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-collation.yml".freeze, "spec/spec_tests/data/crud/read/count.yml".freeze, "spec/spec_tests/data/crud/read/count-collation.yml".freeze, "spec/spec_tests/data/crud/read/count-empty.yml".freeze, "spec/spec_tests/data/crud/read/find-collation.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-out.yml".freeze, "spec/spec_tests/data/crud/read/distinct.yml".freeze, "spec/spec_tests/data/crud/read/find.yml".freeze, "spec/spec_tests/data/crud/read/aggregate.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-collation.yml".freeze, "spec/spec_tests/data/crud/read/distinct-collation.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-failure.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-unsupported.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedError-errorResponse.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-gridfs.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-change-streams.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-cmap-events.yml".freeze, "spec/spec_tests/data/unified/valid-pass/assertNumberConnectionsCheckedOut.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-crud.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-storeEventsAsEntities.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-command-monitoring.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml".freeze, "spec/spec_tests/data/unified/valid-pass/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-sessions.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-eventType.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml".freeze, "spec/spec_tests/data/unified/valid-pass/observeSensitiveCommands.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-reads.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/awsTemporary.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/count.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/replaceOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/basic.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml".freeze, "spec/spec_tests/data/client_side_encryption/malformedCiphertext.yml".freeze, "spec/spec_tests/data/client_side_encryption/keyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassAutoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-DecryptExistingData.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFieldsMap-defaults.yml".freeze, "spec/spec_tests/data/client_side_encryption/create-and-createIndexes.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/client_side_encryption/insert.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/distinct.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/badQueries.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateMany.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Indexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-jsonSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/bulk.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/getMore.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/find.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/types.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-WrongType.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-BypassQueryAnalysis.yml".freeze, "spec/spec_tests/data/client_side_encryption/azureKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/countDocuments.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/unsupportedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/localSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndDelete.yml".freeze, "spec/spec_tests/data/client_side_encryption/aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection-OldServer.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/explain.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-decrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/removeKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/deleteKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/addKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey-kms_providers-invalid.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-encrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeys.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeyByAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/maxWireVersion.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/gcpKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/noSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Compact.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-MissingKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Unindexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-NoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/localKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndReplace.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/badSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/missingKey.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-merge.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/mapReduce.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/unified/handshakeError.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-abort-handshake.yml".freeze, "spec/spec_tests/data/transactions_unified/mongos-unpin.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-commit-handshake.yml".freeze, "spec/spec_tests/data/transactions_unified/do-not-retry-read-in-transaction.yml".freeze, "spec/spec_tests/data/collection_management/timeseries-collection.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/clustered-indexes.yml".freeze, "spec/spec_tests/data/collection_management/createCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-errorResponse.yml".freeze, "spec/spec_tests/data/sdam/load-balanced/discover_load_balancer.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam/errors/prefer-error-code.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/write_errors_ignored.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/error_handling_handshake.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-error.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/sharded/normalize_uri_case.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_new.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_old.yml".freeze, "spec/spec_tests/data/sdam/sharded/mongos_disconnect.yml".freeze, "spec/spec_tests/data/sdam/sharded/compatible.yml".freeze, "spec/spec_tests/data/sdam/sharded/multiple_mongoses.yml".freeze, "spec/spec_tests/data/sdam/sharded/discover_single_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/sharded/ls_timeout_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/non_mongos_removed.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/single/not_ok_response.yml".freeze, "spec/spec_tests/data/sdam/single/discover_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsarbiter.yml".freeze, "spec/spec_tests/data/sdam/single/too_new.yml".freeze, "spec/spec_tests/data/sdam/single/too_old.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/discover_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsprimary.yml".freeze, "spec/spec_tests/data/sdam/single/too_old_then_upgraded.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/single/compatible.yml".freeze, "spec/spec_tests/data/sdam/single/ls_timeout_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_removed.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_mongos.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rssecondary.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_external_ip.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_using_legacy_hello.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_arbiter.yml".freeze, "spec/spec_tests/data/sdam/rs/unexpected_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/set_version_can_rollback.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_changes_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/too_new.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/too_old.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible_unknown.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_greater.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/response_from_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_equal_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_reports_new_member.yml".freeze, "spec/spec_tests/data/sdam/rs/member_reconfig.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me_not_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives.yml".freeze, "spec/spec_tests/data/sdam/rs/sec_not_auth.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0.yml".freeze, "spec/spec_tests/data/sdam/rs/discovery.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_hint_from_secondary_with_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name_with_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/hosts_differ_from_seeds.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/equal_electionids.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/member_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/replicaset_rsnp.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/non_rs_member.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_equal.yml".freeze, "spec/spec_tests/data/sdam/rs/ls_timeout.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_less.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_greaterthan_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/electionId_precedence_setVersion.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_secondary_wrong_set_name_with_primary_second.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/repeated.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case_me.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_other.yml".freeze, "spec/spec_tests/data/sdam/rs/stepdown_change_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary_replicaset.yml".freeze, "spec/spec_tests/data/gridfs/download_by_name.yml".freeze, "spec/spec_tests/data/gridfs/delete.yml".freeze, "spec/spec_tests/data/gridfs/download.yml".freeze, "spec/spec_tests/data/gridfs/upload.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/cancel-server-check.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/interruptInUse-pool-clear.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/pool-cleared-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-timeout.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/connectTimeoutMS.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-misc-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/rediscover-quickly-after-step-down.yml".freeze, "spec/spec_tests/data/sdam_unified/minPoolSize-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-error.yml".freeze, "spec/spec_tests/auth_spec.rb".freeze, "spec/spec_tests/transactions_spec.rb".freeze, "spec/spec_tests/transactions_unified_spec.rb".freeze, "spec/spec_tests/retryable_reads_spec.rb".freeze, "spec/spec_tests/gridfs_spec.rb".freeze, "spec/spec_tests/read_write_concern_operaton_spec.rb".freeze, "spec/spec_tests/cmap_spec.rb".freeze, "spec/spec_tests/server_selection_spec.rb".freeze, "spec/spec_tests/crud_unified_spec.rb".freeze, "spec/spec_tests/client_side_encryption_unified_spec.rb".freeze, "spec/spec_tests/retryable_writes_unified_spec.rb".freeze, "spec/spec_tests/read_write_concern_connection_string_spec.rb".freeze, "spec/spec_tests/sdam_spec.rb".freeze, "spec/spec_tests/transactions_api_spec.rb".freeze] -+ s.test_files = ["spec/mongo/session_spec.rb".freeze, "spec/mongo/socket_spec.rb".freeze, "spec/mongo/cluster_spec.rb".freeze, "spec/mongo/auth/stringprep_spec.rb".freeze, "spec/mongo/auth/aws/credential_cache_spec.rb".freeze, "spec/mongo/auth/aws/credentials_spec.rb".freeze, "spec/mongo/auth/aws/credentials_retriever_spec.rb".freeze, "spec/mongo/auth/aws/request_region_spec.rb".freeze, "spec/mongo/auth/aws/request_spec.rb".freeze, "spec/mongo/auth/scram_negotiation_spec.rb".freeze, "spec/mongo/auth/ldap/conversation_spec.rb".freeze, "spec/mongo/auth/scram_spec.rb".freeze, "spec/mongo/auth/cr_spec.rb".freeze, "spec/mongo/auth/stringprep/profiles/sasl_spec.rb".freeze, "spec/mongo/auth/ldap_spec.rb".freeze, "spec/mongo/auth/user_spec.rb".freeze, "spec/mongo/auth/scram/conversation_spec.rb".freeze, "spec/mongo/auth/x509/conversation_spec.rb".freeze, "spec/mongo/auth/gssapi/conversation_spec.rb".freeze, "spec/mongo/auth/x509_spec.rb".freeze, "spec/mongo/auth/scram256/conversation_spec.rb".freeze, "spec/mongo/auth/user/view_spec.rb".freeze, "spec/mongo/auth/invalid_mechanism_spec.rb".freeze, "spec/mongo/collection/view_spec.rb".freeze, "spec/mongo/collection/view/explainable_spec.rb".freeze, "spec/mongo/collection/view/map_reduce_spec.rb".freeze, "spec/mongo/collection/view/immutable_spec.rb".freeze, "spec/mongo/collection/view/writable_spec.rb".freeze, "spec/mongo/collection/view/change_stream_resume_spec.rb".freeze, "spec/mongo/collection/view/builder/op_query_spec.rb".freeze, "spec/mongo/collection/view/builder/find_command_spec.rb".freeze, "spec/mongo/collection/view/aggregation_spec.rb".freeze, "spec/mongo/collection/view/readable_spec.rb".freeze, "spec/mongo/collection/view/iterable_spec.rb".freeze, "spec/mongo/collection/view/change_stream_spec.rb".freeze, "spec/mongo/grid/file/info_spec.rb".freeze, "spec/mongo/grid/file/chunk_spec.rb".freeze, "spec/mongo/grid/stream_spec.rb".freeze, "spec/mongo/grid/fs_bucket_spec.rb".freeze, "spec/mongo/grid/stream/write_spec.rb".freeze, "spec/mongo/grid/stream/read_spec.rb".freeze, "spec/mongo/grid/file_spec.rb".freeze, "spec/mongo/database_spec.rb".freeze, "spec/mongo/uri_spec.rb".freeze, "spec/mongo/protocol/get_more_spec.rb".freeze, "spec/mongo/protocol/query_spec.rb".freeze, "spec/mongo/protocol/msg_spec.rb".freeze, "spec/mongo/protocol/registry_spec.rb".freeze, "spec/mongo/protocol/caching_hash_spec.rb".freeze, "spec/mongo/protocol/reply_spec.rb".freeze, "spec/mongo/protocol/kill_cursors_spec.rb".freeze, "spec/mongo/protocol/compressed_spec.rb".freeze, "spec/mongo/srv/monitor_spec.rb".freeze, "spec/mongo/srv/result_spec.rb".freeze, "spec/mongo/cluster/topology/replica_set_spec.rb".freeze, "spec/mongo/cluster/topology/unknown_spec.rb".freeze, "spec/mongo/cluster/topology/sharded_spec.rb".freeze, "spec/mongo/cluster/topology/single_spec.rb".freeze, "spec/mongo/cluster/topology_spec.rb".freeze, "spec/mongo/cluster/periodic_executor_spec.rb".freeze, "spec/mongo/cluster/socket_reaper_spec.rb".freeze, "spec/mongo/cluster/cursor_reaper_spec.rb".freeze, "spec/mongo/session_transaction_spec.rb".freeze, "spec/mongo/cursor_spec.rb".freeze, "spec/mongo/collection_crud_spec.rb".freeze, "spec/mongo/semaphore_spec.rb".freeze, "spec/mongo/bson_spec.rb".freeze, "spec/mongo/collection_ddl_spec.rb".freeze, "spec/mongo/crypt/binary_spec.rb".freeze, "spec/mongo/crypt/helpers/mongo_crypt_spec_helper.rb".freeze, "spec/mongo/crypt/kms_spec.rb".freeze, "spec/mongo/crypt/binding/mongocrypt_spec.rb".freeze, "spec/mongo/crypt/binding/binary_spec.rb".freeze, "spec/mongo/crypt/binding/context_spec.rb".freeze, "spec/mongo/crypt/binding/helpers_spec.rb".freeze, "spec/mongo/crypt/binding/status_spec.rb".freeze, "spec/mongo/crypt/binding/version_spec.rb".freeze, "spec/mongo/crypt/kms/azure/credentials_retriever_spec.rb".freeze, "spec/mongo/crypt/kms/credentials_spec.rb".freeze, "spec/mongo/crypt/explicit_decryption_context_spec.rb".freeze, "spec/mongo/crypt/auto_decryption_context_spec.rb".freeze, "spec/mongo/crypt/handle_spec.rb".freeze, "spec/mongo/crypt/data_key_context_spec.rb".freeze, "spec/mongo/crypt/auto_encrypter_spec.rb".freeze, "spec/mongo/crypt/encryption_io_spec.rb".freeze, "spec/mongo/crypt/status_spec.rb".freeze, "spec/mongo/crypt/binding_unloaded_spec.rb".freeze, "spec/mongo/crypt/hooks_spec.rb".freeze, "spec/mongo/crypt/auto_encryption_context_spec.rb".freeze, "spec/mongo/crypt/explicit_encryption_context_spec.rb".freeze, "spec/mongo/cursor/builder/op_get_more_spec.rb".freeze, "spec/mongo/cursor/builder/get_more_command_spec.rb".freeze, "spec/mongo/address/ipv4_spec.rb".freeze, "spec/mongo/address/ipv6_spec.rb".freeze, "spec/mongo/address/unix_spec.rb".freeze, "spec/mongo/address/validator_spec.rb".freeze, "spec/mongo/client_spec.rb".freeze, "spec/mongo/uri/srv_protocol_spec.rb".freeze, "spec/mongo/uri/options_mapper_spec.rb".freeze, "spec/mongo/session/session_pool_spec.rb".freeze, "spec/mongo/session/server_session_spec.rb".freeze, "spec/mongo/address_spec.rb".freeze, "spec/mongo/condition_variable_spec.rb".freeze, "spec/mongo/event/subscriber_spec.rb".freeze, "spec/mongo/event/publisher_spec.rb".freeze, "spec/mongo/lint_spec.rb".freeze, "spec/mongo/auth_spec.rb".freeze, "spec/mongo/index/view_spec.rb".freeze, "spec/mongo/client_encryption_spec.rb".freeze, "spec/mongo/server_selector_spec.rb".freeze, "spec/mongo/operation/collections_info_spec.rb".freeze, "spec/mongo/operation/delete_spec.rb".freeze, "spec/mongo/operation/create/op_msg_spec.rb".freeze, "spec/mongo/operation/indexes_spec.rb".freeze, "spec/mongo/operation/insert/bulk_spec.rb".freeze, "spec/mongo/operation/insert/op_msg_spec.rb".freeze, "spec/mongo/operation/map_reduce_spec.rb".freeze, "spec/mongo/operation/delete/bulk_spec.rb".freeze, "spec/mongo/operation/delete/op_msg_spec.rb".freeze, "spec/mongo/operation/aggregate_spec.rb".freeze, "spec/mongo/operation/update_user_spec.rb".freeze, "spec/mongo/operation/limited_spec.rb".freeze, "spec/mongo/operation/create_index_spec.rb".freeze, "spec/mongo/operation/drop_index_spec.rb".freeze, "spec/mongo/operation/read_preference_legacy_spec.rb".freeze, "spec/mongo/operation/read_preference_op_msg_spec.rb".freeze, "spec/mongo/operation/create_user_spec.rb".freeze, "spec/mongo/operation/result_spec.rb".freeze, "spec/mongo/operation/insert_spec.rb".freeze, "spec/mongo/operation/find/builder/modifiers_spec.rb".freeze, "spec/mongo/operation/find/builder/flags_spec.rb".freeze, "spec/mongo/operation/command_spec.rb".freeze, "spec/mongo/operation/specifiable_spec.rb".freeze, "spec/mongo/operation/aggregate/result_spec.rb".freeze, "spec/mongo/operation/update/bulk_spec.rb".freeze, "spec/mongo/operation/update/op_msg_spec.rb".freeze, "spec/mongo/operation/update_spec.rb".freeze, "spec/mongo/operation/remove_user_spec.rb".freeze, "spec/mongo/monitoring/event/topology_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_failed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_out_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_created_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_created_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_ready_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_closed_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_check_out_started_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/pool_cleared_spec.rb".freeze, "spec/mongo/monitoring/event/cmap/connection_checked_in_spec.rb".freeze, "spec/mongo/monitoring/event/topology_changed_spec.rb".freeze, "spec/mongo/monitoring/event/command_started_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/topology_opening_spec.rb".freeze, "spec/mongo/monitoring/event/server_closed_spec.rb".freeze, "spec/mongo/monitoring/event/command_failed_spec.rb".freeze, "spec/mongo/monitoring/event/secure_spec.rb".freeze, "spec/mongo/monitoring/event/server_opening_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_started_spec.rb".freeze, "spec/mongo/monitoring/event/command_succeeded_spec.rb".freeze, "spec/mongo/monitoring/event/server_heartbeat_failed_spec.rb".freeze, "spec/mongo/monitoring/event/server_description_changed_spec.rb".freeze, "spec/mongo/monitoring/command_log_subscriber_spec.rb".freeze, "spec/mongo/server_spec.rb".freeze, "spec/mongo/cluster_time_spec.rb".freeze, "spec/mongo/tls_context_hooks_spec.rb".freeze, "spec/mongo/crypt_spec.rb".freeze, "spec/mongo/monitoring_spec.rb".freeze, "spec/mongo/distinguishing_semaphore_spec.rb".freeze, "spec/mongo/retryable_spec.rb".freeze, "spec/mongo/socket/ssl_spec.rb".freeze, "spec/mongo/socket/unix_spec.rb".freeze, "spec/mongo/socket/tcp_spec.rb".freeze, "spec/mongo/caching_cursor_spec.rb".freeze, "spec/mongo/query_cache_spec.rb".freeze, "spec/mongo/bulk_write_spec.rb".freeze, "spec/mongo/error/notable_spec.rb".freeze, "spec/mongo/error/operation_failure_spec.rb".freeze, "spec/mongo/error/parser_spec.rb".freeze, "spec/mongo/error/bulk_write_error_spec.rb".freeze, "spec/mongo/error/crypt_error_spec.rb".freeze, "spec/mongo/error/max_bson_size_spec.rb".freeze, "spec/mongo/error/no_server_available_spec.rb".freeze, "spec/mongo/error/operation_failure_heavy_spec.rb".freeze, "spec/mongo/error/unsupported_option_spec.rb".freeze, "spec/mongo/query_cache_middleware_spec.rb".freeze, "spec/mongo/config_spec.rb".freeze, "spec/mongo/utils_spec.rb".freeze, "spec/mongo/write_concern_spec.rb".freeze, "spec/mongo/logger_spec.rb".freeze, "spec/mongo/write_concern/acknowledged_spec.rb".freeze, "spec/mongo/write_concern/unacknowledged_spec.rb".freeze, "spec/mongo/options/redacted_spec.rb".freeze, "spec/mongo/server/monitor_spec.rb".freeze, "spec/mongo/server/description_query_methods_spec.rb".freeze, "spec/mongo/server/description_spec.rb".freeze, "spec/mongo/server/app_metadata_spec.rb".freeze, "spec/mongo/server/push_monitor_spec.rb".freeze, "spec/mongo/server/connection_common_spec.rb".freeze, "spec/mongo/server/connection_pool/populator_spec.rb".freeze, "spec/mongo/server/app_metadata/environment_spec.rb".freeze, "spec/mongo/server/app_metadata/truncator_spec.rb".freeze, "spec/mongo/server/description/features_spec.rb".freeze, "spec/mongo/server/round_trip_time_averager_spec.rb".freeze, "spec/mongo/server/monitor/app_metadata_spec.rb".freeze, "spec/mongo/server/monitor/connection_spec.rb".freeze, "spec/mongo/server/connection_auth_spec.rb".freeze, "spec/mongo/server/connection_spec.rb".freeze, "spec/mongo/server/connection_pool_spec.rb".freeze, "spec/mongo/config/options_spec.rb".freeze, "spec/mongo/collection_spec.rb".freeze, "spec/mongo/timeout_spec.rb".freeze, "spec/mongo/bulk_write/unordered_combiner_spec.rb".freeze, "spec/mongo/bulk_write/result_spec.rb".freeze, "spec/mongo/bulk_write/ordered_combiner_spec.rb".freeze, "spec/mongo/client_construction_spec.rb".freeze, "spec/mongo/uri_option_parsing_spec.rb".freeze, "spec/mongo/server_selector/nearest_spec.rb".freeze, "spec/mongo/server_selector/primary_preferred_spec.rb".freeze, "spec/mongo/server_selector/secondary_preferred_spec.rb".freeze, "spec/mongo/server_selector/secondary_spec.rb".freeze, "spec/mongo/server_selector/primary_spec.rb".freeze, "spec/mongo/id_spec.rb".freeze, "spec/README.aws-auth.md".freeze, "spec/shared/LICENSE".freeze, "spec/shared/bin/s3-upload".freeze, "spec/shared/bin/s3-copy".freeze, "spec/shared/bin/get-mongodb-download-url".freeze, "spec/shared/share/haproxy-2.conf".freeze, "spec/shared/share/haproxy-1.conf".freeze, "spec/shared/share/Dockerfile.erb".freeze, "spec/shared/lib/mrss/constraints.rb".freeze, "spec/shared/lib/mrss/utils.rb".freeze, "spec/shared/lib/mrss/spec_organizer.rb".freeze, "spec/shared/lib/mrss/lite_constraints.rb".freeze, "spec/shared/lib/mrss/server_version_registry.rb".freeze, "spec/shared/lib/mrss/eg_config_utils.rb".freeze, "spec/shared/lib/mrss/session_registry.rb".freeze, "spec/shared/lib/mrss/docker_runner.rb".freeze, "spec/shared/lib/mrss/cluster_config.rb".freeze, "spec/shared/lib/mrss/child_process_helper.rb".freeze, "spec/shared/lib/mrss/event_subscriber.rb".freeze, "spec/shared/lib/mrss/session_registry_legacy.rb".freeze, "spec/shared/shlib/server.sh".freeze, "spec/shared/shlib/distro.sh".freeze, "spec/shared/shlib/set_env.sh".freeze, "spec/shared/shlib/config.sh".freeze, "spec/support/client_registry.rb".freeze, "spec/support/authorization.rb".freeze, "spec/support/dns.rb".freeze, "spec/support/matchers.rb".freeze, "spec/support/using_hash.rb".freeze, "spec/support/shared/server_selector.rb".freeze, "spec/support/shared/session.rb".freeze, "spec/support/shared/protocol.rb".freeze, "spec/support/shared/scram_conversation.rb".freeze, "spec/support/shared/auth_context.rb".freeze, "spec/support/shared/app_metadata.rb".freeze, "spec/support/constraints.rb".freeze, "spec/support/keyword_struct.rb".freeze, "spec/support/utils.rb".freeze, "spec/support/spec_setup.rb".freeze, "spec/support/json_ext_formatter.rb".freeze, "spec/support/client_registry_macros.rb".freeze, "spec/support/aws_utils/orchestrator.rb".freeze, "spec/support/aws_utils/base.rb".freeze, "spec/support/aws_utils/inspector.rb".freeze, "spec/support/aws_utils/provisioner.rb".freeze, "spec/support/crypt/data_keys/key_document_azure.json".freeze, "spec/support/crypt/data_keys/key_document_gcp.json".freeze, "spec/support/crypt/data_keys/key_document_aws.json".freeze, "spec/support/crypt/data_keys/key_document_local.json".freeze, "spec/support/crypt/data_keys/key_document_kmip.json".freeze, "spec/support/crypt/limits/limits-doc.json".freeze, "spec/support/crypt/limits/limits-schema.json".freeze, "spec/support/crypt/limits/limits-key.json".freeze, "spec/support/crypt/external/external-key.json".freeze, "spec/support/crypt/external/external-schema.json".freeze, "spec/support/crypt/corpus/corpus-key-azure.json".freeze, "spec/support/crypt/corpus/corpus-encrypted.json".freeze, "spec/support/crypt/corpus/corpus-key-local.json".freeze, "spec/support/crypt/corpus/corpus-key-aws.json".freeze, "spec/support/crypt/corpus/corpus.json".freeze, "spec/support/crypt/corpus/corpus-key-gcp.json".freeze, "spec/support/crypt/corpus/corpus-schema.json".freeze, "spec/support/crypt/corpus/corpus-key-kmip.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoublePrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Date.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DoubleNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Long.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalNoPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalPrecision.json".freeze, "spec/support/crypt/encrypted_fields/range-encryptedFields-Int.json".freeze, "spec/support/crypt/encrypted_fields/encryptedFields.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_local_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_gcp.json".freeze, "spec/support/crypt/schema_maps/schema_map_local.json".freeze, "spec/support/crypt/schema_maps/schema_map_aws_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure.json".freeze, "spec/support/crypt/schema_maps/schema_map_kmip_key_alt_names.json".freeze, "spec/support/crypt/schema_maps/schema_map_azure_key_alt_names.json".freeze, "spec/support/crypt/keys/key1-document.json".freeze, "spec/support/crypt.rb".freeze, "spec/support/monitoring_ext.rb".freeze, "spec/support/common_shortcuts.rb".freeze, "spec/support/mongos_macros.rb".freeze, "spec/support/sdam_formatter_integration.rb".freeze, "spec/support/macros.rb".freeze, "spec/support/cluster_tools.rb".freeze, "spec/support/background_thread_registry.rb".freeze, "spec/support/certificates/multi-ca.crt".freeze, "spec/support/certificates/crl_client_revoked.pem".freeze, "spec/support/certificates/client-encrypted.key".freeze, "spec/support/certificates/atlas-ocsp.crt".freeze, "spec/support/certificates/client-second-level.key".freeze, "spec/support/certificates/client-x509.key".freeze, "spec/support/certificates/README.md".freeze, "spec/support/certificates/server-second-level.pem".freeze, "spec/support/certificates/client-second-level.pem".freeze, "spec/support/certificates/python-ca.crt".freeze, "spec/support/certificates/ca.crt".freeze, "spec/support/certificates/server-second-level.key".freeze, "spec/support/certificates/server-second-level.crt".freeze, "spec/support/certificates/client.crt".freeze, "spec/support/certificates/client-second-level.crt".freeze, "spec/support/certificates/client-int.crt".freeze, "spec/support/certificates/client-second-level-bundle.pem".freeze, "spec/support/certificates/client.key".freeze, "spec/support/certificates/client-x509.crt".freeze, "spec/support/certificates/server-int.crt".freeze, "spec/support/certificates/retrieve-atlas-cert".freeze, "spec/support/certificates/client-x509.pem".freeze, "spec/support/certificates/server-second-level-bundle.pem".freeze, "spec/support/certificates/crl.pem".freeze, "spec/support/certificates/client.pem".freeze, "spec/support/certificates/server.pem".freeze, "spec/support/certificates/atlas-ocsp-ca.crt".freeze, "spec/support/aws_utils.rb".freeze, "spec/support/local_resource_registry.rb".freeze, "spec/support/spec_config.rb".freeze, "spec/support/primary_socket.rb".freeze, "spec/README.md".freeze, "spec/NOTES.aws-auth.md".freeze, "spec/spec_helper.rb".freeze, "spec/kerberos/kerberos_spec.rb".freeze, "spec/runners/unified.rb".freeze, "spec/runners/connection_string.rb".freeze, "spec/runners/cmap/verifier.rb".freeze, "spec/runners/sdam.rb".freeze, "spec/runners/crud.rb".freeze, "spec/runners/transactions.rb".freeze, "spec/runners/read_write_concern_document.rb".freeze, "spec/runners/server_selection.rb".freeze, "spec/runners/server_selection_rtt.rb".freeze, "spec/runners/change_streams/outcome.rb".freeze, "spec/runners/change_streams/spec.rb".freeze, "spec/runners/change_streams/test.rb".freeze, "spec/runners/gridfs.rb".freeze, "spec/runners/transactions/operation.rb".freeze, "spec/runners/transactions/spec.rb".freeze, "spec/runners/transactions/test.rb".freeze, "spec/runners/command_monitoring.rb".freeze, "spec/runners/crud/requirement.rb".freeze, "spec/runners/crud/verifier.rb".freeze, "spec/runners/crud/outcome.rb".freeze, "spec/runners/crud/context.rb".freeze, "spec/runners/crud/operation.rb".freeze, "spec/runners/crud/test_base.rb".freeze, "spec/runners/crud/spec.rb".freeze, "spec/runners/crud/test.rb".freeze, "spec/runners/unified/error.rb".freeze, "spec/runners/unified/exceptions.rb".freeze, "spec/runners/unified/entity_map.rb".freeze, "spec/runners/unified/thread_operations.rb".freeze, "spec/runners/unified/grid_fs_operations.rb".freeze, "spec/runners/unified/ddl_operations.rb".freeze, "spec/runners/unified/support_operations.rb".freeze, "spec/runners/unified/test_group.rb".freeze, "spec/runners/unified/client_side_encryption_operations.rb".freeze, "spec/runners/unified/assertions.rb".freeze, "spec/runners/unified/event_subscriber.rb".freeze, "spec/runners/unified/change_stream_operations.rb".freeze, "spec/runners/unified/crud_operations.rb".freeze, "spec/runners/unified/test.rb".freeze, "spec/runners/auth.rb".freeze, "spec/runners/cmap.rb".freeze, "spec/runners/sdam/verifier.rb".freeze, "spec/solo/clean_exit_spec.rb".freeze, "spec/integration/ocsp_verifier_spec.rb".freeze, "spec/integration/step_down_spec.rb".freeze, "spec/integration/versioned_api_examples_spec.rb".freeze, "spec/integration/client_update_spec.rb".freeze, "spec/integration/cursor_pinning_spec.rb".freeze, "spec/integration/grid_fs_bucket_spec.rb".freeze, "spec/integration/get_more_spec.rb".freeze, "spec/integration/size_limit_spec.rb".freeze, "spec/integration/mmapv1_spec.rb".freeze, "spec/integration/secondary_reads_spec.rb".freeze, "spec/integration/bson_symbol_spec.rb".freeze, "spec/integration/bulk_write_error_message_spec.rb".freeze, "spec/integration/sdam_error_handling_spec.rb".freeze, "spec/integration/read_preference_spec.rb".freeze, "spec/integration/retryable_writes/shared/supports_retries.rb".freeze, "spec/integration/retryable_writes/shared/adds_diagnostics.rb".freeze, "spec/integration/retryable_writes/shared/only_supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_modern_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/performs_no_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_legacy_retries.rb".freeze, "spec/integration/retryable_writes/shared/does_not_support_retries.rb".freeze, "spec/integration/retryable_writes/shared/supports_modern_retries.rb".freeze, "spec/integration/retryable_writes/retryable_writes_36_and_older_spec.rb".freeze, "spec/integration/retryable_writes/retryable_writes_40_and_newer_spec.rb".freeze, "spec/integration/transactions_examples_spec.rb".freeze, "spec/integration/crud_spec.rb".freeze, "spec/integration/srv_monitoring_spec.rb".freeze, "spec/integration/server_description_spec.rb".freeze, "spec/integration/query_cache_transactions_spec.rb".freeze, "spec/integration/connect_single_rs_name_spec.rb".freeze, "spec/integration/mongos_pinning_spec.rb".freeze, "spec/integration/read_concern_spec.rb".freeze, "spec/integration/zstd_compression_spec.rb".freeze, "spec/integration/bulk_insert_spec.rb".freeze, "spec/integration/map_reduce_spec.rb".freeze, "spec/integration/operation_failure_code_spec.rb".freeze, "spec/integration/server_monitor_spec.rb".freeze, "spec/integration/client_spec.rb".freeze, "spec/integration/retryable_errors_spec.rb".freeze, "spec/integration/srv_spec.rb".freeze, "spec/integration/check_clean_slate_spec.rb".freeze, "spec/integration/aws_lambda_examples_spec.rb".freeze, "spec/integration/operation_failure_message_spec.rb".freeze, "spec/integration/time_zone_querying_spec.rb".freeze, "spec/integration/retryable_writes_errors_spec.rb".freeze, "spec/integration/command_monitoring_spec.rb".freeze, "spec/integration/client_construction_aws_auth_spec.rb".freeze, "spec/integration/x509_auth_spec.rb".freeze, "spec/integration/auth_spec.rb".freeze, "spec/integration/connection/faas_env_spec.rb".freeze, "spec/integration/server_selector_spec.rb".freeze, "spec/integration/fork_reconnect_spec.rb".freeze, "spec/integration/heartbeat_events_spec.rb".freeze, "spec/integration/connection_pool_populator_spec.rb".freeze, "spec/integration/aws_auth_credentials_cache_spec.rb".freeze, "spec/integration/server_spec.rb".freeze, "spec/integration/docs_examples_spec.rb".freeze, "spec/integration/snapshot_query_examples_spec.rb".freeze, "spec/integration/ocsp_verifier_cache_spec.rb".freeze, "spec/integration/client_authentication_options_spec.rb".freeze, "spec/integration/client_connectivity_spec.rb".freeze, "spec/integration/sdam_prose_spec.rb".freeze, "spec/integration/shell_examples_spec.rb".freeze, "spec/integration/collection_indexes_prose_spec.rb".freeze, "spec/integration/ssl_uri_options_spec.rb".freeze, "spec/integration/zlib_compression_spec.rb".freeze, "spec/integration/cursor_reaping_spec.rb".freeze, "spec/integration/snappy_compression_spec.rb".freeze, "spec/integration/query_cache_spec.rb".freeze, "spec/integration/bulk_write_spec.rb".freeze, "spec/integration/truncated_utf8_spec.rb".freeze, "spec/integration/command_spec.rb".freeze, "spec/integration/client_side_encryption/bson_size_limit_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/bypass_mongocryptd_spawn_spec.rb".freeze, "spec/integration/client_side_encryption/queryable_encryption_examples_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/unique_index_on_key_alt_names_prose_spec.rb".freeze, "spec/integration/client_side_encryption/views_spec.rb".freeze, "spec/integration/client_side_encryption/decryption_events_prose_spec.rb".freeze, "spec/integration/client_side_encryption/rewrap_prose_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_old_wire_version_spec.rb".freeze, "spec/integration/client_side_encryption/mongocryptd_prose_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_options_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_azure_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/external_key_vault_spec.rb".freeze, "spec/integration/client_side_encryption/explicit_queryable_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/custom_endpoint_spec.rb".freeze, "spec/integration/client_side_encryption/automatic_data_encryption_keys_prose_spec.rb".freeze, "spec/integration/client_side_encryption/corpus_spec.rb".freeze, "spec/integration/client_side_encryption/range_explicit_encryption_prose_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_gcp_credentials_spec.rb".freeze, "spec/integration/client_side_encryption/client_close_spec.rb".freeze, "spec/integration/client_side_encryption/kms_tls_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb".freeze, "spec/integration/client_side_encryption/data_key_spec.rb".freeze, "spec/integration/client_side_encryption/auto_encryption_spec.rb".freeze, "spec/integration/client_side_encryption/on_demand_aws_credentials_spec.rb".freeze, "spec/integration/server_selection_spec.rb".freeze, "spec/integration/ocsp_connectivity_spec.rb".freeze, "spec/integration/error_detection_spec.rb".freeze, "spec/integration/aws_auth_request_spec.rb".freeze, "spec/integration/change_stream_examples_spec.rb".freeze, "spec/integration/reconnect_spec.rb".freeze, "spec/integration/retryable_reads_errors_spec.rb".freeze, "spec/integration/transaction_pinning_spec.rb".freeze, "spec/integration/connection_spec.rb".freeze, "spec/integration/awaited_ismaster_spec.rb".freeze, "spec/integration/transactions_api_examples_spec.rb".freeze, "spec/integration/client_construction_spec.rb".freeze, "spec/integration/aws_credentials_retriever_spec.rb".freeze, "spec/integration/sdam_events_spec.rb".freeze, "spec/integration/change_stream_spec.rb".freeze, "spec/stress/connection_pool_stress_spec.rb".freeze, "spec/stress/cleanup_spec.rb".freeze, "spec/stress/push_monitor_close_spec.rb".freeze, "spec/stress/connection_pool_timing_spec.rb".freeze, "spec/stress/fork_reconnect_stress_spec.rb".freeze, "spec/atlas/operations_spec.rb".freeze, "spec/atlas/atlas_connectivity_spec.rb".freeze, "spec/USERS.md".freeze, "spec/lite_spec_helper.rb".freeze, "spec/spec_tests/retryable_writes_spec.rb".freeze, "spec/spec_tests/sdam_unified_spec.rb".freeze, "spec/spec_tests/retryable_reads_unified_spec.rb".freeze, "spec/spec_tests/max_staleness_spec.rb".freeze, "spec/spec_tests/uri_options_spec.rb".freeze, "spec/spec_tests/connection_string_spec.rb".freeze, "spec/spec_tests/change_streams_unified_spec.rb".freeze, "spec/spec_tests/collection_management_spec.rb".freeze, "spec/spec_tests/crud_spec.rb".freeze, "spec/spec_tests/gridfs_unified_spec.rb".freeze, "spec/spec_tests/load_balancers_spec.rb".freeze, "spec/spec_tests/client_side_encryption_spec.rb".freeze, "spec/spec_tests/unified_spec.rb".freeze, "spec/spec_tests/read_write_concern_document_spec.rb".freeze, "spec/spec_tests/seed_list_discovery_spec.rb".freeze, "spec/spec_tests/versioned_api_spec.rb".freeze, "spec/spec_tests/command_monitoring_unified_spec.rb".freeze, "spec/spec_tests/server_selection_rtt_spec.rb".freeze, "spec/spec_tests/sdam_monitoring_spec.rb".freeze, "spec/spec_tests/sessions_unified_spec.rb".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-client-error.yml".freeze, "spec/spec_tests/data/sessions_unified/driver-sessions-server-support.yml".freeze, "spec/spec_tests/data/sessions_unified/implicit-sessions-default-causal-consistency.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-unsupported-ops.yml".freeze, "spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-server-error.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-strict-mode.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml".freeze, "spec/spec_tests/data/versioned_api/transaction-handling.yml".freeze, "spec/spec_tests/data/versioned_api/crud-api-version-1.yml".freeze, "spec/spec_tests/data/versioned_api/runcommand-helper-no-api-version-declared.yml".freeze, "spec/spec_tests/data/versioned_api/test-commands-deprecation-errors.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-make-available.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-returned-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin.yml".freeze, "spec/spec_tests/data/cmap/pool-ready-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-idle.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-fairness.yml".freeze, "spec/spec_tests/data/cmap/pool-create-max-size.yml".freeze, "spec/spec_tests/data/cmap/connection-must-have-id.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-minPoolSize-connection-maxConnecting.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupting-pending-connections.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-schedule-run-interruptInUseConnections-false.yml".freeze, "spec/spec_tests/data/cmap/pool-create-with-options.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-stale.yml".freeze, "spec/spec_tests/data/cmap/pool-create.yml".freeze, "spec/spec_tests/data/cmap/pool-close-destroy-conns.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-error-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-close.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-maxConnecting-timeout.yml".freeze, "spec/spec_tests/data/cmap/pool-checkin-destroy-closed.yml".freeze, "spec/spec_tests/data/cmap/pool-ready.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-paused.yml".freeze, "spec/spec_tests/data/cmap/connection-must-order-ids.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-multiple.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-custom-maxConnecting-is-enforced.yml".freeze, "spec/spec_tests/data/cmap/pool-create-min-size-error.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-interrupt-immediately.yml".freeze, "spec/spec_tests/data/cmap/pool-clear-min-size.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-connection.yml".freeze, "spec/spec_tests/data/cmap/pool-checkout-no-stale.yml".freeze, "spec/spec_tests/data/cmap/wait-queue-timeout.yml".freeze, "spec/spec_tests/data/auth/connection-string.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/updateOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndUpdate-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndDelete.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/insertMany-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/bulkWrite-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/deleteOne.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/findOneAndReplace.yml".freeze, "spec/spec_tests/data/retryable_writes/legacy/replaceOne-errorLabels.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-noWritesPerformedError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/handshakeError.yml".freeze, "spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml".freeze, "spec/spec_tests/data/server_selection/Single/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetNoPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/Sharded/read/Primary.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/write/ghost.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/ghost.yml".freeze, "spec/spec_tests/data/server_selection/Unknown/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/server_selection/ReplicaSetWithPrimary/read/Primary.yml".freeze, "spec/spec_tests/data/transactions_api/callback-commits.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror-4.2.yml".freeze, "spec/spec_tests/data/transactions_api/callback-aborts.yml".freeze, "spec/spec_tests/data/transactions_api/commit-writeconcernerror.yml".freeze, "spec/spec_tests/data/transactions_api/commit-transienttransactionerror.yml".freeze, "spec/spec_tests/data/transactions_api/callback-retry.yml".freeze, "spec/spec_tests/data/transactions_api/commit.yml".freeze, "spec/spec_tests/data/transactions_api/transaction-options.yml".freeze, "spec/spec_tests/data/transactions_api/commit-retry.yml".freeze, "spec/spec_tests/data/uri_options/compression-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-auth-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-pool-options.yml".freeze, "spec/spec_tests/data/uri_options/ruby-connection-options.yml".freeze, "spec/spec_tests/data/uri_options/srv-options.yml".freeze, "spec/spec_tests/data/uri_options/tls-options.yml".freeze, "spec/spec_tests/data/uri_options/auth-options.yml".freeze, "spec/spec_tests/data/uri_options/concern-options.yml".freeze, "spec/spec_tests/data/uri_options/read-preference-options.yml".freeze, "spec/spec_tests/data/uri_options/connection-options.yml".freeze, "spec/spec_tests/data/connection_string/valid-host_identifiers.yml".freeze, "spec/spec_tests/data/connection_string/valid-db-with-dotted-name.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-absolute.yml".freeze, "spec/spec_tests/data/connection_string/valid-auth.yml".freeze, "spec/spec_tests/data/connection_string/valid-warnings.yml".freeze, "spec/spec_tests/data/connection_string/valid-options.yml".freeze, "spec/spec_tests/data/connection_string/invalid-uris.yml".freeze, "spec/spec_tests/data/connection_string/valid-unix_socket-relative.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_chain.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_second_seed_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/required_replica_set.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone.yml".freeze, "spec/spec_tests/data/sdam_monitoring/load_balancer.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_suppress_equal_description_changes.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_repeated.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_no_primary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/standalone_to_rs_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_and_secondary.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_me_mismatch.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_other_change.yml".freeze, "spec/spec_tests/data/sdam_monitoring/replica_set_with_removal.yml".freeze, "spec/spec_tests/data/sdam_monitoring/discovered_standalone.yml".freeze, "spec/spec_tests/data/max_staleness/Single/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Single/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Secondary.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/Sharded/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/Unknown/SmallMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Secondary_tags2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Incompatible.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/Nearest2.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml".freeze, "spec/spec_tests/data/max_staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateWithPipelines.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/distinct-comment.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-validation.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-validation.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-update-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/db-aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/countDocuments-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-out-readConcern.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-let.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/deleteOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-write-readPreference.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/find-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/replaceOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/find.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/find-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-validation.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-comment.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-let.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse.yml".freeze, "spec/spec_tests/data/crud_unified/insertMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-delete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndDelete-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/updateOne-errorResponse.yml".freeze, "spec/spec_tests/data/crud_unified/estimatedDocumentCount-comment.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate.yml".freeze, "spec/spec_tests/data/crud_unified/aggregate-merge.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-insertOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-let.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateMany-hint-unacknowledged.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint.yml".freeze, "spec/spec_tests/data/crud_unified/updateMany-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-updateOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-hint-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-comment.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-dots_and_dollars.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndReplace-hint.yml".freeze, "spec/spec_tests/data/crud_unified/deleteMany-hint-clientError.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-serverError.yml".freeze, "spec/spec_tests/data/crud_unified/findOneAndUpdate-comment.yml".freeze, "spec/spec_tests/data/crud_unified/find-allowdiskuse-clientError.yml".freeze, "spec/spec_tests/data/load_balancers/non-lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/lb-connection-establishment.yml".freeze, "spec/spec_tests/data/load_balancers/server-selection.yml".freeze, "spec/spec_tests/data/load_balancers/event-monitoring.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/writeConcernError.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/pre-42-server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/bulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/command.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/updateOne.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/insertMany.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/find.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/unacknowledgedBulkWrite.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/server-connection-id.yml".freeze, "spec/spec_tests/data/command_monitoring_unified/deleteOne.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-errorLabels.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-errors.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-disambiguatedPaths.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml".freeze, "spec/spec_tests/data/change_streams_unified/change-streams-clusterTime.yml".freeze, "spec/spec_tests/data/read_write_concern/document/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/document/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/read-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/connection-string/write-concern.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-4.2.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.4.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-2.6.yml".freeze, "spec/spec_tests/data/read_write_concern/operation/default-write-concern-3.2.yml".freeze, "spec/spec_tests/data/gridfs_unified/downloadByName.yml".freeze, "spec/spec_tests/data/gridfs_unified/delete.yml".freeze, "spec/spec_tests/data/gridfs_unified/download.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload-disableMD5.yml".freeze, "spec/spec_tests/data/gridfs_unified/upload.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-conflicts_with_loadBalanced-true-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-true-multiple-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-replicaSet-errors.yml".freeze, "spec/spec_tests/data/seed_list_discovery/load-balanced/loadBalanced-directConnection.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/longer-parent-in-return.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-true.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch4.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/misformatted-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch3.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/encoded-userinfo-and-db.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/loadBalanced-false-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-wrong.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-unallowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-admin-database.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/direct-connection-false.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-results-nonstandard-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/not-enough-parts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-less_than_srv_records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-ssl-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/two-txt-records.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-not-allowed-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-two-hosts.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch2.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch1.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/parent-part-mismatch5.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/no-results.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/returned-parent-too-short.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/srv-service-name.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/txt-record-with-overridden-uri-option.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-result-default-port.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/one-txt-record-multiple-strings.yml".freeze, "spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-auth.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort.yml".freeze, "spec/spec_tests/data/transactions/create-collection.yml".freeze, "spec/spec_tests/data/transactions/count.yml".freeze, "spec/spec_tests/data/transactions/update.yml".freeze, "spec/spec_tests/data/transactions/isolation.yml".freeze, "spec/spec_tests/data/transactions/errors-client.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit-errorLabels.yml".freeze, "spec/spec_tests/data/transactions/delete.yml".freeze, "spec/spec_tests/data/transactions/mongos-recovery-token.yml".freeze, "spec/spec_tests/data/transactions/mongos-pin-auto.yml".freeze, "spec/spec_tests/data/transactions/read-concern.yml".freeze, "spec/spec_tests/data/transactions/insert.yml".freeze, "spec/spec_tests/data/transactions/transaction-options-repl.yml".freeze, "spec/spec_tests/data/transactions/read-pref.yml".freeze, "spec/spec_tests/data/transactions/retryable-writes.yml".freeze, "spec/spec_tests/data/transactions/reads.yml".freeze, "spec/spec_tests/data/transactions/bulk.yml".freeze, "spec/spec_tests/data/transactions/errors.yml".freeze, "spec/spec_tests/data/transactions/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/transactions/retryable-commit.yml".freeze, "spec/spec_tests/data/transactions/create-index.yml".freeze, "spec/spec_tests/data/transactions/pin-mongos.yml".freeze, "spec/spec_tests/data/transactions/write-concern.yml".freeze, "spec/spec_tests/data/transactions/findOneAndDelete.yml".freeze, "spec/spec_tests/data/transactions/run-command.yml".freeze, "spec/spec_tests/data/transactions/abort.yml".freeze, "spec/spec_tests/data/transactions/error-labels.yml".freeze, "spec/spec_tests/data/transactions/causal-consistency.yml".freeze, "spec/spec_tests/data/transactions/findOneAndReplace.yml".freeze, "spec/spec_tests/data/transactions/commit.yml".freeze, "spec/spec_tests/data/transactions/transaction-options.yml".freeze, "spec/spec_tests/data/transactions/retryable-abort-errorLabels.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_2.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_3.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_5.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_4.yml".freeze, "spec/spec_tests/data/server_selection_rtt/first_value_zero.yml".freeze, "spec/spec_tests/data/server_selection_rtt/value_test_1.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-collation.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/insertOne.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-upsert_pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/updateMany.yml".freeze, "spec/spec_tests/data/crud/write/updateOne.yml".freeze, "spec/spec_tests/data/crud/write/insertMany.yml".freeze, "spec/spec_tests/data/crud/write/deleteMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/crud/write/updateOne-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndDelete.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-upsert.yml".freeze, "spec/spec_tests/data/crud/write/deleteOne.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-pre_2.6.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-collation.yml".freeze, "spec/spec_tests/data/crud/write/updateMany-collation.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace.yml".freeze, "spec/spec_tests/data/crud/write/bulkWrite-arrayFilters.yml".freeze, "spec/spec_tests/data/crud/write/findOneAndReplace-collation.yml".freeze, "spec/spec_tests/data/crud/write/replaceOne-collation.yml".freeze, "spec/spec_tests/data/crud/read/count.yml".freeze, "spec/spec_tests/data/crud/read/count-collation.yml".freeze, "spec/spec_tests/data/crud/read/count-empty.yml".freeze, "spec/spec_tests/data/crud/read/find-collation.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-out.yml".freeze, "spec/spec_tests/data/crud/read/distinct.yml".freeze, "spec/spec_tests/data/crud/read/find.yml".freeze, "spec/spec_tests/data/crud/read/aggregate.yml".freeze, "spec/spec_tests/data/crud/read/aggregate-collation.yml".freeze, "spec/spec_tests/data/crud/read/distinct-collation.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-failure.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-fail/entity-findCursor.yml".freeze, "spec/spec_tests/data/unified/valid-fail/operation-unsupported.yml".freeze, "spec/spec_tests/data/unified/valid-fail/ignoreResultAndError-malformed.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedError-errorResponse.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-gridfs.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-change-streams.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-cmap-events.yml".freeze, "spec/spec_tests/data/unified/valid-pass/assertNumberConnectionsCheckedOut.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-crud.yml".freeze, "spec/spec_tests/data/unified/valid-pass/entity-client-storeEventsAsEntities.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-command-monitoring.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml".freeze, "spec/spec_tests/data/unified/valid-pass/ignoreResultAndError.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-sessions.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-transactions.yml".freeze, "spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-eventType.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml".freeze, "spec/spec_tests/data/unified/valid-pass/observeSensitiveCommands.yml".freeze, "spec/spec_tests/data/unified/valid-pass/poc-retryable-reads.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/awsTemporary.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/count.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/replaceOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/basic.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml".freeze, "spec/spec_tests/data/client_side_encryption/malformedCiphertext.yml".freeze, "spec/spec_tests/data/client_side_encryption/keyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassAutoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-DecryptExistingData.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFieldsMap-defaults.yml".freeze, "spec/spec_tests/data/client_side_encryption/create-and-createIndexes.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/client_side_encryption/insert.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/distinct.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/badQueries.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateMany.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Indexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-EncryptedFields-vs-jsonSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/bulk.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Decimal-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/updateOne.yml".freeze, "spec/spec_tests/data/client_side_encryption/getMore.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/find.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/types.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-WrongType.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-BypassQueryAnalysis.yml".freeze, "spec/spec_tests/data/client_side_encryption/azureKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/countDocuments.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Delete.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/unsupportedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Date-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/localSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/bypassedCommand.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndDelete.yml".freeze, "spec/spec_tests/data/client_side_encryption/aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-CreateCollection-OldServer.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/explain.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Aggregate.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-decrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/removeKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/deleteKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/addKeyAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/createDataKey-kms_providers-invalid.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/rewrapManyDataKey-encrypt_failure.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeys.yml".freeze, "spec/spec_tests/data/client_side_encryption/unified/getKeyByAltName.yml".freeze, "spec/spec_tests/data/client_side_encryption/maxWireVersion.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Int-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/gcpKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/noSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Double-InsertFind.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DecimalPrecision-Correctness.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Compact.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-MissingKey.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-InsertFind-Unindexed.yml".freeze, "spec/spec_tests/data/client_side_encryption/validatorAndPartialFieldExpression.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-NoEncryption.yml".freeze, "spec/spec_tests/data/client_side_encryption/localKMS.yml".freeze, "spec/spec_tests/data/client_side_encryption/findOneAndReplace.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-Long-Update.yml".freeze, "spec/spec_tests/data/client_side_encryption/badSchema.yml".freeze, "spec/spec_tests/data/client_side_encryption/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml".freeze, "spec/spec_tests/data/client_side_encryption/missingKey.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/count-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/findOne-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-downloadByName-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/distinct.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollections-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/find.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabases.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listIndexes.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/countDocuments.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-client.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/aggregate-merge.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.coll.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/mapReduce.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/estimatedDocumentCount-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/gridfs-download.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionObjects.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listDatabaseObjects-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/changeStreams-db.watch.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames.yml".freeze, "spec/spec_tests/data/retryable_reads/legacy/listCollectionNames-serverErrors.yml".freeze, "spec/spec_tests/data/retryable_reads/unified/handshakeError.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-abort-handshake.yml".freeze, "spec/spec_tests/data/transactions_unified/mongos-unpin.yml".freeze, "spec/spec_tests/data/transactions_unified/retryable-commit-handshake.yml".freeze, "spec/spec_tests/data/transactions_unified/do-not-retry-read-in-transaction.yml".freeze, "spec/spec_tests/data/collection_management/timeseries-collection.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/clustered-indexes.yml".freeze, "spec/spec_tests/data/collection_management/createCollection-pre_and_post_images.yml".freeze, "spec/spec_tests/data/collection_management/modifyCollection-errorResponse.yml".freeze, "spec/spec_tests/data/sdam/load-balanced/discover_load_balancer.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam/errors/prefer-error-code.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-network.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/pre-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-timeout.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-topologyVersion-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/write_errors_ignored.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-NotWritablePrimary.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml".freeze, "spec/spec_tests/data/sdam/errors/error_handling_handshake.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-network-error.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml".freeze, "spec/spec_tests/data/sdam/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml".freeze, "spec/spec_tests/data/sdam/errors/post-42-ShutdownInProgress.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/sharded/normalize_uri_case.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_new.yml".freeze, "spec/spec_tests/data/sdam/sharded/too_old.yml".freeze, "spec/spec_tests/data/sdam/sharded/mongos_disconnect.yml".freeze, "spec/spec_tests/data/sdam/sharded/compatible.yml".freeze, "spec/spec_tests/data/sdam/sharded/multiple_mongoses.yml".freeze, "spec/spec_tests/data/sdam/sharded/discover_single_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/sharded/ls_timeout_mongos.yml".freeze, "spec/spec_tests/data/sdam/sharded/non_mongos_removed.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/single/not_ok_response.yml".freeze, "spec/spec_tests/data/sdam/single/discover_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsarbiter.yml".freeze, "spec/spec_tests/data/sdam/single/too_new.yml".freeze, "spec/spec_tests/data/sdam/single/too_old.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_unavailable_seed.yml".freeze, "spec/spec_tests/data/sdam/single/discover_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rsprimary.yml".freeze, "spec/spec_tests/data/sdam/single/too_old_then_upgraded.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/single/compatible.yml".freeze, "spec/spec_tests/data/sdam/single/ls_timeout_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_removed.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_mongos.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_rssecondary.yml".freeze, "spec/spec_tests/data/sdam/single/ruby_primary_different_address.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_standalone.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_external_ip.yml".freeze, "spec/spec_tests/data/sdam/single/standalone_using_legacy_hello.yml".freeze, "spec/spec_tests/data/sdam/single/direct_connection_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_arbiter.yml".freeze, "spec/spec_tests/data/sdam/rs/unexpected_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/set_version_can_rollback.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_changes_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/too_new.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/too_old.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible_unknown.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_greater.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/response_from_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_equal_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_reports_new_member.yml".freeze, "spec/spec_tests/data/sdam/rs/member_reconfig.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me_not_removed.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives.yml".freeze, "spec/spec_tests/data/sdam/rs/sec_not_auth.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0.yml".freeze, "spec/spec_tests/data/sdam/rs/discovery.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/null_election_id.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_hint_from_secondary_with_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/compatible.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_ghost.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_becomes_mongos.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_without_electionid-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_disconnect_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name_with_primary.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_ignore_ok_0-pre-6.0.yml".freeze, "spec/spec_tests/data/sdam/rs/wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/secondary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_ghost_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/hosts_differ_from_seeds.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_rsother_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/equal_electionids.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_new_setversion.yml".freeze, "spec/spec_tests/data/sdam/rs/member_standalone.yml".freeze, "spec/spec_tests/data/sdam/rs/replicaset_rsnp.yml".freeze, "spec/spec_tests/data/sdam/rs/use_setversion_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/non_rs_member.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_equal.yml".freeze, "spec/spec_tests/data/sdam/rs/ls_timeout.yml".freeze, "spec/spec_tests/data/sdam/rs/topology_version_less.yml".freeze, "spec/spec_tests/data/sdam/rs/setversion_greaterthan_max_without_electionid.yml".freeze, "spec/spec_tests/data/sdam/rs/electionId_precedence_setVersion.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_primary_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_passives_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_secondary_wrong_set_name_with_primary_second.yml".freeze, "spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml".freeze, "spec/spec_tests/data/sdam/rs/repeated.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_arbiters.yml".freeze, "spec/spec_tests/data/sdam/rs/normalize_case_me.yml".freeze, "spec/spec_tests/data/sdam/rs/incompatible_other.yml".freeze, "spec/spec_tests/data/sdam/rs/stepdown_change_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/ruby_primary_address_change.yml".freeze, "spec/spec_tests/data/sdam/rs/new_primary_wrong_set_name.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_hidden_replicaset.yml".freeze, "spec/spec_tests/data/sdam/rs/discover_secondary_replicaset.yml".freeze, "spec/spec_tests/data/gridfs/download_by_name.yml".freeze, "spec/spec_tests/data/gridfs/delete.yml".freeze, "spec/spec_tests/data/gridfs/download.yml".freeze, "spec/spec_tests/data/gridfs/upload.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/cancel-server-check.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/interruptInUse-pool-clear.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/pool-cleared-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-timeout.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/insert-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/connectTimeoutMS.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-misc-command-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-network-timeout-error.yml".freeze, "spec/spec_tests/data/sdam_unified/hello-network-error.yml".freeze, "spec/spec_tests/data/sdam_unified/rediscover-quickly-after-step-down.yml".freeze, "spec/spec_tests/data/sdam_unified/minPoolSize-error.yml".freeze, "spec/spec_tests/data/sdam_unified/find-shutdown-error.yml".freeze, "spec/spec_tests/data/sdam_unified/auth-error.yml".freeze, "spec/spec_tests/auth_spec.rb".freeze, "spec/spec_tests/transactions_spec.rb".freeze, "spec/spec_tests/transactions_unified_spec.rb".freeze, "spec/spec_tests/retryable_reads_spec.rb".freeze, "spec/spec_tests/gridfs_spec.rb".freeze, "spec/spec_tests/read_write_concern_operaton_spec.rb".freeze, "spec/spec_tests/cmap_spec.rb".freeze, "spec/spec_tests/server_selection_spec.rb".freeze, "spec/spec_tests/crud_unified_spec.rb".freeze, "spec/spec_tests/client_side_encryption_unified_spec.rb".freeze, "spec/spec_tests/retryable_writes_unified_spec.rb".freeze, "spec/spec_tests/read_write_concern_connection_string_spec.rb".freeze, "spec/spec_tests/sdam_spec.rb".freeze, "spec/spec_tests/transactions_api_spec.rb".freeze] - - s.specification_version = 4 - diff --git a/devel/rubygem-oj/Makefile b/devel/rubygem-oj/Makefile index 3a75a24daf9..bfbb09ad23a 100644 --- a/devel/rubygem-oj/Makefile +++ b/devel/rubygem-oj/Makefile @@ -1,5 +1,5 @@ PORTNAME= oj -PORTVERSION= 3.15.1 +PORTVERSION= 3.16.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-oj/distinfo b/devel/rubygem-oj/distinfo index 9b90bcd8064..c3da862a46a 100644 --- a/devel/rubygem-oj/distinfo +++ b/devel/rubygem-oj/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070404 -SHA256 (rubygem/oj-3.15.1.gem) = e82bfcf278acca68a10dbf0a94edbee98b3d1d6d03f9570e0569166eb6ceecef -SIZE (rubygem/oj-3.15.1.gem) = 260096 +TIMESTAMP = 1692211965 +SHA256 (rubygem/oj-3.16.0.gem) = 1752ffc49d61220d424d216aff3c109c18a1e0eac8c7e4b647c3ab21c7f0d89a +SIZE (rubygem/oj-3.16.0.gem) = 260096 diff --git a/devel/rubygem-prettier_print/Makefile b/devel/rubygem-prettier_print/Makefile new file mode 100644 index 00000000000..be913e7ef93 --- /dev/null +++ b/devel/rubygem-prettier_print/Makefile @@ -0,0 +1,17 @@ +PORTNAME= prettier_print +PORTVERSION= 1.2.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Drop-in replacement for the prettyprint gem with more functionality +WWW= https://github.com/ruby-syntax-tree/prettier_print + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= gem + +NO_ARCH= yes + +.include diff --git a/devel/rubygem-prettier_print/distinfo b/devel/rubygem-prettier_print/distinfo new file mode 100644 index 00000000000..a6ce30db609 --- /dev/null +++ b/devel/rubygem-prettier_print/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211623 +SHA256 (rubygem/prettier_print-1.2.1.gem) = a72838b5f23facff21f90a5423cdcdda19e4271092b41f4ea7f50b83929e6ff9 +SIZE (rubygem/prettier_print-1.2.1.gem) = 25088 diff --git a/devel/rubygem-prettier_print/pkg-descr b/devel/rubygem-prettier_print/pkg-descr new file mode 100644 index 00000000000..e81511d9cd8 --- /dev/null +++ b/devel/rubygem-prettier_print/pkg-descr @@ -0,0 +1,2 @@ +PrettierPrint is a drop-in replacement for the prettyprint gem with more +functionality. diff --git a/devel/rubygem-rails-i18n-rails60/Makefile b/devel/rubygem-rails-i18n-rails60/Makefile index 92b0b47f84e..51c3ba07351 100644 --- a/devel/rubygem-rails-i18n-rails60/Makefile +++ b/devel/rubygem-rails-i18n-rails60/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-i18n -PORTVERSION= 6.0.0 +PORTVERSION= 7.0.8 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails60 @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE.txt RUN_DEPENDS= rubygem-i18n>=0.7,2<2,2:devel/rubygem-i18n \ - rubygem-railties60>=6.0<7:www/rubygem-railties60 + rubygem-railties60>=6.0.0<8:www/rubygem-railties60 USES= gem diff --git a/devel/rubygem-rails-i18n-rails60/distinfo b/devel/rubygem-rails-i18n-rails60/distinfo index 77db0b17e17..3c23ef7ca9c 100644 --- a/devel/rubygem-rails-i18n-rails60/distinfo +++ b/devel/rubygem-rails-i18n-rails60/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582615250 -SHA256 (rubygem/rails-i18n-6.0.0.gem) = 072c38eb0add07a91a2581bb8d240f86b7e1253f8356eb46b5f76e44ce7eac16 -SIZE (rubygem/rails-i18n-6.0.0.gem) = 109568 +TIMESTAMP = 1692212119 +SHA256 (rubygem/rails-i18n-7.0.8.gem) = ee9ff92bc4734085aaf234157a7c1c795a29bf3f7edeede1e14e3d4247dd12cd +SIZE (rubygem/rails-i18n-7.0.8.gem) = 120832 diff --git a/devel/rubygem-rails-i18n-rails61/Makefile b/devel/rubygem-rails-i18n-rails61/Makefile index 6179ddcefc4..1c707024890 100644 --- a/devel/rubygem-rails-i18n-rails61/Makefile +++ b/devel/rubygem-rails-i18n-rails61/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-i18n -PORTVERSION= 7.0.7 +PORTVERSION= 7.0.8 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails61 diff --git a/devel/rubygem-rails-i18n-rails61/distinfo b/devel/rubygem-rails-i18n-rails61/distinfo index b8f3f599210..f72dd503b04 100644 --- a/devel/rubygem-rails-i18n-rails61/distinfo +++ b/devel/rubygem-rails-i18n-rails61/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162484 -SHA256 (rubygem/rails-i18n-7.0.7.gem) = 6fd879657a39b8ce299b7c84d90ad439c92a351f58f1d65eaeb219c2f52b70ad -SIZE (rubygem/rails-i18n-7.0.7.gem) = 120320 +TIMESTAMP = 1692212121 +SHA256 (rubygem/rails-i18n-7.0.8.gem) = ee9ff92bc4734085aaf234157a7c1c795a29bf3f7edeede1e14e3d4247dd12cd +SIZE (rubygem/rails-i18n-7.0.8.gem) = 120832 diff --git a/devel/rubygem-rails-i18n-rails70/Makefile b/devel/rubygem-rails-i18n-rails70/Makefile index 03d528a5369..a8b9c414ae0 100644 --- a/devel/rubygem-rails-i18n-rails70/Makefile +++ b/devel/rubygem-rails-i18n-rails70/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-i18n -PORTVERSION= 7.0.7 +PORTVERSION= 7.0.8 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails70 diff --git a/devel/rubygem-rails-i18n-rails70/distinfo b/devel/rubygem-rails-i18n-rails70/distinfo index a4a08b52313..7d7b1325308 100644 --- a/devel/rubygem-rails-i18n-rails70/distinfo +++ b/devel/rubygem-rails-i18n-rails70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162366 -SHA256 (rubygem/rails-i18n-7.0.7.gem) = 6fd879657a39b8ce299b7c84d90ad439c92a351f58f1d65eaeb219c2f52b70ad -SIZE (rubygem/rails-i18n-7.0.7.gem) = 120320 +TIMESTAMP = 1692211967 +SHA256 (rubygem/rails-i18n-7.0.8.gem) = ee9ff92bc4734085aaf234157a7c1c795a29bf3f7edeede1e14e3d4247dd12cd +SIZE (rubygem/rails-i18n-7.0.8.gem) = 120832 diff --git a/devel/rubygem-react-rails-rails5/Makefile b/devel/rubygem-react-rails-rails5/Makefile index 76300099540..79cd1aa6ea6 100644 --- a/devel/rubygem-react-rails-rails5/Makefile +++ b/devel/rubygem-react-rails-rails5/Makefile @@ -1,5 +1,5 @@ PORTNAME= react-rails -PORTVERSION= 2.7.1 +PORTVERSION= 3.1.1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 diff --git a/devel/rubygem-react-rails-rails5/distinfo b/devel/rubygem-react-rails-rails5/distinfo index 20e4bee8ea1..fbea03dd89c 100644 --- a/devel/rubygem-react-rails-rails5/distinfo +++ b/devel/rubygem-react-rails-rails5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162490 -SHA256 (rubygem/react-rails-2.7.1.gem) = 30f72c4807e38ba9aceaf9d02c399a7eabc5387ab81c06f1f765ecd1ebdea249 -SIZE (rubygem/react-rails-2.7.1.gem) = 514560 +TIMESTAMP = 1692212125 +SHA256 (rubygem/react-rails-3.1.1.gem) = c1e5c51657c690c5c91616d9506b8144b7d30ba13fb4e1c17043cbead70349aa +SIZE (rubygem/react-rails-3.1.1.gem) = 676864 diff --git a/devel/rubygem-react-rails/Makefile b/devel/rubygem-react-rails/Makefile index e0b1c90e2f6..12e84ada96b 100644 --- a/devel/rubygem-react-rails/Makefile +++ b/devel/rubygem-react-rails/Makefile @@ -1,5 +1,5 @@ PORTNAME= react-rails -PORTVERSION= 2.7.1 +PORTVERSION= 3.1.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-react-rails/distinfo b/devel/rubygem-react-rails/distinfo index 063b4a5c48c..717b2ebb97b 100644 --- a/devel/rubygem-react-rails/distinfo +++ b/devel/rubygem-react-rails/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162488 -SHA256 (rubygem/react-rails-2.7.1.gem) = 30f72c4807e38ba9aceaf9d02c399a7eabc5387ab81c06f1f765ecd1ebdea249 -SIZE (rubygem/react-rails-2.7.1.gem) = 514560 +TIMESTAMP = 1692212123 +SHA256 (rubygem/react-rails-3.1.1.gem) = c1e5c51657c690c5c91616d9506b8144b7d30ba13fb4e1c17043cbead70349aa +SIZE (rubygem/react-rails-3.1.1.gem) = 676864 diff --git a/devel/rubygem-redlock/Makefile b/devel/rubygem-redlock/Makefile index 677423b0bad..02858972260 100644 --- a/devel/rubygem-redlock/Makefile +++ b/devel/rubygem-redlock/Makefile @@ -1,6 +1,5 @@ PORTNAME= redlock -PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTVERSION= 2.0.3 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,7 +10,7 @@ WWW= https://github.com/leandromoreira/redlock-rb LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-redis-client>=0.14.1<1:databases/rubygem-redis-client +RUN_DEPENDS= rubygem-redis-client>=0.14.1<1.0.0:databases/rubygem-redis-client USES= gem diff --git a/devel/rubygem-redlock/distinfo b/devel/rubygem-redlock/distinfo index f1bc9472c5e..ba976c5857e 100644 --- a/devel/rubygem-redlock/distinfo +++ b/devel/rubygem-redlock/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167108 -SHA256 (rubygem/redlock-2.0.2.gem) = 9a750c2fa8fad96f9546114ffd659975e1e6b7fb0489fa24ff67a83cbc81ffd0 -SIZE (rubygem/redlock-2.0.2.gem) = 18432 +TIMESTAMP = 1692640080 +SHA256 (rubygem/redlock-2.0.3.gem) = 10cb53db7e442c66df6f500506ba46453575e5e9fa8e33248627a8e78030e8a1 +SIZE (rubygem/redlock-2.0.3.gem) = 18944 diff --git a/devel/rubygem-redlock/files/patch-gemspec b/devel/rubygem-redlock/files/patch-gemspec deleted file mode 100644 index edcc9bb256d..00000000000 --- a/devel/rubygem-redlock/files/patch-gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- redlock.gemspec.orig 2023-08-03 15:43:05 UTC -+++ redlock.gemspec -@@ -20,7 +20,7 @@ Gem::Specification.new do |s| - - s.specification_version = 4 - -- s.add_runtime_dependency(%q.freeze, ["~> 0.14.1"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 0.14", ">= 0.14.1"]) - s.add_development_dependency(%q.freeze, ["~> 2.2"]) - s.add_development_dependency(%q.freeze, ["~> 0.8"]) - s.add_development_dependency(%q.freeze, [">= 2.3.0", "~> 2.3.1"]) diff --git a/devel/rubygem-reline/Makefile b/devel/rubygem-reline/Makefile index 4c1b56d6f94..46a805db301 100644 --- a/devel/rubygem-reline/Makefile +++ b/devel/rubygem-reline/Makefile @@ -1,5 +1,5 @@ PORTNAME= reline -DISTVERSION= 0.3.7 +DISTVERSION= 0.3.8 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-reline/distinfo b/devel/rubygem-reline/distinfo index da8e82d8bca..3c2d97d615e 100644 --- a/devel/rubygem-reline/distinfo +++ b/devel/rubygem-reline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690449747 -SHA256 (rubygem/reline-0.3.7.gem) = 52a3b04bf7ff88766a2584a02c48e17f1e1aa62cdc01e71267daa1b08232cbd8 -SIZE (rubygem/reline-0.3.7.gem) = 57856 +TIMESTAMP = 1692711922 +SHA256 (rubygem/reline-0.3.8.gem) = 8ba214a53cb65224d39cd623cce6b35db553c711b0c05175c5c40ef3cfb66153 +SIZE (rubygem/reline-0.3.8.gem) = 57856 diff --git a/devel/rubygem-rubocop-performance/Makefile b/devel/rubygem-rubocop-performance/Makefile index 109fdc36839..c0c131202f3 100644 --- a/devel/rubygem-rubocop-performance/Makefile +++ b/devel/rubygem-rubocop-performance/Makefile @@ -1,5 +1,5 @@ PORTNAME= rubocop-performance -PORTVERSION= 1.18.0 +PORTVERSION= 1.19.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-rubocop-performance/distinfo b/devel/rubygem-rubocop-performance/distinfo index ec52f563376..0b8781099ee 100644 --- a/devel/rubygem-rubocop-performance/distinfo +++ b/devel/rubygem-rubocop-performance/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685162372 -SHA256 (rubygem/rubocop-performance-1.18.0.gem) = 4c9d74f1b5bfaffb5b1cdb843279364198ac804e2644ae194615834dd011e02e -SIZE (rubygem/rubocop-performance-1.18.0.gem) = 41472 +TIMESTAMP = 1692211969 +SHA256 (rubygem/rubocop-performance-1.19.0.gem) = b693ba4a36482fafd927ce0f397f1186d13e31088afe0f2650588dc9c7136aec +SIZE (rubygem/rubocop-performance-1.19.0.gem) = 42496 diff --git a/devel/rubygem-rubocop-rspec/Makefile b/devel/rubygem-rubocop-rspec/Makefile index e2379f9c7f6..31d15a7458e 100644 --- a/devel/rubygem-rubocop-rspec/Makefile +++ b/devel/rubygem-rubocop-rspec/Makefile @@ -1,5 +1,5 @@ PORTNAME= rubocop-rspec -PORTVERSION= 2.23.0 +PORTVERSION= 2.23.2 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-rubocop-rspec/distinfo b/devel/rubygem-rubocop-rspec/distinfo index dd4ba58280f..6b157d2b93b 100644 --- a/devel/rubygem-rubocop-rspec/distinfo +++ b/devel/rubygem-rubocop-rspec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070410 -SHA256 (rubygem/rubocop-rspec-2.23.0.gem) = dee5bb767e290f8c655751c3297493d96d44ecedacb7fc86663ff00580276650 -SIZE (rubygem/rubocop-rspec-2.23.0.gem) = 89088 +TIMESTAMP = 1692211971 +SHA256 (rubygem/rubocop-rspec-2.23.2.gem) = aef4a8d16661948d2e733ebef76d57e8c81fb34d5621a7e8ce0b76eb14f19c7a +SIZE (rubygem/rubocop-rspec-2.23.2.gem) = 89600 diff --git a/devel/rubygem-rubocop/Makefile b/devel/rubygem-rubocop/Makefile index e1ef2a405e8..553a9bbea7c 100644 --- a/devel/rubygem-rubocop/Makefile +++ b/devel/rubygem-rubocop/Makefile @@ -1,5 +1,5 @@ PORTNAME= rubocop -PORTVERSION= 1.55.1 +PORTVERSION= 1.56.0 CATEGORIES= devel ruby MASTER_SITES= RG @@ -10,7 +10,8 @@ WWW= https://rubocop.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-json>=2.3<3:devel/rubygem-json \ +RUN_DEPENDS= rubygem-base64>=0.1.1<0.2:converters/rubygem-base64 \ + rubygem-json>=2.3<3:devel/rubygem-json \ rubygem-language_server-protocol>=3.17.0:devel/rubygem-language_server-protocol \ rubygem-parallel>=1.10<2:sysutils/rubygem-parallel \ rubygem-parser>=3.2.2.3:devel/rubygem-parser \ diff --git a/devel/rubygem-rubocop/distinfo b/devel/rubygem-rubocop/distinfo index 363b6216084..69013fdfb16 100644 --- a/devel/rubygem-rubocop/distinfo +++ b/devel/rubygem-rubocop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070492 -SHA256 (rubygem/rubocop-1.55.1.gem) = 35e7ab338bcfd883122a3cb828b33aaa32c6759ab423ed872e10198c152e3769 -SIZE (rubygem/rubocop-1.55.1.gem) = 616960 +TIMESTAMP = 1692212127 +SHA256 (rubygem/rubocop-1.56.0.gem) = 96152bc00f2bd09df20a48133cb2b5c34267414d665f424d7cc127470c1fe2c5 +SIZE (rubygem/rubocop-1.56.0.gem) = 617984 diff --git a/devel/rubygem-ruby-lsp/Makefile b/devel/rubygem-ruby-lsp/Makefile new file mode 100644 index 00000000000..51f7f515987 --- /dev/null +++ b/devel/rubygem-ruby-lsp/Makefile @@ -0,0 +1,26 @@ +PORTNAME= ruby-lsp +PORTVERSION= 0.8.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Opinionated language server for Ruby +WWW= https://shopify.github.io/ruby-lsp/ \ + https://github.com/Shopify/ruby-lsp + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-language_server-protocol>=3.17.0<3.18:devel/rubygem-language_server-protocol \ + rubygem-sorbet-runtime>=0:devel/rubygem-sorbet-runtime \ + rubygem-syntax_tree>=6.1.1<7:devel/rubygem-syntax_tree \ + rubygem-yarp>=0.6.0<0.7:textproc/rubygem-yarp + +USES= gem + +NO_ARCH= yes + +PLIST_FILES= bin/ruby-lsp \ + bin/ruby-lsp-check + +.include diff --git a/devel/rubygem-ruby-lsp/distinfo b/devel/rubygem-ruby-lsp/distinfo new file mode 100644 index 00000000000..d23e2b7b4d9 --- /dev/null +++ b/devel/rubygem-ruby-lsp/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211621 +SHA256 (rubygem/ruby-lsp-0.8.1.gem) = f8e4be69799cdff14b6583d6fcec13c81f11abab7cac8f0334562e12648ebb84 +SIZE (rubygem/ruby-lsp-0.8.1.gem) = 57344 diff --git a/devel/rubygem-ruby-lsp/pkg-descr b/devel/rubygem-ruby-lsp/pkg-descr new file mode 100644 index 00000000000..b5465552e39 --- /dev/null +++ b/devel/rubygem-ruby-lsp/pkg-descr @@ -0,0 +1,4 @@ +The Ruby LSP is an implementation of the language server protocol for Ruby, used +to improve rich features in editors. It is a part of a wider goal to provide a +state-of-the-art experience to Ruby developers using modern standards for +cross-editor features, documentation and debugging. diff --git a/devel/rubygem-ruby_dep/files/patch-gemspec b/devel/rubygem-ruby_dep/files/patch-gemspec index 6895836bd21..032793a35cf 100644 --- a/devel/rubygem-ruby_dep/files/patch-gemspec +++ b/devel/rubygem-ruby_dep/files/patch-gemspec @@ -6,6 +6,6 @@ s.licenses = ["MIT".freeze] - s.required_ruby_version = Gem::Requirement.new(["~> 2.2".freeze, ">= 2.2.5".freeze]) + s.required_ruby_version = Gem::Requirement.new([">= 2.2".freeze, ">= 2.2.5".freeze]) - s.rubygems_version = "3.4.18".freeze + s.rubygems_version = "3.4.19".freeze s.summary = "Extracts supported Ruby versions from Travis file".freeze diff --git a/devel/rubygem-ruby_memcheck/Makefile b/devel/rubygem-ruby_memcheck/Makefile new file mode 100644 index 00000000000..1168216a82e --- /dev/null +++ b/devel/rubygem-ruby_memcheck/Makefile @@ -0,0 +1,22 @@ +PORTNAME= ruby_memcheck +PORTVERSION= 2.1.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Use Valgrind memcheck without going crazy +WWW= https://github.com/Shopify/ruby_memcheck + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-nokogiri>=0:textproc/rubygem-nokogiri \ + valgrind>=3.20.0,1:devel/valgrind + +USES= gem + +NO_ARCH= yes + +PLIST_FILES= bin/ruby_memcheck + +.include diff --git a/devel/rubygem-ruby_memcheck/distinfo b/devel/rubygem-ruby_memcheck/distinfo new file mode 100644 index 00000000000..eb94e822d71 --- /dev/null +++ b/devel/rubygem-ruby_memcheck/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211625 +SHA256 (rubygem/ruby_memcheck-2.1.1.gem) = 83ddcbdd2517f096d632969969d12827915921624aa57d936be200d0bc18ed45 +SIZE (rubygem/ruby_memcheck-2.1.1.gem) = 15360 diff --git a/devel/rubygem-ruby_memcheck/pkg-descr b/devel/rubygem-ruby_memcheck/pkg-descr new file mode 100644 index 00000000000..73a2e30b740 --- /dev/null +++ b/devel/rubygem-ruby_memcheck/pkg-descr @@ -0,0 +1,9 @@ +ruby_memcheck provides a sane way to use Valgrind's memcheck on your native +extension gem. + +Valgrind's memcheck is a great tool to find and debug memory issues (e.g. memory +leak, use-after-free, etc.). However, it doesn't work well on Ruby because Ruby +does not free all of the memory it allocates during shutdown. This results in +Valgrind reporting thousands (or more) false positives, making it very difficult +for Valgrind to actually be useful. This gem solves the problem by using +heuristics to filter out false positives. diff --git a/devel/rubygem-sorbet-runtime/Makefile b/devel/rubygem-sorbet-runtime/Makefile new file mode 100644 index 00000000000..ed9bcbd2bd1 --- /dev/null +++ b/devel/rubygem-sorbet-runtime/Makefile @@ -0,0 +1,17 @@ +PORTNAME= sorbet-runtime +PORTVERSION= 0.5.10974 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Sorbet's runtime type checking component +WWW= https://sorbet.org/ \ + https://github.com/sorbet/sorbet + +LICENSE= APACHE20 + +USES= gem + +NO_ARCH= yes + +.include diff --git a/devel/rubygem-sorbet-runtime/distinfo b/devel/rubygem-sorbet-runtime/distinfo new file mode 100644 index 00000000000..5f9de433cd6 --- /dev/null +++ b/devel/rubygem-sorbet-runtime/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692640082 +SHA256 (rubygem/sorbet-runtime-0.5.10974.gem) = f412bb485e0eac82f1a7df9e539a8e9df0466f069f4f22f45938dec292861e8d +SIZE (rubygem/sorbet-runtime-0.5.10974.gem) = 88064 diff --git a/devel/rubygem-sorbet-runtime/pkg-descr b/devel/rubygem-sorbet-runtime/pkg-descr new file mode 100644 index 00000000000..09a4093c6aa --- /dev/null +++ b/devel/rubygem-sorbet-runtime/pkg-descr @@ -0,0 +1,3 @@ +Sorbet is a fast and powerful type checker designed for Ruby. It aims to be easy +to add to existing codebases with gradual types, and fast to respond with errors +and suggestions. diff --git a/devel/rubygem-stoplight/Makefile b/devel/rubygem-stoplight/Makefile index eceec150d3d..f0ea81ee09a 100644 --- a/devel/rubygem-stoplight/Makefile +++ b/devel/rubygem-stoplight/Makefile @@ -1,6 +1,5 @@ PORTNAME= stoplight -PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTVERSION= 4.0.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-stoplight/distinfo b/devel/rubygem-stoplight/distinfo index 52578f07fb3..d7a72b04a79 100644 --- a/devel/rubygem-stoplight/distinfo +++ b/devel/rubygem-stoplight/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590476 -SHA256 (rubygem/stoplight-3.0.1.gem) = 069f17337954b531db7333ac9775dfdd6e33f6e5c449963239e8d8bc3786b066 -SIZE (rubygem/stoplight-3.0.1.gem) = 21504 +TIMESTAMP = 1692640084 +SHA256 (rubygem/stoplight-4.0.0.gem) = 7cdc9dad1fde2ef7219c3c0e5d158ce2441264b60c4d51bd135c815e030964ea +SIZE (rubygem/stoplight-4.0.0.gem) = 27136 diff --git a/devel/rubygem-stringio/Makefile b/devel/rubygem-stringio/Makefile index 8314e548e0a..cfeb611c8dc 100644 --- a/devel/rubygem-stringio/Makefile +++ b/devel/rubygem-stringio/Makefile @@ -1,5 +1,5 @@ PORTNAME= stringio -PORTVERSION= 3.0.7 +PORTVERSION= 3.0.8 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-stringio/distinfo b/devel/rubygem-stringio/distinfo index d4cb0107bda..288f35bbb09 100644 --- a/devel/rubygem-stringio/distinfo +++ b/devel/rubygem-stringio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685793082 -SHA256 (rubygem/stringio-3.0.7.gem) = b681d64f2b0a7b9a6c1b493795a700bbfa8a083a29a478387ecca4743ed9a714 -SIZE (rubygem/stringio-3.0.7.gem) = 15872 +TIMESTAMP = 1692211973 +SHA256 (rubygem/stringio-3.0.8.gem) = 135b23c65628dc395d49cf660df1c10b6417338f8dac175bf59762b97a33a947 +SIZE (rubygem/stringio-3.0.8.gem) = 15872 diff --git a/devel/rubygem-strong_migrations/Makefile b/devel/rubygem-strong_migrations/Makefile index 81ab6e58516..c9f5c3bdd1e 100644 --- a/devel/rubygem-strong_migrations/Makefile +++ b/devel/rubygem-strong_migrations/Makefile @@ -1,5 +1,5 @@ PORTNAME= strong_migrations -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-strong_migrations/distinfo b/devel/rubygem-strong_migrations/distinfo index efed53b6100..01c5f5f13a0 100644 --- a/devel/rubygem-strong_migrations/distinfo +++ b/devel/rubygem-strong_migrations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070498 -SHA256 (rubygem/strong_migrations-1.6.0.gem) = b18af83f9c4adf62b0c58fdb87035b62e261856412106e8ce030804631888897 -SIZE (rubygem/strong_migrations-1.6.0.gem) = 28160 +TIMESTAMP = 1692212129 +SHA256 (rubygem/strong_migrations-1.6.1.gem) = 84bfd48f8391cb26aef8a88f878393cf4eeb8db3cf92920bb79f31ca8f6d3c87 +SIZE (rubygem/strong_migrations-1.6.1.gem) = 28160 diff --git a/devel/rubygem-syntax_tree/Makefile b/devel/rubygem-syntax_tree/Makefile new file mode 100644 index 00000000000..c860e73ebe9 --- /dev/null +++ b/devel/rubygem-syntax_tree/Makefile @@ -0,0 +1,23 @@ +PORTNAME= syntax_tree +PORTVERSION= 6.1.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Parser based on ripper +WWW= https://ruby-syntax-tree.github.io/syntax_tree/ \ + https://github.com/ruby-syntax-tree/syntax_tree + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-prettier_print>=1.2.0:devel/rubygem-prettier_print + +USES= gem + +NO_ARCH= yes + +PLIST_FILES= bin/stree \ + bin/yarv + +.include diff --git a/devel/rubygem-syntax_tree/distinfo b/devel/rubygem-syntax_tree/distinfo new file mode 100644 index 00000000000..ad86e6dd277 --- /dev/null +++ b/devel/rubygem-syntax_tree/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211629 +SHA256 (rubygem/syntax_tree-6.1.1.gem) = eb03ff60f51ac29af5cf4fe39bc06e6714cd5b8b3f91cbec2a61e0b8602f5598 +SIZE (rubygem/syntax_tree-6.1.1.gem) = 218112 diff --git a/devel/rubygem-syntax_tree/pkg-descr b/devel/rubygem-syntax_tree/pkg-descr new file mode 100644 index 00000000000..c3730568c0a --- /dev/null +++ b/devel/rubygem-syntax_tree/pkg-descr @@ -0,0 +1,8 @@ +Syntax Tree is a suite of tools built on top of the internal CRuby parser. It +provides the ability to generate a syntax tree from source, as well as the tools +necessary to inspect and manipulate that syntax tree. It can be used to build +formatters, linters, language servers, and more. + +It is built with only standard library dependencies. It additionally ships with +a plugin system so that you can build your own syntax trees from other languages +and incorporate these tools. diff --git a/devel/rubygem-timecop/Makefile b/devel/rubygem-timecop/Makefile index f8ae4554312..5bd3d423f63 100644 --- a/devel/rubygem-timecop/Makefile +++ b/devel/rubygem-timecop/Makefile @@ -1,5 +1,5 @@ PORTNAME= timecop -PORTVERSION= 0.9.6 +PORTVERSION= 0.9.8 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-timecop/distinfo b/devel/rubygem-timecop/distinfo index 81f763ba520..7324448bc8b 100644 --- a/devel/rubygem-timecop/distinfo +++ b/devel/rubygem-timecop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669057523 -SHA256 (rubygem/timecop-0.9.6.gem) = cc8586a03284cf314db6f49a5ff41882b9435b1f40d96f4f3403c10ffa239d36 -SIZE (rubygem/timecop-0.9.6.gem) = 17408 +TIMESTAMP = 1692211975 +SHA256 (rubygem/timecop-0.9.8.gem) = 89996da54eafb25c007d309099ae18a1cb1c6a59fe42f7f1ab4148e21e98f563 +SIZE (rubygem/timecop-0.9.8.gem) = 11776 diff --git a/devel/rubygem-xdg3/files/patch-gemspec b/devel/rubygem-xdg3/files/patch-gemspec index b69320fdd28..b5f76b1c7d4 100644 --- a/devel/rubygem-xdg3/files/patch-gemspec +++ b/devel/rubygem-xdg3/files/patch-gemspec @@ -6,6 +6,6 @@ s.licenses = ["Apache-2.0".freeze] - s.required_ruby_version = Gem::Requirement.new("~> 2.6".freeze) + s.required_ruby_version = Gem::Requirement.new(">= 2.6".freeze) - s.rubygems_version = "3.4.18".freeze + s.rubygems_version = "3.4.19".freeze s.summary = "Provides an implementation of the XDG Base Directory Specification.".freeze diff --git a/devel/rubygem-xdg4/files/patch-gemspec b/devel/rubygem-xdg4/files/patch-gemspec index 6363f973106..8a007f553c2 100644 --- a/devel/rubygem-xdg4/files/patch-gemspec +++ b/devel/rubygem-xdg4/files/patch-gemspec @@ -6,6 +6,6 @@ s.licenses = ["Apache-2.0".freeze] - s.required_ruby_version = Gem::Requirement.new("~> 2.7".freeze) + s.required_ruby_version = Gem::Requirement.new(">= 2.7".freeze) - s.rubygems_version = "3.4.18".freeze + s.rubygems_version = "3.4.19".freeze s.summary = "Provides an implementation of the XDG Base Directory Specification.".freeze end diff --git a/devel/sdsl-lite/Makefile b/devel/sdsl-lite/Makefile index b8ebb72dc4d..fd763bd755f 100644 --- a/devel/sdsl-lite/Makefile +++ b/devel/sdsl-lite/Makefile @@ -23,7 +23,7 @@ CMAKE_ON= BUILD_SHARED_LIBS CONFLICTS_INSTALL= libdivsufsort -PORTSCOUT= limit:^[v1-9] # prevent tags like c++11v1 +PORTSCOUT= limit:^[v1-9].*$$ # prevent tags like c++11v1 post-install: # remove bundled gtest, see https://github.com/simongog/sdsl-lite/issues/458 ${RM} -r \ diff --git a/devel/sentry-cli/Makefile b/devel/sentry-cli/Makefile index 42bb924f92d..5ba8f851e9c 100644 --- a/devel/sentry-cli/Makefile +++ b/devel/sentry-cli/Makefile @@ -1,6 +1,5 @@ PORTNAME= sentry-cli -DISTVERSION= 2.18.1 -PORTREVISION= 2 +DISTVERSION= 2.20.5 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org diff --git a/devel/sentry-cli/Makefile.crates b/devel/sentry-cli/Makefile.crates index 07258fe1884..d581be796aa 100644 --- a/devel/sentry-cli/Makefile.crates +++ b/devel/sentry-cli/Makefile.crates @@ -73,7 +73,7 @@ CARGO_CRATES= addr2line-0.19.0 \ dunce-1.0.3 \ either-1.8.1 \ elementtree-1.2.3 \ - elsa-1.7.0 \ + elsa-1.8.1 \ encode_unicode-0.3.6 \ encode_unicode-1.0.0 \ encoding-0.2.33 \ @@ -95,11 +95,11 @@ CARGO_CRATES= addr2line-0.19.0 \ funty-2.0.0 \ generic-array-0.14.6 \ getrandom-0.2.8 \ - gimli-0.27.1 \ + gimli-0.27.3 \ git2-0.16.1 \ glob-0.3.1 \ globset-0.4.10 \ - goblin-0.6.0 \ + goblin-0.6.1 \ hashbrown-0.12.3 \ hermit-abi-0.1.19 \ hermit-abi-0.2.6 \ @@ -131,7 +131,6 @@ CARGO_CRATES= addr2line-0.19.0 \ joinery-2.1.0 \ js-sys-0.3.60 \ lazy_static-1.4.0 \ - lazycell-1.3.0 \ leb128-0.2.5 \ libc-0.2.139 \ libgit2-sys-0.14.2+1.5.1 \ @@ -143,10 +142,11 @@ CARGO_CRATES= addr2line-0.19.0 \ lock_api-0.4.9 \ log-0.4.17 \ mac-process-info-0.2.0 \ + magic_string-0.3.4 \ match_cfg-0.1.0 \ maybe-owned-0.3.4 \ memchr-2.5.0 \ - memmap2-0.5.8 \ + memmap2-0.5.10 \ memoffset-0.7.1 \ might-be-minified-0.3.0 \ minimal-lexical-0.2.1 \ @@ -162,7 +162,7 @@ CARGO_CRATES= addr2line-0.19.0 \ num_cpus-1.15.0 \ number_prefix-0.3.0 \ object-0.30.3 \ - once_cell-1.17.0 \ + once_cell-1.18.0 \ opaque-debug-0.3.0 \ open-3.2.0 \ openssl-probe-0.1.5 \ @@ -194,10 +194,10 @@ CARGO_CRATES= addr2line-0.19.0 \ predicates-2.1.5 \ predicates-core-1.0.5 \ prettytable-rs-0.10.0 \ - proc-macro2-1.0.50 \ + proc-macro2-1.0.60 \ proguard-5.0.0 \ quick-xml-0.26.0 \ - quote-1.0.23 \ + quote-1.0.28 \ r2d2-0.8.10 \ radium-0.7.0 \ rand-0.8.5 \ @@ -233,15 +233,15 @@ CARGO_CRATES= addr2line-0.19.0 \ semver-0.9.0 \ semver-1.0.16 \ semver-parser-0.7.0 \ - sentry-0.31.1 \ - sentry-anyhow-0.31.1 \ - sentry-backtrace-0.31.1 \ - sentry-contexts-0.31.1 \ - sentry-core-0.31.1 \ - sentry-types-0.31.1 \ - serde-1.0.152 \ - serde_derive-1.0.152 \ - serde_json-1.0.93 \ + sentry-0.31.2 \ + sentry-anyhow-0.31.2 \ + sentry-backtrace-0.31.2 \ + sentry-contexts-0.31.2 \ + sentry-core-0.31.2 \ + sentry-types-0.31.2 \ + serde-1.0.164 \ + serde_derive-1.0.164 \ + serde_json-1.0.97 \ serde_spanned-0.6.1 \ serde_urlencoded-0.7.1 \ sha1-0.10.5 \ @@ -256,25 +256,26 @@ CARGO_CRATES= addr2line-0.19.0 \ snapbox-0.4.4 \ snapbox-macros-0.3.1 \ socket2-0.4.7 \ - sourcemap-6.2.3 \ + sourcemap-6.4.1 \ stable_deref_trait-1.2.0 \ string_cache-0.8.4 \ strsim-0.10.0 \ subtle-2.4.1 \ - symbolic-12.0.0 \ - symbolic-common-12.0.0 \ - symbolic-debuginfo-12.0.0 \ - symbolic-il2cpp-12.0.0 \ - symbolic-ppdb-12.0.0 \ - symbolic-symcache-12.0.0 \ + symbolic-12.1.5 \ + symbolic-common-12.1.5 \ + symbolic-debuginfo-12.1.5 \ + symbolic-il2cpp-12.1.5 \ + symbolic-ppdb-12.1.5 \ + symbolic-symcache-12.1.5 \ syn-1.0.107 \ + syn-2.0.18 \ tap-1.0.1 \ tempfile-3.3.0 \ term-0.7.0 \ termcolor-1.2.0 \ terminal_size-0.2.3 \ - thiserror-1.0.38 \ - thiserror-impl-1.0.38 \ + thiserror-1.0.40 \ + thiserror-impl-1.0.40 \ thread_local-1.1.4 \ time-0.1.45 \ time-0.3.17 \ @@ -302,6 +303,7 @@ CARGO_CRATES= addr2line-0.19.0 \ uuid-1.3.0 \ vcpkg-0.2.15 \ version_check-0.9.4 \ + vlq-0.5.1 \ wait-timeout-0.2.0 \ walkdir-2.3.2 \ wasi-0.10.0+wasi-snapshot-preview1 \ @@ -311,7 +313,7 @@ CARGO_CRATES= addr2line-0.19.0 \ wasm-bindgen-macro-0.2.83 \ wasm-bindgen-macro-support-0.2.83 \ wasm-bindgen-shared-0.2.83 \ - wasmparser-0.95.0 \ + wasmparser-0.102.0 \ watto-0.1.0 \ which-4.4.0 \ winapi-0.2.8 \ diff --git a/devel/sentry-cli/distinfo b/devel/sentry-cli/distinfo index 492d62b8dd9..5bb7ffcba3f 100644 --- a/devel/sentry-cli/distinfo +++ b/devel/sentry-cli/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1685781128 +TIMESTAMP = 1692656304 SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97 SIZE (rust/crates/addr2line-0.19.0.crate) = 33210 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -149,8 +149,8 @@ SHA256 (rust/crates/either-1.8.1.crate) = 7fcaabb2fef8c910e7f4c7ce9f67a1283a1715 SIZE (rust/crates/either-1.8.1.crate) = 16027 SHA256 (rust/crates/elementtree-1.2.3.crate) = 3efd4742acf458718a6456e0adf0b4d734d6b783e452bbf1ac36bf31f4085cb3 SIZE (rust/crates/elementtree-1.2.3.crate) = 56821 -SHA256 (rust/crates/elsa-1.7.0.crate) = 2b4b5d23ed6b6948d68240aafa4ac98e568c9a020efd9d4201a6288bc3006e09 -SIZE (rust/crates/elsa-1.7.0.crate) = 13892 +SHA256 (rust/crates/elsa-1.8.1.crate) = b5e0aca8dce8856e420195bd13b6a64de3334235ccc9214e824b86b12bf26283 +SIZE (rust/crates/elsa-1.8.1.crate) = 16395 SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741 SHA256 (rust/crates/encode_unicode-1.0.0.crate) = 34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0 @@ -193,16 +193,16 @@ SHA256 (rust/crates/generic-array-0.14.6.crate) = bff49e947297f3312447abdca79f45 SIZE (rust/crates/generic-array-0.14.6.crate) = 15889 SHA256 (rust/crates/getrandom-0.2.8.crate) = c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31 SIZE (rust/crates/getrandom-0.2.8.crate) = 30553 -SHA256 (rust/crates/gimli-0.27.1.crate) = 221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec -SIZE (rust/crates/gimli-0.27.1.crate) = 721022 +SHA256 (rust/crates/gimli-0.27.3.crate) = b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e +SIZE (rust/crates/gimli-0.27.3.crate) = 287904 SHA256 (rust/crates/git2-0.16.1.crate) = ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc SIZE (rust/crates/git2-0.16.1.crate) = 199956 SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b SIZE (rust/crates/glob-0.3.1.crate) = 18880 SHA256 (rust/crates/globset-0.4.10.crate) = 029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc SIZE (rust/crates/globset-0.4.10.crate) = 22923 -SHA256 (rust/crates/goblin-0.6.0.crate) = 572564d6cba7d09775202c8e7eebc4d534d5ae36578ab402fb21e182a0ac9505 -SIZE (rust/crates/goblin-0.6.0.crate) = 159778 +SHA256 (rust/crates/goblin-0.6.1.crate) = 0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68 +SIZE (rust/crates/goblin-0.6.1.crate) = 160490 SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888 SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 @@ -265,8 +265,6 @@ SHA256 (rust/crates/js-sys-0.3.60.crate) = 49409df3e3bf0856b916e2ceaca09ee28e687 SIZE (rust/crates/js-sys-0.3.60.crate) = 79257 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 -SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55 -SIZE (rust/crates/lazycell-1.3.0.crate) = 12502 SHA256 (rust/crates/leb128-0.2.5.crate) = 884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67 SIZE (rust/crates/leb128-0.2.5.crate) = 11843 SHA256 (rust/crates/libc-0.2.139.crate) = 201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79 @@ -289,14 +287,16 @@ SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b603 SIZE (rust/crates/log-0.4.17.crate) = 38028 SHA256 (rust/crates/mac-process-info-0.2.0.crate) = bb6648b65cc40174967a26b2cd7a5d859a33a7cfeef7fd1007a50de62c1f2788 SIZE (rust/crates/mac-process-info-0.2.0.crate) = 2853 +SHA256 (rust/crates/magic_string-0.3.4.crate) = 6c8033ce8c43f7ccb207e4699f30eed50d7526379ee08fab47159f80b7934e18 +SIZE (rust/crates/magic_string-0.3.4.crate) = 13095 SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4 SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153 SHA256 (rust/crates/maybe-owned-0.3.4.crate) = 4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4 SIZE (rust/crates/maybe-owned-0.3.4.crate) = 14308 SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d SIZE (rust/crates/memchr-2.5.0.crate) = 65812 -SHA256 (rust/crates/memmap2-0.5.8.crate) = 4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc -SIZE (rust/crates/memmap2-0.5.8.crate) = 26592 +SHA256 (rust/crates/memmap2-0.5.10.crate) = 83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327 +SIZE (rust/crates/memmap2-0.5.10.crate) = 26847 SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4 SIZE (rust/crates/memoffset-0.7.1.crate) = 8556 SHA256 (rust/crates/might-be-minified-0.3.0.crate) = 885fbcf107091675518e63d521d5f7244efb11a6bd2ee8cbe2f056fddbd4b769 @@ -327,8 +327,8 @@ SHA256 (rust/crates/number_prefix-0.3.0.crate) = 17b02fc0ff9a9e4b35b3342880f48e8 SIZE (rust/crates/number_prefix-0.3.0.crate) = 6291 SHA256 (rust/crates/object-0.30.3.crate) = ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439 SIZE (rust/crates/object-0.30.3.crate) = 258901 -SHA256 (rust/crates/once_cell-1.17.0.crate) = 6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66 -SIZE (rust/crates/once_cell-1.17.0.crate) = 32736 +SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d +SIZE (rust/crates/once_cell-1.18.0.crate) = 32969 SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5 SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767 SHA256 (rust/crates/open-3.2.0.crate) = 2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8 @@ -391,14 +391,14 @@ SHA256 (rust/crates/predicates-core-1.0.5.crate) = 72f883590242d3c6fc5bf50299011 SIZE (rust/crates/predicates-core-1.0.5.crate) = 7773 SHA256 (rust/crates/prettytable-rs-0.10.0.crate) = eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a SIZE (rust/crates/prettytable-rs-0.10.0.crate) = 35474 -SHA256 (rust/crates/proc-macro2-1.0.50.crate) = 6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2 -SIZE (rust/crates/proc-macro2-1.0.50.crate) = 41667 +SHA256 (rust/crates/proc-macro2-1.0.60.crate) = dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406 +SIZE (rust/crates/proc-macro2-1.0.60.crate) = 44160 SHA256 (rust/crates/proguard-5.0.0.crate) = 9ea52ab74a4eeffa17e7ab1fefd1416bd49e88afe8d214cdc164efef1bde4525 SIZE (rust/crates/proguard-5.0.0.crate) = 460089 SHA256 (rust/crates/quick-xml-0.26.0.crate) = 7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd SIZE (rust/crates/quick-xml-0.26.0.crate) = 116260 -SHA256 (rust/crates/quote-1.0.23.crate) = 8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b -SIZE (rust/crates/quote-1.0.23.crate) = 28058 +SHA256 (rust/crates/quote-1.0.28.crate) = 1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488 +SIZE (rust/crates/quote-1.0.28.crate) = 28382 SHA256 (rust/crates/r2d2-0.8.10.crate) = 51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93 SIZE (rust/crates/r2d2-0.8.10.crate) = 17888 SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09 @@ -469,24 +469,24 @@ SHA256 (rust/crates/semver-1.0.16.crate) = 58bc9567378fc7690d6b2addae4e60ac2eeea SIZE (rust/crates/semver-1.0.16.crate) = 29850 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268 -SHA256 (rust/crates/sentry-0.31.1.crate) = 37dd6c0cdca6b1d1ca44cde7fff289f2592a97965afec870faa7b81b9fc87745 -SIZE (rust/crates/sentry-0.31.1.crate) = 49420 -SHA256 (rust/crates/sentry-anyhow-0.31.1.crate) = d9c3d7032fff178c77c107c32c6d3337b12847adf67165ccc876c898e7154b00 -SIZE (rust/crates/sentry-anyhow-0.31.1.crate) = 6768 -SHA256 (rust/crates/sentry-backtrace-0.31.1.crate) = c029fe8317cdd75cb2b52c600bab4e2ef64c552198e669ba874340447f330962 -SIZE (rust/crates/sentry-backtrace-0.31.1.crate) = 10356 -SHA256 (rust/crates/sentry-contexts-0.31.1.crate) = bc575098d73c8b942b589ab453b06e4c43527556dd8f95532220d1b54d7c6b4b -SIZE (rust/crates/sentry-contexts-0.31.1.crate) = 8437 -SHA256 (rust/crates/sentry-core-0.31.1.crate) = 20216140001bbf05895f013abd0dae4df58faee24e016d54cbf107f070bac56b -SIZE (rust/crates/sentry-core-0.31.1.crate) = 45946 -SHA256 (rust/crates/sentry-types-0.31.1.crate) = d7f6959d8cb3a77be27e588eef6ce9a2a469651a556d9de662e4d07e5ace4232 -SIZE (rust/crates/sentry-types-0.31.1.crate) = 40950 -SHA256 (rust/crates/serde-1.0.152.crate) = bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb -SIZE (rust/crates/serde-1.0.152.crate) = 77091 -SHA256 (rust/crates/serde_derive-1.0.152.crate) = af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e -SIZE (rust/crates/serde_derive-1.0.152.crate) = 55586 -SHA256 (rust/crates/serde_json-1.0.93.crate) = cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76 -SIZE (rust/crates/serde_json-1.0.93.crate) = 144383 +SHA256 (rust/crates/sentry-0.31.2.crate) = 234f6e133d27140ad5ea3b369a7665f7fbc060fe246f81d8168665b38c08b600 +SIZE (rust/crates/sentry-0.31.2.crate) = 49408 +SHA256 (rust/crates/sentry-anyhow-0.31.2.crate) = 47e940be4c63b29006b4ac422cacea932c2cb5f8c209647ee86446ed27595a42 +SIZE (rust/crates/sentry-anyhow-0.31.2.crate) = 6767 +SHA256 (rust/crates/sentry-backtrace-0.31.2.crate) = d89b6b53de06308dd5ac08934b597bcd72a9aae0c20bc3ab06da69cb34d468e3 +SIZE (rust/crates/sentry-backtrace-0.31.2.crate) = 10354 +SHA256 (rust/crates/sentry-contexts-0.31.2.crate) = 0769b66763e59976cd5c0fd817dcd51ccce404de8bebac0cd0e886c55b0fffa8 +SIZE (rust/crates/sentry-contexts-0.31.2.crate) = 8438 +SHA256 (rust/crates/sentry-core-0.31.2.crate) = a1f954f1b89e8cd82576dc49bfab80304c9a6201343b4fe5c68c819f7a9bbed2 +SIZE (rust/crates/sentry-core-0.31.2.crate) = 45951 +SHA256 (rust/crates/sentry-types-0.31.2.crate) = 85c53caf80cb1c6fcdf4d82b7bfff8477f50841e4caad7bf8e5e57a152b564cb +SIZE (rust/crates/sentry-types-0.31.2.crate) = 42318 +SHA256 (rust/crates/serde-1.0.164.crate) = 9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d +SIZE (rust/crates/serde-1.0.164.crate) = 77057 +SHA256 (rust/crates/serde_derive-1.0.164.crate) = d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68 +SIZE (rust/crates/serde_derive-1.0.164.crate) = 54789 +SHA256 (rust/crates/serde_json-1.0.97.crate) = bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a +SIZE (rust/crates/serde_json-1.0.97.crate) = 145152 SHA256 (rust/crates/serde_spanned-0.6.1.crate) = 0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4 SIZE (rust/crates/serde_spanned-0.6.1.crate) = 7828 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd @@ -515,8 +515,8 @@ SHA256 (rust/crates/snapbox-macros-0.3.1.crate) = 485e65c1203eb37244465e857d15a2 SIZE (rust/crates/snapbox-macros-0.3.1.crate) = 1877 SHA256 (rust/crates/socket2-0.4.7.crate) = 02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd SIZE (rust/crates/socket2-0.4.7.crate) = 44619 -SHA256 (rust/crates/sourcemap-6.2.3.crate) = eed16231c92d0a6f0388f56e0ab2be24ecff1173f8e22f0ea5e074d0525631cb -SIZE (rust/crates/sourcemap-6.2.3.crate) = 33243 +SHA256 (rust/crates/sourcemap-6.4.1.crate) = e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90 +SIZE (rust/crates/sourcemap-6.4.1.crate) = 41774 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054 SHA256 (rust/crates/string_cache-0.8.4.crate) = 213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08 @@ -525,20 +525,22 @@ SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f0 SIZE (rust/crates/strsim-0.10.0.crate) = 11355 SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601 SIZE (rust/crates/subtle-2.4.1.crate) = 12630 -SHA256 (rust/crates/symbolic-12.0.0.crate) = 3c8842a52dc500c0d997b525747ea4514b1bdf7d652e0d1287d0aef9111d2c02 -SIZE (rust/crates/symbolic-12.0.0.crate) = 2906 -SHA256 (rust/crates/symbolic-common-12.0.0.crate) = 87abaf26f8fe1ffbcabcdcb5c090cba8da4a82803456bb05b5663fcbca2cd877 -SIZE (rust/crates/symbolic-common-12.0.0.crate) = 22830 -SHA256 (rust/crates/symbolic-debuginfo-12.0.0.crate) = 6a3e3d193c41fa790c8d913ac642bbfcb0c4e356a95ebf4f1baa8be2a8474c82 -SIZE (rust/crates/symbolic-debuginfo-12.0.0.crate) = 126484 -SHA256 (rust/crates/symbolic-il2cpp-12.0.0.crate) = 44853ca2c7f9da1960178bccef8ea16593b5d2f0a8a5c3ddc36eadae096b82fd -SIZE (rust/crates/symbolic-il2cpp-12.0.0.crate) = 4583 -SHA256 (rust/crates/symbolic-ppdb-12.0.0.crate) = 5660b66c748cdddb30e12e3748b5241a72e9a19b555396b3555042b5f31ca27b -SIZE (rust/crates/symbolic-ppdb-12.0.0.crate) = 24177 -SHA256 (rust/crates/symbolic-symcache-12.0.0.crate) = 4805e6fddf325b9770a089b59bd3d523fbca0ca036525394807eb56d77e645c8 -SIZE (rust/crates/symbolic-symcache-12.0.0.crate) = 15289 +SHA256 (rust/crates/symbolic-12.1.5.crate) = 0d311bfa722c01294e838091c455ed4e63c96ea7b8fb65b7fd7acdc72a4b0309 +SIZE (rust/crates/symbolic-12.1.5.crate) = 2907 +SHA256 (rust/crates/symbolic-common-12.1.5.crate) = 0eb6682826c7186b16c5c0ed2a68f419609f8af62f070c688871caae4911432d +SIZE (rust/crates/symbolic-common-12.1.5.crate) = 22765 +SHA256 (rust/crates/symbolic-debuginfo-12.1.5.crate) = 222363f4ca5fb00cdd4915afba4a6aa18549d3438b27c048db2c41f0ea7a1e58 +SIZE (rust/crates/symbolic-debuginfo-12.1.5.crate) = 127316 +SHA256 (rust/crates/symbolic-il2cpp-12.1.5.crate) = ffa4db538300bbac1e849bf0ffb3d8f555e76b3a55a7fb88e840832b03e75d8e +SIZE (rust/crates/symbolic-il2cpp-12.1.5.crate) = 6337 +SHA256 (rust/crates/symbolic-ppdb-12.1.5.crate) = 1e3c9b6cc654de90c05d841af02f3dd37415278538fa23534cbcb58a1a74ae8b +SIZE (rust/crates/symbolic-ppdb-12.1.5.crate) = 24239 +SHA256 (rust/crates/symbolic-symcache-12.1.5.crate) = 90eb533854b83630874a393c2e2048a5f9fe0b38ce6d000afe7b58f0a28cc511 +SIZE (rust/crates/symbolic-symcache-12.1.5.crate) = 15294 SHA256 (rust/crates/syn-1.0.107.crate) = 1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5 SIZE (rust/crates/syn-1.0.107.crate) = 237539 +SHA256 (rust/crates/syn-2.0.18.crate) = 32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e +SIZE (rust/crates/syn-2.0.18.crate) = 240648 SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369 SIZE (rust/crates/tap-1.0.1.crate) = 11316 SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4 @@ -549,10 +551,10 @@ SHA256 (rust/crates/termcolor-1.2.0.crate) = be55cf8942feac5c765c2c993422806843c SIZE (rust/crates/termcolor-1.2.0.crate) = 17917 SHA256 (rust/crates/terminal_size-0.2.3.crate) = cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907 SIZE (rust/crates/terminal_size-0.2.3.crate) = 9361 -SHA256 (rust/crates/thiserror-1.0.38.crate) = 6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0 -SIZE (rust/crates/thiserror-1.0.38.crate) = 18947 -SHA256 (rust/crates/thiserror-impl-1.0.38.crate) = 1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f -SIZE (rust/crates/thiserror-impl-1.0.38.crate) = 15429 +SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac +SIZE (rust/crates/thiserror-1.0.40.crate) = 18709 +SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f +SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138 SHA256 (rust/crates/thread_local-1.1.4.crate) = 5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180 SIZE (rust/crates/thread_local-1.1.4.crate) = 13106 SHA256 (rust/crates/time-0.1.45.crate) = 1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a @@ -607,6 +609,8 @@ SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677 SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f SIZE (rust/crates/version_check-0.9.4.crate) = 14895 +SHA256 (rust/crates/vlq-0.5.1.crate) = 65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff +SIZE (rust/crates/vlq-0.5.1.crate) = 9213 SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6 SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441 SHA256 (rust/crates/walkdir-2.3.2.crate) = 808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56 @@ -625,8 +629,8 @@ SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 07bc0c051dc5f23e3 SIZE (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 18530 SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194 -SHA256 (rust/crates/wasmparser-0.95.0.crate) = f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a -SIZE (rust/crates/wasmparser-0.95.0.crate) = 123630 +SHA256 (rust/crates/wasmparser-0.102.0.crate) = 48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b +SIZE (rust/crates/wasmparser-0.102.0.crate) = 127298 SHA256 (rust/crates/watto-0.1.0.crate) = 6746b5315e417144282a047ebb82260d45c92d09bf653fa9ec975e3809be942b SIZE (rust/crates/watto-0.1.0.crate) = 10502 SHA256 (rust/crates/which-4.4.0.crate) = 2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269 @@ -673,5 +677,5 @@ SHA256 (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 1d2a5585e04f9eea4b2a3d1e SIZE (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 17273 SHA256 (rust/crates/zstd-sys-2.0.5+zstd.1.5.2.crate) = edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596 SIZE (rust/crates/zstd-sys-2.0.5+zstd.1.5.2.crate) = 713791 -SHA256 (getsentry-sentry-cli-2.18.1_GH0.tar.gz) = 7a21fe9fd815a3630072de3aad80f9d02652b54366282c4ddd98bcb1918be3d3 -SIZE (getsentry-sentry-cli-2.18.1_GH0.tar.gz) = 2949825 +SHA256 (getsentry-sentry-cli-2.20.5_GH0.tar.gz) = 00eb37471acf23dc286c301a8c5b6eb00c0a9c392b16811ec2ad74d334d71e5a +SIZE (getsentry-sentry-cli-2.20.5_GH0.tar.gz) = 2963409 diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile index c390556c2d6..35bbe0227cc 100644 --- a/devel/valgrind-devel/Makefile +++ b/devel/valgrind-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= valgrind PORTVERSION= 3.21.0.g20230218 +PORTREVISION= 1 DISTVERSIONPREFIX= freebsd- PORTEPOCH= 1 CATEGORIES= devel @@ -28,6 +29,15 @@ SSP_UNSAFE= yes LIB32_PATH?= /usr/lib32/libc.so CONFLICTS= valgrind + +# Valgrind needs to read debuginfo from its own preload shared libraries +# (quote from README_PACKAGERS +#-- Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so +# in the installation tree. Either Valgrind won't work at all, or it +# will still work if you do, but will generate less helpful error +# messages.) +STRIP= # empty + PORTDOCS= html OPTIONS_DEFINE= DOCS MANPAGES MPI diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index 391d437067f..0eb2d678cbb 100644 --- a/devel/valgrind/Makefile +++ b/devel/valgrind/Makefile @@ -1,5 +1,6 @@ PORTNAME= valgrind PORTVERSION= 3.21.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SOURCEWARE/valgrind @@ -33,6 +34,14 @@ OPTIONS_DEFAULT_amd64= 32BIT .endif OPTIONS_SUB= yes +# Valgrind needs to read debuginfo from its own preload shared libraries +# (quote from README_PACKAGERS +#-- Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so +# in the installation tree. Either Valgrind won't work at all, or it +# will still work if you do, but will generate less helpful error +# messages.) +STRIP= # empty + 32BIT_DESC= Enable debugging of 32-bit programs (requires lib32) MPI_DESC= Enable build of MPI wrappers diff --git a/devel/wasmer/Makefile b/devel/wasmer/Makefile index d4035614a14..4789e476602 100644 --- a/devel/wasmer/Makefile +++ b/devel/wasmer/Makefile @@ -1,6 +1,6 @@ PORTNAME= wasmer DISTVERSIONPREFIX= v -DISTVERSION= 4.0.0 +DISTVERSION= 4.1.1 CATEGORIES= devel MAINTAINER= kjozic@gmail.com diff --git a/devel/wasmer/Makefile.crates b/devel/wasmer/Makefile.crates index e34fbd39745..41167d614ed 100644 --- a/devel/wasmer/Makefile.crates +++ b/devel/wasmer/Makefile.crates @@ -1,11 +1,14 @@ -CARGO_CRATES= addr2line-0.19.0 \ +CARGO_CRATES= Inflector-0.11.4 \ + addr2line-0.20.0 \ adler-1.0.2 \ ahash-0.7.6 \ ahash-0.8.3 \ aho-corasick-1.0.2 \ - allocator-api2-0.2.15 \ + aliasable-0.1.3 \ + allocator-api2-0.2.16 \ android-tzdata-0.1.1 \ android_system_properties-0.1.5 \ + anes-0.1.6 \ ansi_term-0.12.1 \ anstream-0.3.2 \ anstyle-1.0.1 \ @@ -13,31 +16,30 @@ CARGO_CRATES= addr2line-0.19.0 \ anstyle-query-1.0.0 \ anstyle-wincon-1.0.1 \ any_ascii-0.1.7 \ - anyhow-1.0.71 \ + anyhow-1.0.72 \ arbitrary-1.3.0 \ arrayref-0.3.7 \ arrayvec-0.5.2 \ arrayvec-0.7.4 \ ascii-0.9.3 \ assert_cmd-1.0.8 \ - assert_cmd-2.0.11 \ - async-compression-0.4.0 \ - async-trait-0.1.68 \ + assert_cmd-2.0.12 \ + async-compression-0.4.1 \ + async-trait-0.1.72 \ atomic-polyfill-0.1.11 \ - atty-0.2.14 \ autocfg-1.1.0 \ - backtrace-0.3.67 \ + backtrace-0.3.68 \ base-x-0.2.11 \ base64-0.21.2 \ - basic-toml-0.1.2 \ + basic-toml-0.1.4 \ bincode-1.3.3 \ bitflags-1.3.2 \ - bitflags-2.3.2 \ + bitflags-2.3.3 \ bitvec-1.0.1 \ - blake3-1.4.0 \ + blake3-1.4.1 \ block-buffer-0.10.4 \ bstr-0.2.17 \ - bstr-1.5.0 \ + bstr-1.6.0 \ build-deps-0.1.4 \ build_const-0.2.2 \ bumpalo-3.13.0 \ @@ -46,40 +48,39 @@ CARGO_CRATES= addr2line-0.19.0 \ byteorder-1.4.3 \ bytes-1.4.0 \ bytesize-1.2.0 \ - camino-1.1.4 \ - cargo-platform-0.1.2 \ + camino-1.1.6 \ + cargo-platform-0.1.3 \ cargo_metadata-0.15.4 \ cast-0.3.0 \ cbindgen-0.24.5 \ - cc-1.0.79 \ - cfg-if-0.1.10 \ + cc-1.0.81 \ cfg-if-1.0.0 \ chrono-0.4.26 \ + ciborium-0.2.1 \ + ciborium-io-0.2.1 \ + ciborium-ll-0.2.1 \ cipher-0.4.4 \ - clap-2.34.0 \ - clap-3.2.25 \ - clap-4.3.5 \ + clap-4.3.19 \ clap-verbosity-flag-2.0.1 \ - clap_builder-4.3.5 \ - clap_derive-4.3.2 \ - clap_lex-0.2.4 \ + clap_builder-4.3.19 \ + clap_derive-4.3.12 \ clap_lex-0.5.0 \ colorchoice-1.0.0 \ - colored-1.9.3 \ - colored-2.0.0 \ + colored-1.9.4 \ + colored-2.0.4 \ combine-3.8.1 \ - comfy-table-6.2.0 \ + comfy-table-7.0.1 \ compiletest_rs-0.6.0 \ console-0.15.7 \ console_error_panic_hook-0.1.7 \ const_fn-0.4.9 \ - constant_time_eq-0.2.6 \ + constant_time_eq-0.3.0 \ cooked-waker-5.0.0 \ core-foundation-0.9.3 \ core-foundation-sys-0.8.4 \ corosensei-0.1.3 \ counter-0.5.7 \ - cpufeatures-0.2.8 \ + cpufeatures-0.2.9 \ cranelift-bforest-0.91.1 \ cranelift-codegen-0.91.1 \ cranelift-codegen-meta-0.91.1 \ @@ -90,8 +91,8 @@ CARGO_CRATES= addr2line-0.19.0 \ cranelift-isle-0.91.1 \ crc-1.8.1 \ crc32fast-1.3.2 \ - criterion-0.3.6 \ - criterion-plot-0.4.5 \ + criterion-0.5.1 \ + criterion-plot-0.5.0 \ critical-section-1.1.1 \ crossbeam-channel-0.5.8 \ crossbeam-deque-0.8.3 \ @@ -104,18 +105,22 @@ CARGO_CRATES= addr2line-0.19.0 \ csv-core-0.1.10 \ ctor-0.1.26 \ cty-0.2.2 \ - cynic-2.2.8 \ - cynic-codegen-2.2.8 \ - cynic-proc-macros-2.2.8 \ - darling-0.13.4 \ - darling-0.20.1 \ - darling_core-0.13.4 \ - darling_core-0.20.1 \ - darling_macro-0.13.4 \ - darling_macro-0.20.1 \ - dashmap-5.4.0 \ + cynic-3.2.2 \ + cynic-codegen-3.2.2 \ + cynic-proc-macros-3.2.2 \ + darling-0.14.4 \ + darling-0.20.3 \ + darling_core-0.14.4 \ + darling_core-0.20.3 \ + darling_macro-0.14.4 \ + darling_macro-0.20.3 \ + dashmap-5.5.0 \ + deranged-0.3.7 \ derivative-2.2.0 \ derive_arbitrary-1.3.1 \ + derive_builder-0.12.0 \ + derive_builder_core-0.12.0 \ + derive_builder_macro-0.12.0 \ dialoguer-0.10.4 \ diff-0.1.13 \ difflib-0.4.0 \ @@ -129,10 +134,10 @@ CARGO_CRATES= addr2line-0.19.0 \ dlib-0.5.2 \ doc-comment-0.3.3 \ downcast-rs-1.2.0 \ - dyn-clone-1.0.11 \ + dyn-clone-1.0.12 \ dynasm-1.2.3 \ dynasmrt-1.2.3 \ - either-1.8.1 \ + either-1.9.0 \ encode_unicode-0.3.6 \ encode_unicode-1.0.0 \ encoding_rs-0.8.32 \ @@ -140,12 +145,13 @@ CARGO_CRATES= addr2line-0.19.0 \ enum-iterator-derive-0.7.0 \ enumset-1.1.2 \ enumset_derive-0.8.1 \ - erased-serde-0.3.25 \ - errno-0.3.1 \ + equivalent-1.0.1 \ + erased-serde-0.3.28 \ + errno-0.3.2 \ errno-dragonfly-0.1.2 \ fallible-iterator-0.2.0 \ fallible-streaming-iterator-0.1.9 \ - fastrand-1.9.0 \ + fastrand-2.0.0 \ fern-0.6.2 \ field-offset-0.3.6 \ filetime-0.2.21 \ @@ -171,7 +177,7 @@ CARGO_CRATES= addr2line-0.19.0 \ generic-array-0.14.7 \ getopts-0.2.21 \ getrandom-0.2.10 \ - ghost-0.1.9 \ + ghost-0.1.14 \ gimli-0.26.2 \ gimli-0.27.3 \ glob-0.3.1 \ @@ -182,7 +188,7 @@ CARGO_CRATES= addr2line-0.19.0 \ graphql_query_derive-0.11.0 \ gumdrop-0.8.1 \ gumdrop_derive-0.8.1 \ - h2-0.3.19 \ + h2-0.3.20 \ half-1.8.2 \ hash32-0.2.1 \ hashbrown-0.11.2 \ @@ -192,19 +198,17 @@ CARGO_CRATES= addr2line-0.19.0 \ heapless-0.7.16 \ heck-0.3.3 \ heck-0.4.1 \ - hermit-abi-0.1.19 \ - hermit-abi-0.2.6 \ - hermit-abi-0.3.1 \ + hermit-abi-0.3.2 \ hex-0.4.3 \ hmac-0.12.1 \ http-0.2.9 \ http-body-0.4.5 \ - http-range-header-0.3.0 \ + http-range-header-0.3.1 \ http-serde-1.1.2 \ httparse-1.8.0 \ httpdate-1.0.2 \ - hyper-0.14.26 \ - hyper-rustls-0.24.0 \ + hyper-0.14.27 \ + hyper-rustls-0.24.1 \ hyper-tls-0.5.0 \ iana-time-zone-0.1.57 \ iana-time-zone-haiku-0.1.2 \ @@ -213,36 +217,34 @@ CARGO_CRATES= addr2line-0.19.0 \ idna-0.2.3 \ idna-0.4.0 \ indexmap-1.9.3 \ - indicatif-0.17.5 \ + indexmap-2.0.0 \ + indicatif-0.17.6 \ inkwell-0.1.1 \ inkwell_internals-0.7.0 \ inline-c-0.1.7 \ inline-c-macro-0.1.5 \ inout-0.1.3 \ - insta-1.29.0 \ + insta-1.31.0 \ instant-0.1.12 \ inventory-0.2.3 \ - io-lifetimes-1.0.11 \ - ipnet-2.7.2 \ - is-terminal-0.4.7 \ - isatty-0.1.9 \ + ipnet-2.8.0 \ + is-terminal-0.4.9 \ itertools-0.10.5 \ - itoa-1.0.6 \ + itoa-1.0.9 \ jobserver-0.1.26 \ js-sys-0.3.61 \ - json5-0.4.1 \ lazy_static-1.4.0 \ leb128-0.2.5 \ lexical-core-0.7.6 \ lexical-sort-0.3.1 \ - libc-0.2.146 \ + libc-0.2.147 \ libfuzzer-sys-0.4.6 \ libloading-0.8.0 \ libsqlite3-sys-0.25.2 \ linked-hash-map-0.5.6 \ linked_hash_set-0.1.4 \ - linux-raw-sys-0.3.8 \ - llvm-sys-140.1.1 \ + linux-raw-sys-0.4.5 \ + llvm-sys-140.1.2 \ lock_api-0.4.10 \ log-0.4.19 \ lzma-rs-0.2.0 \ @@ -263,7 +265,6 @@ CARGO_CRATES= addr2line-0.19.0 \ minifb-0.24.0 \ minimal-lexical-0.2.1 \ minisign-0.7.5 \ - miniz_oxide-0.6.2 \ miniz_oxide-0.7.1 \ mio-0.8.8 \ miow-0.3.7 \ @@ -274,66 +275,62 @@ CARGO_CRATES= addr2line-0.19.0 \ nom-5.1.3 \ nom-7.1.3 \ normalize-line-endings-0.3.0 \ + normpath-1.1.1 \ nu-ansi-term-0.46.0 \ - nuke-dir-0.1.0 \ - num-traits-0.2.15 \ - num_cpus-1.15.0 \ + num-traits-0.2.16 \ + num_cpus-1.16.0 \ num_enum-0.5.11 \ num_enum_derive-0.5.11 \ number_prefix-0.4.0 \ object-0.28.4 \ object-0.30.4 \ + object-0.31.1 \ once_cell-1.18.0 \ oorandom-11.1.3 \ + opener-0.6.1 \ openssl-0.10.55 \ openssl-macros-0.1.1 \ openssl-probe-0.1.5 \ openssl-sys-0.9.90 \ - orbclient-0.3.45 \ - os_str_bytes-6.5.1 \ - output_vt100-0.1.3 \ + orbclient-0.3.46 \ + ouroboros-0.15.6 \ + ouroboros_macro-0.15.6 \ overload-0.1.1 \ parking_lot-0.11.2 \ parking_lot-0.12.1 \ parking_lot_core-0.8.6 \ parking_lot_core-0.9.8 \ - paste-1.0.12 \ - path-clean-0.1.0 \ + paste-1.0.14 \ + path-clean-1.0.1 \ pathdiff-0.2.1 \ - pbkdf2-0.12.1 \ + pbkdf2-0.12.2 \ percent-encoding-2.3.0 \ - pest-2.7.0 \ - pest_derive-2.7.0 \ - pest_generator-2.7.0 \ - pest_meta-2.7.0 \ + pest-2.7.2 \ petgraph-0.6.3 \ - pin-project-1.1.0 \ - pin-project-internal-1.1.0 \ - pin-project-lite-0.2.9 \ + pin-project-1.1.2 \ + pin-project-internal-1.1.2 \ + pin-project-lite-0.2.10 \ pin-utils-0.1.0 \ pkg-config-0.3.27 \ - plotters-0.3.5 \ - plotters-backend-0.3.5 \ - plotters-svg-0.3.5 \ - portable-atomic-1.3.3 \ + portable-atomic-1.4.2 \ ppv-lite86-0.2.17 \ predicates-2.1.5 \ predicates-3.0.3 \ predicates-core-1.0.6 \ predicates-tree-1.0.9 \ - pretty_assertions-1.3.0 \ + pretty_assertions-1.4.0 \ prettytable-rs-0.10.0 \ proc-macro-crate-1.3.1 \ proc-macro-error-1.0.4 \ proc-macro-error-attr-1.0.4 \ proc-macro-hack-0.5.20+deprecated \ - proc-macro2-1.0.60 \ + proc-macro2-1.0.66 \ proc-quote-0.4.0 \ proc-quote-impl-0.3.2 \ ptr_meta-0.1.4 \ ptr_meta_derive-0.1.4 \ pulldown-cmark-0.8.0 \ - quote-1.0.28 \ + quote-1.0.32 \ radium-0.7.0 \ rand-0.8.5 \ rand_chacha-0.3.1 \ @@ -341,16 +338,18 @@ CARGO_CRATES= addr2line-0.19.0 \ raw-window-handle-0.4.3 \ rayon-1.7.0 \ rayon-core-1.11.0 \ - redox_syscall-0.1.57 \ redox_syscall-0.2.16 \ redox_syscall-0.3.5 \ redox_users-0.4.3 \ + ref-cast-1.0.19 \ + ref-cast-impl-1.0.19 \ ref_thread_local-0.1.1 \ regalloc2-0.5.1 \ - regex-1.8.4 \ + regex-1.9.1 \ regex-automata-0.1.10 \ + regex-automata-0.3.4 \ regex-syntax-0.6.29 \ - regex-syntax-0.7.2 \ + regex-syntax-0.7.4 \ region-3.0.0 \ rend-0.4.0 \ replace_with-0.1.7 \ @@ -366,46 +365,46 @@ CARGO_CRATES= addr2line-0.19.0 \ rustc_version-0.3.3 \ rustc_version-0.4.0 \ rustfix-0.5.1 \ - rustix-0.37.20 \ - rustls-0.21.2 \ - rustls-pemfile-1.0.2 \ - rustls-webpki-0.100.1 \ - rustversion-1.0.12 \ + rustix-0.38.6 \ + rustls-0.21.6 \ + rustls-pemfile-1.0.3 \ + rustls-webpki-0.101.2 \ + rustversion-1.0.14 \ rusty_jsc-0.1.0 \ rusty_jsc_macros-0.1.0 \ rusty_jsc_sys-0.1.0 \ - ryu-1.0.13 \ + ryu-1.0.15 \ salsa20-0.10.2 \ same-file-1.0.6 \ - schannel-0.1.21 \ + schannel-0.1.22 \ schemars-0.8.12 \ schemars_derive-0.8.12 \ scoped-tls-1.0.1 \ - scopeguard-1.1.0 \ + scopeguard-1.2.0 \ scrypt-0.11.0 \ sct-0.7.0 \ sdl2-0.35.2 \ sdl2-sys-0.35.2 \ seahash-4.1.0 \ - security-framework-2.9.1 \ - security-framework-sys-2.9.0 \ + security-framework-2.9.2 \ + security-framework-sys-2.9.1 \ semver-0.9.0 \ semver-0.11.0 \ - semver-1.0.17 \ + semver-1.0.18 \ semver-parser-0.7.0 \ semver-parser-0.10.2 \ - serde-1.0.164 \ + serde-1.0.180 \ serde-wasm-bindgen-0.4.5 \ - serde_bytes-0.11.9 \ + serde_bytes-0.11.12 \ serde_cbor-0.11.2 \ - serde_derive-1.0.164 \ + serde_derive-1.0.180 \ serde_derive_internals-0.26.0 \ - serde_json-1.0.97 \ - serde_path_to_error-0.1.11 \ - serde_spanned-0.6.2 \ + serde_json-1.0.104 \ + serde_path_to_error-0.1.14 \ + serde_spanned-0.6.3 \ serde_urlencoded-0.7.1 \ serde_yaml-0.8.26 \ - serde_yaml-0.9.21 \ + serde_yaml-0.9.25 \ serial_test-0.5.1 \ serial_test_derive-0.5.1 \ sha1-0.6.1 \ @@ -414,15 +413,14 @@ CARGO_CRATES= addr2line-0.19.0 \ sharded-slab-0.1.4 \ shared-buffer-0.1.3 \ shell-words-1.1.0 \ - shellexpand-2.1.2 \ - signal-hook-0.3.15 \ + signal-hook-0.3.17 \ signal-hook-mio-0.2.3 \ signal-hook-registry-1.4.1 \ simdutf8-0.1.4 \ similar-2.2.1 \ slab-0.4.8 \ slice-group-by-0.3.1 \ - smallvec-1.10.0 \ + smallvec-1.11.0 \ socket2-0.4.9 \ spin-0.5.2 \ spin-0.9.8 \ @@ -439,12 +437,12 @@ CARGO_CRATES= addr2line-0.19.0 \ strum_macros-0.24.3 \ subtle-2.5.0 \ syn-1.0.109 \ - syn-2.0.18 \ + syn-2.0.28 \ tap-1.0.1 \ - tar-0.4.38 \ + tar-0.4.39 \ target-lexicon-0.11.2 \ - target-lexicon-0.12.8 \ - tempfile-3.6.0 \ + target-lexicon-0.12.11 \ + tempfile-3.7.0 \ term-0.7.0 \ term_size-0.3.2 \ termcolor-1.2.0 \ @@ -452,32 +450,30 @@ CARGO_CRATES= addr2line-0.19.0 \ termtree-0.4.1 \ test-log-0.2.12 \ tester-0.9.1 \ - textwrap-0.11.0 \ - textwrap-0.16.0 \ - thiserror-1.0.40 \ - thiserror-impl-1.0.40 \ + thiserror-1.0.44 \ + thiserror-impl-1.0.44 \ thread_local-1.1.7 \ time-0.2.27 \ - time-0.3.22 \ + time-0.3.25 \ time-core-0.1.1 \ time-macros-0.1.1 \ - time-macros-0.2.9 \ + time-macros-0.2.11 \ time-macros-impl-0.1.2 \ tinytemplate-1.2.1 \ tinyvec-1.6.0 \ tinyvec_macros-0.1.1 \ tldextract-0.6.0 \ - tokio-1.28.2 \ + tokio-1.29.1 \ tokio-macros-2.1.0 \ tokio-native-tls-0.3.1 \ tokio-rustls-0.24.1 \ tokio-util-0.7.8 \ toml-0.5.11 \ - toml-0.7.4 \ - toml_datetime-0.6.2 \ - toml_edit-0.19.10 \ + toml-0.7.6 \ + toml_datetime-0.6.3 \ + toml_edit-0.19.14 \ tower-0.4.13 \ - tower-http-0.4.1 \ + tower-http-0.4.3 \ tower-layer-0.3.2 \ tower-service-0.3.2 \ tracing-0.1.37 \ @@ -489,27 +485,26 @@ CARGO_CRATES= addr2line-0.19.0 \ tracing-subscriber-0.3.17 \ tracing-wasm-0.2.1 \ try-lock-0.2.4 \ - trybuild-1.0.80 \ + trybuild-1.0.82 \ typenum-1.16.0 \ typetag-0.1.8 \ typetag-impl-0.1.8 \ - ucd-trie-0.1.5 \ + ucd-trie-0.1.6 \ unicase-2.6.0 \ unicode-bidi-0.3.13 \ - unicode-ident-1.0.9 \ + unicode-ident-1.0.11 \ unicode-normalization-0.1.22 \ unicode-segmentation-1.10.1 \ unicode-width-0.1.10 \ unicode-xid-0.2.4 \ unix_mode-0.1.3 \ unreachable-1.0.0 \ - unsafe-libyaml-0.2.8 \ + unsafe-libyaml-0.2.9 \ untrusted-0.7.1 \ url-2.4.0 \ - urlencoding-2.1.2 \ + urlencoding-2.1.3 \ utf8parse-0.2.1 \ - uuid-1.3.4 \ - validator-0.16.1 \ + uuid-1.4.1 \ valuable-0.1.0 \ vcpkg-0.2.15 \ version-compare-0.1.1 \ @@ -527,7 +522,6 @@ CARGO_CRATES= addr2line-0.19.0 \ waker-fn-1.1.0 \ walkdir-2.3.3 \ want-0.3.1 \ - wapm-targz-to-pirita-0.3.1 \ wasi-0.11.0+wasi-snapshot-preview1 \ wasm-bindgen-0.2.84 \ wasm-bindgen-backend-0.2.84 \ @@ -539,32 +533,33 @@ CARGO_CRATES= addr2line-0.19.0 \ wasm-bindgen-shared-0.2.84 \ wasm-bindgen-test-0.3.34 \ wasm-bindgen-test-macro-0.3.34 \ - wasm-coredump-builder-0.1.15 \ - wasm-coredump-encoder-0.1.15 \ - wasm-coredump-types-0.1.15 \ + wasm-coredump-builder-0.1.20 \ + wasm-coredump-encoder-0.1.20 \ + wasm-coredump-types-0.1.20 \ wasm-encoder-0.4.1 \ wasm-encoder-0.23.0 \ - wasm-encoder-0.29.0 \ + wasm-encoder-0.31.1 \ wasm-smith-0.4.5 \ wasm-streams-0.2.3 \ - wasmer-api-0.0.8 \ - wasmer-deploy-cli-0.1.16 \ - wasmer-deploy-schema-0.0.8 \ - wasmer-deploy-util-0.0.8 \ + wasmer-api-0.0.12 \ + wasmer-deploy-cli-0.1.19 \ + wasmer-deploy-schema-0.0.10 \ + wasmer-deploy-util-0.0.10 \ wasmer-inline-c-0.1.2 \ wasmer-inline-c-macro-0.1.6 \ - wasmer-registry-4.7.0 \ + wasmer-registry-5.3.0 \ wasmer-toml-0.6.0 \ - wasmer-wasm-interface-4.0.0-beta.3 \ + wasmer-toml-0.7.0 \ + wasmer-wasm-interface-4.1.0 \ wasmparser-0.51.4 \ wasmparser-0.83.0 \ wasmparser-0.95.0 \ - wasmparser-0.107.0 \ - wasmprinter-0.2.59 \ + wasmparser-0.110.0 \ + wasmprinter-0.2.62 \ wast-24.0.0 \ wast-38.0.1 \ - wast-60.0.0 \ - wat-1.0.66 \ + wast-62.0.1 \ + wat-1.0.69 \ wayland-client-0.29.5 \ wayland-commons-0.29.5 \ wayland-cursor-0.29.5 \ @@ -574,22 +569,21 @@ CARGO_CRATES= addr2line-0.19.0 \ wcgi-0.1.2 \ wcgi-host-0.1.2 \ web-sys-0.3.61 \ - webc-5.0.4 \ + webc-5.3.0 \ webpki-0.22.0 \ webpki-roots-0.22.6 \ weezl-0.1.7 \ - whoami-1.4.0 \ + whoami-1.4.1 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.5 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ windows-0.48.0 \ windows-sys-0.33.0 \ - windows-sys-0.42.0 \ windows-sys-0.45.0 \ windows-sys-0.48.0 \ windows-targets-0.42.2 \ - windows-targets-0.48.0 \ + windows-targets-0.48.1 \ windows_aarch64_gnullvm-0.42.2 \ windows_aarch64_gnullvm-0.48.0 \ windows_aarch64_msvc-0.33.0 \ @@ -609,13 +603,13 @@ CARGO_CRATES= addr2line-0.19.0 \ windows_x86_64_msvc-0.33.0 \ windows_x86_64_msvc-0.42.2 \ windows_x86_64_msvc-0.48.0 \ - winnow-0.4.7 \ + winnow-0.5.3 \ winreg-0.10.1 \ wyz-0.5.1 \ x11-dl-2.21.0 \ xattr-0.2.3 \ xcursor-0.3.4 \ - xml-rs-0.8.14 \ + xml-rs-0.8.16 \ yaml-rust-0.4.5 \ yansi-0.5.1 \ zeroize-1.6.0 diff --git a/devel/wasmer/distinfo b/devel/wasmer/distinfo index ad42ea18b8c..e91ad39dd93 100644 --- a/devel/wasmer/distinfo +++ b/devel/wasmer/distinfo @@ -1,6 +1,8 @@ -TIMESTAMP = 1690058559 -SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97 -SIZE (rust/crates/addr2line-0.19.0.crate) = 33210 +TIMESTAMP = 1692381328 +SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3 +SIZE (rust/crates/Inflector-0.11.4.crate) = 17438 +SHA256 (rust/crates/addr2line-0.20.0.crate) = f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3 +SIZE (rust/crates/addr2line-0.20.0.crate) = 39558 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe SIZE (rust/crates/adler-1.0.2.crate) = 12778 SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 @@ -9,12 +11,16 @@ SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e289758 SIZE (rust/crates/ahash-0.8.3.crate) = 42416 SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41 SIZE (rust/crates/aho-corasick-1.0.2.crate) = 167694 -SHA256 (rust/crates/allocator-api2-0.2.15.crate) = 56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9 -SIZE (rust/crates/allocator-api2-0.2.15.crate) = 58998 +SHA256 (rust/crates/aliasable-0.1.3.crate) = 250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd +SIZE (rust/crates/aliasable-0.1.3.crate) = 6169 +SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5 +SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025 SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0 SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243 +SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299 +SIZE (rust/crates/anes-0.1.6.crate) = 23857 SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2 SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838 SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163 @@ -29,8 +35,8 @@ SHA256 (rust/crates/anstyle-wincon-1.0.1.crate) = 180abfa45703aebe0093f79badacc0 SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718 SHA256 (rust/crates/any_ascii-0.1.7.crate) = 70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e SIZE (rust/crates/any_ascii-0.1.7.crate) = 220683 -SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8 -SIZE (rust/crates/anyhow-1.0.71.crate) = 43808 +SHA256 (rust/crates/anyhow-1.0.72.crate) = 3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854 +SIZE (rust/crates/anyhow-1.0.72.crate) = 43837 SHA256 (rust/crates/arbitrary-1.3.0.crate) = e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e SIZE (rust/crates/arbitrary-1.3.0.crate) = 30930 SHA256 (rust/crates/arrayref-0.3.7.crate) = 6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545 @@ -43,42 +49,40 @@ SHA256 (rust/crates/ascii-0.9.3.crate) = eab1c04a571841102f5345a8fc0f6bb3d31c315 SIZE (rust/crates/ascii-0.9.3.crate) = 28283 SHA256 (rust/crates/assert_cmd-1.0.8.crate) = c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe SIZE (rust/crates/assert_cmd-1.0.8.crate) = 27830 -SHA256 (rust/crates/assert_cmd-2.0.11.crate) = 86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151 -SIZE (rust/crates/assert_cmd-2.0.11.crate) = 25346 -SHA256 (rust/crates/async-compression-0.4.0.crate) = 5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11 -SIZE (rust/crates/async-compression-0.4.0.crate) = 41890 -SHA256 (rust/crates/async-trait-0.1.68.crate) = b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842 -SIZE (rust/crates/async-trait-0.1.68.crate) = 28625 +SHA256 (rust/crates/assert_cmd-2.0.12.crate) = 88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6 +SIZE (rust/crates/assert_cmd-2.0.12.crate) = 25347 +SHA256 (rust/crates/async-compression-0.4.1.crate) = 62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6 +SIZE (rust/crates/async-compression-0.4.1.crate) = 97688 +SHA256 (rust/crates/async-trait-0.1.72.crate) = cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09 +SIZE (rust/crates/async-trait-0.1.72.crate) = 28592 SHA256 (rust/crates/atomic-polyfill-0.1.11.crate) = e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28 SIZE (rust/crates/atomic-polyfill-0.1.11.crate) = 11087 -SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 -SIZE (rust/crates/atty-0.2.14.crate) = 5470 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 -SHA256 (rust/crates/backtrace-0.3.67.crate) = 233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca -SIZE (rust/crates/backtrace-0.3.67.crate) = 78564 +SHA256 (rust/crates/backtrace-0.3.68.crate) = 4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12 +SIZE (rust/crates/backtrace-0.3.68.crate) = 79891 SHA256 (rust/crates/base-x-0.2.11.crate) = 4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270 SIZE (rust/crates/base-x-0.2.11.crate) = 10755 SHA256 (rust/crates/base64-0.21.2.crate) = 604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d SIZE (rust/crates/base64-0.21.2.crate) = 76389 -SHA256 (rust/crates/basic-toml-0.1.2.crate) = 5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1 -SIZE (rust/crates/basic-toml-0.1.2.crate) = 50174 +SHA256 (rust/crates/basic-toml-0.1.4.crate) = 7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6 +SIZE (rust/crates/basic-toml-0.1.4.crate) = 50206 SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad SIZE (rust/crates/bincode-1.3.3.crate) = 28958 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 -SHA256 (rust/crates/bitflags-2.3.2.crate) = 6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded -SIZE (rust/crates/bitflags-2.3.2.crate) = 39637 +SHA256 (rust/crates/bitflags-2.3.3.crate) = 630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42 +SIZE (rust/crates/bitflags-2.3.3.crate) = 34320 SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c SIZE (rust/crates/bitvec-1.0.1.crate) = 224375 -SHA256 (rust/crates/blake3-1.4.0.crate) = 729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888 -SIZE (rust/crates/blake3-1.4.0.crate) = 162833 +SHA256 (rust/crates/blake3-1.4.1.crate) = 199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5 +SIZE (rust/crates/blake3-1.4.1.crate) = 163154 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538 SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223 SIZE (rust/crates/bstr-0.2.17.crate) = 330350 -SHA256 (rust/crates/bstr-1.5.0.crate) = a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5 -SIZE (rust/crates/bstr-1.5.0.crate) = 346060 +SHA256 (rust/crates/bstr-1.6.0.crate) = 6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05 +SIZE (rust/crates/bstr-1.6.0.crate) = 385877 SHA256 (rust/crates/build-deps-0.1.4.crate) = 64f14468960818ce4f3e3553c32d524446687884f8e7af5d3e252331d8a87e43 SIZE (rust/crates/build-deps-0.1.4.crate) = 35939 SHA256 (rust/crates/build_const-0.2.2.crate) = b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7 @@ -95,52 +99,50 @@ SHA256 (rust/crates/bytes-1.4.0.crate) = 89b2fd2a0dcf38d7971e2194b6b6eebab45ae01 SIZE (rust/crates/bytes-1.4.0.crate) = 58080 SHA256 (rust/crates/bytesize-1.2.0.crate) = 38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5 SIZE (rust/crates/bytesize-1.2.0.crate) = 9996 -SHA256 (rust/crates/camino-1.1.4.crate) = c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2 -SIZE (rust/crates/camino-1.1.4.crate) = 32290 -SHA256 (rust/crates/cargo-platform-0.1.2.crate) = cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27 -SIZE (rust/crates/cargo-platform-0.1.2.crate) = 11645 +SHA256 (rust/crates/camino-1.1.6.crate) = c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c +SIZE (rust/crates/camino-1.1.6.crate) = 30519 +SHA256 (rust/crates/cargo-platform-0.1.3.crate) = 2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479 +SIZE (rust/crates/cargo-platform-0.1.3.crate) = 11230 SHA256 (rust/crates/cargo_metadata-0.15.4.crate) = eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a SIZE (rust/crates/cargo_metadata-0.15.4.crate) = 19993 SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5 SIZE (rust/crates/cast-0.3.0.crate) = 11452 SHA256 (rust/crates/cbindgen-0.24.5.crate) = 4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d SIZE (rust/crates/cbindgen-0.24.5.crate) = 196574 -SHA256 (rust/crates/cc-1.0.79.crate) = 50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f -SIZE (rust/crates/cc-1.0.79.crate) = 62624 -SHA256 (rust/crates/cfg-if-0.1.10.crate) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822 -SIZE (rust/crates/cfg-if-0.1.10.crate) = 7933 +SHA256 (rust/crates/cc-1.0.81.crate) = 6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0 +SIZE (rust/crates/cc-1.0.81.crate) = 66857 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/chrono-0.4.26.crate) = ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5 SIZE (rust/crates/chrono-0.4.26.crate) = 191501 +SHA256 (rust/crates/ciborium-0.2.1.crate) = effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926 +SIZE (rust/crates/ciborium-0.2.1.crate) = 34974 +SHA256 (rust/crates/ciborium-io-0.2.1.crate) = cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656 +SIZE (rust/crates/ciborium-io-0.2.1.crate) = 6679 +SHA256 (rust/crates/ciborium-ll-0.2.1.crate) = defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b +SIZE (rust/crates/ciborium-ll-0.2.1.crate) = 14649 SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad SIZE (rust/crates/cipher-0.4.4.crate) = 19073 -SHA256 (rust/crates/clap-2.34.0.crate) = a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c -SIZE (rust/crates/clap-2.34.0.crate) = 202210 -SHA256 (rust/crates/clap-3.2.25.crate) = 4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123 -SIZE (rust/crates/clap-3.2.25.crate) = 219403 -SHA256 (rust/crates/clap-4.3.5.crate) = 2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc -SIZE (rust/crates/clap-4.3.5.crate) = 54241 +SHA256 (rust/crates/clap-4.3.19.crate) = 5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d +SIZE (rust/crates/clap-4.3.19.crate) = 55022 SHA256 (rust/crates/clap-verbosity-flag-2.0.1.crate) = 1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de SIZE (rust/crates/clap-verbosity-flag-2.0.1.crate) = 11908 -SHA256 (rust/crates/clap_builder-4.3.5.crate) = 2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae -SIZE (rust/crates/clap_builder-4.3.5.crate) = 162212 -SHA256 (rust/crates/clap_derive-4.3.2.crate) = b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f -SIZE (rust/crates/clap_derive-4.3.2.crate) = 29053 -SHA256 (rust/crates/clap_lex-0.2.4.crate) = 2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5 -SIZE (rust/crates/clap_lex-0.2.4.crate) = 9652 +SHA256 (rust/crates/clap_builder-4.3.19.crate) = 01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1 +SIZE (rust/crates/clap_builder-4.3.19.crate) = 161122 +SHA256 (rust/crates/clap_derive-4.3.12.crate) = 54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050 +SIZE (rust/crates/clap_derive-4.3.12.crate) = 29052 SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792 SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7 SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857 -SHA256 (rust/crates/colored-1.9.3.crate) = f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59 -SIZE (rust/crates/colored-1.9.3.crate) = 20062 -SHA256 (rust/crates/colored-2.0.0.crate) = b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd -SIZE (rust/crates/colored-2.0.0.crate) = 21619 +SHA256 (rust/crates/colored-1.9.4.crate) = 5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355 +SIZE (rust/crates/colored-1.9.4.crate) = 21849 +SHA256 (rust/crates/colored-2.0.4.crate) = 2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6 +SIZE (rust/crates/colored-2.0.4.crate) = 23654 SHA256 (rust/crates/combine-3.8.1.crate) = da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680 SIZE (rust/crates/combine-3.8.1.crate) = 103773 -SHA256 (rust/crates/comfy-table-6.2.0.crate) = 7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba -SIZE (rust/crates/comfy-table-6.2.0.crate) = 67803 +SHA256 (rust/crates/comfy-table-7.0.1.crate) = 9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b +SIZE (rust/crates/comfy-table-7.0.1.crate) = 72831 SHA256 (rust/crates/compiletest_rs-0.6.0.crate) = 0086d6ad78cf409c3061618cd98e2789d5c9ce598fc9651611cf62eae0a599cb SIZE (rust/crates/compiletest_rs-0.6.0.crate) = 54431 SHA256 (rust/crates/console-0.15.7.crate) = c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8 @@ -149,8 +151,8 @@ SHA256 (rust/crates/console_error_panic_hook-0.1.7.crate) = a06aeb73f470f66dcdbf SIZE (rust/crates/console_error_panic_hook-0.1.7.crate) = 507196 SHA256 (rust/crates/const_fn-0.4.9.crate) = fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935 SIZE (rust/crates/const_fn-0.4.9.crate) = 12624 -SHA256 (rust/crates/constant_time_eq-0.2.6.crate) = 21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6 -SIZE (rust/crates/constant_time_eq-0.2.6.crate) = 10936 +SHA256 (rust/crates/constant_time_eq-0.3.0.crate) = f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2 +SIZE (rust/crates/constant_time_eq-0.3.0.crate) = 11369 SHA256 (rust/crates/cooked-waker-5.0.0.crate) = 147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f SIZE (rust/crates/cooked-waker-5.0.0.crate) = 11317 SHA256 (rust/crates/core-foundation-0.9.3.crate) = 194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146 @@ -161,8 +163,8 @@ SHA256 (rust/crates/corosensei-0.1.3.crate) = 9847f90f32a50b0dcbd68bc23ff242798b SIZE (rust/crates/corosensei-0.1.3.crate) = 63948 SHA256 (rust/crates/counter-0.5.7.crate) = 2d458e66999348f56fd3ffcfbb7f7951542075ca8359687c703de6500c1ddccd SIZE (rust/crates/counter-0.5.7.crate) = 12868 -SHA256 (rust/crates/cpufeatures-0.2.8.crate) = 03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c -SIZE (rust/crates/cpufeatures-0.2.8.crate) = 11840 +SHA256 (rust/crates/cpufeatures-0.2.9.crate) = a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1 +SIZE (rust/crates/cpufeatures-0.2.9.crate) = 11895 SHA256 (rust/crates/cranelift-bforest-0.91.1.crate) = 2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115 SIZE (rust/crates/cranelift-bforest-0.91.1.crate) = 30789 SHA256 (rust/crates/cranelift-codegen-0.91.1.crate) = 98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc @@ -183,10 +185,10 @@ SHA256 (rust/crates/crc-1.8.1.crate) = d663548de7f5cca343f1e0a48d14dcfb0e9eb4e07 SIZE (rust/crates/crc-1.8.1.crate) = 9114 SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661 -SHA256 (rust/crates/criterion-0.3.6.crate) = b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f -SIZE (rust/crates/criterion-0.3.6.crate) = 110967 -SHA256 (rust/crates/criterion-plot-0.4.5.crate) = 2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876 -SIZE (rust/crates/criterion-plot-0.4.5.crate) = 22721 +SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f +SIZE (rust/crates/criterion-0.5.1.crate) = 110088 +SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1 +SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706 SHA256 (rust/crates/critical-section-1.1.1.crate) = 6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52 SIZE (rust/crates/critical-section-1.1.1.crate) = 17373 SHA256 (rust/crates/crossbeam-channel-0.5.8.crate) = a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200 @@ -211,30 +213,38 @@ SHA256 (rust/crates/ctor-0.1.26.crate) = 6d2301688392eb071b0bf1a37be05c469d3cc4d SIZE (rust/crates/ctor-0.1.26.crate) = 10803 SHA256 (rust/crates/cty-0.2.2.crate) = b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35 SIZE (rust/crates/cty-0.2.2.crate) = 7230 -SHA256 (rust/crates/cynic-2.2.8.crate) = b1afa0591b1021e427e548a1f0f147fe6168f6c7c7f7006bace77f28856051b8 -SIZE (rust/crates/cynic-2.2.8.crate) = 49235 -SHA256 (rust/crates/cynic-codegen-2.2.8.crate) = 70a1bb05cc554f46079d0fa72abe995a2d32d0737d410a41da75b31e3f7ef768 -SIZE (rust/crates/cynic-codegen-2.2.8.crate) = 77334 -SHA256 (rust/crates/cynic-proc-macros-2.2.8.crate) = aa595c4ed7a5374e0e58c5c34f9d93bd6b7d45062790963bd4b4c3c0bf520c4d -SIZE (rust/crates/cynic-proc-macros-2.2.8.crate) = 2113 -SHA256 (rust/crates/darling-0.13.4.crate) = a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c -SIZE (rust/crates/darling-0.13.4.crate) = 20895 -SHA256 (rust/crates/darling-0.20.1.crate) = 0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944 -SIZE (rust/crates/darling-0.20.1.crate) = 25792 -SHA256 (rust/crates/darling_core-0.13.4.crate) = 859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610 -SIZE (rust/crates/darling_core-0.13.4.crate) = 52937 -SHA256 (rust/crates/darling_core-0.20.1.crate) = ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb -SIZE (rust/crates/darling_core-0.20.1.crate) = 59009 -SHA256 (rust/crates/darling_macro-0.13.4.crate) = 9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835 -SIZE (rust/crates/darling_macro-0.13.4.crate) = 1910 -SHA256 (rust/crates/darling_macro-0.20.1.crate) = 29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a -SIZE (rust/crates/darling_macro-0.20.1.crate) = 1855 -SHA256 (rust/crates/dashmap-5.4.0.crate) = 907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc -SIZE (rust/crates/dashmap-5.4.0.crate) = 22862 +SHA256 (rust/crates/cynic-3.2.2.crate) = bf035d785657f3621eee03fdfeefab48127d8b1643b6f9edf8b3cd66cbd86e9b +SIZE (rust/crates/cynic-3.2.2.crate) = 53527 +SHA256 (rust/crates/cynic-codegen-3.2.2.crate) = 4e8e65b71a8bd2751712ab38326b73a5f98405b6b5f8fd4dae658e58c1576d09 +SIZE (rust/crates/cynic-codegen-3.2.2.crate) = 85733 +SHA256 (rust/crates/cynic-proc-macros-3.2.2.crate) = 4a933ea1f357cbd48f2068c59457631696ae58d554f89290e4da272b1f69ebf1 +SIZE (rust/crates/cynic-proc-macros-3.2.2.crate) = 2319 +SHA256 (rust/crates/darling-0.14.4.crate) = 7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850 +SIZE (rust/crates/darling-0.14.4.crate) = 25168 +SHA256 (rust/crates/darling-0.20.3.crate) = 0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e +SIZE (rust/crates/darling-0.20.3.crate) = 26066 +SHA256 (rust/crates/darling_core-0.14.4.crate) = 109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0 +SIZE (rust/crates/darling_core-0.14.4.crate) = 57485 +SHA256 (rust/crates/darling_core-0.20.3.crate) = 177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621 +SIZE (rust/crates/darling_core-0.20.3.crate) = 60281 +SHA256 (rust/crates/darling_macro-0.14.4.crate) = a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e +SIZE (rust/crates/darling_macro-0.14.4.crate) = 1896 +SHA256 (rust/crates/darling_macro-0.20.3.crate) = 836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5 +SIZE (rust/crates/darling_macro-0.20.3.crate) = 1859 +SHA256 (rust/crates/dashmap-5.5.0.crate) = 6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d +SIZE (rust/crates/dashmap-5.5.0.crate) = 24067 +SHA256 (rust/crates/deranged-0.3.7.crate) = 7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929 +SIZE (rust/crates/deranged-0.3.7.crate) = 14803 SHA256 (rust/crates/derivative-2.2.0.crate) = fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b SIZE (rust/crates/derivative-2.2.0.crate) = 48076 SHA256 (rust/crates/derive_arbitrary-1.3.1.crate) = 53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8 SIZE (rust/crates/derive_arbitrary-1.3.1.crate) = 10624 +SHA256 (rust/crates/derive_builder-0.12.0.crate) = 8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8 +SIZE (rust/crates/derive_builder-0.12.0.crate) = 35456 +SHA256 (rust/crates/derive_builder_core-0.12.0.crate) = c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f +SIZE (rust/crates/derive_builder_core-0.12.0.crate) = 31438 +SHA256 (rust/crates/derive_builder_macro-0.12.0.crate) = ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e +SIZE (rust/crates/derive_builder_macro-0.12.0.crate) = 6288 SHA256 (rust/crates/dialoguer-0.10.4.crate) = 59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87 SIZE (rust/crates/dialoguer-0.10.4.crate) = 29928 SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8 @@ -261,14 +271,14 @@ SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054 SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123 SHA256 (rust/crates/downcast-rs-1.2.0.crate) = 9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650 SIZE (rust/crates/downcast-rs-1.2.0.crate) = 11670 -SHA256 (rust/crates/dyn-clone-1.0.11.crate) = 68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30 -SIZE (rust/crates/dyn-clone-1.0.11.crate) = 11771 +SHA256 (rust/crates/dyn-clone-1.0.12.crate) = 304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272 +SIZE (rust/crates/dyn-clone-1.0.12.crate) = 11800 SHA256 (rust/crates/dynasm-1.2.3.crate) = add9a102807b524ec050363f09e06f1504214b0e1c7797f64261c891022dce8b SIZE (rust/crates/dynasm-1.2.3.crate) = 103467 SHA256 (rust/crates/dynasmrt-1.2.3.crate) = 64fba5a42bd76a17cad4bfa00de168ee1cbfa06a5e8ce992ae880218c05641a9 SIZE (rust/crates/dynasmrt-1.2.3.crate) = 19701 -SHA256 (rust/crates/either-1.8.1.crate) = 7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91 -SIZE (rust/crates/either-1.8.1.crate) = 16027 +SHA256 (rust/crates/either-1.9.0.crate) = a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07 +SIZE (rust/crates/either-1.9.0.crate) = 16660 SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741 SHA256 (rust/crates/encode_unicode-1.0.0.crate) = 34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0 @@ -283,18 +293,20 @@ SHA256 (rust/crates/enumset-1.1.2.crate) = e875f1719c16de097dee81ed675e2d9bb6309 SIZE (rust/crates/enumset-1.1.2.crate) = 26785 SHA256 (rust/crates/enumset_derive-0.8.1.crate) = e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af SIZE (rust/crates/enumset_derive-0.8.1.crate) = 12711 -SHA256 (rust/crates/erased-serde-0.3.25.crate) = 4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569 -SIZE (rust/crates/erased-serde-0.3.25.crate) = 24916 -SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a -SIZE (rust/crates/errno-0.3.1.crate) = 10348 +SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5 +SIZE (rust/crates/equivalent-1.0.1.crate) = 6615 +SHA256 (rust/crates/erased-serde-0.3.28.crate) = da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070 +SIZE (rust/crates/erased-serde-0.3.28.crate) = 24944 +SHA256 (rust/crates/errno-0.3.2.crate) = 6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f +SIZE (rust/crates/errno-0.3.2.crate) = 10424 SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810 SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7 SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509 SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249 -SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be -SIZE (rust/crates/fastrand-1.9.0.crate) = 11910 +SHA256 (rust/crates/fastrand-2.0.0.crate) = 6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764 +SIZE (rust/crates/fastrand-2.0.0.crate) = 14402 SHA256 (rust/crates/fern-0.6.2.crate) = d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee SIZE (rust/crates/fern-0.6.2.crate) = 304626 SHA256 (rust/crates/field-offset-0.3.6.crate) = 38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f @@ -345,8 +357,8 @@ SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce8 SIZE (rust/crates/getopts-0.2.21.crate) = 18457 SHA256 (rust/crates/getrandom-0.2.10.crate) = be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427 SIZE (rust/crates/getrandom-0.2.10.crate) = 34955 -SHA256 (rust/crates/ghost-0.1.9.crate) = e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357 -SIZE (rust/crates/ghost-0.1.9.crate) = 14099 +SHA256 (rust/crates/ghost-0.1.14.crate) = ba330b70a5341d3bc730b8e205aaee97ddab5d9c448c4f51a7c2d924266fa8f9 +SIZE (rust/crates/ghost-0.1.14.crate) = 14176 SHA256 (rust/crates/gimli-0.26.2.crate) = 22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d SIZE (rust/crates/gimli-0.26.2.crate) = 717340 SHA256 (rust/crates/gimli-0.27.3.crate) = b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e @@ -367,8 +379,8 @@ SHA256 (rust/crates/gumdrop-0.8.1.crate) = 5bc700f989d2f6f0248546222d9b4258f5b02 SIZE (rust/crates/gumdrop-0.8.1.crate) = 17522 SHA256 (rust/crates/gumdrop_derive-0.8.1.crate) = 729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d SIZE (rust/crates/gumdrop_derive-0.8.1.crate) = 11657 -SHA256 (rust/crates/h2-0.3.19.crate) = d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782 -SIZE (rust/crates/h2-0.3.19.crate) = 164681 +SHA256 (rust/crates/h2-0.3.20.crate) = 97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049 +SIZE (rust/crates/h2-0.3.20.crate) = 165260 SHA256 (rust/crates/half-1.8.2.crate) = eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7 SIZE (rust/crates/half-1.8.2.crate) = 41874 SHA256 (rust/crates/hash32-0.2.1.crate) = b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67 @@ -387,12 +399,8 @@ SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b774 SIZE (rust/crates/heck-0.3.3.crate) = 10260 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8 SIZE (rust/crates/heck-0.4.1.crate) = 11567 -SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 -SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979 -SHA256 (rust/crates/hermit-abi-0.2.6.crate) = ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7 -SIZE (rust/crates/hermit-abi-0.2.6.crate) = 13027 -SHA256 (rust/crates/hermit-abi-0.3.1.crate) = fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286 -SIZE (rust/crates/hermit-abi-0.3.1.crate) = 13793 +SHA256 (rust/crates/hermit-abi-0.3.2.crate) = 443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b +SIZE (rust/crates/hermit-abi-0.3.2.crate) = 13783 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70 SIZE (rust/crates/hex-0.4.3.crate) = 13299 SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e @@ -401,18 +409,18 @@ SHA256 (rust/crates/http-0.2.9.crate) = bd6effc99afb63425aff9b05836f029929e345a6 SIZE (rust/crates/http-0.2.9.crate) = 100146 SHA256 (rust/crates/http-body-0.4.5.crate) = d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1 SIZE (rust/crates/http-body-0.4.5.crate) = 9242 -SHA256 (rust/crates/http-range-header-0.3.0.crate) = 0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29 -SIZE (rust/crates/http-range-header-0.3.0.crate) = 7120 +SHA256 (rust/crates/http-range-header-0.3.1.crate) = add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f +SIZE (rust/crates/http-range-header-0.3.1.crate) = 7712 SHA256 (rust/crates/http-serde-1.1.2.crate) = 0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e SIZE (rust/crates/http-serde-1.1.2.crate) = 4274 SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904 SIZE (rust/crates/httparse-1.8.0.crate) = 29954 SHA256 (rust/crates/httpdate-1.0.2.crate) = c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421 SIZE (rust/crates/httpdate-1.0.2.crate) = 10673 -SHA256 (rust/crates/hyper-0.14.26.crate) = ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4 -SIZE (rust/crates/hyper-0.14.26.crate) = 195570 -SHA256 (rust/crates/hyper-rustls-0.24.0.crate) = 0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7 -SIZE (rust/crates/hyper-rustls-0.24.0.crate) = 29917 +SHA256 (rust/crates/hyper-0.14.27.crate) = ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468 +SIZE (rust/crates/hyper-0.14.27.crate) = 195700 +SHA256 (rust/crates/hyper-rustls-0.24.1.crate) = 8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97 +SIZE (rust/crates/hyper-rustls-0.24.1.crate) = 30224 SHA256 (rust/crates/hyper-tls-0.5.0.crate) = d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905 SIZE (rust/crates/hyper-tls-0.5.0.crate) = 13257 SHA256 (rust/crates/iana-time-zone-0.1.57.crate) = 2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613 @@ -429,8 +437,10 @@ SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260 SIZE (rust/crates/idna-0.4.0.crate) = 271429 SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99 SIZE (rust/crates/indexmap-1.9.3.crate) = 54653 -SHA256 (rust/crates/indicatif-0.17.5.crate) = 8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057 -SIZE (rust/crates/indicatif-0.17.5.crate) = 59843 +SHA256 (rust/crates/indexmap-2.0.0.crate) = d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d +SIZE (rust/crates/indexmap-2.0.0.crate) = 64038 +SHA256 (rust/crates/indicatif-0.17.6.crate) = 0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730 +SIZE (rust/crates/indicatif-0.17.6.crate) = 62817 SHA256 (rust/crates/inkwell-0.1.1.crate) = bbac11e485159a525867fb7e6aa61981453e6a72f625fde6a4ab3047b0c6dec9 SIZE (rust/crates/inkwell-0.1.1.crate) = 176392 SHA256 (rust/crates/inkwell_internals-0.7.0.crate) = 87d00c17e264ce02be5bc23d7bff959188ec7137beddd06b8b6b05a7c680ea85 @@ -441,30 +451,24 @@ SHA256 (rust/crates/inline-c-macro-0.1.5.crate) = 17f5621ec7adacda881d7c2826c064 SIZE (rust/crates/inline-c-macro-0.1.5.crate) = 2449 SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5 SIZE (rust/crates/inout-0.1.3.crate) = 10743 -SHA256 (rust/crates/insta-1.29.0.crate) = 9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972 -SIZE (rust/crates/insta-1.29.0.crate) = 543492 +SHA256 (rust/crates/insta-1.31.0.crate) = a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a +SIZE (rust/crates/insta-1.31.0.crate) = 543861 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c SIZE (rust/crates/instant-0.1.12.crate) = 6128 SHA256 (rust/crates/inventory-0.2.3.crate) = 84344c6e0b90a9e2b6f3f9abe5cc74402684e348df7b32adca28747e0cef091a SIZE (rust/crates/inventory-0.2.3.crate) = 13590 -SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2 -SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346 -SHA256 (rust/crates/ipnet-2.7.2.crate) = 12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f -SIZE (rust/crates/ipnet-2.7.2.crate) = 27044 -SHA256 (rust/crates/is-terminal-0.4.7.crate) = adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f -SIZE (rust/crates/is-terminal-0.4.7.crate) = 8356 -SHA256 (rust/crates/isatty-0.1.9.crate) = e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc -SIZE (rust/crates/isatty-0.1.9.crate) = 8009 +SHA256 (rust/crates/ipnet-2.8.0.crate) = 28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6 +SIZE (rust/crates/ipnet-2.8.0.crate) = 27474 +SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b +SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473 SIZE (rust/crates/itertools-0.10.5.crate) = 115354 -SHA256 (rust/crates/itoa-1.0.6.crate) = 453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6 -SIZE (rust/crates/itoa-1.0.6.crate) = 10410 +SHA256 (rust/crates/itoa-1.0.9.crate) = af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38 +SIZE (rust/crates/itoa-1.0.9.crate) = 10492 SHA256 (rust/crates/jobserver-0.1.26.crate) = 936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2 SIZE (rust/crates/jobserver-0.1.26.crate) = 22645 SHA256 (rust/crates/js-sys-0.3.61.crate) = 445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730 SIZE (rust/crates/js-sys-0.3.61.crate) = 80158 -SHA256 (rust/crates/json5-0.4.1.crate) = 96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1 -SIZE (rust/crates/json5-0.4.1.crate) = 15678 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 SHA256 (rust/crates/leb128-0.2.5.crate) = 884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67 @@ -473,8 +477,8 @@ SHA256 (rust/crates/lexical-core-0.7.6.crate) = 6607c62aa161d23d17a9072cc5da0be6 SIZE (rust/crates/lexical-core-0.7.6.crate) = 494385 SHA256 (rust/crates/lexical-sort-0.3.1.crate) = c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a SIZE (rust/crates/lexical-sort-0.3.1.crate) = 63689 -SHA256 (rust/crates/libc-0.2.146.crate) = f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b -SIZE (rust/crates/libc-0.2.146.crate) = 684707 +SHA256 (rust/crates/libc-0.2.147.crate) = b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3 +SIZE (rust/crates/libc-0.2.147.crate) = 686772 SHA256 (rust/crates/libfuzzer-sys-0.4.6.crate) = beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e SIZE (rust/crates/libfuzzer-sys-0.4.6.crate) = 127910 SHA256 (rust/crates/libloading-0.8.0.crate) = d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb @@ -485,10 +489,10 @@ SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049 SHA256 (rust/crates/linked_hash_set-0.1.4.crate) = 47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588 SIZE (rust/crates/linked_hash_set-0.1.4.crate) = 15328 -SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519 -SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776 -SHA256 (rust/crates/llvm-sys-140.1.1.crate) = fe48b87b95ad1b3eeca563010aadbb427b3d3e89c1f78fe21acd39846be5c7d4 -SIZE (rust/crates/llvm-sys-140.1.1.crate) = 53210 +SHA256 (rust/crates/linux-raw-sys-0.4.5.crate) = 57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503 +SIZE (rust/crates/linux-raw-sys-0.4.5.crate) = 1274380 +SHA256 (rust/crates/llvm-sys-140.1.2.crate) = 69b285f8682531b9b394dd9891977a2a28c47006e491bda944e1ca62ebab2664 +SIZE (rust/crates/llvm-sys-140.1.2.crate) = 53221 SHA256 (rust/crates/lock_api-0.4.10.crate) = c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16 SIZE (rust/crates/lock_api-0.4.10.crate) = 26713 SHA256 (rust/crates/log-0.4.19.crate) = b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4 @@ -529,8 +533,6 @@ SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841 SHA256 (rust/crates/minisign-0.7.5.crate) = d2b6f58413c6cee060115673578e47271838f3c87cb9322c61a3bcd6d740b7d2 SIZE (rust/crates/minisign-0.7.5.crate) = 34449 -SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa -SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536 SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7 SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194 SHA256 (rust/crates/mio-0.8.8.crate) = 927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2 @@ -551,14 +553,14 @@ SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b SIZE (rust/crates/nom-7.1.3.crate) = 117570 SHA256 (rust/crates/normalize-line-endings-0.3.0.crate) = 61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be SIZE (rust/crates/normalize-line-endings-0.3.0.crate) = 5737 +SHA256 (rust/crates/normpath-1.1.1.crate) = ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5 +SIZE (rust/crates/normpath-1.1.1.crate) = 19786 SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311 -SHA256 (rust/crates/nuke-dir-0.1.0.crate) = 6a6842d8099b88d19a64158a6cfdc3e9ad82c738c041dab98280ef7ba98d64fa -SIZE (rust/crates/nuke-dir-0.1.0.crate) = 1150 -SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd -SIZE (rust/crates/num-traits-0.2.15.crate) = 49262 -SHA256 (rust/crates/num_cpus-1.15.0.crate) = 0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b -SIZE (rust/crates/num_cpus-1.15.0.crate) = 15680 +SHA256 (rust/crates/num-traits-0.2.16.crate) = f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2 +SIZE (rust/crates/num-traits-0.2.16.crate) = 50130 +SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43 +SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713 SHA256 (rust/crates/num_enum-0.5.11.crate) = 1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9 SIZE (rust/crates/num_enum-0.5.11.crate) = 16772 SHA256 (rust/crates/num_enum_derive-0.5.11.crate) = dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799 @@ -569,10 +571,14 @@ SHA256 (rust/crates/object-0.28.4.crate) = e42c982f2d955fac81dd7e1d0e1426a7d702a SIZE (rust/crates/object-0.28.4.crate) = 237248 SHA256 (rust/crates/object-0.30.4.crate) = 03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385 SIZE (rust/crates/object-0.30.4.crate) = 259203 +SHA256 (rust/crates/object-0.31.1.crate) = 8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1 +SIZE (rust/crates/object-0.31.1.crate) = 272843 SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d SIZE (rust/crates/once_cell-1.18.0.crate) = 32969 SHA256 (rust/crates/oorandom-11.1.3.crate) = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575 SIZE (rust/crates/oorandom-11.1.3.crate) = 10068 +SHA256 (rust/crates/opener-0.6.1.crate) = 6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788 +SIZE (rust/crates/opener-0.6.1.crate) = 19173 SHA256 (rust/crates/openssl-0.10.55.crate) = 345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d SIZE (rust/crates/openssl-0.10.55.crate) = 258750 SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c @@ -581,12 +587,12 @@ SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc19480 SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227 SHA256 (rust/crates/openssl-sys-0.9.90.crate) = 374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6 SIZE (rust/crates/openssl-sys-0.9.90.crate) = 66197 -SHA256 (rust/crates/orbclient-0.3.45.crate) = 221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1 -SIZE (rust/crates/orbclient-0.3.45.crate) = 1324416 -SHA256 (rust/crates/os_str_bytes-6.5.1.crate) = 4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac -SIZE (rust/crates/os_str_bytes-6.5.1.crate) = 22778 -SHA256 (rust/crates/output_vt100-0.1.3.crate) = 628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66 -SIZE (rust/crates/output_vt100-0.1.3.crate) = 4473 +SHA256 (rust/crates/orbclient-0.3.46.crate) = 8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f +SIZE (rust/crates/orbclient-0.3.46.crate) = 1324549 +SHA256 (rust/crates/ouroboros-0.15.6.crate) = e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db +SIZE (rust/crates/ouroboros-0.15.6.crate) = 11257 +SHA256 (rust/crates/ouroboros_macro-0.15.6.crate) = 5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7 +SIZE (rust/crates/ouroboros_macro-0.15.6.crate) = 20751 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39 SIZE (rust/crates/overload-0.1.1.crate) = 24439 SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99 @@ -597,44 +603,32 @@ SHA256 (rust/crates/parking_lot_core-0.8.6.crate) = 60a2cfe6f0ad2bfc16aefa463b49 SIZE (rust/crates/parking_lot_core-0.8.6.crate) = 32567 SHA256 (rust/crates/parking_lot_core-0.9.8.crate) = 93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447 SIZE (rust/crates/parking_lot_core-0.9.8.crate) = 32383 -SHA256 (rust/crates/paste-1.0.12.crate) = 9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79 -SIZE (rust/crates/paste-1.0.12.crate) = 18156 -SHA256 (rust/crates/path-clean-0.1.0.crate) = ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd -SIZE (rust/crates/path-clean-0.1.0.crate) = 4909 +SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c +SIZE (rust/crates/paste-1.0.14.crate) = 18157 +SHA256 (rust/crates/path-clean-1.0.1.crate) = 17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef +SIZE (rust/crates/path-clean-1.0.1.crate) = 4514 SHA256 (rust/crates/pathdiff-0.2.1.crate) = 8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd SIZE (rust/crates/pathdiff-0.2.1.crate) = 7142 -SHA256 (rust/crates/pbkdf2-0.12.1.crate) = f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31 -SIZE (rust/crates/pbkdf2-0.12.1.crate) = 13866 +SHA256 (rust/crates/pbkdf2-0.12.2.crate) = f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2 +SIZE (rust/crates/pbkdf2-0.12.2.crate) = 13906 SHA256 (rust/crates/percent-encoding-2.3.0.crate) = 9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94 SIZE (rust/crates/percent-encoding-2.3.0.crate) = 10196 -SHA256 (rust/crates/pest-2.7.0.crate) = f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9 -SIZE (rust/crates/pest-2.7.0.crate) = 110274 -SHA256 (rust/crates/pest_derive-2.7.0.crate) = aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b -SIZE (rust/crates/pest_derive-2.7.0.crate) = 30867 -SHA256 (rust/crates/pest_generator-2.7.0.crate) = b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190 -SIZE (rust/crates/pest_generator-2.7.0.crate) = 17331 -SHA256 (rust/crates/pest_meta-2.7.0.crate) = a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0 -SIZE (rust/crates/pest_meta-2.7.0.crate) = 37255 +SHA256 (rust/crates/pest-2.7.2.crate) = 1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a +SIZE (rust/crates/pest-2.7.2.crate) = 111301 SHA256 (rust/crates/petgraph-0.6.3.crate) = 4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4 SIZE (rust/crates/petgraph-0.6.3.crate) = 185740 -SHA256 (rust/crates/pin-project-1.1.0.crate) = c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead -SIZE (rust/crates/pin-project-1.1.0.crate) = 57895 -SHA256 (rust/crates/pin-project-internal-1.1.0.crate) = 39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07 -SIZE (rust/crates/pin-project-internal-1.1.0.crate) = 27855 -SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116 -SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713 +SHA256 (rust/crates/pin-project-1.1.2.crate) = 030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842 +SIZE (rust/crates/pin-project-1.1.2.crate) = 57540 +SHA256 (rust/crates/pin-project-internal-1.1.2.crate) = ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c +SIZE (rust/crates/pin-project-internal-1.1.2.crate) = 27825 +SHA256 (rust/crates/pin-project-lite-0.2.10.crate) = 4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57 +SIZE (rust/crates/pin-project-lite-0.2.10.crate) = 28026 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580 SHA256 (rust/crates/pkg-config-0.3.27.crate) = 26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964 SIZE (rust/crates/pkg-config-0.3.27.crate) = 18838 -SHA256 (rust/crates/plotters-0.3.5.crate) = d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45 -SIZE (rust/crates/plotters-0.3.5.crate) = 143975 -SHA256 (rust/crates/plotters-backend-0.3.5.crate) = 9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609 -SIZE (rust/crates/plotters-backend-0.3.5.crate) = 13440 -SHA256 (rust/crates/plotters-svg-0.3.5.crate) = 38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab -SIZE (rust/crates/plotters-svg-0.3.5.crate) = 6948 -SHA256 (rust/crates/portable-atomic-1.3.3.crate) = 767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794 -SIZE (rust/crates/portable-atomic-1.3.3.crate) = 124809 +SHA256 (rust/crates/portable-atomic-1.4.2.crate) = f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e +SIZE (rust/crates/portable-atomic-1.4.2.crate) = 124375 SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242 SHA256 (rust/crates/predicates-2.1.5.crate) = 59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd @@ -645,8 +639,8 @@ SHA256 (rust/crates/predicates-core-1.0.6.crate) = b794032607612e7abeb4db69adb4e SIZE (rust/crates/predicates-core-1.0.6.crate) = 8084 SHA256 (rust/crates/predicates-tree-1.0.9.crate) = 368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf SIZE (rust/crates/predicates-tree-1.0.9.crate) = 7960 -SHA256 (rust/crates/pretty_assertions-1.3.0.crate) = a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755 -SIZE (rust/crates/pretty_assertions-1.3.0.crate) = 79441 +SHA256 (rust/crates/pretty_assertions-1.4.0.crate) = af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66 +SIZE (rust/crates/pretty_assertions-1.4.0.crate) = 78846 SHA256 (rust/crates/prettytable-rs-0.10.0.crate) = eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a SIZE (rust/crates/prettytable-rs-0.10.0.crate) = 35474 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919 @@ -657,8 +651,8 @@ SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b1 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971 SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068 SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045 -SHA256 (rust/crates/proc-macro2-1.0.60.crate) = dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406 -SIZE (rust/crates/proc-macro2-1.0.60.crate) = 44160 +SHA256 (rust/crates/proc-macro2-1.0.66.crate) = 18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9 +SIZE (rust/crates/proc-macro2-1.0.66.crate) = 43575 SHA256 (rust/crates/proc-quote-0.4.0.crate) = 5e84ab161de78c915302ca325a19bee6df272800e2ae1a43fe3ef430bab2a100 SIZE (rust/crates/proc-quote-0.4.0.crate) = 17119 SHA256 (rust/crates/proc-quote-impl-0.3.2.crate) = 7fb3ec628b063cdbcf316e06a8b8c1a541d28fa6c0a8eacd2bfb2b7f49e88aa0 @@ -669,8 +663,8 @@ SHA256 (rust/crates/ptr_meta_derive-0.1.4.crate) = 16b845dbfca988fa33db069c0e230 SIZE (rust/crates/ptr_meta_derive-0.1.4.crate) = 2302 SHA256 (rust/crates/pulldown-cmark-0.8.0.crate) = ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8 SIZE (rust/crates/pulldown-cmark-0.8.0.crate) = 106330 -SHA256 (rust/crates/quote-1.0.28.crate) = 1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488 -SIZE (rust/crates/quote-1.0.28.crate) = 28382 +SHA256 (rust/crates/quote-1.0.32.crate) = 50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965 +SIZE (rust/crates/quote-1.0.32.crate) = 28037 SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09 SIZE (rust/crates/radium-0.7.0.crate) = 10906 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404 @@ -685,26 +679,30 @@ SHA256 (rust/crates/rayon-1.7.0.crate) = 1d2df5196e37bcc87abebc0053e20787d73847b SIZE (rust/crates/rayon-1.7.0.crate) = 169488 SHA256 (rust/crates/rayon-core-1.11.0.crate) = 4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d SIZE (rust/crates/rayon-core-1.11.0.crate) = 73118 -SHA256 (rust/crates/redox_syscall-0.1.57.crate) = 41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce -SIZE (rust/crates/redox_syscall-0.1.57.crate) = 17087 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29 SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 +SHA256 (rust/crates/ref-cast-1.0.19.crate) = 61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1 +SIZE (rust/crates/ref-cast-1.0.19.crate) = 12424 +SHA256 (rust/crates/ref-cast-impl-1.0.19.crate) = 2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa +SIZE (rust/crates/ref-cast-impl-1.0.19.crate) = 9083 SHA256 (rust/crates/ref_thread_local-0.1.1.crate) = a0d51660a68078997855ba5602f73ab3a5031bd7ad480a9d4c90fbbf04e1fff0 SIZE (rust/crates/ref_thread_local-0.1.1.crate) = 8074 SHA256 (rust/crates/regalloc2-0.5.1.crate) = 300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c SIZE (rust/crates/regalloc2-0.5.1.crate) = 127205 -SHA256 (rust/crates/regex-1.8.4.crate) = d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f -SIZE (rust/crates/regex-1.8.4.crate) = 249562 +SHA256 (rust/crates/regex-1.9.1.crate) = b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575 +SIZE (rust/crates/regex-1.9.1.crate) = 251978 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533 +SHA256 (rust/crates/regex-automata-0.3.4.crate) = b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294 +SIZE (rust/crates/regex-automata-0.3.4.crate) = 604400 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752 -SHA256 (rust/crates/regex-syntax-0.7.2.crate) = 436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78 -SIZE (rust/crates/regex-syntax-0.7.2.crate) = 339778 +SHA256 (rust/crates/regex-syntax-0.7.4.crate) = e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2 +SIZE (rust/crates/regex-syntax-0.7.4.crate) = 343365 SHA256 (rust/crates/region-3.0.0.crate) = 76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e SIZE (rust/crates/region-3.0.0.crate) = 21488 SHA256 (rust/crates/rend-0.4.0.crate) = 581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab @@ -735,38 +733,38 @@ SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175 SHA256 (rust/crates/rustfix-0.5.1.crate) = f2c50b74badcddeb8f7652fa8323ce440b95286f8e4b64ebfd871c609672704e SIZE (rust/crates/rustfix-0.5.1.crate) = 17768 -SHA256 (rust/crates/rustix-0.37.20.crate) = b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0 -SIZE (rust/crates/rustix-0.37.20.crate) = 327665 -SHA256 (rust/crates/rustls-0.21.2.crate) = e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f -SIZE (rust/crates/rustls-0.21.2.crate) = 279135 -SHA256 (rust/crates/rustls-pemfile-1.0.2.crate) = d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b -SIZE (rust/crates/rustls-pemfile-1.0.2.crate) = 19347 -SHA256 (rust/crates/rustls-webpki-0.100.1.crate) = d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b -SIZE (rust/crates/rustls-webpki-0.100.1.crate) = 70719 -SHA256 (rust/crates/rustversion-1.0.12.crate) = 4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06 -SIZE (rust/crates/rustversion-1.0.12.crate) = 17278 +SHA256 (rust/crates/rustix-0.38.6.crate) = 1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f +SIZE (rust/crates/rustix-0.38.6.crate) = 331959 +SHA256 (rust/crates/rustls-0.21.6.crate) = 1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb +SIZE (rust/crates/rustls-0.21.6.crate) = 282907 +SHA256 (rust/crates/rustls-pemfile-1.0.3.crate) = 2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2 +SIZE (rust/crates/rustls-pemfile-1.0.3.crate) = 20432 +SHA256 (rust/crates/rustls-webpki-0.101.2.crate) = 513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59 +SIZE (rust/crates/rustls-webpki-0.101.2.crate) = 163257 +SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4 +SIZE (rust/crates/rustversion-1.0.14.crate) = 17261 SHA256 (rust/crates/rusty_jsc-0.1.0.crate) = 4f8f838ac489c4fec2ae60bcd620e70ca829b75f83d4516f2708fd2a9edafdd0 SIZE (rust/crates/rusty_jsc-0.1.0.crate) = 7784 SHA256 (rust/crates/rusty_jsc_macros-0.1.0.crate) = 7b2407097cc2d172aedd2da887e68c1724c96f7828bad033096d0bb911dc4071 SIZE (rust/crates/rusty_jsc_macros-0.1.0.crate) = 1917 SHA256 (rust/crates/rusty_jsc_sys-0.1.0.crate) = 927443ab7a267331865e31bfe0ffb70216cbbadb8e3b15c09774fae6caa9d8df SIZE (rust/crates/rusty_jsc_sys-0.1.0.crate) = 4342 -SHA256 (rust/crates/ryu-1.0.13.crate) = f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041 -SIZE (rust/crates/ryu-1.0.13.crate) = 46823 +SHA256 (rust/crates/ryu-1.0.15.crate) = 1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741 +SIZE (rust/crates/ryu-1.0.15.crate) = 46906 SHA256 (rust/crates/salsa20-0.10.2.crate) = 97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213 SIZE (rust/crates/salsa20-0.10.2.crate) = 12780 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 SIZE (rust/crates/same-file-1.0.6.crate) = 10183 -SHA256 (rust/crates/schannel-0.1.21.crate) = 713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3 -SIZE (rust/crates/schannel-0.1.21.crate) = 41719 +SHA256 (rust/crates/schannel-0.1.22.crate) = 0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88 +SIZE (rust/crates/schannel-0.1.22.crate) = 41642 SHA256 (rust/crates/schemars-0.8.12.crate) = 02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f SIZE (rust/crates/schemars-0.8.12.crate) = 54931 SHA256 (rust/crates/schemars_derive-0.8.12.crate) = 109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c SIZE (rust/crates/schemars_derive-0.8.12.crate) = 18331 SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202 -SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd -SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 +SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49 +SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619 SHA256 (rust/crates/scrypt-0.11.0.crate) = 0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f SIZE (rust/crates/scrypt-0.11.0.crate) = 13440 SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4 @@ -777,44 +775,44 @@ SHA256 (rust/crates/sdl2-sys-0.35.2.crate) = e3586be2cf6c0a8099a79a12b4084357aa9 SIZE (rust/crates/sdl2-sys-0.35.2.crate) = 7425816 SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b SIZE (rust/crates/seahash-4.1.0.crate) = 31976 -SHA256 (rust/crates/security-framework-2.9.1.crate) = 1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8 -SIZE (rust/crates/security-framework-2.9.1.crate) = 78844 -SHA256 (rust/crates/security-framework-sys-2.9.0.crate) = f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7 -SIZE (rust/crates/security-framework-sys-2.9.0.crate) = 18197 +SHA256 (rust/crates/security-framework-2.9.2.crate) = 05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de +SIZE (rust/crates/security-framework-2.9.2.crate) = 79295 +SHA256 (rust/crates/security-framework-sys-2.9.1.crate) = e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a +SIZE (rust/crates/security-framework-sys-2.9.1.crate) = 18284 SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403 SIZE (rust/crates/semver-0.9.0.crate) = 17344 SHA256 (rust/crates/semver-0.11.0.crate) = f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6 SIZE (rust/crates/semver-0.11.0.crate) = 20826 -SHA256 (rust/crates/semver-1.0.17.crate) = bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed -SIZE (rust/crates/semver-1.0.17.crate) = 29685 +SHA256 (rust/crates/semver-1.0.18.crate) = b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918 +SIZE (rust/crates/semver-1.0.18.crate) = 29703 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268 SHA256 (rust/crates/semver-parser-0.10.2.crate) = 00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7 SIZE (rust/crates/semver-parser-0.10.2.crate) = 23176 -SHA256 (rust/crates/serde-1.0.164.crate) = 9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d -SIZE (rust/crates/serde-1.0.164.crate) = 77057 +SHA256 (rust/crates/serde-1.0.180.crate) = 0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed +SIZE (rust/crates/serde-1.0.180.crate) = 76950 SHA256 (rust/crates/serde-wasm-bindgen-0.4.5.crate) = e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf SIZE (rust/crates/serde-wasm-bindgen-0.4.5.crate) = 17012 -SHA256 (rust/crates/serde_bytes-0.11.9.crate) = 416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294 -SIZE (rust/crates/serde_bytes-0.11.9.crate) = 10833 +SHA256 (rust/crates/serde_bytes-0.11.12.crate) = ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff +SIZE (rust/crates/serde_bytes-0.11.12.crate) = 10910 SHA256 (rust/crates/serde_cbor-0.11.2.crate) = 2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5 SIZE (rust/crates/serde_cbor-0.11.2.crate) = 44570 -SHA256 (rust/crates/serde_derive-1.0.164.crate) = d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68 -SIZE (rust/crates/serde_derive-1.0.164.crate) = 54789 +SHA256 (rust/crates/serde_derive-1.0.180.crate) = 24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036 +SIZE (rust/crates/serde_derive-1.0.180.crate) = 377689 SHA256 (rust/crates/serde_derive_internals-0.26.0.crate) = 85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c SIZE (rust/crates/serde_derive_internals-0.26.0.crate) = 25382 -SHA256 (rust/crates/serde_json-1.0.97.crate) = bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a -SIZE (rust/crates/serde_json-1.0.97.crate) = 145152 -SHA256 (rust/crates/serde_path_to_error-0.1.11.crate) = f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0 -SIZE (rust/crates/serde_path_to_error-0.1.11.crate) = 16485 -SHA256 (rust/crates/serde_spanned-0.6.2.crate) = 93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d -SIZE (rust/crates/serde_spanned-0.6.2.crate) = 7749 +SHA256 (rust/crates/serde_json-1.0.104.crate) = 076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c +SIZE (rust/crates/serde_json-1.0.104.crate) = 146130 +SHA256 (rust/crates/serde_path_to_error-0.1.14.crate) = 4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335 +SIZE (rust/crates/serde_path_to_error-0.1.14.crate) = 16553 +SHA256 (rust/crates/serde_spanned-0.6.3.crate) = 96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186 +SIZE (rust/crates/serde_spanned-0.6.3.crate) = 7737 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822 SHA256 (rust/crates/serde_yaml-0.8.26.crate) = 578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b SIZE (rust/crates/serde_yaml-0.8.26.crate) = 40670 -SHA256 (rust/crates/serde_yaml-0.9.21.crate) = d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c -SIZE (rust/crates/serde_yaml-0.9.21.crate) = 64229 +SHA256 (rust/crates/serde_yaml-0.9.25.crate) = 1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574 +SIZE (rust/crates/serde_yaml-0.9.25.crate) = 64594 SHA256 (rust/crates/serial_test-0.5.1.crate) = e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d SIZE (rust/crates/serial_test-0.5.1.crate) = 2993 SHA256 (rust/crates/serial_test_derive-0.5.1.crate) = b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5 @@ -831,10 +829,8 @@ SHA256 (rust/crates/shared-buffer-0.1.3.crate) = 2cf61602ee61e2f83dd016b3e638724 SIZE (rust/crates/shared-buffer-0.1.3.crate) = 10369 SHA256 (rust/crates/shell-words-1.1.0.crate) = 24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde SIZE (rust/crates/shell-words-1.1.0.crate) = 9871 -SHA256 (rust/crates/shellexpand-2.1.2.crate) = 7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4 -SIZE (rust/crates/shellexpand-2.1.2.crate) = 16884 -SHA256 (rust/crates/signal-hook-0.3.15.crate) = 732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9 -SIZE (rust/crates/signal-hook-0.3.15.crate) = 50138 +SHA256 (rust/crates/signal-hook-0.3.17.crate) = 8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801 +SIZE (rust/crates/signal-hook-0.3.17.crate) = 50296 SHA256 (rust/crates/signal-hook-mio-0.2.3.crate) = 29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af SIZE (rust/crates/signal-hook-mio-0.2.3.crate) = 9064 SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1 @@ -847,8 +843,8 @@ SHA256 (rust/crates/slab-0.4.8.crate) = 6528351c9bc8ab22353f9d776db39a20288e8d6c SIZE (rust/crates/slab-0.4.8.crate) = 16928 SHA256 (rust/crates/slice-group-by-0.3.1.crate) = 826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7 SIZE (rust/crates/slice-group-by-0.3.1.crate) = 14640 -SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 -SIZE (rust/crates/smallvec-1.10.0.crate) = 31564 +SHA256 (rust/crates/smallvec-1.11.0.crate) = 62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9 +SIZE (rust/crates/smallvec-1.11.0.crate) = 34680 SHA256 (rust/crates/socket2-0.4.9.crate) = 64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662 SIZE (rust/crates/socket2-0.4.9.crate) = 45421 SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d @@ -881,18 +877,18 @@ SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01 SIZE (rust/crates/subtle-2.5.0.crate) = 13909 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 SIZE (rust/crates/syn-1.0.109.crate) = 237611 -SHA256 (rust/crates/syn-2.0.18.crate) = 32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e -SIZE (rust/crates/syn-2.0.18.crate) = 240648 +SHA256 (rust/crates/syn-2.0.28.crate) = 04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567 +SIZE (rust/crates/syn-2.0.28.crate) = 241635 SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369 SIZE (rust/crates/tap-1.0.1.crate) = 11316 -SHA256 (rust/crates/tar-0.4.38.crate) = 4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6 -SIZE (rust/crates/tar-0.4.38.crate) = 49158 +SHA256 (rust/crates/tar-0.4.39.crate) = ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96 +SIZE (rust/crates/tar-0.4.39.crate) = 51491 SHA256 (rust/crates/target-lexicon-0.11.2.crate) = 422045212ea98508ae3d28025bc5aaa2bd4a9cdaecd442a08da2ee620ee9ea95 SIZE (rust/crates/target-lexicon-0.11.2.crate) = 21796 -SHA256 (rust/crates/target-lexicon-0.12.8.crate) = 1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac -SIZE (rust/crates/target-lexicon-0.12.8.crate) = 24518 -SHA256 (rust/crates/tempfile-3.6.0.crate) = 31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6 -SIZE (rust/crates/tempfile-3.6.0.crate) = 31812 +SHA256 (rust/crates/target-lexicon-0.12.11.crate) = 9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a +SIZE (rust/crates/target-lexicon-0.12.11.crate) = 24594 +SHA256 (rust/crates/tempfile-3.7.0.crate) = 5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998 +SIZE (rust/crates/tempfile-3.7.0.crate) = 31754 SHA256 (rust/crates/term-0.7.0.crate) = c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f SIZE (rust/crates/term-0.7.0.crate) = 37082 SHA256 (rust/crates/term_size-0.3.2.crate) = 1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9 @@ -907,26 +903,22 @@ SHA256 (rust/crates/test-log-0.2.12.crate) = d9601d162c1d77e62c1ea0bc8116cd1caf1 SIZE (rust/crates/test-log-0.2.12.crate) = 10583 SHA256 (rust/crates/tester-0.9.1.crate) = 89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f SIZE (rust/crates/tester-0.9.1.crate) = 40422 -SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 -SIZE (rust/crates/textwrap-0.11.0.crate) = 17322 -SHA256 (rust/crates/textwrap-0.16.0.crate) = 222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d -SIZE (rust/crates/textwrap-0.16.0.crate) = 53722 -SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac -SIZE (rust/crates/thiserror-1.0.40.crate) = 18709 -SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f -SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138 +SHA256 (rust/crates/thiserror-1.0.44.crate) = 611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90 +SIZE (rust/crates/thiserror-1.0.44.crate) = 18760 +SHA256 (rust/crates/thiserror-impl-1.0.44.crate) = 090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96 +SIZE (rust/crates/thiserror-impl-1.0.44.crate) = 15086 SHA256 (rust/crates/thread_local-1.1.7.crate) = 3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152 SIZE (rust/crates/thread_local-1.1.7.crate) = 13585 SHA256 (rust/crates/time-0.2.27.crate) = 4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242 SIZE (rust/crates/time-0.2.27.crate) = 65167 -SHA256 (rust/crates/time-0.3.22.crate) = ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd -SIZE (rust/crates/time-0.3.22.crate) = 113792 +SHA256 (rust/crates/time-0.3.25.crate) = b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea +SIZE (rust/crates/time-0.3.25.crate) = 116903 SHA256 (rust/crates/time-core-0.1.1.crate) = 7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb SIZE (rust/crates/time-core-0.1.1.crate) = 7197 SHA256 (rust/crates/time-macros-0.1.1.crate) = 957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1 SIZE (rust/crates/time-macros-0.1.1.crate) = 5447 -SHA256 (rust/crates/time-macros-0.2.9.crate) = 372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b -SIZE (rust/crates/time-macros-0.2.9.crate) = 23684 +SHA256 (rust/crates/time-macros-0.2.11.crate) = eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd +SIZE (rust/crates/time-macros-0.2.11.crate) = 23738 SHA256 (rust/crates/time-macros-impl-0.1.2.crate) = fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f SIZE (rust/crates/time-macros-impl-0.1.2.crate) = 10096 SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc @@ -937,8 +929,8 @@ SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865 SHA256 (rust/crates/tldextract-0.6.0.crate) = ec03259a0567ad58eed30812bc3e5eda8030f154abc70317ab57b14f00699ca4 SIZE (rust/crates/tldextract-0.6.0.crate) = 54131 -SHA256 (rust/crates/tokio-1.28.2.crate) = 94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2 -SIZE (rust/crates/tokio-1.28.2.crate) = 660565 +SHA256 (rust/crates/tokio-1.29.1.crate) = 532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da +SIZE (rust/crates/tokio-1.29.1.crate) = 693627 SHA256 (rust/crates/tokio-macros-2.1.0.crate) = 630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e SIZE (rust/crates/tokio-macros-2.1.0.crate) = 11472 SHA256 (rust/crates/tokio-native-tls-0.3.1.crate) = bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2 @@ -949,16 +941,16 @@ SHA256 (rust/crates/tokio-util-0.7.8.crate) = 806fe8c2c87eccc8b3267cbae29ed3ab2d SIZE (rust/crates/tokio-util-0.7.8.crate) = 101644 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234 SIZE (rust/crates/toml-0.5.11.crate) = 54910 -SHA256 (rust/crates/toml-0.7.4.crate) = d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec -SIZE (rust/crates/toml-0.7.4.crate) = 49003 -SHA256 (rust/crates/toml_datetime-0.6.2.crate) = 5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f -SIZE (rust/crates/toml_datetime-0.6.2.crate) = 10768 -SHA256 (rust/crates/toml_edit-0.19.10.crate) = 2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739 -SIZE (rust/crates/toml_edit-0.19.10.crate) = 95594 +SHA256 (rust/crates/toml-0.7.6.crate) = c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542 +SIZE (rust/crates/toml-0.7.6.crate) = 49220 +SHA256 (rust/crates/toml_datetime-0.6.3.crate) = 7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b +SIZE (rust/crates/toml_datetime-0.6.3.crate) = 10770 +SHA256 (rust/crates/toml_edit-0.19.14.crate) = f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a +SIZE (rust/crates/toml_edit-0.19.14.crate) = 94875 SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c SIZE (rust/crates/tower-0.4.13.crate) = 106906 -SHA256 (rust/crates/tower-http-0.4.1.crate) = a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c -SIZE (rust/crates/tower-http-0.4.1.crate) = 114242 +SHA256 (rust/crates/tower-http-0.4.3.crate) = 55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82 +SIZE (rust/crates/tower-http-0.4.3.crate) = 115404 SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0 SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023 SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52 @@ -981,22 +973,22 @@ SHA256 (rust/crates/tracing-wasm-0.2.1.crate) = 4575c663a174420fa2d78f4108ff68f6 SIZE (rust/crates/tracing-wasm-0.2.1.crate) = 9372 SHA256 (rust/crates/try-lock-0.2.4.crate) = 3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed SIZE (rust/crates/try-lock-0.2.4.crate) = 4467 -SHA256 (rust/crates/trybuild-1.0.80.crate) = 501dbdbb99861e4ab6b60eb6a7493956a9defb644fd034bc4a5ef27c693c8a3a -SIZE (rust/crates/trybuild-1.0.80.crate) = 40184 +SHA256 (rust/crates/trybuild-1.0.82.crate) = a84e0202ea606ba5ebee8507ab2bfbe89b98551ed9b8f0be198109275cff284b +SIZE (rust/crates/trybuild-1.0.82.crate) = 40191 SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba SIZE (rust/crates/typenum-1.16.0.crate) = 42477 SHA256 (rust/crates/typetag-0.1.8.crate) = 4080564c5b2241b5bff53ab610082234e0c57b0417f4bd10596f183001505b8a SIZE (rust/crates/typetag-0.1.8.crate) = 25667 SHA256 (rust/crates/typetag-impl-0.1.8.crate) = e60147782cc30833c05fba3bab1d9b5771b2685a2557672ac96fa5d154099c0e SIZE (rust/crates/typetag-impl-0.1.8.crate) = 8875 -SHA256 (rust/crates/ucd-trie-0.1.5.crate) = 9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81 -SIZE (rust/crates/ucd-trie-0.1.5.crate) = 45391 +SHA256 (rust/crates/ucd-trie-0.1.6.crate) = ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9 +SIZE (rust/crates/ucd-trie-0.1.6.crate) = 45790 SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6 SIZE (rust/crates/unicase-2.6.0.crate) = 23478 SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460 SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477 -SHA256 (rust/crates/unicode-ident-1.0.9.crate) = b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0 -SIZE (rust/crates/unicode-ident-1.0.9.crate) = 41978 +SHA256 (rust/crates/unicode-ident-1.0.11.crate) = 301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c +SIZE (rust/crates/unicode-ident-1.0.11.crate) = 42067 SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921 SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604 SHA256 (rust/crates/unicode-segmentation-1.10.1.crate) = 1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36 @@ -1009,20 +1001,18 @@ SHA256 (rust/crates/unix_mode-0.1.3.crate) = 35abed4630bb800f02451a7428205d1f37b SIZE (rust/crates/unix_mode-0.1.3.crate) = 10806 SHA256 (rust/crates/unreachable-1.0.0.crate) = 382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56 SIZE (rust/crates/unreachable-1.0.0.crate) = 6355 -SHA256 (rust/crates/unsafe-libyaml-0.2.8.crate) = 1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6 -SIZE (rust/crates/unsafe-libyaml-0.2.8.crate) = 61459 +SHA256 (rust/crates/unsafe-libyaml-0.2.9.crate) = f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa +SIZE (rust/crates/unsafe-libyaml-0.2.9.crate) = 60812 SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a SIZE (rust/crates/untrusted-0.7.1.crate) = 7924 SHA256 (rust/crates/url-2.4.0.crate) = 50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb SIZE (rust/crates/url-2.4.0.crate) = 75670 -SHA256 (rust/crates/urlencoding-2.1.2.crate) = e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9 -SIZE (rust/crates/urlencoding-2.1.2.crate) = 6422 +SHA256 (rust/crates/urlencoding-2.1.3.crate) = daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da +SIZE (rust/crates/urlencoding-2.1.3.crate) = 6538 SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435 -SHA256 (rust/crates/uuid-1.3.4.crate) = 0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81 -SIZE (rust/crates/uuid-1.3.4.crate) = 53874 -SHA256 (rust/crates/validator-0.16.1.crate) = b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd -SIZE (rust/crates/validator-0.16.1.crate) = 13718 +SHA256 (rust/crates/uuid-1.4.1.crate) = 79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d +SIZE (rust/crates/uuid-1.4.1.crate) = 55291 SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d SIZE (rust/crates/valuable-0.1.0.crate) = 27718 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426 @@ -1057,8 +1047,6 @@ SHA256 (rust/crates/walkdir-2.3.3.crate) = 36df944cda56c7d8d8b7496af378e6b16de92 SIZE (rust/crates/walkdir-2.3.3.crate) = 23125 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e SIZE (rust/crates/want-0.3.1.crate) = 6398 -SHA256 (rust/crates/wapm-targz-to-pirita-0.3.1.crate) = 8d816eaf89496a0eefecb79f43463b07205701165c17790fa6f0eab5ae72bc39 -SIZE (rust/crates/wapm-targz-to-pirita-0.3.1.crate) = 1494494 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 SHA256 (rust/crates/wasm-bindgen-0.2.84.crate) = 31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b @@ -1081,58 +1069,60 @@ SHA256 (rust/crates/wasm-bindgen-test-0.3.34.crate) = 6db36fc0f9fb209e88fb364259 SIZE (rust/crates/wasm-bindgen-test-0.3.34.crate) = 15710 SHA256 (rust/crates/wasm-bindgen-test-macro-0.3.34.crate) = 0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9 SIZE (rust/crates/wasm-bindgen-test-macro-0.3.34.crate) = 6331 -SHA256 (rust/crates/wasm-coredump-builder-0.1.15.crate) = bcb7050c67c77c4fe0c1197565c2e24ad6e5f66318f32dcbbe8f07b00d8d1502 -SIZE (rust/crates/wasm-coredump-builder-0.1.15.crate) = 2648 -SHA256 (rust/crates/wasm-coredump-encoder-0.1.15.crate) = 6b78901e352d547edcaa8e5ee9e77bcdf354f7b67c327225839243c6c24c6747 -SIZE (rust/crates/wasm-coredump-encoder-0.1.15.crate) = 1307 -SHA256 (rust/crates/wasm-coredump-types-0.1.15.crate) = 6b3ba1c7b0d578f4733643ec18f35bd81a57197debb1d35be631787630ae615b -SIZE (rust/crates/wasm-coredump-types-0.1.15.crate) = 1131 +SHA256 (rust/crates/wasm-coredump-builder-0.1.20.crate) = 46a45b77df22075a4cc28a1f1b0ffde2f98ea9427b08be653cd42301cc31a733 +SIZE (rust/crates/wasm-coredump-builder-0.1.20.crate) = 2646 +SHA256 (rust/crates/wasm-coredump-encoder-0.1.20.crate) = 4c768410ee257f529009c138d91ba69e5b03c406954401411ca2ce7e172a3043 +SIZE (rust/crates/wasm-coredump-encoder-0.1.20.crate) = 1307 +SHA256 (rust/crates/wasm-coredump-types-0.1.20.crate) = 16c10cfb746471f9d2f70beac757f29919baae2b666dbc52c3f8f8d0c9d32afe +SIZE (rust/crates/wasm-coredump-types-0.1.20.crate) = 1132 SHA256 (rust/crates/wasm-encoder-0.4.1.crate) = 51b4949d4f2b25a4b208317dcf86aacef9e7a5884e48dfc45d4aeb91808d6f86 SIZE (rust/crates/wasm-encoder-0.4.1.crate) = 17860 SHA256 (rust/crates/wasm-encoder-0.23.0.crate) = 1c3e4bc09095436c8e7584d86d33e6c3ee67045af8fb262cbb9cc321de553428 SIZE (rust/crates/wasm-encoder-0.23.0.crate) = 36619 -SHA256 (rust/crates/wasm-encoder-0.29.0.crate) = 18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881 -SIZE (rust/crates/wasm-encoder-0.29.0.crate) = 41553 +SHA256 (rust/crates/wasm-encoder-0.31.1.crate) = 41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16 +SIZE (rust/crates/wasm-encoder-0.31.1.crate) = 45496 SHA256 (rust/crates/wasm-smith-0.4.5.crate) = f7e95fdeed16adeffed44efdc7ccf27d4f57ff2e99de417c75bcee7dee09049b SIZE (rust/crates/wasm-smith-0.4.5.crate) = 356120 SHA256 (rust/crates/wasm-streams-0.2.3.crate) = 6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078 SIZE (rust/crates/wasm-streams-0.2.3.crate) = 33205 -SHA256 (rust/crates/wasmer-api-0.0.8.crate) = 96d3d713e203593b245f700f42f23ec632e6cf8c01be3ed2ce828b6948a261e4 -SIZE (rust/crates/wasmer-api-0.0.8.crate) = 19500 -SHA256 (rust/crates/wasmer-deploy-cli-0.1.16.crate) = 401220ca92419731ffb670b6d6f8442fc32b110f6e9bb5658c4cfa658c48ab32 -SIZE (rust/crates/wasmer-deploy-cli-0.1.16.crate) = 41859 -SHA256 (rust/crates/wasmer-deploy-schema-0.0.8.crate) = 518852c619a39aebe90bf38f0a1c8669c6b9eaf78ba11b899ec240745df1166d -SIZE (rust/crates/wasmer-deploy-schema-0.0.8.crate) = 28399 -SHA256 (rust/crates/wasmer-deploy-util-0.0.8.crate) = 94cb6c1cc25b066e81a2fdd7cd1774b68fbb733f4618e92f5b2e1e182c7d6894 -SIZE (rust/crates/wasmer-deploy-util-0.0.8.crate) = 4666 +SHA256 (rust/crates/wasmer-api-0.0.12.crate) = ce5c528b93fa430da1d4960759ded4f905bd7a82c68857f9eb01202a62650224 +SIZE (rust/crates/wasmer-api-0.0.12.crate) = 22857 +SHA256 (rust/crates/wasmer-deploy-cli-0.1.19.crate) = 622926606a0ec3d5d474485e2770e661445665e8e7a9e144c3e3732ebbf2c772 +SIZE (rust/crates/wasmer-deploy-cli-0.1.19.crate) = 47802 +SHA256 (rust/crates/wasmer-deploy-schema-0.0.10.crate) = 9f8c1b8e8c2e49f3c1a54bce561dbb79e81ced47818deddde8b32280e33ca2a6 +SIZE (rust/crates/wasmer-deploy-schema-0.0.10.crate) = 29450 +SHA256 (rust/crates/wasmer-deploy-util-0.0.10.crate) = 27a1a67c2146f62b3e336f131404235f54e12fa80f0d8278b77fff56cdbe548f +SIZE (rust/crates/wasmer-deploy-util-0.0.10.crate) = 4992 SHA256 (rust/crates/wasmer-inline-c-0.1.2.crate) = 7c4e7a2a3363ceeb2ee60371af9460748f2bf53569b58627f1f640284ab07778 SIZE (rust/crates/wasmer-inline-c-0.1.2.crate) = 3960 SHA256 (rust/crates/wasmer-inline-c-macro-0.1.6.crate) = 058581df4116836c51906e346d6f49ad1b1de0129243fba6b1e1d3c206cd36d1 SIZE (rust/crates/wasmer-inline-c-macro-0.1.6.crate) = 2362 -SHA256 (rust/crates/wasmer-registry-4.7.0.crate) = abc018188be9bb86e1e548ad3e5eedc33e6a0fca703172b1dd4a605d35e82086 -SIZE (rust/crates/wasmer-registry-4.7.0.crate) = 36189 +SHA256 (rust/crates/wasmer-registry-5.3.0.crate) = 74c6b4b47cf736e1c6aaf27f2b12a4140d5399c9609e08815cdc4cb622f0c726 +SIZE (rust/crates/wasmer-registry-5.3.0.crate) = 37307 SHA256 (rust/crates/wasmer-toml-0.6.0.crate) = 4232db0aff83ed6208d541ddcf1bf72730673528be8c4fe13c6369060f6e05a7 SIZE (rust/crates/wasmer-toml-0.6.0.crate) = 10711 -SHA256 (rust/crates/wasmer-wasm-interface-4.0.0-beta.3.crate) = 71d70bdc140529bd98fec735cc4fc0fde15632fd29350445fdc3413b11c8b41f -SIZE (rust/crates/wasmer-wasm-interface-4.0.0-beta.3.crate) = 10397 +SHA256 (rust/crates/wasmer-toml-0.7.0.crate) = d79d9e87af8aea672134da379ccef76e659b7bc316a10b7e51d30177515c0199 +SIZE (rust/crates/wasmer-toml-0.7.0.crate) = 13212 +SHA256 (rust/crates/wasmer-wasm-interface-4.1.0.crate) = 676a4e64975caa2cc3947fe061ac4f7fc2efaa1ed8c192120b46d79419f8419e +SIZE (rust/crates/wasmer-wasm-interface-4.1.0.crate) = 10457 SHA256 (rust/crates/wasmparser-0.51.4.crate) = aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a SIZE (rust/crates/wasmparser-0.51.4.crate) = 71773 SHA256 (rust/crates/wasmparser-0.83.0.crate) = 718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a SIZE (rust/crates/wasmparser-0.83.0.crate) = 82579 SHA256 (rust/crates/wasmparser-0.95.0.crate) = f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a SIZE (rust/crates/wasmparser-0.95.0.crate) = 123630 -SHA256 (rust/crates/wasmparser-0.107.0.crate) = 29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb -SIZE (rust/crates/wasmparser-0.107.0.crate) = 162060 -SHA256 (rust/crates/wasmprinter-0.2.59.crate) = cc960b30b84abca377768f3c62cff3a1c74db8c0f6759ed581827da0bd3a3fed -SIZE (rust/crates/wasmprinter-0.2.59.crate) = 31271 +SHA256 (rust/crates/wasmparser-0.110.0.crate) = 1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c +SIZE (rust/crates/wasmparser-0.110.0.crate) = 164385 +SHA256 (rust/crates/wasmprinter-0.2.62.crate) = 42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f +SIZE (rust/crates/wasmprinter-0.2.62.crate) = 31607 SHA256 (rust/crates/wast-24.0.0.crate) = 6ff1e3bd3ad0b2ee7784add89c30dc96b89a54b43e5d6d95d774eda1863b3500 SIZE (rust/crates/wast-24.0.0.crate) = 103430 SHA256 (rust/crates/wast-38.0.1.crate) = ae0d7b256bef26c898fa7344a2d627e8499f5a749432ce0a05eae1a64ff0c271 SIZE (rust/crates/wast-38.0.1.crate) = 96511 -SHA256 (rust/crates/wast-60.0.0.crate) = bd06cc744b536e30387e72a48fdd492105b9c938bb4f415c39c616a7a0a697ad -SIZE (rust/crates/wast-60.0.0.crate) = 129585 -SHA256 (rust/crates/wat-1.0.66.crate) = 5abe520f0ab205366e9ac7d3e6b2fc71de44e32a2b58f2ec871b6b575bdcea3b -SIZE (rust/crates/wat-1.0.66.crate) = 9148 +SHA256 (rust/crates/wast-62.0.1.crate) = b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f +SIZE (rust/crates/wast-62.0.1.crate) = 131574 +SHA256 (rust/crates/wat-1.0.69.crate) = 842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637 +SIZE (rust/crates/wat-1.0.69.crate) = 9148 SHA256 (rust/crates/wayland-client-0.29.5.crate) = 3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715 SIZE (rust/crates/wayland-client-0.29.5.crate) = 71041 SHA256 (rust/crates/wayland-commons-0.29.5.crate) = 8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902 @@ -1151,16 +1141,16 @@ SHA256 (rust/crates/wcgi-host-0.1.2.crate) = a762cf2b0ed389a2a2fb591d63a398c1a4c SIZE (rust/crates/wcgi-host-0.1.2.crate) = 6154 SHA256 (rust/crates/web-sys-0.3.61.crate) = e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97 SIZE (rust/crates/web-sys-0.3.61.crate) = 706333 -SHA256 (rust/crates/webc-5.0.4.crate) = 02ba1b6e7ad252e691a86d727aa422fbc5ed95e9bca4ec8547869e9b5779f8f3 -SIZE (rust/crates/webc-5.0.4.crate) = 411789 +SHA256 (rust/crates/webc-5.3.0.crate) = e5c35d27cb4c7898571b5f25036ead587736ffb371261f9e928a28edee7abf9d +SIZE (rust/crates/webc-5.3.0.crate) = 439635 SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd SIZE (rust/crates/webpki-0.22.0.crate) = 58663 SHA256 (rust/crates/webpki-roots-0.22.6.crate) = b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87 SIZE (rust/crates/webpki-roots-0.22.6.crate) = 242386 SHA256 (rust/crates/weezl-0.1.7.crate) = 9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb SIZE (rust/crates/weezl-0.1.7.crate) = 42166 -SHA256 (rust/crates/whoami-1.4.0.crate) = 2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68 -SIZE (rust/crates/whoami-1.4.0.crate) = 15581 +SHA256 (rust/crates/whoami-1.4.1.crate) = 22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50 +SIZE (rust/crates/whoami-1.4.1.crate) = 19677 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 @@ -1173,16 +1163,14 @@ SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb8150 SIZE (rust/crates/windows-0.48.0.crate) = 11864177 SHA256 (rust/crates/windows-sys-0.33.0.crate) = 43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75 SIZE (rust/crates/windows-sys-0.33.0.crate) = 3355291 -SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7 -SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9 SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884 SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071 SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492 -SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5 -SIZE (rust/crates/windows-targets-0.48.0.crate) = 7466 +SHA256 (rust/crates/windows-targets-0.48.1.crate) = 05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f +SIZE (rust/crates/windows-targets-0.48.1.crate) = 6902 SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8 SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc @@ -1221,8 +1209,8 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936 SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422 -SHA256 (rust/crates/winnow-0.4.7.crate) = ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448 -SIZE (rust/crates/winnow-0.4.7.crate) = 142640 +SHA256 (rust/crates/winnow-0.5.3.crate) = f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807 +SIZE (rust/crates/winnow-0.5.3.crate) = 142396 SHA256 (rust/crates/winreg-0.10.1.crate) = 80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d SIZE (rust/crates/winreg-0.10.1.crate) = 25725 SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed @@ -1233,13 +1221,13 @@ SHA256 (rust/crates/xattr-0.2.3.crate) = 6d1526bbe5aaeb5eb06885f4d987bcdfa5e2318 SIZE (rust/crates/xattr-0.2.3.crate) = 11959 SHA256 (rust/crates/xcursor-0.3.4.crate) = 463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7 SIZE (rust/crates/xcursor-0.3.4.crate) = 6069 -SHA256 (rust/crates/xml-rs-0.8.14.crate) = 52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c -SIZE (rust/crates/xml-rs-0.8.14.crate) = 51905 +SHA256 (rust/crates/xml-rs-0.8.16.crate) = 47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1 +SIZE (rust/crates/xml-rs-0.8.16.crate) = 52990 SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85 SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783 SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec SIZE (rust/crates/yansi-0.5.1.crate) = 16525 SHA256 (rust/crates/zeroize-1.6.0.crate) = 2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9 SIZE (rust/crates/zeroize-1.6.0.crate) = 19049 -SHA256 (wasmerio-wasmer-v4.0.0_GH0.tar.gz) = fcac7573c6c54e8bed8e2ec9dc3d3973ce1fa949c6c1956b3b6bf7e27bb186bb -SIZE (wasmerio-wasmer-v4.0.0_GH0.tar.gz) = 49629253 +SHA256 (wasmerio-wasmer-v4.1.1_GH0.tar.gz) = 84dd57c798bd8041a1adb1aa65aacccdb11687b64f0e134ef7a5b61fa44ab2f3 +SIZE (wasmerio-wasmer-v4.1.1_GH0.tar.gz) = 53177847 diff --git a/devel/wasmer/files/patch-Makefile b/devel/wasmer/files/patch-Makefile deleted file mode 100644 index d35b624655e..00000000000 --- a/devel/wasmer/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2023-06-24 22:58:59 UTC -+++ Makefile -@@ -312,7 +312,7 @@ ifneq (, $(filter 1, $(IS_DARWIN) $(IS_LINUX) $(IS_FRE - reset := $(shell tput sgr0 2>/dev/null || echo -n '') - endif - --HOST_TARGET=$(shell rustup show | grep 'Default host: ' | cut -d':' -f2 | tr -d ' ') -+HOST_TARGET=$(shell rustc -V -v | grep 'host: ' | cut -d':' -f2 | tr -d ' ') - - TARGET_DIR ?= target/release - diff --git a/devel/youcompleteme/Makefile b/devel/youcompleteme/Makefile index aeb737c94ab..9e466da9469 100644 --- a/devel/youcompleteme/Makefile +++ b/devel/youcompleteme/Makefile @@ -1,5 +1,5 @@ PORTNAME= YouCompleteMe -DISTVERSION= g20220614 +DISTVERSION= g20230819 CATEGORIES= devel PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,8 +23,8 @@ USES= cmake compiler:c++11-lang python USE_PYTHON= flavors USE_GITHUB= yes GH_ACCOUNT= ycm-core -GH_TAGNAME= c99f408 -GH_TUPLE= ycm-core:ycmd:d1707c1:ycm/third_party/ycmd +GH_TAGNAME= e949df3 +GH_TUPLE= ycm-core:ycmd:45bc1c5:ycm/third_party/ycmd CMAKE_SOURCE_PATH= ${WRKSRC}/third_party/ycmd/cpp diff --git a/devel/youcompleteme/distinfo b/devel/youcompleteme/distinfo index bae7e3ebfe9..52df29d3cd0 100644 --- a/devel/youcompleteme/distinfo +++ b/devel/youcompleteme/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1658692980 -SHA256 (ycm-core-YouCompleteMe-g20220614-c99f408_GH0.tar.gz) = 9971fbbc84babb2b1913854a52ada2c20dec31ac9db3e42db69dff94722b546a -SIZE (ycm-core-YouCompleteMe-g20220614-c99f408_GH0.tar.gz) = 310443 -SHA256 (ycm-core-ycmd-d1707c1_GH0.tar.gz) = 46a84d6e8c59b1f9bf33e6ab813d9a6ca23ba022cfb96a1e700f817e2584d7f4 -SIZE (ycm-core-ycmd-d1707c1_GH0.tar.gz) = 2992035 +TIMESTAMP = 1692552198 +SHA256 (ycm-core-YouCompleteMe-g20230819-e949df3_GH0.tar.gz) = 3b8d0e529f77124c12fc44b682f032cccc4049c9e9cd01165483421274bc46dd +SIZE (ycm-core-YouCompleteMe-g20230819-e949df3_GH0.tar.gz) = 326872 +SHA256 (ycm-core-ycmd-45bc1c5_GH0.tar.gz) = 23370c28c4adcc7ed630bcc643d26a1a449e23e140f534d8bf5ec845b92da6c0 +SIZE (ycm-core-ycmd-45bc1c5_GH0.tar.gz) = 3045862 diff --git a/devel/youcompleteme/pkg-plist b/devel/youcompleteme/pkg-plist index 172c8c7f2a6..eacc2e52202 100644 --- a/devel/youcompleteme/pkg-plist +++ b/devel/youcompleteme/pkg-plist @@ -1,4 +1,5 @@ %%VIMFILESDIR%%/autoload/youcompleteme.vim +%%VIMFILESDIR%%/autoload/youcompleteme/filetypes.vim %%VIMFILESDIR%%/autoload/youcompleteme/finder.vim %%VIMFILESDIR%%/doc/youcompleteme.txt %%VIMFILESDIR%%/plugin/youcompleteme.vim @@ -13,6 +14,7 @@ %%VIMFILESDIR%%/python/ycm/client/completion_request.py %%VIMFILESDIR%%/python/ycm/client/debug_info_request.py %%VIMFILESDIR%%/python/ycm/client/event_notification.py +%%VIMFILESDIR%%/python/ycm/client/inlay_hints_request.py %%VIMFILESDIR%%/python/ycm/client/messages_request.py %%VIMFILESDIR%%/python/ycm/client/omni_completion_request.py %%VIMFILESDIR%%/python/ycm/client/resolve_completion_request.py @@ -22,9 +24,11 @@ %%VIMFILESDIR%%/python/ycm/client/ycmd_keepalive.py %%VIMFILESDIR%%/python/ycm/diagnostic_filter.py %%VIMFILESDIR%%/python/ycm/diagnostic_interface.py +%%VIMFILESDIR%%/python/ycm/inlay_hints.py %%VIMFILESDIR%%/python/ycm/omni_completer.py %%VIMFILESDIR%%/python/ycm/paths.py %%VIMFILESDIR%%/python/ycm/paths.py.bak +%%VIMFILESDIR%%/python/ycm/scrolling_range.py %%VIMFILESDIR%%/python/ycm/semantic_highlighting.py %%VIMFILESDIR%%/python/ycm/signature_help.py %%VIMFILESDIR%%/python/ycm/syntax_parse.py @@ -57,6 +61,7 @@ %%VIMFILESDIR%%/python/ycm/tests/testdata/uni¢od€/tags %%VIMFILESDIR%%/python/ycm/tests/vimsupport_test.py %%VIMFILESDIR%%/python/ycm/tests/youcompleteme_test.py +%%VIMFILESDIR%%/python/ycm/text_properties.py %%VIMFILESDIR%%/python/ycm/unsafe_thread_pool_executor.py %%VIMFILESDIR%%/python/ycm/vimsupport.py %%VIMFILESDIR%%/python/ycm/youcompleteme.py @@ -64,7 +69,10 @@ %%YCMDDIR%%/cpp/CMakeLists.txt %%YCMDDIR%%/cpp/llvm/include/clang-c/BuildSystem.h %%YCMDDIR%%/cpp/llvm/include/clang-c/CXCompilationDatabase.h +%%YCMDDIR%%/cpp/llvm/include/clang-c/CXDiagnostic.h %%YCMDDIR%%/cpp/llvm/include/clang-c/CXErrorCode.h +%%YCMDDIR%%/cpp/llvm/include/clang-c/CXFile.h +%%YCMDDIR%%/cpp/llvm/include/clang-c/CXSourceLocation.h %%YCMDDIR%%/cpp/llvm/include/clang-c/CXString.h %%YCMDDIR%%/cpp/llvm/include/clang-c/Documentation.h %%YCMDDIR%%/cpp/llvm/include/clang-c/ExternC.h @@ -84,11 +92,13 @@ %%YCMDDIR%%/cpp/pybind11/pybind11/detail/descr.h %%YCMDDIR%%/cpp/pybind11/pybind11/detail/init.h %%YCMDDIR%%/cpp/pybind11/pybind11/detail/internals.h +%%YCMDDIR%%/cpp/pybind11/pybind11/detail/type_caster_base.h %%YCMDDIR%%/cpp/pybind11/pybind11/detail/typeid.h %%YCMDDIR%%/cpp/pybind11/pybind11/eigen.h %%YCMDDIR%%/cpp/pybind11/pybind11/embed.h %%YCMDDIR%%/cpp/pybind11/pybind11/eval.h %%YCMDDIR%%/cpp/pybind11/pybind11/functional.h +%%YCMDDIR%%/cpp/pybind11/pybind11/gil.h %%YCMDDIR%%/cpp/pybind11/pybind11/iostream.h %%YCMDDIR%%/cpp/pybind11/pybind11/numpy.h %%YCMDDIR%%/cpp/pybind11/pybind11/operators.h @@ -96,6 +106,7 @@ %%YCMDDIR%%/cpp/pybind11/pybind11/pybind11.h %%YCMDDIR%%/cpp/pybind11/pybind11/pytypes.h %%YCMDDIR%%/cpp/pybind11/pybind11/stl.h +%%YCMDDIR%%/cpp/pybind11/pybind11/stl/filesystem.h %%YCMDDIR%%/cpp/pybind11/pybind11/stl_bind.h %%YCMDDIR%%/cpp/whereami/LICENSE.MIT %%YCMDDIR%%/cpp/whereami/whereami.c @@ -155,171 +166,195 @@ %%YCMDDIR%%/cpp/ycm/versioning.cpp %%YCMDDIR%%/cpp/ycm/versioning.h %%YCMDDIR%%/cpp/ycm/ycm_core.cpp -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_builtin_vars.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_cmath.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_complex_builtins.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_device_functions.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_intrinsics.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_libdevice_declares.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_math.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_math_forward_declares.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_runtime_wrapper.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_cuda_texture_intrinsics.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_hip_cmath.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_hip_libdevice_declares.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_hip_math.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__clang_hip_runtime_wrapper.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__stddef_max_align_t.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__wmmintrin_aes.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/__wmmintrin_pclmul.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/adxintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/altivec.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ammintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/amxintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/arm64intr.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/arm_acle.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/arm_cmse.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/arm_neon_sve_bridge.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/armintr.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx2intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512bf16intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512bitalgintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512bwintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512cdintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512dqintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512erintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512fintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512fp16intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512ifmaintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512ifmavlintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512pfintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vbmi2intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vbmiintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vbmivlintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlbf16intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlbitalgintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlbwintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlcdintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vldqintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlfp16intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlvbmi2intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlvnniintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vlvp2intersectintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vnniintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vp2intersectintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vpopcntdqintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avx512vpopcntdqvlintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avxintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/avxvnniintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/bmi2intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/bmiintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/builtins.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/cet.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/cetintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/cldemoteintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/clflushoptintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/clwbintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/clzerointrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/cpuid.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/crc32intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/cuda_wrappers/algorithm -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/cuda_wrappers/complex -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/cuda_wrappers/new -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/emmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/enqcmdintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/f16cintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/float.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/fma4intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/fmaintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/fxsrintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/gfniintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/hexagon_circ_brev_intrinsics.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/hexagon_protos.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/hexagon_types.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/hresetintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/htmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/htmxlintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/hvx_hexagon_protos.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ia32intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/immintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/inttypes.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/invpcidintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/iso646.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/keylockerintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/limits.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/lwpintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/lzcntintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/mm3dnow.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/mm_malloc.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/mmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/module.modulemap -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/movdirintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/msa.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/mwaitxintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/nmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/opencl-c-base.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/opencl-c.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/cmath -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/complex -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/complex.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/complex_cmath.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/math.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/new -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/openmp_wrappers/time.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/pconfigintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/pkuintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/pmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/popcntintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ppc_wrappers/emmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ppc_wrappers/mm_malloc.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ppc_wrappers/mmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ppc_wrappers/pmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ppc_wrappers/smmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ppc_wrappers/tmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ppc_wrappers/xmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/prfchwintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/ptwriteintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/rdseedintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/rtmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/s390intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/serializeintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/sgxintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/shaintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/smmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/stdalign.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/stdarg.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/stdatomic.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/stdbool.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/stddef.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/stdint.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/stdnoreturn.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/tbmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/tgmath.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/tmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/tsxldtrkintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/uintrintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/unwind.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/vadefs.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/vaesintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/varargs.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/vecintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/vpclmulqdqintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/waitpkgintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/wasm_simd128.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/wbnoinvdintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/wmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/x86gprintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/x86intrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/xmmintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/xopintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/xsavecintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/xsaveintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/xsaveoptintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/xsavesintrin.h -%%YCMDDIR%%/third_party/clang/lib/clang/14.0.0/include/xtestintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_builtin_vars.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_cmath.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_complex_builtins.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_device_functions.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_intrinsics.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_libdevice_declares.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_math.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_math_forward_declares.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_runtime_wrapper.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_cuda_texture_intrinsics.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_hip_cmath.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_hip_libdevice_declares.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_hip_math.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_hip_runtime_wrapper.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__clang_hip_stdlib.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__stddef_max_align_t.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__wmmintrin_aes.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/__wmmintrin_pclmul.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/adxintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/altivec.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ammintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/amxfp16intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/amxintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/arm64intr.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/arm_acle.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/arm_cmse.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/arm_neon_sve_bridge.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/armintr.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx2intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512bf16intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512bitalgintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512bwintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512cdintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512dqintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512erintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512fintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512fp16intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512ifmaintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512ifmavlintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512pfintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vbmi2intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vbmiintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vbmivlintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlbf16intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlbitalgintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlbwintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlcdintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vldqintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlfp16intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlvbmi2intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlvnniintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vlvp2intersectintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vnniintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vp2intersectintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vpopcntdqintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avx512vpopcntdqvlintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avxifmaintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avxintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avxneconvertintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avxvnniint8intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/avxvnniintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/bmi2intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/bmiintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/builtins.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cet.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cetintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cldemoteintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/clflushoptintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/clwbintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/clzerointrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cmpccxaddintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cpuid.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/crc32intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cuda_wrappers/algorithm +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cuda_wrappers/cmath +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cuda_wrappers/complex +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/cuda_wrappers/new +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/emmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/enqcmdintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/f16cintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/float.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/fma4intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/fmaintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/fxsrintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/gfniintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hexagon_circ_brev_intrinsics.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hexagon_protos.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hexagon_types.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hlsl.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hlsl/hlsl_basic_types.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hlsl/hlsl_intrinsics.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hresetintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/htmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/htmxlintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/hvx_hexagon_protos.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ia32intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/immintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/inttypes.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/invpcidintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/iso646.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/keylockerintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/larchintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/limits.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/lwpintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/lzcntintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/mm3dnow.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/mm_malloc.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/mmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/module.modulemap +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/movdirintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/msa.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/mwaitxintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/nmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/opencl-c-base.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/opencl-c.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/cmath +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/complex +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/complex.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/complex_cmath.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/math.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/new +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/stdlib.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/openmp_wrappers/time.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/pconfigintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/pkuintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/pmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/popcntintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/bmi2intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/bmiintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/emmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/immintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/mm_malloc.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/mmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/nmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/pmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/smmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/tmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/x86gprintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/x86intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ppc_wrappers/xmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/prfchiintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/prfchwintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/ptwriteintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/raointintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/rdpruintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/rdseedintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/rtmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/s390intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/serializeintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/sgxintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/shaintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/smmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/stdalign.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/stdarg.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/stdatomic.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/stdbool.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/stddef.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/stdint.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/stdnoreturn.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/tbmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/tgmath.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/tmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/tsxldtrkintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/uintrintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/unwind.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/vadefs.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/vaesintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/varargs.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/vecintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/velintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/velintrin_approx.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/velintrin_gen.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/vpclmulqdqintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/waitpkgintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/wasm_simd128.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/wbnoinvdintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/wmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/x86gprintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/x86intrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/xmmintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/xopintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/xsavecintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/xsaveintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/xsaveoptintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/xsavesintrin.h +%%YCMDDIR%%/third_party/clang/lib/clang/16.0.0/include/xtestintrin.h %%YCMDDIR%%/third_party/generic_server/.eslintignore %%YCMDDIR%%/third_party/generic_server/.eslintrc.js %%YCMDDIR%%/third_party/generic_server/.eslintrc.json diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index f9b64d65e43..2fc4c57371c 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= emacs -DISTVERSION= 30.0.50.20230806 +DISTVERSION= 30.0.50.20230820 PORTEPOCH= 3 CATEGORIES= editors PKGNAMESUFFIX= -devel @@ -24,7 +24,7 @@ USES= autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \ CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 18e7bc8 +GH_TAGNAME= fd1479a GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-build-details \ @@ -269,8 +269,8 @@ post-patch: pre-configure: @(cd ${WRKSRC} && ./autogen.sh all) @${REINPLACE_CMD} \ - -e '/emacs-repository-version/s/^.*$$/(setq emacs-repository-version "${GH_TAGNAME}")/' \ - -e '/emacs-repository-branch/s/^.*$$/(setq emacs-repository-branch "master")/' \ + -e 's/(ignore-errors (emacs-repository-get-version))/"${GH_TAGNAME}"/' \ + -e 's/(ignore-errors (emacs-repository-get-branch))/"master"/' \ ${WRKSRC}/lisp/loadup.el post-install: diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index bb8b962b6ef..292a39edaa0 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691351545 -SHA256 (emacs-mirror-emacs-30.0.50.20230806-18e7bc8_GH0.tar.gz) = 7ee7265aa3975e15c1994c7edd9964e5217ed58783df53539172aaf3a33dd49d -SIZE (emacs-mirror-emacs-30.0.50.20230806-18e7bc8_GH0.tar.gz) = 48447257 +TIMESTAMP = 1692513250 +SHA256 (emacs-mirror-emacs-30.0.50.20230820-fd1479a_GH0.tar.gz) = cfa57d5083cf4adce23002037d0e31475035125b35b0dc31c21862c63adddd3c +SIZE (emacs-mirror-emacs-30.0.50.20230820-fd1479a_GH0.tar.gz) = 49228292 diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index dc24fb112e5..aa74fae6a29 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -211,6 +211,7 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/gnus/news-server.ast %%DATADIR%%/%%EMACS_VER%%/etc/grep.txt %%DATADIR%%/%%EMACS_VER%%/etc/images/README +%%DATADIR%%/%%EMACS_VER%%/etc/images/alt.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.pbm @@ -232,6 +233,7 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/images/contact.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.xpm +%%DATADIR%%/%%EMACS_VER%%/etc/images/ctrl.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/README %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.xpm @@ -396,6 +398,7 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/images/help.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/home.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/home.xpm +%%DATADIR%%/%%EMACS_VER%%/etc/images/hyper.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/README %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/dark-bg/closed.png %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/dark-bg/closed.xpm @@ -466,6 +469,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/images/info.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.xpm +%%DATADIR%%/%%EMACS_VER%%/etc/images/last-page.pbm +%%DATADIR%%/%%EMACS_VER%%/etc/images/last-page.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/left.svg @@ -537,6 +542,7 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/spam.xpm +%%DATADIR%%/%%EMACS_VER%%/etc/images/meta.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/README @@ -609,6 +615,7 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/images/search.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/separator.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/separator.xpm +%%DATADIR%%/%%EMACS_VER%%/etc/images/shift.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/show.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/show.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/README @@ -681,8 +688,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.png %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.svg %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.xpm +%%DATADIR%%/%%EMACS_VER%%/etc/images/super.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/README - %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/check-mark_16.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/check-mark_16.svg %%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_down_16.pbm @@ -1589,12 +1596,10 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-print.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.elc -%%NO_NATIVECOMP%%%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-cstr.el -%%NO_NATIVECOMP%%%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.el -%%NATIVECOMP%%%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-cstr.el.gz -%%NATIVECOMP%%%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-cstr.elc -%%NATIVECOMP%%%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.el.gz -%%NATIVECOMP%%%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-cstr.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-cstr.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/copyright.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/copyright.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/crm.el.gz @@ -2290,6 +2295,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/image/wallpaper.elc %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/indent-aux.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/indent-aux.elc %%DATADIR%%/%%EMACS_VER%%/lisp/indent.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/indent.elc %%DATADIR%%/%%EMACS_VER%%/lisp/info-look.el.gz @@ -3781,6 +3788,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/README +%%DATADIR%%/%%EMACS_VER%%/lisp/term/android-win.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/term/android-win.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.el.gz @@ -3964,6 +3973,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.elc %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/touch-screen.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/touch-screen.elc %%DATADIR%%/%%EMACS_VER%%/lisp/transient.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/transient.elc %%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.el.gz @@ -4182,6 +4193,18 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/site-lisp/subdirs.el %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android-asset.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android-emacs.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidfns.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidfont.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidgui.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidmenu.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidselect.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidterm.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidterm.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidvfs.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bidi.c @@ -4336,6 +4359,11 @@ share/applications/emacsclient-mail.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/region-cache.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/search.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfnt.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfnt.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont-android.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sort.c diff --git a/editors/rubygem-neovim/Makefile b/editors/rubygem-neovim/Makefile index d8a624f5a8b..73d0644557d 100644 --- a/editors/rubygem-neovim/Makefile +++ b/editors/rubygem-neovim/Makefile @@ -1,5 +1,5 @@ PORTNAME= neovim -PORTVERSION= 0.9.0 +PORTVERSION= 0.9.1 CATEGORIES= editors rubygems MASTER_SITES= RG diff --git a/editors/rubygem-neovim/distinfo b/editors/rubygem-neovim/distinfo index bb3e6a88234..d6186aee589 100644 --- a/editors/rubygem-neovim/distinfo +++ b/editors/rubygem-neovim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632664560 -SHA256 (rubygem/neovim-0.9.0.gem) = 851238dd718719eab132fa458e9d28efd18645e88b5d3921c21e4b62ae8040be -SIZE (rubygem/neovim-0.9.0.gem) = 45056 +TIMESTAMP = 1692212131 +SHA256 (rubygem/neovim-0.9.1.gem) = 99a3ff961567ceea2b91ab7d35d0793f8b4ec8595a429e2200af4cc818f0eb22 +SIZE (rubygem/neovim-0.9.1.gem) = 45568 diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 9f85e711945..b91f0e56831 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.29-15497 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g454cb69700 +DISTVERSION= 0.0.29-15512 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g36dce454dd CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 4b1f5ed942b..91e3fad0ae3 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1692385756 -SHA256 (RPCS3-rpcs3-v0.0.29-15497-g454cb69700_GH0.tar.gz) = 6d4b8110a09ed78c70bca739968b983c860db62c7056a4d9272166a16314667a -SIZE (RPCS3-rpcs3-v0.0.29-15497-g454cb69700_GH0.tar.gz) = 8880932 +TIMESTAMP = 1692654536 +SHA256 (RPCS3-rpcs3-v0.0.29-15512-g36dce454dd_GH0.tar.gz) = e8257d83d7edff28faf7d595d8597a155d57b49666b4017f2ee94a2094bb899e +SIZE (RPCS3-rpcs3-v0.0.29-15512-g36dce454dd_GH0.tar.gz) = 8884392 SHA256 (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 109ba77362885d60e274930f637735ee75df2850fe99e3f1c3a5b9d1187f8cb6 SIZE (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 348879 SHA256 (RPCS3-soundtouch-2.3.1-16-g83cfba6_GH0.tar.gz) = 56863dbed27510742ed4ced54e9a5fba8658bcbfbb1cc5cdb978d7d537a3a874 diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index aaa555bdf7c..b61370e72d5 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20230818 +PORTVERSION= s20230821 CATEGORIES= emulators wayland .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb @@ -46,7 +46,7 @@ qt6_OPTIONS_EXCLUDE= QT5 USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= ae1421265a +GH_TAGNAME= df00da176 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ yuzu-emu:sirit:ab75463:sirit/externals/sirit \ GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:v3.0.1-94-g9b0fc3e:VulkanMemoryAllocator/externals/VulkanMemoryAllocator \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 289098124da..e72114af639 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1692364347 +TIMESTAMP = 1692649511 SHA256 (yuzu-s20230424/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac SIZE (yuzu-s20230424/compatibility_list.json) = 1801327 -SHA256 (yuzu-emu-yuzu-s20230818-ae1421265a_GH0.tar.gz) = 57d2ace403e3b1a6bfe71e9ec185a996c90622a266cd64e2202f2288f3e4c00d -SIZE (yuzu-emu-yuzu-s20230818-ae1421265a_GH0.tar.gz) = 6216183 +SHA256 (yuzu-emu-yuzu-s20230821-df00da176_GH0.tar.gz) = 63f3b4fac7675711e30a591feb19d2450b8e91a94783df1fa32b0b1c0bf66025 +SIZE (yuzu-emu-yuzu-s20230821-df00da176_GH0.tar.gz) = 6258932 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (yuzu-emu-sirit-ab75463_GH0.tar.gz) = 6b61e265be182b7a78075fc1b98ccf80fd33008343205dd0e22a10a439c45319 diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile index afd9c0a5356..50976aa0554 100644 --- a/finance/p5-Finance-Quote/Makefile +++ b/finance/p5-Finance-Quote/Makefile @@ -1,5 +1,5 @@ PORTNAME= Finance-Quote -PORTVERSION= 1.57 +PORTVERSION= 1.58 CATEGORIES= finance perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,14 +12,14 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \ - p5-DateTime>=0:devel/p5-DateTime \ +RUN_DEPENDS= p5-DateTime>=0:devel/p5-DateTime \ p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \ p5-HTML-Parser>=0:www/p5-HTML-Parser \ p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \ p5-HTML-TokeParser-Simple>=0:www/p5-HTML-TokeParser-Simple \ p5-HTML-Tree>=0:www/p5-HTML-Tree \ p5-HTML-TreeBuilder-XPath>=0:www/p5-HTML-TreeBuilder-XPath \ + p5-HTTP-CookieJar>=0:www/p5-HTTP-CookieJar \ p5-HTTP-Cookies>=0:www/p5-HTTP-Cookies \ p5-HTTP-Message>=0:www/p5-HTTP-Message \ p5-IO-String>=0:devel/p5-IO-String \ @@ -34,7 +34,8 @@ RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Web-Scraper>=0:www/p5-Web-Scraper \ p5-XML-LibXML>=0:textproc/p5-XML-LibXML \ p5-libwww>=6.48:www/p5-libwww -TEST_DEPENDS= p5-Date-Range>=0:devel/p5-Date-Range \ +TEST_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \ + p5-Date-Range>=0:devel/p5-Date-Range \ p5-Date-Simple>=0:devel/p5-Date-Simple \ p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \ p5-Test-Kwalitee>=0:devel/p5-Test-Kwalitee \ diff --git a/finance/p5-Finance-Quote/distinfo b/finance/p5-Finance-Quote/distinfo index 11d58daa493..ad56fac7fce 100644 --- a/finance/p5-Finance-Quote/distinfo +++ b/finance/p5-Finance-Quote/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902059 -SHA256 (Finance-Quote-1.57.tar.gz) = 766edd530f91469f8c1a253a9d5b388d7d7aecf4cc8a28452f448701239342ce -SIZE (Finance-Quote-1.57.tar.gz) = 256933 +TIMESTAMP = 1692211677 +SHA256 (Finance-Quote-1.58.tar.gz) = 8cddea0d3809a36695cee69a2862beaacd615357febafdb72641a77ab4676b80 +SIZE (Finance-Quote-1.58.tar.gz) = 262288 diff --git a/finance/p5-Finance-Quote/pkg-plist b/finance/p5-Finance-Quote/pkg-plist index c17d1a23f8a..5a1911ab43a 100644 --- a/finance/p5-Finance-Quote/pkg-plist +++ b/finance/p5-Finance-Quote/pkg-plist @@ -10,6 +10,7 @@ %%SITE_PERL%%/Finance/Quote/CSE.pm %%SITE_PERL%%/Finance/Quote/Cdnfundlibrary.pm %%SITE_PERL%%/Finance/Quote/Comdirect.pm +%%SITE_PERL%%/Finance/Quote/Consorsbank.pm %%SITE_PERL%%/Finance/Quote/Currencies.pm %%SITE_PERL%%/Finance/Quote/CurrencyRates/AlphaVantage.pm %%SITE_PERL%%/Finance/Quote/CurrencyRates/ECB.pm @@ -41,6 +42,7 @@ %%SITE_PERL%%/Finance/Quote/SEB.pm %%SITE_PERL%%/Finance/Quote/SIX.pm %%SITE_PERL%%/Finance/Quote/Sinvestor.pm +%%SITE_PERL%%/Finance/Quote/Stooq.pm %%SITE_PERL%%/Finance/Quote/TMX.pm %%SITE_PERL%%/Finance/Quote/TSP.pm %%SITE_PERL%%/Finance/Quote/TesouroDireto.pm @@ -67,6 +69,7 @@ %%PERL5_MAN3%%/Finance::Quote::CSE.3.gz %%PERL5_MAN3%%/Finance::Quote::Cdnfundlibrary.3.gz %%PERL5_MAN3%%/Finance::Quote::Comdirect.3.gz +%%PERL5_MAN3%%/Finance::Quote::Consorsbank.3.gz %%PERL5_MAN3%%/Finance::Quote::Currencies.3.gz %%PERL5_MAN3%%/Finance::Quote::CurrencyRates::AlphaVantage.3.gz %%PERL5_MAN3%%/Finance::Quote::CurrencyRates::ECB.3.gz @@ -98,6 +101,7 @@ %%PERL5_MAN3%%/Finance::Quote::SEB.3.gz %%PERL5_MAN3%%/Finance::Quote::SIX.3.gz %%PERL5_MAN3%%/Finance::Quote::Sinvestor.3.gz +%%PERL5_MAN3%%/Finance::Quote::Stooq.3.gz %%PERL5_MAN3%%/Finance::Quote::TMX.3.gz %%PERL5_MAN3%%/Finance::Quote::TSP.3.gz %%PERL5_MAN3%%/Finance::Quote::TesouroDireto.3.gz diff --git a/finance/py-ccxt/Makefile b/finance/py-ccxt/Makefile index 24c05f0c60d..b98b0485d34 100644 --- a/finance/py-ccxt/Makefile +++ b/finance/py-ccxt/Makefile @@ -1,5 +1,5 @@ PORTNAME= ccxt -DISTVERSION= 2.4.101 +DISTVERSION= 4.0.72 CATEGORIES= finance python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,12 +11,11 @@ WWW= https://github.com/ccxt/ccxt LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2018.1.18:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} -BUILD_DEPENDS= ${PY_DEPENDS} -RUN_DEPENDS= ${PY_DEPENDS} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8:www/py-aiohttp@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2018.1.18:security/py-certifi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8:www/py-aiohttp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yarl>=1.7.2:www/py-yarl@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} USES= python pycryptography:build,run USE_PYTHON= distutils autoplist pytest # 3 errors during tests, see https://github.com/ccxt/ccxt/issues/16661 diff --git a/finance/py-ccxt/distinfo b/finance/py-ccxt/distinfo index e2210af5aac..3b46fb1c67a 100644 --- a/finance/py-ccxt/distinfo +++ b/finance/py-ccxt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678772562 -SHA256 (ccxt-2.4.101.tar.gz) = d4a47478e969cf60298ea38429faa3e2fa370b4c7e87f8e4ed1b00017cf966d1 -SIZE (ccxt-2.4.101.tar.gz) = 3133244 +TIMESTAMP = 1692760346 +SHA256 (ccxt-4.0.72.tar.gz) = b463cbceb5f237c8deea28f6ec7926a797c49335aeaa1423951309b3604325dd +SIZE (ccxt-4.0.72.tar.gz) = 3547463 diff --git a/finance/py-pandas-market-calendars/Makefile b/finance/py-pandas-market-calendars/Makefile index b23706bdef8..bf94deca6a0 100644 --- a/finance/py-pandas-market-calendars/Makefile +++ b/finance/py-pandas-market-calendars/Makefile @@ -1,7 +1,6 @@ PORTNAME= pandas-market-calendars DISTVERSIONPREFIX= v -DISTVERSION= 4.1.4 -PORTREVISION= 1 +DISTVERSION= 4.2.1 CATEGORIES= finance python #MASTER_SITES= PYPI # no tests PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,11 +17,13 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}exchange-calendars>=3.3:finance/py-exchange-calendars@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=1.1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} -BUILD_DEPENDS= ${PY_DEPENDS} +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ + ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} USES= python -USE_PYTHON= distutils autoplist pytest +USE_PYTHON= pep517 autoplist pytest # 4 tests fail, see https://github.com/rsheftel/pandas_market_calendars/issues/275 USE_GITHUB= yes GH_ACCOUNT= rsheftel diff --git a/finance/py-pandas-market-calendars/distinfo b/finance/py-pandas-market-calendars/distinfo index 8a3849d0f1f..0294422cfbb 100644 --- a/finance/py-pandas-market-calendars/distinfo +++ b/finance/py-pandas-market-calendars/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675621066 -SHA256 (rsheftel-pandas_market_calendars-v4.1.4_GH0.tar.gz) = d62cdc75075df54d583f37d5b4d705c620373e92df96ccb3ab83bcdbd7820c00 -SIZE (rsheftel-pandas_market_calendars-v4.1.4_GH0.tar.gz) = 210300 +TIMESTAMP = 1692764191 +SHA256 (rsheftel-pandas_market_calendars-v4.2.1_GH0.tar.gz) = 6e2c9b2532d08ebb185ef7df7e768f1058600399194525baa242de917413a26b +SIZE (rsheftel-pandas_market_calendars-v4.2.1_GH0.tar.gz) = 207462 diff --git a/finance/py-python-binance/Makefile b/finance/py-python-binance/Makefile index f233d182057..784fc7ec834 100644 --- a/finance/py-python-binance/Makefile +++ b/finance/py-python-binance/Makefile @@ -1,5 +1,5 @@ PORTNAME= python-binance -DISTVERSION= 1.0.18 +DISTVERSION= 1.0.19 CATEGORIES= finance python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/finance/py-python-binance/distinfo b/finance/py-python-binance/distinfo index c313c37538d..3afab95125d 100644 --- a/finance/py-python-binance/distinfo +++ b/finance/py-python-binance/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691643808 -SHA256 (python-binance-1.0.18.tar.gz) = 9c5259e8205bdfc8857eb9e8ca3dfca808184abb873a76e75c665daab48a7f34 -SIZE (python-binance-1.0.18.tar.gz) = 69129 +TIMESTAMP = 1692662814 +SHA256 (python-binance-1.0.19.tar.gz) = b58cb5313d4fafbcfab3afe6082fff8ba4ebf7261211e7a322c2137637825e82 +SIZE (python-binance-1.0.19.tar.gz) = 70568 diff --git a/finance/py-yfinance/Makefile b/finance/py-yfinance/Makefile index 607cbc92dc4..cd8b14200cd 100644 --- a/finance/py-yfinance/Makefile +++ b/finance/py-yfinance/Makefile @@ -1,5 +1,5 @@ PORTNAME= yfinance -PORTVERSION= 0.2.26 +PORTVERSION= 0.2.28 CATEGORIES= finance python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/finance/py-yfinance/distinfo b/finance/py-yfinance/distinfo index 1b314dff3fc..966afc199a6 100644 --- a/finance/py-yfinance/distinfo +++ b/finance/py-yfinance/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070144 -SHA256 (yfinance-0.2.26.tar.gz) = a3ca2218cc99ebf345c5cfe43f69e6d1a0d360cb3cd6e0cd8f5ff80f81ee069d -SIZE (yfinance-0.2.26.tar.gz) = 60661 +TIMESTAMP = 1692211787 +SHA256 (yfinance-0.2.28.tar.gz) = be89cd2a4d55c0a2a6227c32915b355bde59f85c569dca9123320322445901ff +SIZE (yfinance-0.2.28.tar.gz) = 63007 diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile index da74e015c11..02de36aad3d 100644 --- a/games/DDNet/Makefile +++ b/games/DDNet/Makefile @@ -1,5 +1,5 @@ PORTNAME= DDNet -PORTVERSION= 17.1.1 +PORTVERSION= 17.2.1 CATEGORIES= games MASTER_SITES= https://ddnet.tw/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/games/DDNet/distinfo b/games/DDNet/distinfo index 53f99b8176e..413640136b7 100644 --- a/games/DDNet/distinfo +++ b/games/DDNet/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1690306323 -SHA256 (DDNet-17.1.1.tar.xz) = 341b840ca7aabbca1253d99a321620b6901a444fb080e10a2a4cb5f7ff88aae6 -SIZE (DDNet-17.1.1.tar.xz) = 28870348 +TIMESTAMP = 1692617074 +SHA256 (DDNet-17.2.1.tar.xz) = d015a2645fd56b81cad308dc8f083aa0a8248803871c84de1663b4f7fb200c1b +SIZE (DDNet-17.2.1.tar.xz) = 35294584 SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11 SIZE (rust/crates/cc-1.0.73.crate) = 57880 SHA256 (rust/crates/cxx-1.0.71.crate) = 5469a6f42296f4fd40789b397383718f9a0bd75d2f9b7cedbb249996811fba27 diff --git a/games/Makefile b/games/Makefile index d51fecb6eef..c4705b29245 100644 --- a/games/Makefile +++ b/games/Makefile @@ -142,7 +142,6 @@ SUBDIR += caph SUBDIR += cardpics SUBDIR += cataclysm-dda - SUBDIR += cataclysm-dda-tiles SUBDIR += catesc SUBDIR += cave9 SUBDIR += cavezofphear diff --git a/games/cataclysm-dda-tiles/Makefile b/games/cataclysm-dda-tiles/Makefile deleted file mode 100644 index 45701870242..00000000000 --- a/games/cataclysm-dda-tiles/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -PKGNAMESUFFIX= -tiles - -MASTERDIR= ${.CURDIR}/../cataclysm-dda - -FLAVORS= tiles -FLAVOR= tiles - -RUN_DEPENDS+= cataclysm-dda>0:games/cataclysm-dda - -.include "${MASTERDIR}/Makefile" diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile index f4514c53c65..2c0e493d891 100644 --- a/games/cataclysm-dda/Makefile +++ b/games/cataclysm-dda/Makefile @@ -1,6 +1,6 @@ PORTNAME= cataclysm-dda DISTVERSION= 0.G -PORTREVISION?= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games @@ -11,43 +11,39 @@ WWW= https://cataclysmdda.org LICENSE= CC-BY-SA-3.0 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -FLAVORS?= curses +FLAVORS= curses tiles FLAVOR?= curses +FLAVORS_SUB= yes -USES= alias cmake compiler:c++14-lang shebangfix +tiles_PKGNAMESUFFIX= -tiles +curses_CONFLICTS_INSTALL= cataclysm-dda-tiles +tiles_CONFLICTS_INSTALL= cataclysm-dda + +USES= cmake compiler:c++14-lang USE_GITHUB= yes GH_ACCOUNT= CleverRaven GH_PROJECT= Cataclysm-DDA -SHEBANG_FILES= lang/*.sh -bash_CMD= /bin/sh - CMAKE_OFF= BACKTRACE TESTS CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git -.if ${FLAVOR} == tiles - -USES+= pkgconfig sdl -USE_SDL= image2 mixer2 ttf2 -CMAKE_ARGS+= -DLOCALIZE=OFF \ - -DSOUND=1 \ - -DTILES=1 -PLIST_SUB+= CURSES="@comment " \ - TILES="" - -.else - -USES+= ncurses -CMAKE_ARGS+= -DCURSES_INCLUDE_PATH:STRING="${NCURSESINC}" - OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext-tools NLS_CMAKE_OFF= -DLOCALIZE=OFF -PLIST_SUB+= CURSES="" \ - TILES="@comment " PORTDOCS= * +.if ${FLAVOR} == tiles + +USES+= pkgconfig sdl +USE_SDL= image2 mixer2 ttf2 +CMAKE_ON+= SOUND TILES + +.else + +USES+= ncurses +CMAKE_ARGS+= -DCURSES_INCLUDE_PATH:STRING="${NCURSESINC}" + .endif post-patch: @@ -59,7 +55,6 @@ post-install: post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DOCSDIR}) + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include diff --git a/games/cataclysm-dda/pkg-plist b/games/cataclysm-dda/pkg-plist index 5c7e06f405a..79b460e45a3 100644 --- a/games/cataclysm-dda/pkg-plist +++ b/games/cataclysm-dda/pkg-plist @@ -2,37 +2,37 @@ %%CURSES%%share/man/man6/cataclysm.6.gz %%TILES%%bin/cataclysm-tiles %%TILES%%share/man/man6/cataclysm-tiles.6.gz -%%CURSES%%%%DATADIR%%/LICENSE-OFL-Terminus-Font.txt -%%CURSES%%%%DATADIR%%/LICENSE.txt -%%CURSES%%%%DATADIR%%/README.md -%%CURSES%%%%DATADIR%%/cataicon.ico -%%CURSES%%%%DATADIR%%/changelog.txt -%%CURSES%%%%DATADIR%%/core/game_balance.json -%%CURSES%%%%DATADIR%%/core/sentinels.json -%%CURSES%%%%DATADIR%%/core/tips.json -%%CURSES%%%%DATADIR%%/core/traps.json -%%CURSES%%%%DATADIR%%/core/weather.json -%%CURSES%%%%DATADIR%%/core/world_option_sliders.json -%%CURSES%%%%DATADIR%%/credits/cs.credits -%%CURSES%%%%DATADIR%%/credits/de.credits -%%CURSES%%%%DATADIR%%/credits/el.credits -%%CURSES%%%%DATADIR%%/credits/en.credits -%%CURSES%%%%DATADIR%%/credits/es_AR.credits -%%CURSES%%%%DATADIR%%/credits/es_ES.credits -%%CURSES%%%%DATADIR%%/credits/fil_PH.credits -%%CURSES%%%%DATADIR%%/credits/fr.credits -%%CURSES%%%%DATADIR%%/credits/hu.credits -%%CURSES%%%%DATADIR%%/credits/it_IT.credits -%%CURSES%%%%DATADIR%%/credits/ja.credits -%%CURSES%%%%DATADIR%%/credits/ko.credits -%%CURSES%%%%DATADIR%%/credits/nb.credits -%%CURSES%%%%DATADIR%%/credits/pl.credits -%%CURSES%%%%DATADIR%%/credits/pt_BR.credits -%%CURSES%%%%DATADIR%%/credits/ru.credits -%%CURSES%%%%DATADIR%%/credits/tr.credits -%%CURSES%%%%DATADIR%%/credits/uk_UA.credits -%%CURSES%%%%DATADIR%%/credits/zh_CN.credits -%%CURSES%%%%DATADIR%%/credits/zh_TW.credits +%%DATADIR%%/LICENSE-OFL-Terminus-Font.txt +%%DATADIR%%/LICENSE.txt +%%DATADIR%%/README.md +%%DATADIR%%/cataicon.ico +%%DATADIR%%/changelog.txt +%%DATADIR%%/core/game_balance.json +%%DATADIR%%/core/sentinels.json +%%DATADIR%%/core/tips.json +%%DATADIR%%/core/traps.json +%%DATADIR%%/core/weather.json +%%DATADIR%%/core/world_option_sliders.json +%%DATADIR%%/credits/cs.credits +%%DATADIR%%/credits/de.credits +%%DATADIR%%/credits/el.credits +%%DATADIR%%/credits/en.credits +%%DATADIR%%/credits/es_AR.credits +%%DATADIR%%/credits/es_ES.credits +%%DATADIR%%/credits/fil_PH.credits +%%DATADIR%%/credits/fr.credits +%%DATADIR%%/credits/hu.credits +%%DATADIR%%/credits/it_IT.credits +%%DATADIR%%/credits/ja.credits +%%DATADIR%%/credits/ko.credits +%%DATADIR%%/credits/nb.credits +%%DATADIR%%/credits/pl.credits +%%DATADIR%%/credits/pt_BR.credits +%%DATADIR%%/credits/ru.credits +%%DATADIR%%/credits/tr.credits +%%DATADIR%%/credits/uk_UA.credits +%%DATADIR%%/credits/zh_CN.credits +%%DATADIR%%/credits/zh_TW.credits %%TILES%%%%DATADIR%%/font/Terminus.ttf %%TILES%%%%DATADIR%%/font/VecTerminus12Medium.otf %%TILES%%%%DATADIR%%/font/map_font_LARWICK.png @@ -241,5915 +241,5915 @@ %%TILES%%%%DATADIR%%/gfx/tile_config.json %%TILES%%%%DATADIR%%/gfx/tile_config_template.json %%TILES%%%%DATADIR%%/gfx/tinytile.png -%%CURSES%%%%DATADIR%%/help/texts.json -%%CURSES%%%%DATADIR%%/json/LOADING_ORDER.md -%%CURSES%%%%DATADIR%%/json/achievements.json -%%CURSES%%%%DATADIR%%/json/addictions.json -%%CURSES%%%%DATADIR%%/json/addictions_eocs.json -%%CURSES%%%%DATADIR%%/json/ammo_effects.json -%%CURSES%%%%DATADIR%%/json/anatomy.json -%%CURSES%%%%DATADIR%%/json/artifact/altered_object_active.json -%%CURSES%%%%DATADIR%%/json/artifact/artifact_item_types.json -%%CURSES%%%%DATADIR%%/json/artifact/legacy_artifact_active.json -%%CURSES%%%%DATADIR%%/json/artifact/legacy_artifact_passive.json -%%CURSES%%%%DATADIR%%/json/artifact/premade_artifacts.json -%%CURSES%%%%DATADIR%%/json/artifact/relic_procgen_data.json -%%CURSES%%%%DATADIR%%/json/ascii_art/generic_ascii.json -%%CURSES%%%%DATADIR%%/json/ascii_art/gun_ascii.json -%%CURSES%%%%DATADIR%%/json/bionics.json -%%CURSES%%%%DATADIR%%/json/body_parts.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/arms.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/feet.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/full_body.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/full_body_iteminfo.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/full_body_widget.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/hands.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/head.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/legs.json -%%CURSES%%%%DATADIR%%/json/bodypart_graphs/torso.json -%%CURSES%%%%DATADIR%%/json/butchery_requirements.json -%%CURSES%%%%DATADIR%%/json/character_modifiers.json -%%CURSES%%%%DATADIR%%/json/clothing_mods.json -%%CURSES%%%%DATADIR%%/json/conducts.json -%%CURSES%%%%DATADIR%%/json/connect_groups.json -%%CURSES%%%%DATADIR%%/json/construction.json -%%CURSES%%%%DATADIR%%/json/construction_category.json -%%CURSES%%%%DATADIR%%/json/construction_group.json -%%CURSES%%%%DATADIR%%/json/deconstruction.json -%%CURSES%%%%DATADIR%%/json/default_blacklist.json -%%CURSES%%%%DATADIR%%/json/disease.json -%%CURSES%%%%DATADIR%%/json/dreams.json -%%CURSES%%%%DATADIR%%/json/effect_on_condition.json -%%CURSES%%%%DATADIR%%/json/effects.json -%%CURSES%%%%DATADIR%%/json/emit.json -%%CURSES%%%%DATADIR%%/json/enchantments.json -%%CURSES%%%%DATADIR%%/json/encounters/randec_valhallist_cult.json -%%CURSES%%%%DATADIR%%/json/encounters/randenc_caravans.json -%%CURSES%%%%DATADIR%%/json/encounters/randenc_refugee_center.json -%%CURSES%%%%DATADIR%%/json/field_type.json -%%CURSES%%%%DATADIR%%/json/flags.json -%%CURSES%%%%DATADIR%%/json/flags/trap.json -%%CURSES%%%%DATADIR%%/json/flags/widget.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/appliances.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-alien.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-appliances.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-barriers.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-decorative.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-domestic_plants.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-eggs.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-emitters.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-fakes.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-fireplaces.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-flora.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-fungal.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-graves.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-industrial.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-medical.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-pallet.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-plumbing.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-recreation.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-regional-pseudo.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-roof.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-rural.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-seats.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-signs.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-sleep.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-storage.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-surfaces.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-terrains.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-tools.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/furniture-triffid.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-bridges-docks.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-doors.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-embrasures.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-fences-gates.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-flesh.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-floors-indoor.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-floors-outdoors.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-flora.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-fungal.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-highways.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-liquids.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-manufactured.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-mechanisms.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-migo.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-nether.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-railroads.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-recreational.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-regional-pseudo.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-roofs.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-traps.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-triffid.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-walls.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-windows.json -%%CURSES%%%%DATADIR%%/json/furniture_and_terrain/terrain-zlevel-transitions.json -%%CURSES%%%%DATADIR%%/json/gates.json -%%CURSES%%%%DATADIR%%/json/harvest.json -%%CURSES%%%%DATADIR%%/json/harvest_dissect.json -%%CURSES%%%%DATADIR%%/json/harvest_drop_type.json -%%CURSES%%%%DATADIR%%/json/hit_range.json -%%CURSES%%%%DATADIR%%/json/hobbies.json -%%CURSES%%%%DATADIR%%/json/item_actions.json -%%CURSES%%%%DATADIR%%/json/item_category.json -%%CURSES%%%%DATADIR%%/json/item_spell_effects.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Agriculture_Forage_Excavation/forage.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Clothing_Gear/clothing.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Clothing_Gear/costumes.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Clothing_Gear/gear.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Clothing_Gear/gear_civilian.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Clothing_Gear/hazmat_gear.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Clothing_Gear/jewellery_gems.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Clothing_Gear/wallets.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Drugs_Tobacco_Alcohol/tobacco.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Food/food.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Food/irradiated.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Labs/lab_security.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Labs/labs_common.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Labs/labs_mutagen.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/Arsonist_stock.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/locations.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/locations_commercial.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/locations_mapextras.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/mall_item_groups.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/mansion.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/map_extras.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/prison_item_groups.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Locations_MapExtras/robofac_trade.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/harvest_cbm.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/harvest_dissection.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/alien.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/clothes_store.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/combos.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/domestic.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/evac_shelter.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/fridges.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/garage.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/gunstore.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/library.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/lodge.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/mre_packages.json -%%CURSES%%%%DATADIR%%/json/itemgroups/SUS/office.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/ammo.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/223_mg.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_mg.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_sniper.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x46.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x53.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/50_mg.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/50_sniper.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/66.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/84x246.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm_submachine_gun.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/armor.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/atgm.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/explosive.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/shot.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/field_drops.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/gunmod.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/guns.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/magazines.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json -%%CURSES%%%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json -%%CURSES%%%%DATADIR%%/json/itemgroups/activities_hobbies.json -%%CURSES%%%%DATADIR%%/json/itemgroups/altered_item.json -%%CURSES%%%%DATADIR%%/json/itemgroups/art_antiques_crafts.json -%%CURSES%%%%DATADIR%%/json/itemgroups/artifacts.json -%%CURSES%%%%DATADIR%%/json/itemgroups/bionics.json -%%CURSES%%%%DATADIR%%/json/itemgroups/books.json -%%CURSES%%%%DATADIR%%/json/itemgroups/cash_register.json -%%CURSES%%%%DATADIR%%/json/itemgroups/collections_domestic.json -%%CURSES%%%%DATADIR%%/json/itemgroups/collections_trades.json -%%CURSES%%%%DATADIR%%/json/itemgroups/corpses.json -%%CURSES%%%%DATADIR%%/json/itemgroups/custom_lbvs.json -%%CURSES%%%%DATADIR%%/json/itemgroups/defense_mode.json -%%CURSES%%%%DATADIR%%/json/itemgroups/electronics.json -%%CURSES%%%%DATADIR%%/json/itemgroups/faction_camps.json -%%CURSES%%%%DATADIR%%/json/itemgroups/food_service.json -%%CURSES%%%%DATADIR%%/json/itemgroups/furniture.json -%%CURSES%%%%DATADIR%%/json/itemgroups/mail.json -%%CURSES%%%%DATADIR%%/json/itemgroups/main.json -%%CURSES%%%%DATADIR%%/json/itemgroups/military.json -%%CURSES%%%%DATADIR%%/json/itemgroups/misc.json -%%CURSES%%%%DATADIR%%/json/itemgroups/oa_shared_item_groups.json -%%CURSES%%%%DATADIR%%/json/itemgroups/obsolete.json -%%CURSES%%%%DATADIR%%/json/itemgroups/portal_storm_loot.json -%%CURSES%%%%DATADIR%%/json/itemgroups/portalmancy.json -%%CURSES%%%%DATADIR%%/json/itemgroups/roof.json -%%CURSES%%%%DATADIR%%/json/itemgroups/science_and_tech.json -%%CURSES%%%%DATADIR%%/json/itemgroups/shops_trades.json -%%CURSES%%%%DATADIR%%/json/itemgroups/stashes.json -%%CURSES%%%%DATADIR%%/json/itemgroups/supplies.json -%%CURSES%%%%DATADIR%%/json/itemgroups/tools.json -%%CURSES%%%%DATADIR%%/json/itemgroups/trash_and_debris.json -%%CURSES%%%%DATADIR%%/json/itemgroups/vehicles_fuel_related.json -%%CURSES%%%%DATADIR%%/json/itemgroups/vending_machines.json -%%CURSES%%%%DATADIR%%/json/items/ammo.json -%%CURSES%%%%DATADIR%%/json/items/ammo/10mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/12mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/20x66mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/22.json -%%CURSES%%%%DATADIR%%/json/items/ammo/223.json -%%CURSES%%%%DATADIR%%/json/items/ammo/270win.json -%%CURSES%%%%DATADIR%%/json/items/ammo/300.json -%%CURSES%%%%DATADIR%%/json/items/ammo/3006.json -%%CURSES%%%%DATADIR%%/json/items/ammo/300blk.json -%%CURSES%%%%DATADIR%%/json/items/ammo/308.json -%%CURSES%%%%DATADIR%%/json/items/ammo/30carbine.json -%%CURSES%%%%DATADIR%%/json/items/ammo/32.json -%%CURSES%%%%DATADIR%%/json/items/ammo/357mag.json -%%CURSES%%%%DATADIR%%/json/items/ammo/357sig.json -%%CURSES%%%%DATADIR%%/json/items/ammo/36paper.json -%%CURSES%%%%DATADIR%%/json/items/ammo/38.json -%%CURSES%%%%DATADIR%%/json/items/ammo/380.json -%%CURSES%%%%DATADIR%%/json/items/ammo/38super.json -%%CURSES%%%%DATADIR%%/json/items/ammo/40.json -%%CURSES%%%%DATADIR%%/json/items/ammo/40x46mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/40x53mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/410shot.json -%%CURSES%%%%DATADIR%%/json/items/ammo/44.json -%%CURSES%%%%DATADIR%%/json/items/ammo/44paper.json -%%CURSES%%%%DATADIR%%/json/items/ammo/45.json -%%CURSES%%%%DATADIR%%/json/items/ammo/454.json -%%CURSES%%%%DATADIR%%/json/items/ammo/4570.json -%%CURSES%%%%DATADIR%%/json/items/ammo/45colt.json -%%CURSES%%%%DATADIR%%/json/items/ammo/46.json -%%CURSES%%%%DATADIR%%/json/items/ammo/460.json -%%CURSES%%%%DATADIR%%/json/items/ammo/50.json -%%CURSES%%%%DATADIR%%/json/items/ammo/500.json -%%CURSES%%%%DATADIR%%/json/items/ammo/545x39.json -%%CURSES%%%%DATADIR%%/json/items/ammo/57.json -%%CURSES%%%%DATADIR%%/json/items/ammo/5x50.json -%%CURSES%%%%DATADIR%%/json/items/ammo/66mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/700nx.json -%%CURSES%%%%DATADIR%%/json/items/ammo/762.json -%%CURSES%%%%DATADIR%%/json/items/ammo/762R.json -%%CURSES%%%%DATADIR%%/json/items/ammo/762x25.json -%%CURSES%%%%DATADIR%%/json/items/ammo/84x246mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/8x40mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/9mm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/9x18.json -%%CURSES%%%%DATADIR%%/json/items/ammo/atgm.json -%%CURSES%%%%DATADIR%%/json/items/ammo/barb.json -%%CURSES%%%%DATADIR%%/json/items/ammo/blank.json -%%CURSES%%%%DATADIR%%/json/items/ammo/cannon.json -%%CURSES%%%%DATADIR%%/json/items/ammo/chemical_spray.json -%%CURSES%%%%DATADIR%%/json/items/ammo/exodii.json -%%CURSES%%%%DATADIR%%/json/items/ammo/flintlock.json -%%CURSES%%%%DATADIR%%/json/items/ammo/nail.json -%%CURSES%%%%DATADIR%%/json/items/ammo/paintball.json -%%CURSES%%%%DATADIR%%/json/items/ammo/rpg.json -%%CURSES%%%%DATADIR%%/json/items/ammo/shot.json -%%CURSES%%%%DATADIR%%/json/items/ammo/shotpaper.json -%%CURSES%%%%DATADIR%%/json/items/ammo/signal_flare.json -%%CURSES%%%%DATADIR%%/json/items/ammo/sling-ready_grenade.json -%%CURSES%%%%DATADIR%%/json/items/ammo/weldgas.json -%%CURSES%%%%DATADIR%%/json/items/ammo_types.json -%%CURSES%%%%DATADIR%%/json/items/appliances.json -%%CURSES%%%%DATADIR%%/json/items/armor/altered_object_auras.json -%%CURSES%%%%DATADIR%%/json/items/armor/ammo_pouch.json -%%CURSES%%%%DATADIR%%/json/items/armor/arms_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/ballistic_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/bandolier.json -%%CURSES%%%%DATADIR%%/json/items/armor/belts.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_bodysuits.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_boots.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_gloves.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_headgear.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_legs.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_overcoats.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_storage.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/custom_underwear.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/cuttingroom.json -%%CURSES%%%%DATADIR%%/json/items/armor/bespoke_armor/utility.json -%%CURSES%%%%DATADIR%%/json/items/armor/boots.json -%%CURSES%%%%DATADIR%%/json/items/armor/cloaks.json -%%CURSES%%%%DATADIR%%/json/items/armor/coats.json -%%CURSES%%%%DATADIR%%/json/items/armor/exotic.json -%%CURSES%%%%DATADIR%%/json/items/armor/eyewear.json -%%CURSES%%%%DATADIR%%/json/items/armor/gloves.json -%%CURSES%%%%DATADIR%%/json/items/armor/hats.json -%%CURSES%%%%DATADIR%%/json/items/armor/head_attachments.json -%%CURSES%%%%DATADIR%%/json/items/armor/helmets.json -%%CURSES%%%%DATADIR%%/json/items/armor/holster.json -%%CURSES%%%%DATADIR%%/json/items/armor/hoods.json -%%CURSES%%%%DATADIR%%/json/items/armor/integrated.json -%%CURSES%%%%DATADIR%%/json/items/armor/jewelry.json -%%CURSES%%%%DATADIR%%/json/items/armor/legs_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/legs_clothes.json -%%CURSES%%%%DATADIR%%/json/items/armor/masks.json -%%CURSES%%%%DATADIR%%/json/items/armor/misc.json -%%CURSES%%%%DATADIR%%/json/items/armor/pets_cow_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/pets_dog_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/pets_horse_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/power_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/robofac_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/scarfs.json -%%CURSES%%%%DATADIR%%/json/items/armor/sheath.json -%%CURSES%%%%DATADIR%%/json/items/armor/storage.json -%%CURSES%%%%DATADIR%%/json/items/armor/suits_clothes.json -%%CURSES%%%%DATADIR%%/json/items/armor/suits_protection.json -%%CURSES%%%%DATADIR%%/json/items/armor/swimming.json -%%CURSES%%%%DATADIR%%/json/items/armor/torso_armor.json -%%CURSES%%%%DATADIR%%/json/items/armor/torso_clothes.json -%%CURSES%%%%DATADIR%%/json/items/armor/undergarment.json -%%CURSES%%%%DATADIR%%/json/items/basecamp.json -%%CURSES%%%%DATADIR%%/json/items/battery.json -%%CURSES%%%%DATADIR%%/json/items/bionics.json -%%CURSES%%%%DATADIR%%/json/items/biosignatures.json -%%CURSES%%%%DATADIR%%/json/items/book/abstract.json -%%CURSES%%%%DATADIR%%/json/items/book/anthology.json -%%CURSES%%%%DATADIR%%/json/items/book/archery.json -%%CURSES%%%%DATADIR%%/json/items/book/barter.json -%%CURSES%%%%DATADIR%%/json/items/book/bashing.json -%%CURSES%%%%DATADIR%%/json/items/book/chemistry.json -%%CURSES%%%%DATADIR%%/json/items/book/computer.json -%%CURSES%%%%DATADIR%%/json/items/book/cooking.json -%%CURSES%%%%DATADIR%%/json/items/book/cutting.json -%%CURSES%%%%DATADIR%%/json/items/book/dodge.json -%%CURSES%%%%DATADIR%%/json/items/book/driving.json -%%CURSES%%%%DATADIR%%/json/items/book/electronics.json -%%CURSES%%%%DATADIR%%/json/items/book/fabrication.json -%%CURSES%%%%DATADIR%%/json/items/book/firstaid.json -%%CURSES%%%%DATADIR%%/json/items/book/gun.json -%%CURSES%%%%DATADIR%%/json/items/book/launcher.json -%%CURSES%%%%DATADIR%%/json/items/book/lockpick.json -%%CURSES%%%%DATADIR%%/json/items/book/maps.json -%%CURSES%%%%DATADIR%%/json/items/book/martial.json -%%CURSES%%%%DATADIR%%/json/items/book/mechanics.json -%%CURSES%%%%DATADIR%%/json/items/book/melee.json -%%CURSES%%%%DATADIR%%/json/items/book/misc.json -%%CURSES%%%%DATADIR%%/json/items/book/misc_newage.json -%%CURSES%%%%DATADIR%%/json/items/book/misc_philosophy.json -%%CURSES%%%%DATADIR%%/json/items/book/misc_pulp.json -%%CURSES%%%%DATADIR%%/json/items/book/misc_scifi.json -%%CURSES%%%%DATADIR%%/json/items/book/misc_sports.json -%%CURSES%%%%DATADIR%%/json/items/book/nonfiction.json -%%CURSES%%%%DATADIR%%/json/items/book/pistol.json -%%CURSES%%%%DATADIR%%/json/items/book/rifle.json -%%CURSES%%%%DATADIR%%/json/items/book/shotgun.json -%%CURSES%%%%DATADIR%%/json/items/book/smg.json -%%CURSES%%%%DATADIR%%/json/items/book/speech.json -%%CURSES%%%%DATADIR%%/json/items/book/spiritual.json -%%CURSES%%%%DATADIR%%/json/items/book/stabbing.json -%%CURSES%%%%DATADIR%%/json/items/book/survival.json -%%CURSES%%%%DATADIR%%/json/items/book/swimming.json -%%CURSES%%%%DATADIR%%/json/items/book/tailor.json -%%CURSES%%%%DATADIR%%/json/items/book/throw.json -%%CURSES%%%%DATADIR%%/json/items/book/traps.json -%%CURSES%%%%DATADIR%%/json/items/book/unarmed.json -%%CURSES%%%%DATADIR%%/json/items/book/young.json -%%CURSES%%%%DATADIR%%/json/items/chemicals_and_resources.json -%%CURSES%%%%DATADIR%%/json/items/classes/comestible.json -%%CURSES%%%%DATADIR%%/json/items/classes/gun.json -%%CURSES%%%%DATADIR%%/json/items/classes/magazine.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/alcohol.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/baked.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/bread.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/brewing.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/carnivore.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/casseroles.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/cereal.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/dairy.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/drink.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/drink_other.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/egg.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/frozen.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/fruit_dishes.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/irradiated_fruit.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/irradiated_veggy.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/junkfood.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/meat_dishes.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/med.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/mre.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/mushroom.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/mutagen.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/nuts.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/offal_dishes.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/other.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/protein.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/raw_fruit.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/raw_veggy.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/sandwich.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/seed.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/soup.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/spice.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/veggy_dishes.json -%%CURSES%%%%DATADIR%%/json/items/comestibles/wheat.json -%%CURSES%%%%DATADIR%%/json/items/containers.json -%%CURSES%%%%DATADIR%%/json/items/containers/military.json -%%CURSES%%%%DATADIR%%/json/items/corpses/corpses.json -%%CURSES%%%%DATADIR%%/json/items/corpses/dead_exodii.json -%%CURSES%%%%DATADIR%%/json/items/corpses/dead_yrax.json -%%CURSES%%%%DATADIR%%/json/items/corpses/inactive_bots.json -%%CURSES%%%%DATADIR%%/json/items/electronics.json -%%CURSES%%%%DATADIR%%/json/items/fake.json -%%CURSES%%%%DATADIR%%/json/items/faults_bionic.json -%%CURSES%%%%DATADIR%%/json/items/fluff.json -%%CURSES%%%%DATADIR%%/json/items/fuel.json -%%CURSES%%%%DATADIR%%/json/items/furniture.json -%%CURSES%%%%DATADIR%%/json/items/generic.json -%%CURSES%%%%DATADIR%%/json/items/generic/ammolink.json -%%CURSES%%%%DATADIR%%/json/items/generic/bathroom_house.json -%%CURSES%%%%DATADIR%%/json/items/generic/bedding.json -%%CURSES%%%%DATADIR%%/json/items/generic/casing.json -%%CURSES%%%%DATADIR%%/json/items/generic/currency.json -%%CURSES%%%%DATADIR%%/json/items/generic/dining_kitchen.json -%%CURSES%%%%DATADIR%%/json/items/generic/mail.json -%%CURSES%%%%DATADIR%%/json/items/generic/music.json -%%CURSES%%%%DATADIR%%/json/items/generic/skulls.json -%%CURSES%%%%DATADIR%%/json/items/generic/spares.json -%%CURSES%%%%DATADIR%%/json/items/generic/storage.json -%%CURSES%%%%DATADIR%%/json/items/generic/string.json -%%CURSES%%%%DATADIR%%/json/items/generic/toys_and_sports.json -%%CURSES%%%%DATADIR%%/json/items/gun/10mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/12mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/20x66mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/22.json -%%CURSES%%%%DATADIR%%/json/items/gun/223.json -%%CURSES%%%%DATADIR%%/json/items/gun/270win.json -%%CURSES%%%%DATADIR%%/json/items/gun/300.json -%%CURSES%%%%DATADIR%%/json/items/gun/3006.json -%%CURSES%%%%DATADIR%%/json/items/gun/300BLK.json -%%CURSES%%%%DATADIR%%/json/items/gun/308.json -%%CURSES%%%%DATADIR%%/json/items/gun/30carbine.json -%%CURSES%%%%DATADIR%%/json/items/gun/32.json -%%CURSES%%%%DATADIR%%/json/items/gun/357sig.json -%%CURSES%%%%DATADIR%%/json/items/gun/36paper.json -%%CURSES%%%%DATADIR%%/json/items/gun/38.json -%%CURSES%%%%DATADIR%%/json/items/gun/380.json -%%CURSES%%%%DATADIR%%/json/items/gun/38super.json -%%CURSES%%%%DATADIR%%/json/items/gun/40.json -%%CURSES%%%%DATADIR%%/json/items/gun/40x46mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/40x53mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/410shot.json -%%CURSES%%%%DATADIR%%/json/items/gun/44.json -%%CURSES%%%%DATADIR%%/json/items/gun/44paper.json -%%CURSES%%%%DATADIR%%/json/items/gun/45.json -%%CURSES%%%%DATADIR%%/json/items/gun/454.json -%%CURSES%%%%DATADIR%%/json/items/gun/4570.json -%%CURSES%%%%DATADIR%%/json/items/gun/45colt.json -%%CURSES%%%%DATADIR%%/json/items/gun/46.json -%%CURSES%%%%DATADIR%%/json/items/gun/460.json -%%CURSES%%%%DATADIR%%/json/items/gun/50.json -%%CURSES%%%%DATADIR%%/json/items/gun/500.json -%%CURSES%%%%DATADIR%%/json/items/gun/545x39.json -%%CURSES%%%%DATADIR%%/json/items/gun/57.json -%%CURSES%%%%DATADIR%%/json/items/gun/5x50.json -%%CURSES%%%%DATADIR%%/json/items/gun/66mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/700nx.json -%%CURSES%%%%DATADIR%%/json/items/gun/762.json -%%CURSES%%%%DATADIR%%/json/items/gun/762R.json -%%CURSES%%%%DATADIR%%/json/items/gun/762x25.json -%%CURSES%%%%DATADIR%%/json/items/gun/84x246mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/8x40mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/9mm.json -%%CURSES%%%%DATADIR%%/json/items/gun/9x18.json -%%CURSES%%%%DATADIR%%/json/items/gun/artisan_guns.json -%%CURSES%%%%DATADIR%%/json/items/gun/atgm.json -%%CURSES%%%%DATADIR%%/json/items/gun/bio.json -%%CURSES%%%%DATADIR%%/json/items/gun/blunderbuss.json -%%CURSES%%%%DATADIR%%/json/items/gun/cannon.json -%%CURSES%%%%DATADIR%%/json/items/gun/chemical_spray.json -%%CURSES%%%%DATADIR%%/json/items/gun/combination.json -%%CURSES%%%%DATADIR%%/json/items/gun/exodii.json -%%CURSES%%%%DATADIR%%/json/items/gun/faults_gun.json -%%CURSES%%%%DATADIR%%/json/items/gun/flammable.json -%%CURSES%%%%DATADIR%%/json/items/gun/flintlock.json -%%CURSES%%%%DATADIR%%/json/items/gun/nail.json -%%CURSES%%%%DATADIR%%/json/items/gun/paintball.json -%%CURSES%%%%DATADIR%%/json/items/gun/robofac_gun.json -%%CURSES%%%%DATADIR%%/json/items/gun/shot.json -%%CURSES%%%%DATADIR%%/json/items/gun/signal_flare.json -%%CURSES%%%%DATADIR%%/json/items/gun/ups.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/accessories.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/barrel.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/bionicmods.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/brass_catcher.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/conversions.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/grip.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/laser_gunmods.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/loading_port.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/mechanism.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/mount.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/muzzle.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/rail.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/sights.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/sling.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/stock.json -%%CURSES%%%%DATADIR%%/json/items/gunmod/underbarrel.json -%%CURSES%%%%DATADIR%%/json/items/handloaded_bullets.json -%%CURSES%%%%DATADIR%%/json/items/id_cards.json -%%CURSES%%%%DATADIR%%/json/items/items_holiday.json -%%CURSES%%%%DATADIR%%/json/items/magazine/10mm.json -%%CURSES%%%%DATADIR%%/json/items/magazine/12mm.json -%%CURSES%%%%DATADIR%%/json/items/magazine/20x60mm.json -%%CURSES%%%%DATADIR%%/json/items/magazine/22.json -%%CURSES%%%%DATADIR%%/json/items/magazine/223.json -%%CURSES%%%%DATADIR%%/json/items/magazine/300.json -%%CURSES%%%%DATADIR%%/json/items/magazine/3006.json -%%CURSES%%%%DATADIR%%/json/items/magazine/308.json -%%CURSES%%%%DATADIR%%/json/items/magazine/30carbine.json -%%CURSES%%%%DATADIR%%/json/items/magazine/32.json -%%CURSES%%%%DATADIR%%/json/items/magazine/357sig.json -%%CURSES%%%%DATADIR%%/json/items/magazine/38.json -%%CURSES%%%%DATADIR%%/json/items/magazine/380.json -%%CURSES%%%%DATADIR%%/json/items/magazine/38super.json -%%CURSES%%%%DATADIR%%/json/items/magazine/40.json -%%CURSES%%%%DATADIR%%/json/items/magazine/40mm.json -%%CURSES%%%%DATADIR%%/json/items/magazine/410shot.json -%%CURSES%%%%DATADIR%%/json/items/magazine/44.json -%%CURSES%%%%DATADIR%%/json/items/magazine/45.json -%%CURSES%%%%DATADIR%%/json/items/magazine/454.json -%%CURSES%%%%DATADIR%%/json/items/magazine/46.json -%%CURSES%%%%DATADIR%%/json/items/magazine/460.json -%%CURSES%%%%DATADIR%%/json/items/magazine/50.json -%%CURSES%%%%DATADIR%%/json/items/magazine/500.json -%%CURSES%%%%DATADIR%%/json/items/magazine/545x39.json -%%CURSES%%%%DATADIR%%/json/items/magazine/57.json -%%CURSES%%%%DATADIR%%/json/items/magazine/5x50.json -%%CURSES%%%%DATADIR%%/json/items/magazine/66mm.json -%%CURSES%%%%DATADIR%%/json/items/magazine/762.json -%%CURSES%%%%DATADIR%%/json/items/magazine/762R.json -%%CURSES%%%%DATADIR%%/json/items/magazine/762x25.json -%%CURSES%%%%DATADIR%%/json/items/magazine/8x40mm.json -%%CURSES%%%%DATADIR%%/json/items/magazine/9mm.json -%%CURSES%%%%DATADIR%%/json/items/magazine/9x18.json -%%CURSES%%%%DATADIR%%/json/items/magazine/chemical_spray.json -%%CURSES%%%%DATADIR%%/json/items/magazine/exodii.json -%%CURSES%%%%DATADIR%%/json/items/magazine/liquid.json -%%CURSES%%%%DATADIR%%/json/items/magazine/methanol_fuelcell.json -%%CURSES%%%%DATADIR%%/json/items/magazine/nail.json -%%CURSES%%%%DATADIR%%/json/items/magazine/shot.json -%%CURSES%%%%DATADIR%%/json/items/magazine/weldgas.json -%%CURSES%%%%DATADIR%%/json/items/melee/bludgeons.json -%%CURSES%%%%DATADIR%%/json/items/melee/fake.json -%%CURSES%%%%DATADIR%%/json/items/melee/knives_kitchen.json -%%CURSES%%%%DATADIR%%/json/items/melee/misc.json -%%CURSES%%%%DATADIR%%/json/items/melee/spears_and_polearms.json -%%CURSES%%%%DATADIR%%/json/items/melee/swords_and_blades.json -%%CURSES%%%%DATADIR%%/json/items/melee/unarmed_weapons.json -%%CURSES%%%%DATADIR%%/json/items/migration.json -%%CURSES%%%%DATADIR%%/json/items/mutagen_ingredients.json -%%CURSES%%%%DATADIR%%/json/items/nether.json -%%CURSES%%%%DATADIR%%/json/items/newspaper.json -%%CURSES%%%%DATADIR%%/json/items/obsolete.json -%%CURSES%%%%DATADIR%%/json/items/ranged/archery.json -%%CURSES%%%%DATADIR%%/json/items/ranged/crossbows.json -%%CURSES%%%%DATADIR%%/json/items/ranged/energy.json -%%CURSES%%%%DATADIR%%/json/items/ranged/launchers.json -%%CURSES%%%%DATADIR%%/json/items/ranged/pneumatic.json -%%CURSES%%%%DATADIR%%/json/items/ranged/slings.json -%%CURSES%%%%DATADIR%%/json/items/ranged/spearguns.json -%%CURSES%%%%DATADIR%%/json/items/ranged/throwing.json -%%CURSES%%%%DATADIR%%/json/items/relics/altered_items.json -%%CURSES%%%%DATADIR%%/json/items/relics/monolith_items.json -%%CURSES%%%%DATADIR%%/json/items/resources/alien.json -%%CURSES%%%%DATADIR%%/json/items/resources/appliance_parts.json -%%CURSES%%%%DATADIR%%/json/items/resources/chemicals.json -%%CURSES%%%%DATADIR%%/json/items/resources/fasteners.json -%%CURSES%%%%DATADIR%%/json/items/resources/glass.json -%%CURSES%%%%DATADIR%%/json/items/resources/home_improvement.json -%%CURSES%%%%DATADIR%%/json/items/resources/metal.json -%%CURSES%%%%DATADIR%%/json/items/resources/misc.json -%%CURSES%%%%DATADIR%%/json/items/resources/plastic.json -%%CURSES%%%%DATADIR%%/json/items/resources/stone.json -%%CURSES%%%%DATADIR%%/json/items/resources/tailoring.json -%%CURSES%%%%DATADIR%%/json/items/resources/wood.json -%%CURSES%%%%DATADIR%%/json/items/robot_parts.json -%%CURSES%%%%DATADIR%%/json/items/software.json -%%CURSES%%%%DATADIR%%/json/items/tool/container.json -%%CURSES%%%%DATADIR%%/json/items/tool/cooking.json -%%CURSES%%%%DATADIR%%/json/items/tool/debug_tools.json -%%CURSES%%%%DATADIR%%/json/items/tool/deployable.json -%%CURSES%%%%DATADIR%%/json/items/tool/electronics.json -%%CURSES%%%%DATADIR%%/json/items/tool/entry_tools.json -%%CURSES%%%%DATADIR%%/json/items/tool/explosives.json -%%CURSES%%%%DATADIR%%/json/items/tool/fire.json -%%CURSES%%%%DATADIR%%/json/items/tool/firefighting.json -%%CURSES%%%%DATADIR%%/json/items/tool/fishing.json -%%CURSES%%%%DATADIR%%/json/items/tool/handloading.json -%%CURSES%%%%DATADIR%%/json/items/tool/integrated.json -%%CURSES%%%%DATADIR%%/json/items/tool/knives.json -%%CURSES%%%%DATADIR%%/json/items/tool/landscaping.json -%%CURSES%%%%DATADIR%%/json/items/tool/lighting.json -%%CURSES%%%%DATADIR%%/json/items/tool/masonry.json -%%CURSES%%%%DATADIR%%/json/items/tool/med.json -%%CURSES%%%%DATADIR%%/json/items/tool/metalworking.json -%%CURSES%%%%DATADIR%%/json/items/tool/misc.json -%%CURSES%%%%DATADIR%%/json/items/tool/musical_instruments.json -%%CURSES%%%%DATADIR%%/json/items/tool/pets.json -%%CURSES%%%%DATADIR%%/json/items/tool/pseudo.json -%%CURSES%%%%DATADIR%%/json/items/tool/radio_tools.json -%%CURSES%%%%DATADIR%%/json/items/tool/raincatchers.json -%%CURSES%%%%DATADIR%%/json/items/tool/science.json -%%CURSES%%%%DATADIR%%/json/items/tool/shelters.json -%%CURSES%%%%DATADIR%%/json/items/tool/smoking.json -%%CURSES%%%%DATADIR%%/json/items/tool/stationary.json -%%CURSES%%%%DATADIR%%/json/items/tool/stoneworking.json -%%CURSES%%%%DATADIR%%/json/items/tool/tailoring.json -%%CURSES%%%%DATADIR%%/json/items/tool/toiletries.json -%%CURSES%%%%DATADIR%%/json/items/tool/traps.json -%%CURSES%%%%DATADIR%%/json/items/tool/unfoldable.json -%%CURSES%%%%DATADIR%%/json/items/tool/woodworking.json -%%CURSES%%%%DATADIR%%/json/items/tool/workshop.json -%%CURSES%%%%DATADIR%%/json/items/tool_armor.json -%%CURSES%%%%DATADIR%%/json/items/toolmod.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/alternator.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/animals.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/armor.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/battery.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/boat.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/cables.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/cargo.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/controls.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/engine.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/engineering.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/farming.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/frames.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/fuel_storage.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/lights.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/manual.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/mills.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/motors.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/noise.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/plating.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/rams.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/rigs.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/rotor.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/seating.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/solar.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/tables.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/turrets.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/utilities.json -%%CURSES%%%%DATADIR%%/json/items/vehicle/wheel.json -%%CURSES%%%%DATADIR%%/json/limb_scores.json -%%CURSES%%%%DATADIR%%/json/loot_zones.json -%%CURSES%%%%DATADIR%%/json/mapgen/Glassblower.json -%%CURSES%%%%DATADIR%%/json/mapgen/Metalworker.json -%%CURSES%%%%DATADIR%%/json/mapgen/Pottery_Sewing_Shops.json -%%CURSES%%%%DATADIR%%/json/mapgen/Woodworker.json -%%CURSES%%%%DATADIR%%/json/mapgen/abandoned01.json -%%CURSES%%%%DATADIR%%/json/mapgen/abandoned_barn.json -%%CURSES%%%%DATADIR%%/json/mapgen/abandoned_shopping_plaza.json -%%CURSES%%%%DATADIR%%/json/mapgen/abandoned_textile_mill/abandoned_textile_mill_a.json -%%CURSES%%%%DATADIR%%/json/mapgen/abandoned_textile_mill/abandoned_textile_mill_b.json -%%CURSES%%%%DATADIR%%/json/mapgen/abandoned_warehouse.json -%%CURSES%%%%DATADIR%%/json/mapgen/abstorefront.json -%%CURSES%%%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_nested_maps.json -%%CURSES%%%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z-1.json -%%CURSES%%%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z0.json -%%CURSES%%%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json -%%CURSES%%%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json -%%CURSES%%%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z3.json -%%CURSES%%%%DATADIR%%/json/mapgen/airliner.json -%%CURSES%%%%DATADIR%%/json/mapgen/airport/s_airport_private.json -%%CURSES%%%%DATADIR%%/json/mapgen/airport/s_airport_runway_private.json -%%CURSES%%%%DATADIR%%/json/mapgen/animalpound.json -%%CURSES%%%%DATADIR%%/json/mapgen/animalshelter.json -%%CURSES%%%%DATADIR%%/json/mapgen/antique_store.json -%%CURSES%%%%DATADIR%%/json/mapgen/apartment_con_new.json -%%CURSES%%%%DATADIR%%/json/mapgen/apartment_mod_new.json -%%CURSES%%%%DATADIR%%/json/mapgen/arcade.json -%%CURSES%%%%DATADIR%%/json/mapgen/art_gallery.json -%%CURSES%%%%DATADIR%%/json/mapgen/bakery.json -%%CURSES%%%%DATADIR%%/json/mapgen/bandit_cabin.json -%%CURSES%%%%DATADIR%%/json/mapgen/bandit_camp.json -%%CURSES%%%%DATADIR%%/json/mapgen/bandit_garage.json -%%CURSES%%%%DATADIR%%/json/mapgen/bank.json -%%CURSES%%%%DATADIR%%/json/mapgen/bar.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/bare_bones_basecamp/bare_bones_basecamp.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_garage.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lighthouse/fbmc_lighthouse.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00_beds.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10_beds.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_workshop.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_expansion.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_overmap.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_cross.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_normal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_beds.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/fbmc_sealab_small/fbmc_sealab_small_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation_walls_all.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_defenses.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_tent.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/primitive_field.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_concrete.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rock.json.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_tent.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_standard.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_concrete.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_palettes.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_farm/version_2/modular_farm_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_concrete.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_palettes.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_concrete.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_palettes.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_bookcase.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_concrete.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_dresser.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_locker.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rack.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_warehouse_shelf.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wooden_rack.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_concrete.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_log.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_metal.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_migo_resin.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rock.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wad.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wood.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/expansion/salt_water_pipe.json -%%CURSES%%%%DATADIR%%/json/mapgen/basecamps/modular_shacks.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_bionic.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_chem.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_game.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_guns.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_lab_stairs.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_messed.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_meth.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_survival.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basement_weed.json -%%CURSES%%%%DATADIR%%/json/mapgen/basement/basements.json -%%CURSES%%%%DATADIR%%/json/mapgen/bike_shop.json -%%CURSES%%%%DATADIR%%/json/mapgen/bowling_alley.json -%%CURSES%%%%DATADIR%%/json/mapgen/boxing.json -%%CURSES%%%%DATADIR%%/json/mapgen/bridges.json -%%CURSES%%%%DATADIR%%/json/mapgen/bugs/ants.json -%%CURSES%%%%DATADIR%%/json/mapgen/bugs/nest_dermatik.json -%%CURSES%%%%DATADIR%%/json/mapgen/bugs/spider_pit.json -%%CURSES%%%%DATADIR%%/json/mapgen/bugs/wasp_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/bunker.json -%%CURSES%%%%DATADIR%%/json/mapgen/bunker_shop.json -%%CURSES%%%%DATADIR%%/json/mapgen/bus_station.json -%%CURSES%%%%DATADIR%%/json/mapgen/butcher.json -%%CURSES%%%%DATADIR%%/json/mapgen/cabin.json -%%CURSES%%%%DATADIR%%/json/mapgen/campground.json -%%CURSES%%%%DATADIR%%/json/mapgen/campsite.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/admin_f0.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/admin_f1.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/admin_f2.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/admin_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/commons_f0.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/commons_f1.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/commons_f2.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/commons_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/health_f0.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/health_f1.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/health_f2.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/health_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/lecture_f0.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/lecture_f1.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/lecture_f2.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/lecture_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/media_f0.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/media_f1.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/media_f2.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/media_f3.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/buildings/media_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/open_areas/pedestrian_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/campus/open_areas/pedestrian_westside.json -%%CURSES%%%%DATADIR%%/json/mapgen/cathedral.json -%%CURSES%%%%DATADIR%%/json/mapgen/cave.json -%%CURSES%%%%DATADIR%%/json/mapgen/cemetery_4square.json -%%CURSES%%%%DATADIR%%/json/mapgen/cemetery_medium.json -%%CURSES%%%%DATADIR%%/json/mapgen/cemetery_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/chemist_holdout/chemical_lab.json -%%CURSES%%%%DATADIR%%/json/mapgen/church.json -%%CURSES%%%%DATADIR%%/json/mapgen/city_blocks/city_block_2.json -%%CURSES%%%%DATADIR%%/json/mapgen/city_blocks/urban_13_dense_house_apt_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json -%%CURSES%%%%DATADIR%%/json/mapgen/city_blocks/urban_25_dense_diner_apt.json -%%CURSES%%%%DATADIR%%/json/mapgen/collapsed_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/construction_site.json -%%CURSES%%%%DATADIR%%/json/mapgen/crater.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_car_dealership.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_car_showroom.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_city_dump_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_gardening_allotment.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_internet_cafe.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_market_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_open_sewer_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_private_park.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_public_art_piece.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_public_space.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_sex_shop.json -%%CURSES%%%%DATADIR%%/json/mapgen/cs_tire_shop.json -%%CURSES%%%%DATADIR%%/json/mapgen/daycare.json -%%CURSES%%%%DATADIR%%/json/mapgen/debug_ramps.json -%%CURSES%%%%DATADIR%%/json/mapgen/derelict_property.json -%%CURSES%%%%DATADIR%%/json/mapgen/diner.json -%%CURSES%%%%DATADIR%%/json/mapgen/dispensary.json -%%CURSES%%%%DATADIR%%/json/mapgen/dive_shop.json -%%CURSES%%%%DATADIR%%/json/mapgen/dock.json -%%CURSES%%%%DATADIR%%/json/mapgen/dojo.json -%%CURSES%%%%DATADIR%%/json/mapgen/dollar_store.json -%%CURSES%%%%DATADIR%%/json/mapgen/drive-in_theater.json -%%CURSES%%%%DATADIR%%/json/mapgen/dummy/dummy.json -%%CURSES%%%%DATADIR%%/json/mapgen/dump.json -%%CURSES%%%%DATADIR%%/json/mapgen/dumpsite.json -%%CURSES%%%%DATADIR%%/json/mapgen/earth.json -%%CURSES%%%%DATADIR%%/json/mapgen/exodii/exo_safehouse.json -%%CURSES%%%%DATADIR%%/json/mapgen/exodii/exodii_base.json -%%CURSES%%%%DATADIR%%/json/mapgen/exodii/exodii_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/exodii/exodii_nested_singletile.json -%%CURSES%%%%DATADIR%%/json/mapgen/faction_buildings.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_2side.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_dairy.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_dairy_2.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_horse.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_stills.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_supply.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_tiles.json -%%CURSES%%%%DATADIR%%/json/mapgen/farm_tree.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_blc_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_blc_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_blc_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_blc_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_brc_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_brc_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_brc_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_brc_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_entrance_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_entrance_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_entrance_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_entrance_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_le_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_le_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_le_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_le_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_mid_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_mid_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_mid_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_mid_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_re_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_re_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_re_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_re_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_te_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_te_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_te_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_te_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_tlc_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_tlc_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_tlc_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_tlc_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_trc_00.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_trc_01.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_trc_02.json -%%CURSES%%%%DATADIR%%/json/mapgen/fema/FEMA_trc_03.json -%%CURSES%%%%DATADIR%%/json/mapgen/field_baseball.json -%%CURSES%%%%DATADIR%%/json/mapgen/field_football.json -%%CURSES%%%%DATADIR%%/json/mapgen/fire_station.json -%%CURSES%%%%DATADIR%%/json/mapgen/fort.json -%%CURSES%%%%DATADIR%%/json/mapgen/fortified_scrap_yard/fortified_scrap_yard.json -%%CURSES%%%%DATADIR%%/json/mapgen/fungal/fungal_bloom.json -%%CURSES%%%%DATADIR%%/json/mapgen/fungal/fungal_flowers.json -%%CURSES%%%%DATADIR%%/json/mapgen/fungal/fungal_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/gambling_hall.json -%%CURSES%%%%DATADIR%%/json/mapgen/garage.json -%%CURSES%%%%DATADIR%%/json/mapgen/garage_gas.json -%%CURSES%%%%DATADIR%%/json/mapgen/garden_botanical.json -%%CURSES%%%%DATADIR%%/json/mapgen/garden_community.json -%%CURSES%%%%DATADIR%%/json/mapgen/garden_public.json -%%CURSES%%%%DATADIR%%/json/mapgen/gardening_store.json -%%CURSES%%%%DATADIR%%/json/mapgen/gas_stations/gas_station_bunker.json -%%CURSES%%%%DATADIR%%/json/mapgen/gas_stations/s_gas.json -%%CURSES%%%%DATADIR%%/json/mapgen/godco/church_retreat.json -%%CURSES%%%%DATADIR%%/json/mapgen/godco/godco_eocs.json -%%CURSES%%%%DATADIR%%/json/mapgen/godco/mapgen_updates.json -%%CURSES%%%%DATADIR%%/json/mapgen/godco/nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/golfcourse.json -%%CURSES%%%%DATADIR%%/json/mapgen/gunsmith.json -%%CURSES%%%%DATADIR%%/json/mapgen/gym.json -%%CURSES%%%%DATADIR%%/json/mapgen/hazardous_waste_sarcophagus.json -%%CURSES%%%%DATADIR%%/json/mapgen/headshop.json -%%CURSES%%%%DATADIR%%/json/mapgen/helipad.json -%%CURSES%%%%DATADIR%%/json/mapgen/homeimprovement.json -%%CURSES%%%%DATADIR%%/json/mapgen/homeimprovement_superstore_new.json -%%CURSES%%%%DATADIR%%/json/mapgen/homeless_camp.json -%%CURSES%%%%DATADIR%%/json/mapgen/homeless_shelter.json -%%CURSES%%%%DATADIR%%/json/mapgen/hospital.json -%%CURSES%%%%DATADIR%%/json/mapgen/hotel_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/2storymodern01.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/2storymodern02.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/2storymodern03.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/2storymodern04.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow01.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow02.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow03.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow04.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow05.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow06.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow07.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/bungalow08.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/crack_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/garden_house_1.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house01.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house02.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house03.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house04.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house05.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house05_ab.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house06.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house07.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house08.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house09.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house10.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house11.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house12.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house13.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house14.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house15.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house16.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house17.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house18.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house19.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house20.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house21.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house22.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house23.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house24.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house25.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house26.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house27.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house28.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house29.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house30.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house31.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house32.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house33.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house34.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house35.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house36.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house37.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house38.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house39.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house40.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house41.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house42.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_2story.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched1.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched10.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched2.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched3.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched4.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched5.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched6.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched7.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched8.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_detatched9.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_dogs.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex10.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex11.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex2.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex3.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex4.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex5.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex6.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex7.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex8.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_duplex9.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_fortified.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage2.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage3.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage4.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage5.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage6.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage7.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage8.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_garage_prepper.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_gardener.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_inner_garden.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_library.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_modern_lx.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_patio.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_porch.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_prepper.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_quiverfull.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_rural.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_rv.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_suicide.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_tool_shed.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_vacant.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_w_1.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_w_2.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_w_3.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_w_4.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_w_5.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_w_6.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/house_wooded.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/multi_unit_housing.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_10_house_brick_pool.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_11_house_brick.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_12_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_15_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_16_house_ranch.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_17_house_ranch.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_18_victorian.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_1_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_29_dense_row.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_2_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_2_house_dd.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_3_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_4_house_basement.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_5_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_6_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_7_house_garden.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_8_house_brick_garden.json -%%CURSES%%%%DATADIR%%/json/mapgen/house/urban_9_house_garage_loft.json -%%CURSES%%%%DATADIR%%/json/mapgen/hunting_blind.json -%%CURSES%%%%DATADIR%%/json/mapgen/hunting_lodge.json -%%CURSES%%%%DATADIR%%/json/mapgen/irradiator_1.json -%%CURSES%%%%DATADIR%%/json/mapgen/isherwood_farms/cabin_isherwood.json -%%CURSES%%%%DATADIR%%/json/mapgen/isherwood_farms/dairy_farm_isherwood.json -%%CURSES%%%%DATADIR%%/json/mapgen/isherwood_farms/farm_horse_isherwood.json -%%CURSES%%%%DATADIR%%/json/mapgen/isherwood_farms/farm_isherwood.json -%%CURSES%%%%DATADIR%%/json/mapgen/isherwood_farms/rural_roads_trails.json -%%CURSES%%%%DATADIR%%/json/mapgen/isolated_road/isolated_road_home_chunks.json -%%CURSES%%%%DATADIR%%/json/mapgen/isolated_road/isolated_road_mission_1.json -%%CURSES%%%%DATADIR%%/json/mapgen/jewel_store.json -%%CURSES%%%%DATADIR%%/json/mapgen/junkyard.json -%%CURSES%%%%DATADIR%%/json/mapgen/karting_l.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/README.md -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_central.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_escape.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_floorplan_cross.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_floorplans.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_floorplans_1side.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_floorplans_finale1level.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_1x1_security.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8_apartments.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2_MUT_Tier_1.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2_MUT_Tier_2.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2_cargo_depot.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_cargo_surface.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_central_hallway.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_health_clinic.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_maintenance_areas.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_effect_on_condition.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_cargo.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_commercial.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_medical.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mutagen.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_residential.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_science_common.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_security.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_parking_lot.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_modular/lab_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_rooms.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_rooms_wall.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z1.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z2.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z3.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z4.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z5.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab/lab_trains.json -%%CURSES%%%%DATADIR%%/json/mapgen/lab_subway_vent_shaft.json -%%CURSES%%%%DATADIR%%/json/mapgen/lake.json -%%CURSES%%%%DATADIR%%/json/mapgen/lake_buildings/cabin_lake.json -%%CURSES%%%%DATADIR%%/json/mapgen/lake_buildings/freshwater_research_station.json -%%CURSES%%%%DATADIR%%/json/mapgen/lake_buildings/islands.json -%%CURSES%%%%DATADIR%%/json/mapgen/lake_buildings/lakeside_cabin.json -%%CURSES%%%%DATADIR%%/json/mapgen/lake_buildings/lighthouse.json -%%CURSES%%%%DATADIR%%/json/mapgen/lan_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/landfill.json -%%CURSES%%%%DATADIR%%/json/mapgen/landscaping_supply.json -%%CURSES%%%%DATADIR%%/json/mapgen/laundromat.json -%%CURSES%%%%DATADIR%%/json/mapgen/library.json -%%CURSES%%%%DATADIR%%/json/mapgen/lmoe.json -%%CURSES%%%%DATADIR%%/json/mapgen/looted_buildings.json -%%CURSES%%%%DATADIR%%/json/mapgen/lot_empty_commercial.json -%%CURSES%%%%DATADIR%%/json/mapgen/lot_empty_residential.json -%%CURSES%%%%DATADIR%%/json/mapgen/lumbermill.json -%%CURSES%%%%DATADIR%%/json/mapgen/lumberyard.json -%%CURSES%%%%DATADIR%%/json/mapgen/mall/mall_basement.json -%%CURSES%%%%DATADIR%%/json/mapgen/mall/mall_ground.json -%%CURSES%%%%DATADIR%%/json/mapgen/mall/mall_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/mall/mall_second_floor.json -%%CURSES%%%%DATADIR%%/json/mapgen/mall/mall_upper_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/mansion.json -%%CURSES%%%%DATADIR%%/json/mapgen/mansion_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/bugouts.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/college_kids.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/crater.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/drug_dealers.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/exodii_crashes.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/grave.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/lab_extras.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/marloss_voice.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/mass_grave.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/military.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/nest_dermatik.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/nest_wasp.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/portal.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/prison_bus.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/prison_van.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/sand.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/scientists.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/sewers.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/spider.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/toxic_waste.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/trapdoor_spider_den.json -%%CURSES%%%%DATADIR%%/json/mapgen/map_extras/wilderness.json -%%CURSES%%%%DATADIR%%/json/mapgen/marina.json -%%CURSES%%%%DATADIR%%/json/mapgen/megastore.json -%%CURSES%%%%DATADIR%%/json/mapgen/mi-go/mi-go_encampment.json -%%CURSES%%%%DATADIR%%/json/mapgen/mi-go/mi-go_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/mi-go/mi-go_portal.json -%%CURSES%%%%DATADIR%%/json/mapgen/mi-go/mi-go_scout_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_connector.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_distorted/microlab_distorted.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_distorted/microlab_distorted_chunks.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_edge_room_connector.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_firebreak.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_generic.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_generic_edge.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_hallway.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_hallway_start.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_isolated_stairs.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_portal/microlab_portal_security_checkpoint.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_portal/microlab_portal_unique.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_reactor.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_shifting_hall.json -%%CURSES%%%%DATADIR%%/json/mapgen/microlab/microlab_special_tiles.json -%%CURSES%%%%DATADIR%%/json/mapgen/mil_surplus.json -%%CURSES%%%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z-1.json -%%CURSES%%%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z0.json -%%CURSES%%%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z1.json -%%CURSES%%%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z2.json -%%CURSES%%%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z3.json -%%CURSES%%%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z4.json -%%CURSES%%%%DATADIR%%/json/mapgen/mine/mine_amigara.json -%%CURSES%%%%DATADIR%%/json/mapgen/mine/mine_entrance.json -%%CURSES%%%%DATADIR%%/json/mapgen/mine/mine_generic.json -%%CURSES%%%%DATADIR%%/json/mapgen/mine/mine_shaft.json -%%CURSES%%%%DATADIR%%/json/mapgen/mine/mine_spiral.json -%%CURSES%%%%DATADIR%%/json/mapgen/mine/mine_wyrms.json -%%CURSES%%%%DATADIR%%/json/mapgen/miniature_railway/miniature_railway.json -%%CURSES%%%%DATADIR%%/json/mapgen/missile_silo.json -%%CURSES%%%%DATADIR%%/json/mapgen/mobile_home_park/mobile_home.json -%%CURSES%%%%DATADIR%%/json/mapgen/mobile_home_park/mobile_home_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/mobile_home_park/mobile_home_park.json -%%CURSES%%%%DATADIR%%/json/mapgen/moonshine_camp.json -%%CURSES%%%%DATADIR%%/json/mapgen/mortuary.json -%%CURSES%%%%DATADIR%%/json/mapgen/motel.json -%%CURSES%%%%DATADIR%%/json/mapgen/movie_theater.json -%%CURSES%%%%DATADIR%%/json/mapgen/museum.json -%%CURSES%%%%DATADIR%%/json/mapgen/music_venue.json -%%CURSES%%%%DATADIR%%/json/mapgen/musicstore.json -%%CURSES%%%%DATADIR%%/json/mapgen/natural_spring.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/aux_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/basement_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/cave_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/city_npc_nested_spawns.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/farm_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/fema_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/homeless_missions_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/house_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/lmoe_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/lodge_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/logger_missions_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/mine_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/mini_railway_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/nested_chunks_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/npc_nested_spawns.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/nursing_home_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/office_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/retail_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/rural_outdoors_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/shelter_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nested/strip_mall_nested.json -%%CURSES%%%%DATADIR%%/json/mapgen/nether_fade.json -%%CURSES%%%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_bowels.json -%%CURSES%%%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_head.json -%%CURSES%%%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_misc.json -%%CURSES%%%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_tentacles.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z0.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z1.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z2.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z3.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z4.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z5.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z6.json -%%CURSES%%%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z7.json -%%CURSES%%%%DATADIR%%/json/mapgen/nursing_home.json -%%CURSES%%%%DATADIR%%/json/mapgen/occupied_lumber_mill/occupied_lumber_mill.json -%%CURSES%%%%DATADIR%%/json/mapgen/office_cubical.json -%%CURSES%%%%DATADIR%%/json/mapgen/office_doctor.json -%%CURSES%%%%DATADIR%%/json/mapgen/office_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/office_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/office_tower_2.json -%%CURSES%%%%DATADIR%%/json/mapgen/orchard_apple.json -%%CURSES%%%%DATADIR%%/json/mapgen/orchard_fruit.json -%%CURSES%%%%DATADIR%%/json/mapgen/outpost.json -%%CURSES%%%%DATADIR%%/json/mapgen/paintball_field.json -%%CURSES%%%%DATADIR%%/json/mapgen/park.json -%%CURSES%%%%DATADIR%%/json/mapgen/park_mazes.json -%%CURSES%%%%DATADIR%%/json/mapgen/park_skate.json -%%CURSES%%%%DATADIR%%/json/mapgen/park_state.json -%%CURSES%%%%DATADIR%%/json/mapgen/parking_garage.json -%%CURSES%%%%DATADIR%%/json/mapgen/parking_lot.json -%%CURSES%%%%DATADIR%%/json/mapgen/pavilion.json -%%CURSES%%%%DATADIR%%/json/mapgen/pawn_shop.json -%%CURSES%%%%DATADIR%%/json/mapgen/petstore.json -%%CURSES%%%%DATADIR%%/json/mapgen/pharmacy.json -%%CURSES%%%%DATADIR%%/json/mapgen/pizza_parlor.json -%%CURSES%%%%DATADIR%%/json/mapgen/police_department.json -%%CURSES%%%%DATADIR%%/json/mapgen/police_station.json -%%CURSES%%%%DATADIR%%/json/mapgen/pond_fishing.json -%%CURSES%%%%DATADIR%%/json/mapgen/pond_public.json -%%CURSES%%%%DATADIR%%/json/mapgen/ponds.json -%%CURSES%%%%DATADIR%%/json/mapgen/pool.json -%%CURSES%%%%DATADIR%%/json/mapgen/portal_storm.json -%%CURSES%%%%DATADIR%%/json/mapgen/post_office.json -%%CURSES%%%%DATADIR%%/json/mapgen/power_station_large.json -%%CURSES%%%%DATADIR%%/json/mapgen/power_station_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/prison/prison.json -%%CURSES%%%%DATADIR%%/json/mapgen/prison/prison_alcatraz.json -%%CURSES%%%%DATADIR%%/json/mapgen/prison/prison_island.json -%%CURSES%%%%DATADIR%%/json/mapgen/private_resort.json -%%CURSES%%%%DATADIR%%/json/mapgen/public_works.json -%%CURSES%%%%DATADIR%%/json/mapgen/pump_station.json -%%CURSES%%%%DATADIR%%/json/mapgen/radio_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/railroad/railroad_level_crossing.json -%%CURSES%%%%DATADIR%%/json/mapgen/railroad/railroad_station.json -%%CURSES%%%%DATADIR%%/json/mapgen/ranch_camp.json -%%CURSES%%%%DATADIR%%/json/mapgen/ravine.json -%%CURSES%%%%DATADIR%%/json/mapgen/recycle_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_e.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_n.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_ne.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_nw.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_s.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_se.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_sw.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_w.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/z-1_refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/z-2_refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/z-3_refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/z-4_refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/z1_refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/refugee_center/z2_refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen/regional_airport.json -%%CURSES%%%%DATADIR%%/json/mapgen/restaurant.json -%%CURSES%%%%DATADIR%%/json/mapgen/restaurant_fast.json -%%CURSES%%%%DATADIR%%/json/mapgen/reststop.json -%%CURSES%%%%DATADIR%%/json/mapgen/retirement_community.json -%%CURSES%%%%DATADIR%%/json/mapgen/river_cave.json -%%CURSES%%%%DATADIR%%/json/mapgen/river_shipwreck.json -%%CURSES%%%%DATADIR%%/json/mapgen/riverside/potters_cottage.json -%%CURSES%%%%DATADIR%%/json/mapgen/riverside/whaleys_boat_rental.json -%%CURSES%%%%DATADIR%%/json/mapgen/riverside/whaleys_house_river.json -%%CURSES%%%%DATADIR%%/json/mapgen/roadstop.json -%%CURSES%%%%DATADIR%%/json/mapgen/robofachq_static.json -%%CURSES%%%%DATADIR%%/json/mapgen/robofaq_locs/EOC_robofac_hq_updater.json -%%CURSES%%%%DATADIR%%/json/mapgen/robofaq_locs/ancillia_bar_updater.json -%%CURSES%%%%DATADIR%%/json/mapgen/robofaq_locs/robofac_hq_chunks.json -%%CURSES%%%%DATADIR%%/json/mapgen/robofaq_locs/robofac_mission_chunks.json -%%CURSES%%%%DATADIR%%/json/mapgen/rock_border.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_apt.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_apt_2.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_bookstore.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_candy.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_clothing.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_coffee.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_cosmetic.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_electronics.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_furniture.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_grocery.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_gun.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_hardware.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_icecream.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_lightindustry.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_lightindustry_scen.json -%%CURSES%%%%DATADIR%%/json/mapgen/s_liquor.json -%%CURSES%%%%DATADIR%%/json/mapgen/sai.json -%%CURSES%%%%DATADIR%%/json/mapgen/salon.json -%%CURSES%%%%DATADIR%%/json/mapgen/school_1.json -%%CURSES%%%%DATADIR%%/json/mapgen/sewage_treatment.json -%%CURSES%%%%DATADIR%%/json/mapgen/shelter.json -%%CURSES%%%%DATADIR%%/json/mapgen/shooting_range.json -%%CURSES%%%%DATADIR%%/json/mapgen/slime_pit.json -%%CURSES%%%%DATADIR%%/json/mapgen/smallscrapyard.json -%%CURSES%%%%DATADIR%%/json/mapgen/smoke_lounge.json -%%CURSES%%%%DATADIR%%/json/mapgen/sports_store.json -%%CURSES%%%%DATADIR%%/json/mapgen/stadium_baseball.json -%%CURSES%%%%DATADIR%%/json/mapgen/stadium_football.json -%%CURSES%%%%DATADIR%%/json/mapgen/standing_stones.json -%%CURSES%%%%DATADIR%%/json/mapgen/station_radio.json -%%CURSES%%%%DATADIR%%/json/mapgen/steel_mill/steel_mill_z1.json -%%CURSES%%%%DATADIR%%/json/mapgen/steel_mill/steel_mill_z2.json -%%CURSES%%%%DATADIR%%/json/mapgen/steel_mill/steel_mill_z3.json -%%CURSES%%%%DATADIR%%/json/mapgen/storage_units_large.json -%%CURSES%%%%DATADIR%%/json/mapgen/storage_units_medium.json -%%CURSES%%%%DATADIR%%/json/mapgen/storage_units_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/store/s_camping.json -%%CURSES%%%%DATADIR%%/json/mapgen/store/s_cardealer.json -%%CURSES%%%%DATADIR%%/json/mapgen/store/s_diner.json -%%CURSES%%%%DATADIR%%/json/mapgen/store/s_electronicstore.json -%%CURSES%%%%DATADIR%%/json/mapgen/store/s_games.json -%%CURSES%%%%DATADIR%%/json/mapgen/store/s_gunstore.json -%%CURSES%%%%DATADIR%%/json/mapgen/store/s_hunting.json -%%CURSES%%%%DATADIR%%/json/mapgen/strange_temple.json -%%CURSES%%%%DATADIR%%/json/mapgen/strip_mall.json -%%CURSES%%%%DATADIR%%/json/mapgen/stripclub.json -%%CURSES%%%%DATADIR%%/json/mapgen/sub_station.json -%%CURSES%%%%DATADIR%%/json/mapgen/sugar_house.json -%%CURSES%%%%DATADIR%%/json/mapgen/swamp_shack.json -%%CURSES%%%%DATADIR%%/json/mapgen/teashop.json -%%CURSES%%%%DATADIR%%/json/mapgen/textile_mill_museum.json -%%CURSES%%%%DATADIR%%/json/mapgen/thrift.json -%%CURSES%%%%DATADIR%%/json/mapgen/town_hall.json -%%CURSES%%%%DATADIR%%/json/mapgen/toxic_dump.json -%%CURSES%%%%DATADIR%%/json/mapgen/trail_nature.json -%%CURSES%%%%DATADIR%%/json/mapgen/trail_small.json -%%CURSES%%%%DATADIR%%/json/mapgen/trailhead.json -%%CURSES%%%%DATADIR%%/json/mapgen/triffid/triffid_fields.json -%%CURSES%%%%DATADIR%%/json/mapgen/triffid/triffid_grove.json -%%CURSES%%%%DATADIR%%/json/mapgen/triffid/triffid_grove_roof.json -%%CURSES%%%%DATADIR%%/json/mapgen/triffid/triffid_grove_z2.json -%%CURSES%%%%DATADIR%%/json/mapgen/triffid/triffid_grove_z3.json -%%CURSES%%%%DATADIR%%/json/mapgen/triffid/triffid_heart.json -%%CURSES%%%%DATADIR%%/json/mapgen/triffid/triffid_roots.json -%%CURSES%%%%DATADIR%%/json/mapgen/tutorial.json -%%CURSES%%%%DATADIR%%/json/mapgen/urban_35_hospital.json -%%CURSES%%%%DATADIR%%/json/mapgen/valhalla_cult/car_spawns.json -%%CURSES%%%%DATADIR%%/json/mapgen/valhalla_cult/mapgen.json -%%CURSES%%%%DATADIR%%/json/mapgen/valhalla_cult/mapgen_updates.json -%%CURSES%%%%DATADIR%%/json/mapgen/veterinarian.json -%%CURSES%%%%DATADIR%%/json/mapgen/vfw.json -%%CURSES%%%%DATADIR%%/json/mapgen/warehouse.json -%%CURSES%%%%DATADIR%%/json/mapgen/wind_turbine.json -%%CURSES%%%%DATADIR%%/json/mapgen/ws_biker_dump.json -%%CURSES%%%%DATADIR%%/json/mapgen/ws_fire_lookout_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen/ws_giant_sinkhole.json -%%CURSES%%%%DATADIR%%/json/mapgen/ws_regional_dump.json -%%CURSES%%%%DATADIR%%/json/mapgen/ws_survivor_bunker.json -%%CURSES%%%%DATADIR%%/json/mapgen/ws_survivor_camp.json -%%CURSES%%%%DATADIR%%/json/mapgen/zoo.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/abandoned_barn_p.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/abandoned_textile_mill.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/acidia_camp_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/aircraft_carrier_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/airliner_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/apartment.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/bandit_camp.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/basement.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/bike_shop_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/building.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/cabin.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/campground.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/campus/common.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/cathedral_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/cground.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/church.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/church_retreat.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/city_block_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/clothes_store_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/collapsed_tower.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/construction_site_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/electronic_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/exodii/homebase.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/exodii/medieval.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/farm.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/farm_dairy.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/farm_horse.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/farm_lots.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/farm_supply_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/fema.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/field_football.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/fort_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/gunstore.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/helipad.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/hospital.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/hotel_tower_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/house_general_abandoned.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/house_general_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/house_variant_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/house_w_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/hunting_store_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/isolated_artisans.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/junkyard_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/karting_l.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/lab/lab_modular_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/lab_surface_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/library_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/lmoe.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/lodge_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/lumberyard.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/mall_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/mansion.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/mi-go_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/microlab.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/mil_surplus.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/military/mil_base_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/military/mil_base_roof_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/miniature_railway_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/movie_theater_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/nuclear_plant_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/nursing_home_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/office.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/office_doctor.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/orchard_apple.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/park_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/police_dept_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/prison.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/private_resort.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/railroad.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/ranch_camp.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/refugee_center.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/regional_dump_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/restaurant_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/retirement_community_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/road.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/robofachq.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/roof_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/rural_roads_trails_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/sewers_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/shelter.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/stadium_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/steel_mill_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/subway.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/textile_mill_museum.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/triffid.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/underwater_structures_palette.json -%%CURSES%%%%DATADIR%%/json/mapgen_palettes/wasp_palette.json -%%CURSES%%%%DATADIR%%/json/martialarts.json -%%CURSES%%%%DATADIR%%/json/martialarts_fictional.json -%%CURSES%%%%DATADIR%%/json/materials.json -%%CURSES%%%%DATADIR%%/json/monster_factions.json -%%CURSES%%%%DATADIR%%/json/monster_special_attacks/monster_attacks.json -%%CURSES%%%%DATADIR%%/json/monster_special_attacks/monster_deaths.json -%%CURSES%%%%DATADIR%%/json/monster_special_attacks/monster_gun.json -%%CURSES%%%%DATADIR%%/json/monster_special_attacks/spells.json -%%CURSES%%%%DATADIR%%/json/monster_special_attacks/weapon_spells.json -%%CURSES%%%%DATADIR%%/json/monster_weakpoints/abomination_weakpoints.json -%%CURSES%%%%DATADIR%%/json/monster_weakpoints/arthropod_weakpoints.json -%%CURSES%%%%DATADIR%%/json/monster_weakpoints/bird_weakpoints.json -%%CURSES%%%%DATADIR%%/json/monster_weakpoints/cyborg_weakpoints.json -%%CURSES%%%%DATADIR%%/json/monster_weakpoints/generic_weakpoints.json -%%CURSES%%%%DATADIR%%/json/monster_weakpoints/humanoid_weakpoints.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/clothing_christmas.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/feral_humans.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/marloss.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/misc.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/mutant_experimental.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/nether.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/robofac.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/rodentkin.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_child.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_cop.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_default.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_lab.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_medical.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_milbase_personnel.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_military_pilot.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_naval_personnel.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_prisoner.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_resort.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_soldier.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_survivor.json -%%CURSES%%%%DATADIR%%/json/monsterdrops/zombie_technician.json -%%CURSES%%%%DATADIR%%/json/monstergroups/blob.json -%%CURSES%%%%DATADIR%%/json/monstergroups/bugs.json -%%CURSES%%%%DATADIR%%/json/monstergroups/eggs.json -%%CURSES%%%%DATADIR%%/json/monstergroups/exodii.json -%%CURSES%%%%DATADIR%%/json/monstergroups/fish.json -%%CURSES%%%%DATADIR%%/json/monstergroups/fungi.json -%%CURSES%%%%DATADIR%%/json/monstergroups/kraken.json -%%CURSES%%%%DATADIR%%/json/monstergroups/lab.json -%%CURSES%%%%DATADIR%%/json/monstergroups/mammal.json -%%CURSES%%%%DATADIR%%/json/monstergroups/mi-go.json -%%CURSES%%%%DATADIR%%/json/monstergroups/military.json -%%CURSES%%%%DATADIR%%/json/monstergroups/misc.json -%%CURSES%%%%DATADIR%%/json/monstergroups/missions.json -%%CURSES%%%%DATADIR%%/json/monstergroups/mutant_upgrades.json -%%CURSES%%%%DATADIR%%/json/monstergroups/nether.json -%%CURSES%%%%DATADIR%%/json/monstergroups/obsolete.json -%%CURSES%%%%DATADIR%%/json/monstergroups/resort.json -%%CURSES%%%%DATADIR%%/json/monstergroups/robots.json -%%CURSES%%%%DATADIR%%/json/monstergroups/triffid.json -%%CURSES%%%%DATADIR%%/json/monstergroups/wilderness.json -%%CURSES%%%%DATADIR%%/json/monstergroups/zanimal_upgrades.json -%%CURSES%%%%DATADIR%%/json/monstergroups/zombie_amalgamations.json -%%CURSES%%%%DATADIR%%/json/monstergroups/zombie_upgrades.json -%%CURSES%%%%DATADIR%%/json/monstergroups/zombies.json -%%CURSES%%%%DATADIR%%/json/monsters/bird.json -%%CURSES%%%%DATADIR%%/json/monsters/cyborgs.json -%%CURSES%%%%DATADIR%%/json/monsters/defense_bot.json -%%CURSES%%%%DATADIR%%/json/monsters/drones.json -%%CURSES%%%%DATADIR%%/json/monsters/feral_humans.json -%%CURSES%%%%DATADIR%%/json/monsters/fish.json -%%CURSES%%%%DATADIR%%/json/monsters/fungus.json -%%CURSES%%%%DATADIR%%/json/monsters/fungus_zombie.json -%%CURSES%%%%DATADIR%%/json/monsters/insect_spider.json -%%CURSES%%%%DATADIR%%/json/monsters/jabberwock.json -%%CURSES%%%%DATADIR%%/json/monsters/kraken_spawn.json -%%CURSES%%%%DATADIR%%/json/monsters/lab_security_drones.json -%%CURSES%%%%DATADIR%%/json/monsters/mammal.json -%%CURSES%%%%DATADIR%%/json/monsters/marloss.json -%%CURSES%%%%DATADIR%%/json/monsters/mechsuits.json -%%CURSES%%%%DATADIR%%/json/monsters/mi-go.json -%%CURSES%%%%DATADIR%%/json/monsters/misc.json -%%CURSES%%%%DATADIR%%/json/monsters/mollusk.json -%%CURSES%%%%DATADIR%%/json/monsters/monster_goals.json -%%CURSES%%%%DATADIR%%/json/monsters/mutant.json -%%CURSES%%%%DATADIR%%/json/monsters/mutant_mammal.json -%%CURSES%%%%DATADIR%%/json/monsters/nether.json -%%CURSES%%%%DATADIR%%/json/monsters/obsolete.json -%%CURSES%%%%DATADIR%%/json/monsters/power_leech.json -%%CURSES%%%%DATADIR%%/json/monsters/reptile_amphibian.json -%%CURSES%%%%DATADIR%%/json/monsters/robofac_robots.json -%%CURSES%%%%DATADIR%%/json/monsters/rodentkin.json -%%CURSES%%%%DATADIR%%/json/monsters/slimes.json -%%CURSES%%%%DATADIR%%/json/monsters/starers.json -%%CURSES%%%%DATADIR%%/json/monsters/triffid.json -%%CURSES%%%%DATADIR%%/json/monsters/turrets.json -%%CURSES%%%%DATADIR%%/json/monsters/utility_bot.json -%%CURSES%%%%DATADIR%%/json/monsters/yrax.json -%%CURSES%%%%DATADIR%%/json/monsters/zanimal_upgrade.json -%%CURSES%%%%DATADIR%%/json/monsters/zed-animal.json -%%CURSES%%%%DATADIR%%/json/monsters/zed-classic.json -%%CURSES%%%%DATADIR%%/json/monsters/zed-medical.json -%%CURSES%%%%DATADIR%%/json/monsters/zed-pupating.json -%%CURSES%%%%DATADIR%%/json/monsters/zed-winged.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_acid.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_amalgamation.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_burned.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_children.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_command.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_electric.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_explosive.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_ferrous.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_fusion.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_lab.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_misc.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_prisoner.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_radiation.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_skeletal.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_soldiers.json -%%CURSES%%%%DATADIR%%/json/monsters/zed_survivor.json -%%CURSES%%%%DATADIR%%/json/mood_faces.json -%%CURSES%%%%DATADIR%%/json/morale_types.json -%%CURSES%%%%DATADIR%%/json/move_modes.json -%%CURSES%%%%DATADIR%%/json/mutations/appearance_hair_styles.json -%%CURSES%%%%DATADIR%%/json/mutations/changing_eocs.json -%%CURSES%%%%DATADIR%%/json/mutations/cybernetic_traits.json -%%CURSES%%%%DATADIR%%/json/mutations/migration.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_appearance.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_category.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_eocs.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_item_traits.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_ordering.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_spells.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_techs.json -%%CURSES%%%%DATADIR%%/json/mutations/mutation_type.json -%%CURSES%%%%DATADIR%%/json/mutations/mutations.json -%%CURSES%%%%DATADIR%%/json/nether_glass_effect_on_condition.json -%%CURSES%%%%DATADIR%%/json/npcs/BG_trait_groups.json -%%CURSES%%%%DATADIR%%/json/npcs/BG_traits.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/Brigitte_LaCroix_Background.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/Lapin_01.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/NC_Farmer_background.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/NC_SURVIVOR_CHEF_background.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/No_Others_01.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/No_Others_02.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/backgrounds_table_of_contents.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/bg_pizzaiolo.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/burger_flipper_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/codger.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/confused_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/cop_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/cop_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/cop_3.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/criminal_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/criminal_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/cyborg_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/dreamer.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/evacuee_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/evacuee_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/evacuee_3.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/evacuee_4.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/evacuee_5.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/evacuee_6.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/fema_evacuee_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/grad_student_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/gung_ho_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/gung_ho_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/gung_ho_3.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/high_school_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/hospital_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/hospital_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/hospital_3.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/hunter_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/hunter_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/lab_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/left_for_dead_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/left_for_dead_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/left_for_dead_3.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/lost_partner_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/lost_partner_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/meteorologist.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/nerd_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/no_past_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/no_past_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/no_past_3.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/no_past_4.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/no_past_5.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/othersurvivors_table_of_contents.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/out_of_town_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/out_of_town_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/prepper_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/prepper_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/prisoner_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/professor_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/religious_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/religious_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/rural_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/rural_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/scavenger_merc_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/scientist_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/scientist_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/soldier_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/soldier_2.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/wedding_1.json -%%CURSES%%%%DATADIR%%/json/npcs/Backgrounds/whathappened_table_of_contents.json -%%CURSES%%%%DATADIR%%/json/npcs/Kindred/NPC_Brigitte_LaCroix.json -%%CURSES%%%%DATADIR%%/json/npcs/Kindred/NPC_Darren_Cooper.json -%%CURSES%%%%DATADIR%%/json/npcs/Lighthouse_Family/NPC_lighthouse_girl.json -%%CURSES%%%%DATADIR%%/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json -%%CURSES%%%%DATADIR%%/json/npcs/Lighthouse_Family/NPC_lighthouse_woman.json -%%CURSES%%%%DATADIR%%/json/npcs/Lighthouse_Family/TALK_fix_lighthouse.json -%%CURSES%%%%DATADIR%%/json/npcs/Lighthouse_Family/npc_survivor.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_ARMY.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_ARSONIST.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_BARTENDER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_BOUNTY_HUNTER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_CITY_COP.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_COWBOY.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_CYBORG.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_DEBUG.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_DOCTOR.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_FARMER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_HACKER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_HUNTER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_JUNK_SHOPKEEP.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_MARLOSS_VOICE.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_NINJA.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_OPS.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_SCAVENGER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_SCIENTIST.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_SOLDIER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_SURVIVOR_CHEF.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_THUG.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_TRADER.json -%%CURSES%%%%DATADIR%%/json/npcs/NC_TRUE_FOODPERSON.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_ALLY_TUTORIAL.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_CITY_COP.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_CYBORG_1.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_FACTION_CAMP.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_MARLOSS_VOICE.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_NC_FARMER.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_STRIP_MALL.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_SURVIVOR_CHEF.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_TEST.json -%%CURSES%%%%DATADIR%%/json/npcs/TALK_TRUE_FOODPERSON.json -%%CURSES%%%%DATADIR%%/json/npcs/appearance_trait_groups.json -%%CURSES%%%%DATADIR%%/json/npcs/bunker_shop/NC_BUNKER_MERCHANT.json -%%CURSES%%%%DATADIR%%/json/npcs/bunker_shop/TALK_BUNKER_MERCHANT.json -%%CURSES%%%%DATADIR%%/json/npcs/bunker_shop/classes.json -%%CURSES%%%%DATADIR%%/json/npcs/bunker_shop/npc.json -%%CURSES%%%%DATADIR%%/json/npcs/cabin_chemist/chemist_effects.json -%%CURSES%%%%DATADIR%%/json/npcs/cabin_chemist/chemist_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/cabin_chemist/chemist_npc.json -%%CURSES%%%%DATADIR%%/json/npcs/cabin_chemist/item_groups.json -%%CURSES%%%%DATADIR%%/json/npcs/classes.json -%%CURSES%%%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_ALLY.json -%%CURSES%%%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_GREET.json -%%CURSES%%%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_MISSION.json -%%CURSES%%%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_OTHER.json -%%CURSES%%%%DATADIR%%/json/npcs/common_chat/TALK_FRIEND_CONVERSATION.json -%%CURSES%%%%DATADIR%%/json/npcs/computers/TALK_COMPUTER.json -%%CURSES%%%%DATADIR%%/json/npcs/computers/TALK_NURSING_HOME.json -%%CURSES%%%%DATADIR%%/json/npcs/computers/TALK_PREPPER_1_COMPUTER.json -%%CURSES%%%%DATADIR%%/json/npcs/computers/TALK_RET_COMM.json -%%CURSES%%%%DATADIR%%/json/npcs/computers/TALK_TRAIN_DATA.json -%%CURSES%%%%DATADIR%%/json/npcs/destination_locations.json -%%CURSES%%%%DATADIR%%/json/npcs/exodii/exodii_merchant_definitions.json -%%CURSES%%%%DATADIR%%/json/npcs/exodii/exodii_merchant_itemlist.json -%%CURSES%%%%DATADIR%%/json/npcs/exodii/exodii_merchant_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/exodii/exodii_merchant_talk.json -%%CURSES%%%%DATADIR%%/json/npcs/exodii/exodii_merchant_talk_exodization.json -%%CURSES%%%%DATADIR%%/json/npcs/exodii/non-NPC_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/expertise_traits.json -%%CURSES%%%%DATADIR%%/json/npcs/factions.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Arturo_Maldonado.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Aunt_Theresa.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Chloe_Taylor_King.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Corrie_Kaja_Dosia.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Darryl_Johnstone.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Father_Greenwood.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Felicity_Powell.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Gemma_Johnstone.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Helena_Misinter.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Jane_Schulz.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Jeremiah_Weaver.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Julian_Ray.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Katherine_Weaver.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Kostas_Walsman.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Maria_Serrano.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Olwen_Powell.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Russell_Connelly.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Sonia_Greene.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Tom_Powell.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/NPC_Zachary_Montes.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/classes.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/cook.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/foodguard.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/godco_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/godco/npcs.json -%%CURSES%%%%DATADIR%%/json/npcs/hints.json -%%CURSES%%%%DATADIR%%/json/npcs/holdouts/Mr_Lapin.json -%%CURSES%%%%DATADIR%%/json/npcs/holdouts/NC_GLOOSCAP.json -%%CURSES%%%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Friendly.json -%%CURSES%%%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Hostile.json -%%CURSES%%%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Nihilist.json -%%CURSES%%%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Trader.json -%%CURSES%%%%DATADIR%%/json/npcs/holdouts/rural.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json -%%CURSES%%%%DATADIR%%/json/npcs/island_prison/prisoners.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_cody_dialogue.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_cody_fabricate.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_cody_prototype.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_item_groups.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_jay_convert.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_jay_dialogue.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_npcs.json -%%CURSES%%%%DATADIR%%/json/npcs/isolated_road/isolated_road_worn.json -%%CURSES%%%%DATADIR%%/json/npcs/items_generic.json -%%CURSES%%%%DATADIR%%/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json -%%CURSES%%%%DATADIR%%/json/npcs/lumbermill_employees/TALK_lumbermill_logger.json -%%CURSES%%%%DATADIR%%/json/npcs/lumbermill_employees/TALK_lumbermill_merchant.json -%%CURSES%%%%DATADIR%%/json/npcs/lumbermill_employees/lumbermill_effects.json -%%CURSES%%%%DATADIR%%/json/npcs/lumbermill_employees/lumbermill_employees.json -%%CURSES%%%%DATADIR%%/json/npcs/lumbermill_employees/lumbermill_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/mine/spiral_madman.json -%%CURSES%%%%DATADIR%%/json/npcs/missiondef.json -%%CURSES%%%%DATADIR%%/json/npcs/npc.json -%%CURSES%%%%DATADIR%%/json/npcs/npc_behavior.json -%%CURSES%%%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_Soldier_1.json -%%CURSES%%%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_officer.json -%%CURSES%%%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_pilot.json -%%CURSES%%%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json -%%CURSES%%%%DATADIR%%/json/npcs/other/NPC_pizzaiolo.json -%%CURSES%%%%DATADIR%%/json/npcs/other/TALK_NPC_APARTMENT_SURVIVOR.json -%%CURSES%%%%DATADIR%%/json/npcs/other/TALK_NPC_CAMPER.json -%%CURSES%%%%DATADIR%%/json/npcs/other/TALK_NPC_MOONSHINER.json -%%CURSES%%%%DATADIR%%/json/npcs/other/TALK_NPC_PREPPER_SURVIVOR.json -%%CURSES%%%%DATADIR%%/json/npcs/other/TALK_shelter_survivors.json -%%CURSES%%%%DATADIR%%/json/npcs/other/homeless/TALK_homeless_survivor.json -%%CURSES%%%%DATADIR%%/json/npcs/other/homeless/group_camp/TALK_homeless_broker.json -%%CURSES%%%%DATADIR%%/json/npcs/other/homeless/group_camp/TALK_homeless_group_survivors.json -%%CURSES%%%%DATADIR%%/json/npcs/other/homeless/group_camp/group_camp_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/other/homeless/group_camp/homeless_broker_sell.json -%%CURSES%%%%DATADIR%%/json/npcs/other/homeless/group_camp/nested_homeless_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/other/meteorologist.json -%%CURSES%%%%DATADIR%%/json/npcs/prisoners/mi-go_prisoners.json -%%CURSES%%%%DATADIR%%/json/npcs/random_encounters/free_merchant_caravans.json -%%CURSES%%%%DATADIR%%/json/npcs/random_encounters/john_bailey.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/FREE_MERCHANTS_INFO.md -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_5_Yusuke_Taylor.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/missiondef_free_merchants.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Dino_Dave.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Guneet_Singh.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_John_Clemens.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Stan_Borichenko.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_refugees/shared_dialogue.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard2.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard3.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard_generic.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_hostile_guard.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_itemlist.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk_fluff.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_staff/generic_class_definitions.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_hunter.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json -%%CURSES%%%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_visiting_scavenger.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/NPC_Cranberry_Foster.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/NPC_Ulysses_Rourke.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/NPC_robofac_generic_security.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/ROBOFAC_SURFACE_FREEMERCHANT.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_anchor_seller.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_gunrunner.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_hireable.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_keycard_seller.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_template_seller.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/NPC_BEMS.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_HQ_GUARD.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Andrea_Dzvonko.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Darla_Novak.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Jonathan_Farrier.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Sunil_Narayana.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json -%%CURSES%%%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json -%%CURSES%%%%DATADIR%%/json/npcs/scrap_trader/scrap_trader.json -%%CURSES%%%%DATADIR%%/json/npcs/scrap_trader/scrap_trader_missions.json -%%CURSES%%%%DATADIR%%/json/npcs/slaves/npcs.json -%%CURSES%%%%DATADIR%%/json/npcs/starting_traits.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_barber.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_bartender.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_doctor.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_farmer1.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_farmer2.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_foreman.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_generic.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_guard.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_nurse.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_scrapper.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_sickly_laborer.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_woodcutter2.json -%%CURSES%%%%DATADIR%%/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json -%%CURSES%%%%DATADIR%%/json/npcs/talk_tags.json -%%CURSES%%%%DATADIR%%/json/npcs/talk_tags_chat.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_gode.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_leader.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_mechanic.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_member.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_shopkeeper.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/missions.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/npcs.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/snippets.json -%%CURSES%%%%DATADIR%%/json/npcs/valhalla_cult/valhallist_leader_backstory.json -%%CURSES%%%%DATADIR%%/json/obsolete.json -%%CURSES%%%%DATADIR%%/json/obsolete_terrains.json -%%CURSES%%%%DATADIR%%/json/obsoletion/charge_removal.json -%%CURSES%%%%DATADIR%%/json/obsoletion/fakespecials.json -%%CURSES%%%%DATADIR%%/json/obsoletion/faults.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolis.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolisB1.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolisB2.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolisB3.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_a.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_b1.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_b2.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_b3.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mapgen_palettes/obsolete_palette.json -%%CURSES%%%%DATADIR%%/json/obsoletion/mutations.json -%%CURSES%%%%DATADIR%%/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Captain.json -%%CURSES%%%%DATADIR%%/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Commo.json -%%CURSES%%%%DATADIR%%/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Soldier.json -%%CURSES%%%%DATADIR%%/json/obsoletion/obsolete_fake.json -%%CURSES%%%%DATADIR%%/json/obsoletion/obsolete_mapgen.json -%%CURSES%%%%DATADIR%%/json/obsoletion/overmap/overmap_terrain/overmap_terrain_necropolis.json -%%CURSES%%%%DATADIR%%/json/obsoletion/overmap/overmap_terrain/overmap_terrain_obsoletion.json -%%CURSES%%%%DATADIR%%/json/obsoletion/overmap_special/specials.json -%%CURSES%%%%DATADIR%%/json/obsoletion/professions.json -%%CURSES%%%%DATADIR%%/json/overmap/map_extras.json -%%CURSES%%%%DATADIR%%/json/overmap/multitile_city_buildings.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_connections.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_land_use_codes.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/anthill.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/crater.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/dumpsite_mutable.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/farm_mutable.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/homeless_camp_mutable.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/microlab_mutable.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/mine_mutable.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/mobile_home_park_mutable.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/nether_monster_corpse.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_mutable/river_cave.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/aircraft_carrier.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/alien.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/bordered_world.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/campus.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/lab_modular/lab_mini_specials.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/mine.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/nuclear_plant.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/overmap_special_migration.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/specials.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_special/tutorial.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_abstract.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_agricultural.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_alien.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_ants.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_campus.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_cemetery.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_commercial.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_evac_center.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_faction_base.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_fungal.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_industrial.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_lab.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_mall.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_mansion.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_mi-go.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_microlab.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_military.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_nether.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_nether_monster_corpse.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_nuclear_plant.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_private_resort.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_ravines.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_recreational.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_residential.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_retirement_community.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_river.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_robofachq.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_transportation.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_triffid.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_waterbody.json -%%CURSES%%%%DATADIR%%/json/overmap/overmap_terrain/river_cave.json -%%CURSES%%%%DATADIR%%/json/overmap/special_locations.json -%%CURSES%%%%DATADIR%%/json/player_activities.json -%%CURSES%%%%DATADIR%%/json/portal_dependent_effect_on_condition.json -%%CURSES%%%%DATADIR%%/json/portal_storm_effect_on_condition.json -%%CURSES%%%%DATADIR%%/json/professions.json -%%CURSES%%%%DATADIR%%/json/proficiencies/chemistry.json -%%CURSES%%%%DATADIR%%/json/proficiencies/comestibles.json -%%CURSES%%%%DATADIR%%/json/proficiencies/electronics.json -%%CURSES%%%%DATADIR%%/json/proficiencies/gunsmithing.json -%%CURSES%%%%DATADIR%%/json/proficiencies/health_care.json -%%CURSES%%%%DATADIR%%/json/proficiencies/mechanics.json -%%CURSES%%%%DATADIR%%/json/proficiencies/metalwork.json -%%CURSES%%%%DATADIR%%/json/proficiencies/misc.json -%%CURSES%%%%DATADIR%%/json/proficiencies/proficiency_categories.json -%%CURSES%%%%DATADIR%%/json/proficiencies/tailoring.json -%%CURSES%%%%DATADIR%%/json/proficiencies/traps.json -%%CURSES%%%%DATADIR%%/json/proficiencies/weakpoints.json -%%CURSES%%%%DATADIR%%/json/proficiencies/wilderness.json -%%CURSES%%%%DATADIR%%/json/proficiencies/woodworking.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/40x46mm.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/40x53mm.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/cannon.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/components.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/pistol.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/rifle.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/shot.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/sling-ready_grenade.json -%%CURSES%%%%DATADIR%%/json/recipes/ammo/weldgas.json -%%CURSES%%%%DATADIR%%/json/recipes/appliances/oven.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/arms.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/bespoke_armor/nomad.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/bespoke_armor/survivor.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/feet.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/hands.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/head.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/legs.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/other.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/pets_cow.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/pets_dog.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/pets_horse.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/storage.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/suit.json -%%CURSES%%%%DATADIR%%/json/recipes/armor/torso.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_beds.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_garage.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_lighthouse/recipe_modular_lighthouse_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00_beds.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10_beds.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_workshop.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_expansion_surveys.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_beds.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/fbmc_sealab_small/recipe_sealab_small_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_bare_bones_basecamp/recipe_bare_bones_basecamp.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_defenses.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_tent.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_primitive_field.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/modular_field_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_concrete.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_tent.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/modular_shelter_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_standard.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/modular_shelter_1_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/modular_shelter_2_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/components.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/modular_canteen_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_concrete.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_farm/version_1/recipe_primitive_farm.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_farm/version_2/recipe_modular_farm_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_1/recipe_primitive_garage.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_concrete.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/modular_livestock_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_concrete.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_stone.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_bookcase.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_concrete.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_dresser.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_locker.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rack.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_warehouse_shelf.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wooden_rack.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_common.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_concrete.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_log.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_metal.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_migo_resin.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_rammed_earth.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_rock.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_salt_water_pipe.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_wad.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_wood.json -%%CURSES%%%%DATADIR%%/json/recipes/basecamps/recipe_groups.json -%%CURSES%%%%DATADIR%%/json/recipes/chem/chemicals.json -%%CURSES%%%%DATADIR%%/json/recipes/chem/drugs.json -%%CURSES%%%%DATADIR%%/json/recipes/chem/fuel.json -%%CURSES%%%%DATADIR%%/json/recipes/chem/mutagens.json -%%CURSES%%%%DATADIR%%/json/recipes/chem/other.json -%%CURSES%%%%DATADIR%%/json/recipes/electronics/parts.json -%%CURSES%%%%DATADIR%%/json/recipes/electronics/toolmod.json -%%CURSES%%%%DATADIR%%/json/recipes/food/baking.json -%%CURSES%%%%DATADIR%%/json/recipes/food/bread.json -%%CURSES%%%%DATADIR%%/json/recipes/food/brewing.json -%%CURSES%%%%DATADIR%%/json/recipes/food/canned.json -%%CURSES%%%%DATADIR%%/json/recipes/food/casseroles.json -%%CURSES%%%%DATADIR%%/json/recipes/food/corn.json -%%CURSES%%%%DATADIR%%/json/recipes/food/curing.json -%%CURSES%%%%DATADIR%%/json/recipes/food/dairy_products.json -%%CURSES%%%%DATADIR%%/json/recipes/food/distill.json -%%CURSES%%%%DATADIR%%/json/recipes/food/drinks.json -%%CURSES%%%%DATADIR%%/json/recipes/food/dry.json -%%CURSES%%%%DATADIR%%/json/recipes/food/frozen.json -%%CURSES%%%%DATADIR%%/json/recipes/food/meat_dishes.json -%%CURSES%%%%DATADIR%%/json/recipes/food/offal_dishes.json -%%CURSES%%%%DATADIR%%/json/recipes/food/other.json -%%CURSES%%%%DATADIR%%/json/recipes/food/pasta.json -%%CURSES%%%%DATADIR%%/json/recipes/food/seed.json -%%CURSES%%%%DATADIR%%/json/recipes/food/vegetable_dishes.json -%%CURSES%%%%DATADIR%%/json/recipes/nested.json -%%CURSES%%%%DATADIR%%/json/recipes/other/bots.json -%%CURSES%%%%DATADIR%%/json/recipes/other/cords_and_ropes.json -%%CURSES%%%%DATADIR%%/json/recipes/other/materials.json -%%CURSES%%%%DATADIR%%/json/recipes/other/medical.json -%%CURSES%%%%DATADIR%%/json/recipes/other/other.json -%%CURSES%%%%DATADIR%%/json/recipes/other/parts.json -%%CURSES%%%%DATADIR%%/json/recipes/other/parts_construction.json -%%CURSES%%%%DATADIR%%/json/recipes/other/parts_rigs.json -%%CURSES%%%%DATADIR%%/json/recipes/other/power_supplies.json -%%CURSES%%%%DATADIR%%/json/recipes/other/vehicle.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/athletics.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/computers.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/devices.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/electronics.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/fabrication.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/health.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/mechanics.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/melee.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/ranged.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/social.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/survival.json -%%CURSES%%%%DATADIR%%/json/recipes/practice/tailoring.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_ammo.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_appliance.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_companion.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_deconstruction.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_food.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_furniture.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_medsandchemicals.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_obsolete.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_others.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_traps.json -%%CURSES%%%%DATADIR%%/json/recipes/recipe_vehicle.json -%%CURSES%%%%DATADIR%%/json/recipes/recipes.json -%%CURSES%%%%DATADIR%%/json/recipes/recipes_holiday.json -%%CURSES%%%%DATADIR%%/json/recipes/tools/containers.json -%%CURSES%%%%DATADIR%%/json/recipes/tools/lights.json -%%CURSES%%%%DATADIR%%/json/recipes/tools/tool.json -%%CURSES%%%%DATADIR%%/json/recipes/tools/tools_electronic.json -%%CURSES%%%%DATADIR%%/json/recipes/tools/tools_hand.json -%%CURSES%%%%DATADIR%%/json/recipes/tools/tools_primitive.json -%%CURSES%%%%DATADIR%%/json/recipes/weapon/bashing.json -%%CURSES%%%%DATADIR%%/json/recipes/weapon/cutting.json -%%CURSES%%%%DATADIR%%/json/recipes/weapon/explosive.json -%%CURSES%%%%DATADIR%%/json/recipes/weapon/magazines.json -%%CURSES%%%%DATADIR%%/json/recipes/weapon/mods.json -%%CURSES%%%%DATADIR%%/json/recipes/weapon/piercing.json -%%CURSES%%%%DATADIR%%/json/recipes/weapon/ranged.json -%%CURSES%%%%DATADIR%%/json/regional_map_settings.json -%%CURSES%%%%DATADIR%%/json/requirements/ammo.json -%%CURSES%%%%DATADIR%%/json/requirements/butchery.json -%%CURSES%%%%DATADIR%%/json/requirements/chemistry.json -%%CURSES%%%%DATADIR%%/json/requirements/cooking_components.json -%%CURSES%%%%DATADIR%%/json/requirements/cooking_tools.json -%%CURSES%%%%DATADIR%%/json/requirements/explosives.json -%%CURSES%%%%DATADIR%%/json/requirements/materials.json -%%CURSES%%%%DATADIR%%/json/requirements/ranged.json -%%CURSES%%%%DATADIR%%/json/requirements/tailoring.json -%%CURSES%%%%DATADIR%%/json/requirements/toolsets.json -%%CURSES%%%%DATADIR%%/json/requirements/uncraft.json -%%CURSES%%%%DATADIR%%/json/requirements/vehicle.json -%%CURSES%%%%DATADIR%%/json/road_vehicles.json -%%CURSES%%%%DATADIR%%/json/rotatable_symbols.json -%%CURSES%%%%DATADIR%%/json/scenarios.json -%%CURSES%%%%DATADIR%%/json/scent_types.json -%%CURSES%%%%DATADIR%%/json/scores.json -%%CURSES%%%%DATADIR%%/json/shop_consumption_rates.json -%%CURSES%%%%DATADIR%%/json/skillDisplayType.json -%%CURSES%%%%DATADIR%%/json/skills.json -%%CURSES%%%%DATADIR%%/json/snippets/addiction.json -%%CURSES%%%%DATADIR%%/json/snippets/amigara.json -%%CURSES%%%%DATADIR%%/json/snippets/dimensional_exploration.json -%%CURSES%%%%DATADIR%%/json/snippets/effect_on_conditions.json -%%CURSES%%%%DATADIR%%/json/snippets/epilogue_factions.json -%%CURSES%%%%DATADIR%%/json/snippets/epilogue_npc.json -%%CURSES%%%%DATADIR%%/json/snippets/fliers.json -%%CURSES%%%%DATADIR%%/json/snippets/graffiti.json -%%CURSES%%%%DATADIR%%/json/snippets/grave_labels.json -%%CURSES%%%%DATADIR%%/json/snippets/harvest_drop_msgs.json -%%CURSES%%%%DATADIR%%/json/snippets/hazardous_waste_sarcophagus.json -%%CURSES%%%%DATADIR%%/json/snippets/health_msgs.json -%%CURSES%%%%DATADIR%%/json/snippets/lab.json -%%CURSES%%%%DATADIR%%/json/snippets/lab_signs.json -%%CURSES%%%%DATADIR%%/json/snippets/missing_posters.json -%%CURSES%%%%DATADIR%%/json/snippets/music.json -%%CURSES%%%%DATADIR%%/json/snippets/mutant_anatomy.json -%%CURSES%%%%DATADIR%%/json/snippets/newspapers.json -%%CURSES%%%%DATADIR%%/json/snippets/nightmares.json -%%CURSES%%%%DATADIR%%/json/snippets/npc_quips.json -%%CURSES%%%%DATADIR%%/json/snippets/radio.json -%%CURSES%%%%DATADIR%%/json/snippets/robot_finds_kitten.json -%%CURSES%%%%DATADIR%%/json/snippets/schizophrenia.json -%%CURSES%%%%DATADIR%%/json/snippets/snippets.json -%%CURSES%%%%DATADIR%%/json/snippets/survivor_notes.json -%%CURSES%%%%DATADIR%%/json/snippets/tutorial.json -%%CURSES%%%%DATADIR%%/json/snippets/valentines.json -%%CURSES%%%%DATADIR%%/json/snippets/weed_messages.json -%%CURSES%%%%DATADIR%%/json/species.json -%%CURSES%%%%DATADIR%%/json/speech.json -%%CURSES%%%%DATADIR%%/json/speed_descriptions.json -%%CURSES%%%%DATADIR%%/json/start_locations.json -%%CURSES%%%%DATADIR%%/json/starting_missions.json -%%CURSES%%%%DATADIR%%/json/statistics.json -%%CURSES%%%%DATADIR%%/json/techniques.json -%%CURSES%%%%DATADIR%%/json/test_regions.json -%%CURSES%%%%DATADIR%%/json/tool_qualities.json -%%CURSES%%%%DATADIR%%/json/traps.json -%%CURSES%%%%DATADIR%%/json/ui/activity.json -%%CURSES%%%%DATADIR%%/json/ui/body_graph.json -%%CURSES%%%%DATADIR%%/json/ui/body_temp.json -%%CURSES%%%%DATADIR%%/json/ui/bodypart_armor.json -%%CURSES%%%%DATADIR%%/json/ui/bodypart_color_text.json -%%CURSES%%%%DATADIR%%/json/ui/bodypart_status.json -%%CURSES%%%%DATADIR%%/json/ui/cardio.json -%%CURSES%%%%DATADIR%%/json/ui/carry_weight.json -%%CURSES%%%%DATADIR%%/json/ui/compass.json -%%CURSES%%%%DATADIR%%/json/ui/compass_danger.json -%%CURSES%%%%DATADIR%%/json/ui/date.json -%%CURSES%%%%DATADIR%%/json/ui/encumbrance.json -%%CURSES%%%%DATADIR%%/json/ui/env_temp.json -%%CURSES%%%%DATADIR%%/json/ui/fatigue.json -%%CURSES%%%%DATADIR%%/json/ui/focus.json -%%CURSES%%%%DATADIR%%/json/ui/health.json -%%CURSES%%%%DATADIR%%/json/ui/hp.json -%%CURSES%%%%DATADIR%%/json/ui/hunger.json -%%CURSES%%%%DATADIR%%/json/ui/layout.json -%%CURSES%%%%DATADIR%%/json/ui/lighting.json -%%CURSES%%%%DATADIR%%/json/ui/ma_style.json -%%CURSES%%%%DATADIR%%/json/ui/moon.json -%%CURSES%%%%DATADIR%%/json/ui/morale.json -%%CURSES%%%%DATADIR%%/json/ui/movement.json -%%CURSES%%%%DATADIR%%/json/ui/overmap.json -%%CURSES%%%%DATADIR%%/json/ui/pain.json -%%CURSES%%%%DATADIR%%/json/ui/place.json -%%CURSES%%%%DATADIR%%/json/ui/power.json -%%CURSES%%%%DATADIR%%/json/ui/radiation.json -%%CURSES%%%%DATADIR%%/json/ui/safe_mode.json -%%CURSES%%%%DATADIR%%/json/ui/separator.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar-legacy-classic.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar-legacy-compact.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar-legacy-labels-narrow.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar-legacy-labels.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar-legacy-one-padding.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar-mobile.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar-thick.json -%%CURSES%%%%DATADIR%%/json/ui/sidebar.json -%%CURSES%%%%DATADIR%%/json/ui/sound.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/sidebar-spacebar.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_body_and_health_block.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_environment_block.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_location_compass_block.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_mana.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_movement_block.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_player_weariness_mood_block.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_separators.json -%%CURSES%%%%DATADIR%%/json/ui/spacebar/spacebar_waepon_ma_block.json -%%CURSES%%%%DATADIR%%/json/ui/speed.json -%%CURSES%%%%DATADIR%%/json/ui/stamina.json -%%CURSES%%%%DATADIR%%/json/ui/stats.json -%%CURSES%%%%DATADIR%%/json/ui/structured/sidebar-structured.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_bodygraphs.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_bodygraphs_tiny.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_compass_block.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_environment_blocks.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_health_blocks.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_ma_block.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_mana_block.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_overmap.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_speed_vehicle.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_weariness_block.json -%%CURSES%%%%DATADIR%%/json/ui/structured/structured_wielding.json -%%CURSES%%%%DATADIR%%/json/ui/thirst.json -%%CURSES%%%%DATADIR%%/json/ui/time.json -%%CURSES%%%%DATADIR%%/json/ui/vehicle.json -%%CURSES%%%%DATADIR%%/json/ui/warmth.json -%%CURSES%%%%DATADIR%%/json/ui/weariness.json -%%CURSES%%%%DATADIR%%/json/ui/weather.json -%%CURSES%%%%DATADIR%%/json/ui/weight.json -%%CURSES%%%%DATADIR%%/json/ui/wetness.json -%%CURSES%%%%DATADIR%%/json/ui/wield.json -%%CURSES%%%%DATADIR%%/json/ui/wind.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/10mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/120mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/22.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/223.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/270win.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/30-06.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/300.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/300blk.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/308.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/30carbine.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/32.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/357mag.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/357sig.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/38.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/380.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/38super.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/40.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/40x46mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/40x53mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/410shot.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/44.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/45.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/454.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/4570.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/45colt.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/460.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/46mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/500.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/50bmg.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/545.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/556.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/57mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/5x50.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/66mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/700nx.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/762x25.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/762x39.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/762x51.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/762x54.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/84x246mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/9mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/9x18mm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/atgm.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/rpg.json -%%CURSES%%%%DATADIR%%/json/uncraft/ammo/shot.json -%%CURSES%%%%DATADIR%%/json/uncraft/armor.json -%%CURSES%%%%DATADIR%%/json/uncraft/armor/boots.json -%%CURSES%%%%DATADIR%%/json/uncraft/armor/pets_dog.json -%%CURSES%%%%DATADIR%%/json/uncraft/armor/scrap_armor.json -%%CURSES%%%%DATADIR%%/json/uncraft/armor/storage.json -%%CURSES%%%%DATADIR%%/json/uncraft/armor/suit.json -%%CURSES%%%%DATADIR%%/json/uncraft/cbm/cbm.json -%%CURSES%%%%DATADIR%%/json/uncraft/classes/ammo.json -%%CURSES%%%%DATADIR%%/json/uncraft/containers/military.json -%%CURSES%%%%DATADIR%%/json/uncraft/generic.json -%%CURSES%%%%DATADIR%%/json/uncraft/tool/deployable.json -%%CURSES%%%%DATADIR%%/json/uncraft/tools.json -%%CURSES%%%%DATADIR%%/json/uncraft/vehicle/alternator.json -%%CURSES%%%%DATADIR%%/json/uncraft/vehicle/engines.json -%%CURSES%%%%DATADIR%%/json/uncraft/vehicle/noise.json -%%CURSES%%%%DATADIR%%/json/uncraft/vehicle/wheels.json -%%CURSES%%%%DATADIR%%/json/uncraft/weapon/explosive.json -%%CURSES%%%%DATADIR%%/json/uncraft/weapon/ranged.json -%%CURSES%%%%DATADIR%%/json/vehicle_groups.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/alternator.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/armor.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/battery.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/boards.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/cargo.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/combustion.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/doors.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/engineering.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/faults.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/frames.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/lights.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/manual.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/migration.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/mirrors.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/motor.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/obsolete.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/rams.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/rotor.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/seats.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/tanks.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/turret.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/utilities.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/vehicle_parts.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/vp_categories.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/vp_flags.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/wheel.json -%%CURSES%%%%DATADIR%%/json/vehicleparts/windshields.json -%%CURSES%%%%DATADIR%%/json/vehicles/bikes.json -%%CURSES%%%%DATADIR%%/json/vehicles/boats.json -%%CURSES%%%%DATADIR%%/json/vehicles/cars.json -%%CURSES%%%%DATADIR%%/json/vehicles/carts.json -%%CURSES%%%%DATADIR%%/json/vehicles/custom_vehicles.json -%%CURSES%%%%DATADIR%%/json/vehicles/emergency.json -%%CURSES%%%%DATADIR%%/json/vehicles/factional.json -%%CURSES%%%%DATADIR%%/json/vehicles/farm.json -%%CURSES%%%%DATADIR%%/json/vehicles/helicopters.json -%%CURSES%%%%DATADIR%%/json/vehicles/military.json -%%CURSES%%%%DATADIR%%/json/vehicles/trains.json -%%CURSES%%%%DATADIR%%/json/vehicles/trucks.json -%%CURSES%%%%DATADIR%%/json/vehicles/utility.json -%%CURSES%%%%DATADIR%%/json/vehicles/vans_busses.json -%%CURSES%%%%DATADIR%%/json/vehicles/vehicles.json -%%CURSES%%%%DATADIR%%/json/vitamin.json -%%CURSES%%%%DATADIR%%/json/weapon_categories.json -%%CURSES%%%%DATADIR%%/json/weather_type.json -%%CURSES%%%%DATADIR%%/json/zones.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/README.md -%%CURSES%%%%DATADIR%%/mods/Aftershock/achievements/achievements.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/achievements/statistics.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/ammo_effects.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/crafting_system.md -%%CURSES%%%%DATADIR%%/mods/Aftershock/effects.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/effects_on_condition.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/emit.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/field.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/field_type.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/harvest.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/alien_civ_itemgroups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/arcology_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/bionics_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/clothing/armor_sets.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/clothing/civilian_blue_collar_sets.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/clothing/military_gear.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/clothing/winter_outfits.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/clothing_group.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/food_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/item_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/kitchen_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/loot_corpse_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/nanofab_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/nuclear_reactor_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/science_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/scrap_expansion_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/scrap_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/spaceship_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/titanium_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/tool_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/vending_machine_group.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/weapons/armories.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/weapons/balistic_gun_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/weapons/grenade_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/weapons/makeshift_gun_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/afs_harvest.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/alien_organics.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo/10mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo/25mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo/7.50mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo/battery.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo/foam.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo/metal_rail.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo/plasma.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo_effects.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ammo_type.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/civilian_blue_collar.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/cyberpunk.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_ammo.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_components.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_frame.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_guide.md -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_melee.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_modules.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_mutations.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_arms.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_head.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_legs.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_torso.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_ranged.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_spells.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_storage.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_tool.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/jetpacks.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/winter_masks.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor/winter_suits.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/armor_helmets.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/bioparts.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/books.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/casing.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/cast_spell_items.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/cbms.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/comestibles/alienfood.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/comestibles/bug_brew.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/comestibles/cheap_food.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/comestibles/comestibles.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/comestibles/medicine.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/containers.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/corpses.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/abstract_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/circuity_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/cloth_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/heat_transfer_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/magnet_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/material_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/crafting_scrap/optics.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/ethereal.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/frankenstein_items.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/furniture.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/grenades.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/10mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/25mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/5x50.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/7.50mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/8x40mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/advanced.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/foam.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/laser.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/migrations.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/mining_rod.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/plasma.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/projectile.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gun/voltaic.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gunmods/laser_gunmods.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/gunmods/sights.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/inactiverobot.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/items.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/lore_items.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/10mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/25mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/7.50mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/8x40mm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/alien.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/energy_cell.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/foam.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/plasma.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/magazine/voltaic.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/materials.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/mutagen.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/nanofab_templates.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/radio_tools.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/robotparts.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/seed.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/tool_armor.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/tool_quality.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/tools.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/vehicle_items.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/items/weapons.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/city_buildings.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/furniture_alienciv.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_alienciv.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_floraxeno.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_groundxeno.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_wall.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_manufactured.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/furniture_lab.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/lab_cryo_room.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/lab_vehicle_track.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/lab_weapons_range.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/arcology_ground.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/astrobiology_lab.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/augmentation_clinic.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/basement_bionic.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/escape_pod.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/fungal_siege.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/houses/houses.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/map_palletes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/millyficent_lab.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/municipal_microreactor.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/prepnet_orchard.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_first_01.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_second_01.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/robot_dispatch/tpalettes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/s_gas.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/sadie_large_storage.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/stratoscomm_relay.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/sinkhole.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_ravine_edge.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_river.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_special_chunk.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_tiles.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/urban_worm_farm.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen/whately_lmoe.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_generic_building.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_habitat_structure.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_tunnel.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/arcology.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/augmentation_clinic.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/houses.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mutable_specials/formless_ruin.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/mutable_specials/ravine_tunnels.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/nested/arcology/arcology_chunks.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/nested/arcology/arcology_gate_chunks.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/nested/basement.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/nested/lab.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/nested/road.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/nested/sadie_spawn.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/overmap_locations.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/overmap_map_extras.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/overmap_specials.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/maps/overmap_terrain/overmap_terrain_tunnels.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/martialarts.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/migration.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/PrepPhyle_mobs.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/abstract_monsters.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/aliens.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/harvest.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/monster_faction.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/monster_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/monster_groups/fauna_monsters_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/monster_groups/moxie_monster_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/monster_groups/robot_monster_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/mutants.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/reavers_and_bandits.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/robot_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/robots.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/scavbots.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/species.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/turrets.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/uplifted_monsters.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/water_mobs.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mobs/zombies.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/monster_attacks.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/monsterdrops/monster_default.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/monsterdrops/monsterdrops.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mood_faces.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mutations/dreams.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mutations/integrated.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mutations/mutation_eocs.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mutations/mutations.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/mutations/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/criminal_experiment.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/cyberninja.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/ganger_1.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/ganger_2.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/ganger_3.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/npc_classes_mutant.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/radiation_1.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/radiation_2.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/recent_mutation_1.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/selftest.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/trait_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_1.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_2.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_3.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_4.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_5.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/vatgrown_1.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/whately.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/classes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/backgrounds/bg_traits_cyborg.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/backgrounds/trait_groups_cyborg.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/cyropod_classes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/cyrus_whately.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/factions.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/frankenstein_classes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/milly_whately_dialogue.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/mutant_npcs/trait_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/npc.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/prepnet_dialogue.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/sadie.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/threshold_recruit_dialogue.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/npcs/whately_generic_dialogue.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/options.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/player/bionic_eocs.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/player/bionics.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/player/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/player/professions.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/player/techniques.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/ammo_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/armor_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/basecamps/recipe_overwrites.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/bionic_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/cbm_uncraft.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/comestible_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/deconstruction.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/deconstruction/bionic_deconstruction.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/deconstruction/robot.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/electronics_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/frankenstein_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/grenades.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/gun_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/mutagens.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/recipe_overrides.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/recipes_categories.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/requirements.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/robot_recipes.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/ultratech_tools.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/recipes/uncraft.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/region_settings.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/requirements.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/scenarios.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/skills.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/snippets/effect_on_condition.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/snippets/personal_cards.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/snippets/snippets.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/speech.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/spells.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/spells/enchantments.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/spells/hologram_spells.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/spells/jetpack_spells.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/spells/monster_spells.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/spells/teleport_spells.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/start_locations.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/suit_operating_time.md -%%CURSES%%%%DATADIR%%/mods/Aftershock/vehicles/migrations.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/vehicles/part_items.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/vehicles/vehicle_groups.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/vehicles/vehicle_overrides.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/vehicles/vehicle_parts.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/vehicles/vehicles.json -%%CURSES%%%%DATADIR%%/mods/Aftershock/vitamin.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/README.md -%%CURSES%%%%DATADIR%%/mods/Backrooms/furniture_terrain.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/itemgroups.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/items.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/map_extras.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/monstergroups.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/palettes.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/portal_storm_effect_on_condition.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/regional_map_settings.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_bathroom.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_breakroom.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_common.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_empty.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_generic.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_micro_breakroom.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_micro_common.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_micro_storage.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_special.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_storage.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_teleporter.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/rooms/rooms_whole.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/scenarios.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/snippets.json -%%CURSES%%%%DATADIR%%/mods/Backrooms/teleport.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/README.txt -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/furniture_and_terrain/blaze_appliances.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/furniture_and_terrain/blaze_furniture.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/items/gun/grenade.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/items/items.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/items/materials.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_engine.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_gun.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_other.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_solar.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/modinfo.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/recipes/blaze_construction_recipes.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/recipes/blaze_gun_recipes.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/recipes/blaze_other_recipes.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/recipes/construction_group.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/snippets.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/vehicleparts/blaze_combustion.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/vehicleparts/blaze_other_parts.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/vehicleparts/migrations.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/vehicleparts/vehicle_parts.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/vehicles/part_items.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/vehicles/vehicle_spawn.json -%%CURSES%%%%DATADIR%%/mods/BlazeIndustries/vehicles/vehicles.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/construction_group.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/constructions/crt_constructions.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/constructions/crt_terrain.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/crt_gear/advanced_gear.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/effect_on_condition.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/effects.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_ammo.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_ammotypes.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_armor.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_clothes.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_generic.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_gun.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_gunmods.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_item_enchants.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_item_groups.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_makeshift_survival.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_recipes.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_toolarmor.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/items/crt_tools.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/martial/CRT_Bladework.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/martial/crt_gun_techniques.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/martial/dragonslayertechn.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/martial/generaltechn.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/martial/stabtechn.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/modinfo.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/monsters/crt_monster.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/monsters/crt_monstergroups.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/monsters/monster.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_mut_itemgroups.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_vamp_mutations.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/readme/README.md -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/scenarios/crt_classes.json -%%CURSES%%%%DATADIR%%/mods/CRT_EXPANSION/scenarios/crt_scenarios.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_aperturepotato.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_comestibles.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_item_groups.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_items.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_missions.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_monstergroups.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_monsters.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_recipes.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_speech.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_spells.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_vehicles.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/crazy_widgets.json -%%CURSES%%%%DATADIR%%/mods/CrazyCataclysm/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/DESIGN.md -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/README.md -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/TODO.md -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/ammo_effect.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/blacklists/item_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/blacklists/location_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/blacklists/mon_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/blacklists/scenario_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/blacklists/trait_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/effects.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/factions.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/harvest.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/items/alien-scrap.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/items/electronics.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/mapgen/map_extras/bombed_crater.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/mapgen/map_extras/patrols.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/materials.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monattack.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/mongun.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monspell.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monsters/alien_cyborgs.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monsters/alien_fauna.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monsters/alien_robots.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monsters/mon_groups/alienanimal_spawns.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monsters/mon_groups/invader_spawns.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monsters/mon_groups/stray_spawns.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/monsters/strays.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/mutations/traits.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/armor.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/books.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/carnivore.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/electronic.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/generics.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/newspaper.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/ranged.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/tools.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/vehicle.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/weapons.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/locations/cemetery.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/locations/evac_center.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/locations/overmap_special.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/monsters.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/professions.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/region_settings.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/overrides/scenarios.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/recipies/uncraft.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/snippets/fliers.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/snippets/graffiti.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/snippets/newspaper.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/snippets/radio.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/snippets/survnotes.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/species.json -%%CURSES%%%%DATADIR%%/mods/Dark-Skies-Above/speech/neworder_speech.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/DESIGN.md -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/Mr_Lapin.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/NC_BO_BARONYX.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/NC_Red.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/NC_Yoshimi.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/NPC_Alonso_Lautrec.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/NPC_Brigitte_LaCroix.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/NPC_old_guard_representative.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/TALK_NC_FARMER.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/TALK_SURVIVOR_CHEF.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/npc_classes_mutant.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/NPC/trait_groups.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/README.md -%%CURSES%%%%DATADIR%%/mods/DinoMod/achievements/achievements.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/achievements/statistics.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/dinosaur_weakpoints.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/effects.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/harvest.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/harvest_dissect.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/biosignatures.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/books.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/carnivore.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/containers.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/egg.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/forage.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/helmets.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/itemgroups.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/items.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/laser_items.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/mutagen.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/mutagen_ingredients.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/petfoods.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/pets.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/pets_bear_armor.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/pets_elephant_armor.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/items/pets_ostrich_armor.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/lab_notes.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/DinoLabFinale.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/basement_chem.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/cave.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/church.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/dinoexhibit.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/farm.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/mass_grave.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_achelousaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_acrocanthosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_albertosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_allosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_anchisaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_ankylosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_appalachiosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_aquilops.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_camptosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_centrosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_ceratosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_chasmosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_coelophysis.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_corythosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_daspletosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_deinonychus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dilophosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dromaeosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dryosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dryptosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dyoplosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_edmontonia.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_edmontosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_einiosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_euoplocephalus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gallimimus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gargoyleosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gastonia.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gorgosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gryposaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_hadrosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_hesperosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_hypacrosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_issi.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_kosmoceratops.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_lambeosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_maiasaura.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_nanosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_nanuqsaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_nodosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_ornithomimus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_pachycephalosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_pachyrhinosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_panoplosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_parasaurolophus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_pentaceratops.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_prosaurolophus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_sarahsaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_saurolophus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_sauropelta.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_saurornitholestes.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_scolosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_scutellosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_siats.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_stegoceras.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_stegosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_stenonychosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_struthiomimus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_styracosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_tenontosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_thescelosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_torosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_torvosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_triceratops.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_tyrannosaurus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_utahraptor.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_velociraptor.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_zuniceratops.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_zuul.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/map_extras/portal.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/mi-go_scout_tower.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/microlab_DinoLab.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/nested/shack_nested.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/palettes_DinoLab.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/railroad_station.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/swamp_shack.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mapgen/zoo.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/modinfo.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monster_attacks.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monster_factions.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monstergroups/dinosaur.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monstergroups/fungi.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monstergroups/lab.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monstergroups/misc.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monstergroups/monstergroups_egg.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monstergroups/wilderness.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monstergroups/zinosaur.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/dinosaur.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/dinosaur_CBM.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/fungus.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/hatchling.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/juvenile.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/mutant_dino.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/zed-dinosaur.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/zed-dinosaur_CBM.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/zinosaur_burned.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/monsters/zinosaur_upgrade.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mutations/dreams.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/mutations/mutations.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/obsolete/egg.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/obsolete/fieldoffice.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/obsolete/monstergroups_egg.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/obsolete/monsters.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/overmap/map_extras.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/overmap/overmap_specials.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/overmap/overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/overmap/overmap_terrain_zoo.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/proficiencies/weakpoints.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/containers.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/food_egg.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/head.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/medsandchemicals.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/offal_dishes.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/parts_construction.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/pets_bear.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/pets_elephant.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/pets_ostrich.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/recipe_food.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/recipe_others.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/recipes.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/recipes/uncraft.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/regional_overlay.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/requirements/cooking_components.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/requirements/materials.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/scenarios.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/snippets/graffiti.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/snippets/grave_labels.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/snippets/hints.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/snippets/snippets.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/startlocations.json -%%CURSES%%%%DATADIR%%/mods/DinoMod/vitamin.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/black_powder.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/casings.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/gg_ammo_migration.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/gg_casings_migration.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/grenade.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/pistol.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/pistol_magnum.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/pistol_tiny.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/rifle.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/rifle_huge.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/rocket.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/ammo/shot.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/bandoliers/bandolier.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/bandoliers/holster.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/black_powder.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/gg_firearms_migration.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/grenade.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/pistol.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/pistol_magnum.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/pistol_tiny.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/rifle.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/rifle_huge.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/rocket.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/firearms/shot.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/gg_ammunition_types.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/gunmods/gg_gunmods_migration.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/gunmods/gunmods.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/gg_magazines_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/gg_magazines_migration.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/grenade.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/pistol.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/pistol_magnum.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/pistol_tiny.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/rifle.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/rifle_huge.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/magazines/shot.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipe_obsolete.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipes_deconstruction.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipes_firearms_repeater.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipes_firearms_single.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipes_grenade_propelled.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipes_pistol.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipes_rifle.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/recipes_shot.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/recipes/requirements.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/robots/active_bots.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/robots/broken_bots.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/robots/inactive_bots.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/grenade_propelled.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/pistol.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/pistol_magnum.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/pistol_tiny.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/rifle.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/rifle_huge.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/shot.json -%%CURSES%%%%DATADIR%%/mods/Generic_Guns/vehicles/migrations.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/base_colors.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/fonts.json.txt -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_abstract.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_agricultural.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_campus.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_cemetery.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_commercial.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_evac_center.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_faction_base.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_fungal.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_hardcoded.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_industrial.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_lab.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_mall.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_mansion.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_mi-go.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_microlab.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_military.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_necropolis.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_private_resort.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_public_institutional.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_ranch_camp.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_recreational.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_residential.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_river.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_robofachq.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_test.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_transportation.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_waste_junk.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_waterbody.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap/readme.txt -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap_Magiclysm/go_overmap_terrain_magical.json -%%CURSES%%%%DATADIR%%/mods/Graphical_Overmap_Magiclysm/modinfo.json -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap.ps1 -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap.sql -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_0_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_0_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_0_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_0_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_0_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_10_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_11_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_12_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_13_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_14_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_15_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_16_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_17_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_18_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_19_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_1_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_20_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_21_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_22_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_23_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_24_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_25_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_26_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_27_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_28_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_29_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_2_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_30_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_31_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_32_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_33_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_34_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_35_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_36_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_37_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_38_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_39_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_3_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_40_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_41_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_42_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_43_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_44_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_45_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_1.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_46_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_1.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_47_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_1.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_48_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_0.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_1.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_49_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_4_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_0.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_1.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_50_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_1.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_2.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_3.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_51_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_52_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_53_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_54_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_36.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_55_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_37.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_56_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_57_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_38.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_58_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_59_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_59_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_59_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_59_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_59_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_5_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_60_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_60_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_60_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_60_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_61_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_61_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_61_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_61_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_61_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_62_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_62_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_62_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_62_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_62_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_62_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_62_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_63_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_64_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_65_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_66_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_23.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_24.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_25.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_34.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_35.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_39.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_40.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_67_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_26.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_27.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_28.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_29.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_30.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_31.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_32.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_33.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_41.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_68_42.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_6_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_7_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_8_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_10.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_11.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_12.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_13.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_14.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_15.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_16.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_17.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_18.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_19.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_20.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_21.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_22.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_4.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_5.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_6.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_7.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_8.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap/overmap_9_9.omap.gz -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap_cities.xlsx -%%CURSES%%%%DATADIR%%/mods/MA/MA_overmap_index.png -%%CURSES%%%%DATADIR%%/mods/MA/README.md -%%CURSES%%%%DATADIR%%/mods/MA/cities.json -%%CURSES%%%%DATADIR%%/mods/MA/game_balance.json -%%CURSES%%%%DATADIR%%/mods/MA/modinfo.json -%%CURSES%%%%DATADIR%%/mods/MA/scenario_blacklist.json -%%CURSES%%%%DATADIR%%/mods/MA/scenarios.json -%%CURSES%%%%DATADIR%%/mods/MA/start_locations.json -%%CURSES%%%%DATADIR%%/mods/MMA/bludgeons.json -%%CURSES%%%%DATADIR%%/mods/MMA/exemplar_weapons.json -%%CURSES%%%%DATADIR%%/mods/MMA/item_groups.json -%%CURSES%%%%DATADIR%%/mods/MMA/martial.json -%%CURSES%%%%DATADIR%%/mods/MMA/martialarts.json -%%CURSES%%%%DATADIR%%/mods/MMA/modinfo.json -%%CURSES%%%%DATADIR%%/mods/MMA/mutations.json -%%CURSES%%%%DATADIR%%/mods/MMA/professions.json -%%CURSES%%%%DATADIR%%/mods/MMA/scenarios.json -%%CURSES%%%%DATADIR%%/mods/MMA/spells.json -%%CURSES%%%%DATADIR%%/mods/MMA/swords_and_blades.json -%%CURSES%%%%DATADIR%%/mods/MMA/techniques.json -%%CURSES%%%%DATADIR%%/mods/MMA/weapon_categories.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/animist.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Alchemist.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Artificer.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Biotek.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Blood_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Boreal_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Crusader.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Earth_Elemental.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Fire_Elemental.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Force_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Gaias_Chosen.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Glacier_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Golemancer.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Gravity_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Ice_Elemental.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Illusionist.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Magnetism_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Overclocker.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Permafrost_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Radiation_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Shaman.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Shapeshifter.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Soulfire.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Storm_Elemental.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Stormcaller.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Sun_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Tundra_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Void_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Vulcanist.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/attunements/Wither_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/biomancer.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/black_dragon.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/classless.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/consumables.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/debug.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/dragonbreath.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/druid.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/earthshaper.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/item_only.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/kelvinist.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/lizardfolk_shaman.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/magus.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/manatouched.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/monsterspells.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/stormshaper.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/Spells/technomancer.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/achievements/mutations.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/achievements/spells.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/achievements/statistics.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/bionics.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/charge_removal.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/construction_group.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/cooking_components.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/effects/effects.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/emitter.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Blood_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Boreal_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Cleansing_Flame.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Fire_Elemental.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Force_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Gaias_Chosen.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Glacier_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Golemancer.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Gravity_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Ice_Elemental.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Magnetism_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Permafrost_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Radiaton_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Shaman.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Soulfire.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Storm_Elemental.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Sun_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Tundra_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Void_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Vulcanist.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/enchantments/Wither_Mage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/field.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/furniture.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/furniture_and_terrain/furniture_plants.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/harvest.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/itemgroups/death_drops.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/itemgroups/itemgroups.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/itemgroups/recipe_books.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/itemgroups/spellbooks.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/alchemy_items.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/ammo_types.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/archery.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/armor.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/bionics.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/black_dragon_items.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/books.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/books_lore.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/cast_spell_items.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/class_runes.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/comestibles.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/constructs.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/containers.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/currency.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_belts.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_boots.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_bracelet.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_bracers.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_cloaks.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_clothes.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_gunmods.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_masks.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_melee.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_misc.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_ranged.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_rings.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_tokens.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_tools.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_unarmed.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/enchanted_wands.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/ethereal_items.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/forage.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/fuel.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/generic.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/herbs_and_flowers.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/mana_crystals.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/melee.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/metals.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/mutagen.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/obsolete.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/recipe_books.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/spell_scrolls.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/spellbooks.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/tools.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/vehicle/frames.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/vehicle/vehicle_parts.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/vehicle_parts.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/items/weapons.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/lore.md -%%CURSES%%%%DATADIR%%/mods/Magiclysm/magic_balance.md -%%CURSES%%%%DATADIR%%/mods/Magiclysm/materials.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monster_attacks.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monster_factions.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monstergroups.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monstergroups_egg.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/demon_spider.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/dragon.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/forgedwellers.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/goblin.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/golems.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/holiday_magiclysm.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/lizardfolk.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/mics.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/monsters.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/ogre.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/orcs.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/shadows.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/monsters/zombified_monsters.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/morale_types.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/mutations/debug_mutations.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/mutations/dragon_mutation_category.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/mutations/dreams.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/mutations/mutation_effects.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/mutations/mutation_enchantments.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/mutations/mutations.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/mutations/overlay_ordering.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_ARDELIA.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_HELEN_TAVREL.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_MERCHANT.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_PIRATE.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/TALK_HEALER_GREY.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/TALK_OLD_MAGUS.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/TALK_TECHNO_KID.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/classes.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/factions.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/items_worn.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/missiondef.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/npc.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/npc/trait_groups.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/professions.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/proficiencies.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/qualities.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/alchemy.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/armor.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/blacksmithing.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/construction.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/cooking.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/deconstruction.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/dragon_black.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/magic_tools.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/mods.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/mutagens.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/nested.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/recipe_potions.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/recipe_vehicle.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/tailoring.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/recipes/weapons.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/requirements/alchemy.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/requirements/cooking_components.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/requirements/spell_components.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/scenarios.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/snippets/lab.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/snippets/newspapers.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/snippets/survivor_notes.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/species.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/start_locations.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/techniques.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/terrain.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/tool_qualities.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/traits/attunements.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/traits/classes.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/traits/manatouched.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/traits/mutation.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/traits/temporary_demon_traits.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/traps.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/ui/sidebar.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/vehicle_groups.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/vehicleparts/frames.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/vehicleparts/vehicle_parts.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/vehicles/bikes.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/vehicles/summoned_vehicles.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/vehicles/vans_busses.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/vitamin.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/attunement_altar.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/black_dragon_lair.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/demon_spider_lair.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/forest_tomb.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/forge_of_wonders.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/goblin_encampment.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/house_technomancer.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/lake_retreat.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/magic_academy.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/magic_basement.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/magic_cabin.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/magic_field.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/magic_shop.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/mine_balrog.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/multitile_city_buildings.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/nested_mapgen.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/orc_village.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/overmap_specials.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/regional_overlay.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/small_magic_field.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/used_bookstore.json -%%CURSES%%%%DATADIR%%/mods/Magiclysm/worldgen/wizard-towers.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/construction.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/furniture_and_terrain/terrain-manufactured.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/harvest.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/items/animal_products.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/items/tool/shelters.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/megafauna_factions.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/monstergroups/misc.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/monstergroups/wilderness.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/monsters/fauna_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/monsters/mf_domestic.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/monsters/mf_predators.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/monsters/mf_wild.json -%%CURSES%%%%DATADIR%%/mods/Megafauna/readme.md -%%CURSES%%%%DATADIR%%/mods/Megafauna/recipes/recipe_others.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/npc/NC_ARMY.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/npc/NC_OPS.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/npc/classes.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/prof/army.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/prof/itemgroups_prof.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/prof/spc.json -%%CURSES%%%%DATADIR%%/mods/Military_Professions/scenarios.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/modinfo.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_comestibles.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_effect.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_field_type.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_flesh.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_furniture.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_harvest.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_item_groups.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_items.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_locations.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_specials.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_terrain.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_materials.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_med.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_monster_factions.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_monster_groups.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_monsters.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mutation_category.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mutations.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_professions.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_recipe.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_scenarios.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_scent_types.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_snippets.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_species.json -%%CURSES%%%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_start_locations.json -%%CURSES%%%%DATADIR%%/mods/Mythos/README.md -%%CURSES%%%%DATADIR%%/mods/Mythos/blacklists/item_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Mythos/blacklists/location_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Mythos/blacklists/recipes_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Mythos/blacklists/trait_blacklist.json -%%CURSES%%%%DATADIR%%/mods/Mythos/furniture_and_terrain/1920s_furniture-appliances.json -%%CURSES%%%%DATADIR%%/mods/Mythos/game_balance.json -%%CURSES%%%%DATADIR%%/mods/Mythos/harvest.json -%%CURSES%%%%DATADIR%%/mods/Mythos/items/appliances.json -%%CURSES%%%%DATADIR%%/mods/Mythos/items/corpses/mythos.json -%%CURSES%%%%DATADIR%%/mods/Mythos/mapgen_palettes/1920s_house_general_abandoned.json -%%CURSES%%%%DATADIR%%/mods/Mythos/mapgen_palettes/1920s_house_general_palette.json -%%CURSES%%%%DATADIR%%/mods/Mythos/mapgen_palettes/1920s_house_w_palette.json -%%CURSES%%%%DATADIR%%/mods/Mythos/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Mythos/monster_factions.json -%%CURSES%%%%DATADIR%%/mods/Mythos/monstergroups/blob.json -%%CURSES%%%%DATADIR%%/mods/Mythos/monstergroups/misc.json -%%CURSES%%%%DATADIR%%/mods/Mythos/monstergroups/mythos.json -%%CURSES%%%%DATADIR%%/mods/Mythos/monstergroups/nether.json -%%CURSES%%%%DATADIR%%/mods/Mythos/monstergroups/wilderness.json -%%CURSES%%%%DATADIR%%/mods/Mythos/monsters/mythos.json -%%CURSES%%%%DATADIR%%/mods/Mythos/species.json -%%CURSES%%%%DATADIR%%/mods/No_Fungi/comestibles.json -%%CURSES%%%%DATADIR%%/mods/No_Fungi/furniture.json -%%CURSES%%%%DATADIR%%/mods/No_Fungi/modinfo.json -%%CURSES%%%%DATADIR%%/mods/No_Fungi/terrain.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/2storymodern01.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/FEMA_tlc_03.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/abandoned_barn.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/antique_store.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/arcade.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/bandit_cabin.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/bandit_garage.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/bar.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/basement_bionic.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/basement_chem.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/basement_guns.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/basement_survival.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/bike_shop.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/bunker.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/bus_station.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/butcher.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/cabin_isherwood.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/cabin_lake.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/campground.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/city_npc_nested_spawns.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/collapsed_tower.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/construction_site.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/cs_car_dealership.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/cs_car_showroom.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/cs_internet_cafe.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/dairy_farm_isherwood.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/daycare.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/dojo.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/farm_2side.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/farm_horse.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/farm_horse_isherwood.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/farm_isherwood.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/fire_station.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/freshwater_research_station.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/garage.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/garage_gas.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/garden_house_1.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/gunsmith.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/helipad.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/hotel_tower.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house03.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house11.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house13.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house14.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house21.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house23.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house24.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house33.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house36.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house37.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house38.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house39.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house41.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house42.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_detatched2.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_duplex9.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_fortified.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_garage.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_garage2.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_garage_prepper.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_inner_garden.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_nested.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_prepper.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_quiverfull.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_rv.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_tool_shed.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/house_w_5.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/irradiator_1.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/islands.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/jewel_store.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/junkyard.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/lab_parking_lot.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/lab_surface_big_z1.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/landscaping_supply.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/lighthouse.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/lmoe.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/lot_empty_commercial.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/lumbermill.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mall_basement.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mall_ground.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mall_roof.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mall_second_floor.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mansion.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/map_extras/map_extras.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/map_extras/mapgen_updates.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/megastore.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/microlab_special_tiles.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mil_base_z-1.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mil_base_z0.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/military_outpost.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mine_entrance.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/missile_silo.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/mortuary.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/motel.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/museum.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/necropolis.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/necropolisB1.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/necropolisB2.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/nested/aux_nested.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/nested/basement_nested.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/nested/retail_nested.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/nested/rural_outdoors_nested.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/office_cubical.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/office_doctor.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/office_tower_2.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/outpost.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/park.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/park_skate.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/parking_garage.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/parking_lot.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/pawn_shop.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/petstore.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/pharmacy.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/pizza_parlor.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/police_station.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/post_office.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/power_station_small.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/prison_1.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/private_resort.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/public_works.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/ranch_camp.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/recycle_center.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/refugee_center.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/regional_airport.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/restaurant.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/robofac_hq_chunks.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_airport_private.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_bookstore.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_camping.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_cardealer.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_clothing.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_electronics.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_gas.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_gas_b11.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_hardware.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_hunting.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_lightindustry.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/s_lightindustry_scen.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/school_1.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/sewage_treatment.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/shelter.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/sports_store.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/storage_units_large.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/storage_units_medium.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/storage_units_small.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_10_house_brick_pool.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_11_house_brick.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_12_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_13_dense_house_apt_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_15_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_16_house_ranch.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_17_house_ranch.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_18_victorian.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_1_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_25_dense_diner_apt.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_29_dense_row.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_2_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_35_hospital.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_3_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_4_house_basement.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_5_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_6_house.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_7_house_garden.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_8_house_brick_garden.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/urban_9_house_garage_loft.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/whaleys_house_river.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/ws_biker_dump.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/ws_fire_lookout_tower.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/ws_regional_dump.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/Mapgen/ws_survivor_bunker.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/NPC/npc.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/NPC/npc_classes_bandits.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/NPC/npc_classes_mutant.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/NPC/trait_groups.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/README.md -%%CURSES%%%%DATADIR%%/mods/No_Hope/effects.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/enchantments.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/game_balance.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/item_groups.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/items.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/modinfo.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/monster_attacks.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/monster_drops.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/monster_groups.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/monsters.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/overmap_specials.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/palettes.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/regional_map_settings.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/terrain.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/vehicle_groups.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/vehicle_placement.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/vehicle_spawn.json -%%CURSES%%%%DATADIR%%/mods/No_Hope/vehicles.json -%%CURSES%%%%DATADIR%%/mods/No_NPC_Food/modinfo.json -%%CURSES%%%%DATADIR%%/mods/No_Rail_Stations/modinfo.json -%%CURSES%%%%DATADIR%%/mods/No_Rail_Stations/overmap_specials.json -%%CURSES%%%%DATADIR%%/mods/No_Rail_Stations/region_overlay.json -%%CURSES%%%%DATADIR%%/mods/Only_Wildlife/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Personal_Portal_Storms/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Personal_Portal_Storms/monster_factions.json -%%CURSES%%%%DATADIR%%/mods/Rummaging/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Standard_Combat_Tests/modinfo.json -%%CURSES%%%%DATADIR%%/mods/StatsThroughSkills/modinfo.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/EOC.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/README.md -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/addictions.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/ammo.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/appliance.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/basecamp.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/bionics.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/body_parts.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/books.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/character_modifiers.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/construction.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/construction_group.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/effect_on_condition.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/effects.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/enchantments.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/axes_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/clubs_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/fist_weapons_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/knives_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/polearms_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/shortswords_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/spears_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/staves_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/swords_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_axes_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_clubs_hammers_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_flails_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_swords_dps.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/factions.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/furniture.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/itemgroups.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/items.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/known_bad_density.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/lang/.gitignore -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/lang/mo/ru/LC_MESSAGES/INVALID_RAND.mo -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/lang/po/ru.po -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/magic.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/mapgen-test.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/martialarts.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/metal.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/missions.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/modinfo.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/monster_factions.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/monstergroups.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/monsters.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/mutations.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/npc_shop_cons_rates.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/option_sliders.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/overmap_specials.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/proficiencies.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/proficiency_categories.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/recipes.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/scenarios.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/speed_descriptions.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/terrain.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/traits.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/uncraft.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/vehicle.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/vehicle_drag_test.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/vehicle_efficiency_test.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/vitamins.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/weakpoint_sets.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/weapons.json -%%CURSES%%%%DATADIR%%/mods/TEST_DATA/widgets.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/bird.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/fish.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/insect_spider.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/items/comestibles/eggs.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/items/comestibles/other.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/mammal.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/monstergroups/eggs.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/recipes/nested.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/recipes/recipe_egg.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/recipes/recipe_food.json -%%CURSES%%%%DATADIR%%/mods/Tamable_Wildlife/reptile_amphibian.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/blacklists/default_blacklist.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/effects.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/furniture_and_terrain/terrain_fungal_termite.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/furniture_and_terrain/tropical_terrain_flora.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/furniture_and_terrain/tropical_terrain_nether.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/itemgroups/agriculture.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/items/comestibles/carnivore.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/items/comestibles/egg.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/items/comestibles/raw_veggy.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/items/comestibles/seed.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/mapgen/bugs/termites.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/mapgen/fungal/overtaken_lot.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/mapgen/nether/portal_reef.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/mapgen/triffid/overgrown_lot.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/mapgen/triffid/triffid_blossom.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/mapgen/triffid/triffid_garden.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/modinfo.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monster_special_attacks/monster_deaths,json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/eggs.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/fungi.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/misc.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/nether.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/triffid.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/tropical_bugs.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/wilderness.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monstergroups/zombie_upgrades.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_bird.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_fish.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_fungus.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_insect_spider.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_mammal.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_nether.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_triffid.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_zombies.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/monsters/zed_plant.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_mutable/termitemound.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_special/specials.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_nether.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_residential.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_termites.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_triffid.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/recipes/recipe_food.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/spells.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/tropical_harvest.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/tropical_monster_factions.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/tropical_overmap_connections.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/tropical_overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/tropical_regional_map_settings.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/tropical_special_locations.json -%%CURSES%%%%DATADIR%%/mods/TropiCataclysm/tropical_terrain.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/README.md -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/achievements/achievements.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/achievements/statistics.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/addiction_eocs.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/addictions.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/disease.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/dissect.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/effects/effect_on_condition.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/effects/effects.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/effects/emit.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/effects/field_type.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/effects/vampvirus.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/furniture_and_terrain/furniture.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/furniture_and_terrain/terrain-doors.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/harvest.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/itemgroups.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/map_extra_itemgroups.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/monster_drops.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/classless.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/dreamer.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/dreamsmith.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/eater.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/inventor.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/main.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/ammo.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/ammo_type.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/armor/armor.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/armor/headgear.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/armor/integrated.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/biosignatures.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/book_lore.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/carnivore.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/casing.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/cbms.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/clothes.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/containers.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/drugs.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/ethereal_items.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/gun_magazine.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/gunmod.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/guns.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/inventor/artifacts.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/inventor/spark_artifact_items.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/melee.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/notes_and_news.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/pets.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/resources.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_classless.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_dreamer.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_dreamsmith.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_inventor.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/items/xedra_gear.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/cave.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/map_extras.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/multitile_city_buildings.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/nested/field_office_nests.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/nested/spiders.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/nested/vampires.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/overmap_special.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/safehouse.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/vampire_cathedral.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/vampire_locations.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen/xedra_field_office.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mapgen_palettes/field_office_palette.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/material.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/missions.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/modinfo.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monster_special_attacks/monster_special_attacks.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/bloodsuckers.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/changeling.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/monfaction.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/monster.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/monster_evolutions.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/monster_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/monsterattacks.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/monstergroup.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/nightmares_and_chimeras.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/monsters/species.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mutations/classes.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mutations/cybernetic_traits.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mutations/mutation_eocs.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mutations/mutations.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mutations/spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/npc/mr_lapin.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/npc/npc_classes.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/npc/talk_rescue.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/npc/trait_groups.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/player/cbm_eoc.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/player/cbm_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/player/professions.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/player/renfield_cbms.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/recipes/vampire.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/regional_overlay.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/requirements/spell_components.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/requirements/toolsets.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/scenario.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/skills.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/snippets/changeling_speech.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/snippets/effect_on_condition.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/snippets/migo_speech.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/snippets/snippet.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/snippets/vampire_speech.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/snippets/xedra.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/classless_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/dreamer_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/dreamsmithing.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/eater_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/inventor_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/item_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/spell_eocs.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/spells/vampire_spells.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/tool_qualities.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/ui/sidebar.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/vehicles/migrations.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/vehicles/vehicle_groups.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/vehicles/xedra.json -%%CURSES%%%%DATADIR%%/mods/Xedra_Evolved/vitamin.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/Map/mapgen/bridge.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/Map/mapgen/glacer.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/Map/mapgen/road.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_connections.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_location.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_terrain/ice_fields.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_terrain/overmap_terrain_transportation.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/game_balance.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/modinfo.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/region_settings.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/scenarios.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/setting_blacklists/location_blacklist.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/setting_blacklists/mon_blacklist.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/setting_blacklists/scenario_blacklist.json -%%CURSES%%%%DATADIR%%/mods/aftershock_exoplanet/weather_type.json -%%CURSES%%%%DATADIR%%/mods/alt_map_key/modinfo.json -%%CURSES%%%%DATADIR%%/mods/alt_map_key/overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/alt_map_key/readme.txt -%%CURSES%%%%DATADIR%%/mods/cbm_slots/game_balance.json -%%CURSES%%%%DATADIR%%/mods/cbm_slots/modinfo.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/alberta_regional_map_settings.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/contagion/effect.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/design-doc.md -%%CURSES%%%%DATADIR%%/mods/classic_zombies/exclusions.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/items/blacklists.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/items/guns.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/items/migration.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/missiondef.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/modinfo.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/monsters/species.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/monsters/weakpoints.json -%%CURSES%%%%DATADIR%%/mods/classic_zombies/place_names.md -%%CURSES%%%%DATADIR%%/mods/dda/modinfo.json -%%CURSES%%%%DATADIR%%/mods/deadly_bites/effect_on_conditions.json -%%CURSES%%%%DATADIR%%/mods/deadly_bites/effects.json -%%CURSES%%%%DATADIR%%/mods/deadly_bites/itemgroups.json -%%CURSES%%%%DATADIR%%/mods/deadly_bites/items.json -%%CURSES%%%%DATADIR%%/mods/deadly_bites/modinfo.json -%%CURSES%%%%DATADIR%%/mods/deadly_bites/scenarios.json -%%CURSES%%%%DATADIR%%/mods/default.json -%%CURSES%%%%DATADIR%%/mods/desert_region/desert_insect_spider.json -%%CURSES%%%%DATADIR%%/mods/desert_region/desert_mammal.json -%%CURSES%%%%DATADIR%%/mods/desert_region/desert_monsters.json -%%CURSES%%%%DATADIR%%/mods/desert_region/desert_overmap_connections.json -%%CURSES%%%%DATADIR%%/mods/desert_region/desert_regional_map_settings.json -%%CURSES%%%%DATADIR%%/mods/desert_region/desert_reptile_amphibian.json -%%CURSES%%%%DATADIR%%/mods/desert_region/desert_special_locations.json -%%CURSES%%%%DATADIR%%/mods/desert_region/furniture-and-terrain/desert_furniture.json -%%CURSES%%%%DATADIR%%/mods/desert_region/furniture-and-terrain/desert_terrain.json -%%CURSES%%%%DATADIR%%/mods/desert_region/itemgroups/nature.json -%%CURSES%%%%DATADIR%%/mods/desert_region/mapgen/earth.json -%%CURSES%%%%DATADIR%%/mods/desert_region/modinfo.json -%%CURSES%%%%DATADIR%%/mods/desert_region/monsters/desert_monster_factions.json -%%CURSES%%%%DATADIR%%/mods/desert_region/monsters/desert_monstergroups.json -%%CURSES%%%%DATADIR%%/mods/desert_region/overmap/desert_overmap_terrain.json -%%CURSES%%%%DATADIR%%/mods/desert_region/overmap/location_blacklist.json -%%CURSES%%%%DATADIR%%/mods/desert_region/overmap/mutable/canyon_mutable.json -%%CURSES%%%%DATADIR%%/mods/desert_region/overmap/mutable/dumpsite_mutable.json -%%CURSES%%%%DATADIR%%/mods/desert_region/overmap/mutable/mesa_mutable.json -%%CURSES%%%%DATADIR%%/mods/desert_region/overmap/specials.json -%%CURSES%%%%DATADIR%%/mods/desert_region/weather/desert_weather_type.json -%%CURSES%%%%DATADIR%%/mods/desert_region/weather/dust_storm_snippets.json -%%CURSES%%%%DATADIR%%/mods/desert_region/weather/fd_dust.json -%%CURSES%%%%DATADIR%%/mods/desert_region/weather/weather_eoc.json -%%CURSES%%%%DATADIR%%/mods/extra_mut_scen/modinfo.json -%%CURSES%%%%DATADIR%%/mods/extra_mut_scen/mutation_scenarios.json -%%CURSES%%%%DATADIR%%/mods/innawood/construction.json -%%CURSES%%%%DATADIR%%/mods/innawood/construction_group.json -%%CURSES%%%%DATADIR%%/mods/innawood/furniture_and_terrain/appliances.json -%%CURSES%%%%DATADIR%%/mods/innawood/furniture_and_terrain/furniture-flora.json -%%CURSES%%%%DATADIR%%/mods/innawood/furniture_and_terrain/furniture-tools.json -%%CURSES%%%%DATADIR%%/mods/innawood/furniture_and_terrain/terrain-floors-outdoors.json -%%CURSES%%%%DATADIR%%/mods/innawood/furniture_and_terrain/terrain-flora.json -%%CURSES%%%%DATADIR%%/mods/innawood/harvest.json -%%CURSES%%%%DATADIR%%/mods/innawood/hobbies.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/Location_MapExtras_locations.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/clothing.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/guns.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/military.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/monster_drops_lairs.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/science_and_tech.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/tools.json -%%CURSES%%%%DATADIR%%/mods/innawood/itemgroups/trash_and_debris.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/electronics.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/food_other.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/lighting.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/medical_primitive.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/misc.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/tool_tailoring.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/tool_workshop.json -%%CURSES%%%%DATADIR%%/mods/innawood/items/vehicle_battery.json -%%CURSES%%%%DATADIR%%/mods/innawood/mapgen/cave.json -%%CURSES%%%%DATADIR%%/mods/innawood/mapgen/crater.json -%%CURSES%%%%DATADIR%%/mods/innawood/mapgen/map_extras/trapdoor_spider_den.json -%%CURSES%%%%DATADIR%%/mods/innawood/mapgen/ponds.json -%%CURSES%%%%DATADIR%%/mods/innawood/materials.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/construction.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/construction_group.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/furniture_and_terrain/furniture-tools.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/furniture_and_terrain/terrain-walls.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/furniture_and_terrain/veins.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/itemgroups/Location_MapExtras_locations.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/items/fake.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/items/ore.json -%%CURSES%%%%DATADIR%%/mods/innawood/mining/recipes/smelting.json -%%CURSES%%%%DATADIR%%/mods/innawood/modinfo.json -%%CURSES%%%%DATADIR%%/mods/innawood/monsterdrops/zombie.json -%%CURSES%%%%DATADIR%%/mods/innawood/monsterdrops/zombie_child.json -%%CURSES%%%%DATADIR%%/mods/innawood/monsterdrops/zombie_default.json -%%CURSES%%%%DATADIR%%/mods/innawood/monsters/insect_spider.json -%%CURSES%%%%DATADIR%%/mods/innawood/monsters/mon_blacklist.json -%%CURSES%%%%DATADIR%%/mods/innawood/monsters/nether.json -%%CURSES%%%%DATADIR%%/mods/innawood/mutations/mutations.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/codger.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/confused_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/cop_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/cop_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/cop_3.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/criminal_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/criminal_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/dreamer.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_3.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_4.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_5.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_6.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/grad_student_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/gung_ho_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/gung_ho_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/gung_ho_3.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/high_school_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/hospital_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/hospital_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/hospital_3.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/hunter_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/hunter_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/lab_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/left_for_dead_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/left_for_dead_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/left_for_dead_3.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/lost_partner_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/lost_partner_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/nerd_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_3.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_4.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/out_of_town_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/out_of_town_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/prepper_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/prepper_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/prisoner_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/professor_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/religious_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/religious_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/rural_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/rural_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/scientist_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/soldier_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/soldier_2.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/Backgrounds/wedding_1.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/NC_ARMY.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/NC_OPS.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/class_item_groups.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/items_generic.json -%%CURSES%%%%DATADIR%%/mods/innawood/npcs/missiondef.json -%%CURSES%%%%DATADIR%%/mods/innawood/overmap/connections.json -%%CURSES%%%%DATADIR%%/mods/innawood/overmap/specials_kept.json -%%CURSES%%%%DATADIR%%/mods/innawood/overmap/terrain_hardcoded.json -%%CURSES%%%%DATADIR%%/mods/innawood/portal_storm_effect_on_condition.json -%%CURSES%%%%DATADIR%%/mods/innawood/professions.json -%%CURSES%%%%DATADIR%%/mods/innawood/readme.md -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/armor/arms.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/armor/head.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/armor/other.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/brewing.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/chem_fuel.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/chem_other.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/distill.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/electronic_parts.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/food_drinks.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/medsandchemicals.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/other/construction.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/other/materials.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/other/medical.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/other/parts.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/other/parts_rigs.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/other/power_supplies.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/other/vehicle.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/practice/mechanics.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/practice/melee.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/practice/tailoring.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/recipe_deconstruction.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/recipe_food.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/recipe_others.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/recipe_vehicle.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/tool.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/tools_containers.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/tools_electronic.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/tools_hand.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/tools_lights.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/weapon/bashing.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/weapon/cutting.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/weapon/mods.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/weapon/piercing.json -%%CURSES%%%%DATADIR%%/mods/innawood/recipes/weapon/ranged.json -%%CURSES%%%%DATADIR%%/mods/innawood/region_overlay.json -%%CURSES%%%%DATADIR%%/mods/innawood/requirements/materials.json -%%CURSES%%%%DATADIR%%/mods/innawood/requirements/tailoring.json -%%CURSES%%%%DATADIR%%/mods/innawood/scenario_whitelist.json -%%CURSES%%%%DATADIR%%/mods/innawood/scenarios.json -%%CURSES%%%%DATADIR%%/mods/innawood/start_locations.json -%%CURSES%%%%DATADIR%%/mods/innawood/traps.json -%%CURSES%%%%DATADIR%%/mods/innawood/vehicleparts/battery.json -%%CURSES%%%%DATADIR%%/mods/no_fungal_growth/modinfo.json -%%CURSES%%%%DATADIR%%/mods/package_bionic_professions/bionic_missions.json -%%CURSES%%%%DATADIR%%/mods/package_bionic_professions/bionic_professions.json -%%CURSES%%%%DATADIR%%/mods/package_bionic_professions/modinfo.json -%%CURSES%%%%DATADIR%%/mods/package_bionic_professions/scenarios.json -%%CURSES%%%%DATADIR%%/mods/replacements.json -%%CURSES%%%%DATADIR%%/mods/rural_biome/modinfo.json -%%CURSES%%%%DATADIR%%/mods/rural_biome/rural_regional_map_settings.json -%%CURSES%%%%DATADIR%%/mods/sees_player_hitbutton/mod_tileset.json -%%CURSES%%%%DATADIR%%/mods/sees_player_hitbutton/modinfo.json -%%CURSES%%%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_green.png -%%CURSES%%%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_pink.png -%%CURSES%%%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_red.png -%%CURSES%%%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_yellow.png -%%CURSES%%%%DATADIR%%/mods/sees_player_retro/mod_tileset.json -%%CURSES%%%%DATADIR%%/mods/sees_player_retro/modinfo.json -%%CURSES%%%%DATADIR%%/mods/sees_player_retro/sees_player_retro.png -%%CURSES%%%%DATADIR%%/mods/speedydex/modinfo.json -%%CURSES%%%%DATADIR%%/mods/stats_through_kills/modinfo.json -%%CURSES%%%%DATADIR%%/mods/translate-dialogue/modinfo.json -%%CURSES%%%%DATADIR%%/mods/translate-dialogue/rubik.json -%%CURSES%%%%DATADIR%%/motd/ar.motd -%%CURSES%%%%DATADIR%%/motd/cs.motd -%%CURSES%%%%DATADIR%%/motd/de.motd -%%CURSES%%%%DATADIR%%/motd/el.motd -%%CURSES%%%%DATADIR%%/motd/en.motd -%%CURSES%%%%DATADIR%%/motd/es_AR.motd -%%CURSES%%%%DATADIR%%/motd/es_ES.motd -%%CURSES%%%%DATADIR%%/motd/fil_PH.motd -%%CURSES%%%%DATADIR%%/motd/fr.motd -%%CURSES%%%%DATADIR%%/motd/ga_IE.motd -%%CURSES%%%%DATADIR%%/motd/hu.motd -%%CURSES%%%%DATADIR%%/motd/id.motd -%%CURSES%%%%DATADIR%%/motd/it_IT.motd -%%CURSES%%%%DATADIR%%/motd/ja.motd -%%CURSES%%%%DATADIR%%/motd/ko.motd -%%CURSES%%%%DATADIR%%/motd/nb.motd -%%CURSES%%%%DATADIR%%/motd/pl.motd -%%CURSES%%%%DATADIR%%/motd/pt_BR.motd -%%CURSES%%%%DATADIR%%/motd/ru.motd -%%CURSES%%%%DATADIR%%/motd/tr.motd -%%CURSES%%%%DATADIR%%/motd/uk_UA.motd -%%CURSES%%%%DATADIR%%/motd/zh_CN.motd -%%CURSES%%%%DATADIR%%/motd/zh_TW.motd -%%CURSES%%%%DATADIR%%/names/en.json -%%CURSES%%%%DATADIR%%/names/ja.json -%%CURSES%%%%DATADIR%%/names/ko.json -%%CURSES%%%%DATADIR%%/names/ru.json -%%CURSES%%%%DATADIR%%/names/zh_CN.json -%%CURSES%%%%DATADIR%%/names/zh_TW.json -%%CURSES%%%%DATADIR%%/raw/color_templates/default.json -%%CURSES%%%%DATADIR%%/raw/color_templates/no_bright_background.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-articblush.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-dark.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-default-sleek.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-default.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-green.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-iceberg.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-iceberg_light.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-kanagawa.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-vintage.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors-white.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors_amber.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors_gruvbox-light.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors_gruvbox.json -%%CURSES%%%%DATADIR%%/raw/color_themes/base_colors_one-dark.json -%%CURSES%%%%DATADIR%%/raw/colors.json -%%CURSES%%%%DATADIR%%/raw/keybindings.json -%%CURSES%%%%DATADIR%%/raw/keybindings/vehicle.json -%%CURSES%%%%DATADIR%%/raw/sokoban.txt -%%CURSES%%%%DATADIR%%/screenshots/ultica-showcase-sep-2021.png +%%DATADIR%%/help/texts.json +%%DATADIR%%/json/LOADING_ORDER.md +%%DATADIR%%/json/achievements.json +%%DATADIR%%/json/addictions.json +%%DATADIR%%/json/addictions_eocs.json +%%DATADIR%%/json/ammo_effects.json +%%DATADIR%%/json/anatomy.json +%%DATADIR%%/json/artifact/altered_object_active.json +%%DATADIR%%/json/artifact/artifact_item_types.json +%%DATADIR%%/json/artifact/legacy_artifact_active.json +%%DATADIR%%/json/artifact/legacy_artifact_passive.json +%%DATADIR%%/json/artifact/premade_artifacts.json +%%DATADIR%%/json/artifact/relic_procgen_data.json +%%DATADIR%%/json/ascii_art/generic_ascii.json +%%DATADIR%%/json/ascii_art/gun_ascii.json +%%DATADIR%%/json/bionics.json +%%DATADIR%%/json/body_parts.json +%%DATADIR%%/json/bodypart_graphs/arms.json +%%DATADIR%%/json/bodypart_graphs/feet.json +%%DATADIR%%/json/bodypart_graphs/full_body.json +%%DATADIR%%/json/bodypart_graphs/full_body_iteminfo.json +%%DATADIR%%/json/bodypart_graphs/full_body_widget.json +%%DATADIR%%/json/bodypart_graphs/hands.json +%%DATADIR%%/json/bodypart_graphs/head.json +%%DATADIR%%/json/bodypart_graphs/legs.json +%%DATADIR%%/json/bodypart_graphs/torso.json +%%DATADIR%%/json/butchery_requirements.json +%%DATADIR%%/json/character_modifiers.json +%%DATADIR%%/json/clothing_mods.json +%%DATADIR%%/json/conducts.json +%%DATADIR%%/json/connect_groups.json +%%DATADIR%%/json/construction.json +%%DATADIR%%/json/construction_category.json +%%DATADIR%%/json/construction_group.json +%%DATADIR%%/json/deconstruction.json +%%DATADIR%%/json/default_blacklist.json +%%DATADIR%%/json/disease.json +%%DATADIR%%/json/dreams.json +%%DATADIR%%/json/effect_on_condition.json +%%DATADIR%%/json/effects.json +%%DATADIR%%/json/emit.json +%%DATADIR%%/json/enchantments.json +%%DATADIR%%/json/encounters/randec_valhallist_cult.json +%%DATADIR%%/json/encounters/randenc_caravans.json +%%DATADIR%%/json/encounters/randenc_refugee_center.json +%%DATADIR%%/json/field_type.json +%%DATADIR%%/json/flags.json +%%DATADIR%%/json/flags/trap.json +%%DATADIR%%/json/flags/widget.json +%%DATADIR%%/json/furniture_and_terrain/appliances.json +%%DATADIR%%/json/furniture_and_terrain/furniture-alien.json +%%DATADIR%%/json/furniture_and_terrain/furniture-appliances.json +%%DATADIR%%/json/furniture_and_terrain/furniture-barriers.json +%%DATADIR%%/json/furniture_and_terrain/furniture-decorative.json +%%DATADIR%%/json/furniture_and_terrain/furniture-domestic_plants.json +%%DATADIR%%/json/furniture_and_terrain/furniture-eggs.json +%%DATADIR%%/json/furniture_and_terrain/furniture-emitters.json +%%DATADIR%%/json/furniture_and_terrain/furniture-fakes.json +%%DATADIR%%/json/furniture_and_terrain/furniture-fireplaces.json +%%DATADIR%%/json/furniture_and_terrain/furniture-flora.json +%%DATADIR%%/json/furniture_and_terrain/furniture-fungal.json +%%DATADIR%%/json/furniture_and_terrain/furniture-graves.json +%%DATADIR%%/json/furniture_and_terrain/furniture-industrial.json +%%DATADIR%%/json/furniture_and_terrain/furniture-medical.json +%%DATADIR%%/json/furniture_and_terrain/furniture-pallet.json +%%DATADIR%%/json/furniture_and_terrain/furniture-plumbing.json +%%DATADIR%%/json/furniture_and_terrain/furniture-recreation.json +%%DATADIR%%/json/furniture_and_terrain/furniture-regional-pseudo.json +%%DATADIR%%/json/furniture_and_terrain/furniture-roof.json +%%DATADIR%%/json/furniture_and_terrain/furniture-rural.json +%%DATADIR%%/json/furniture_and_terrain/furniture-seats.json +%%DATADIR%%/json/furniture_and_terrain/furniture-signs.json +%%DATADIR%%/json/furniture_and_terrain/furniture-sleep.json +%%DATADIR%%/json/furniture_and_terrain/furniture-storage.json +%%DATADIR%%/json/furniture_and_terrain/furniture-surfaces.json +%%DATADIR%%/json/furniture_and_terrain/furniture-terrains.json +%%DATADIR%%/json/furniture_and_terrain/furniture-tools.json +%%DATADIR%%/json/furniture_and_terrain/furniture-triffid.json +%%DATADIR%%/json/furniture_and_terrain/terrain-bridges-docks.json +%%DATADIR%%/json/furniture_and_terrain/terrain-doors.json +%%DATADIR%%/json/furniture_and_terrain/terrain-embrasures.json +%%DATADIR%%/json/furniture_and_terrain/terrain-fences-gates.json +%%DATADIR%%/json/furniture_and_terrain/terrain-flesh.json +%%DATADIR%%/json/furniture_and_terrain/terrain-floors-indoor.json +%%DATADIR%%/json/furniture_and_terrain/terrain-floors-outdoors.json +%%DATADIR%%/json/furniture_and_terrain/terrain-flora.json +%%DATADIR%%/json/furniture_and_terrain/terrain-fungal.json +%%DATADIR%%/json/furniture_and_terrain/terrain-highways.json +%%DATADIR%%/json/furniture_and_terrain/terrain-liquids.json +%%DATADIR%%/json/furniture_and_terrain/terrain-manufactured.json +%%DATADIR%%/json/furniture_and_terrain/terrain-mechanisms.json +%%DATADIR%%/json/furniture_and_terrain/terrain-migo.json +%%DATADIR%%/json/furniture_and_terrain/terrain-nether.json +%%DATADIR%%/json/furniture_and_terrain/terrain-railroads.json +%%DATADIR%%/json/furniture_and_terrain/terrain-recreational.json +%%DATADIR%%/json/furniture_and_terrain/terrain-regional-pseudo.json +%%DATADIR%%/json/furniture_and_terrain/terrain-roofs.json +%%DATADIR%%/json/furniture_and_terrain/terrain-traps.json +%%DATADIR%%/json/furniture_and_terrain/terrain-triffid.json +%%DATADIR%%/json/furniture_and_terrain/terrain-walls.json +%%DATADIR%%/json/furniture_and_terrain/terrain-windows.json +%%DATADIR%%/json/furniture_and_terrain/terrain-zlevel-transitions.json +%%DATADIR%%/json/gates.json +%%DATADIR%%/json/harvest.json +%%DATADIR%%/json/harvest_dissect.json +%%DATADIR%%/json/harvest_drop_type.json +%%DATADIR%%/json/hit_range.json +%%DATADIR%%/json/hobbies.json +%%DATADIR%%/json/item_actions.json +%%DATADIR%%/json/item_category.json +%%DATADIR%%/json/item_spell_effects.json +%%DATADIR%%/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json +%%DATADIR%%/json/itemgroups/Agriculture_Forage_Excavation/forage.json +%%DATADIR%%/json/itemgroups/Clothing_Gear/clothing.json +%%DATADIR%%/json/itemgroups/Clothing_Gear/costumes.json +%%DATADIR%%/json/itemgroups/Clothing_Gear/gear.json +%%DATADIR%%/json/itemgroups/Clothing_Gear/gear_civilian.json +%%DATADIR%%/json/itemgroups/Clothing_Gear/hazmat_gear.json +%%DATADIR%%/json/itemgroups/Clothing_Gear/jewellery_gems.json +%%DATADIR%%/json/itemgroups/Clothing_Gear/wallets.json +%%DATADIR%%/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json +%%DATADIR%%/json/itemgroups/Drugs_Tobacco_Alcohol/tobacco.json +%%DATADIR%%/json/itemgroups/Food/food.json +%%DATADIR%%/json/itemgroups/Food/irradiated.json +%%DATADIR%%/json/itemgroups/Labs/lab_security.json +%%DATADIR%%/json/itemgroups/Labs/labs_common.json +%%DATADIR%%/json/itemgroups/Labs/labs_mutagen.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/Arsonist_stock.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/locations.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/locations_commercial.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/locations_mapextras.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/mall_item_groups.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/mansion.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/map_extras.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/prison_item_groups.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json +%%DATADIR%%/json/itemgroups/Locations_MapExtras/robofac_trade.json +%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/harvest_cbm.json +%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/harvest_dissection.json +%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json +%%DATADIR%%/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json +%%DATADIR%%/json/itemgroups/SUS/alien.json +%%DATADIR%%/json/itemgroups/SUS/clothes_store.json +%%DATADIR%%/json/itemgroups/SUS/combos.json +%%DATADIR%%/json/itemgroups/SUS/domestic.json +%%DATADIR%%/json/itemgroups/SUS/evac_shelter.json +%%DATADIR%%/json/itemgroups/SUS/fridges.json +%%DATADIR%%/json/itemgroups/SUS/garage.json +%%DATADIR%%/json/itemgroups/SUS/gunstore.json +%%DATADIR%%/json/itemgroups/SUS/library.json +%%DATADIR%%/json/itemgroups/SUS/lodge.json +%%DATADIR%%/json/itemgroups/SUS/mre_packages.json +%%DATADIR%%/json/itemgroups/SUS/office.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/ammo.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/223.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/223_mg.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/300_sniper.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_mg.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_sniper.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x46.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x53.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/50_mg.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/50_sniper.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/66.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/84x246.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm_submachine_gun.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/armor.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/atgm.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/explosive.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/arsenal/shot.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/field_drops.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/gunmod.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/guns.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/magazines.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +%%DATADIR%%/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json +%%DATADIR%%/json/itemgroups/activities_hobbies.json +%%DATADIR%%/json/itemgroups/altered_item.json +%%DATADIR%%/json/itemgroups/art_antiques_crafts.json +%%DATADIR%%/json/itemgroups/artifacts.json +%%DATADIR%%/json/itemgroups/bionics.json +%%DATADIR%%/json/itemgroups/books.json +%%DATADIR%%/json/itemgroups/cash_register.json +%%DATADIR%%/json/itemgroups/collections_domestic.json +%%DATADIR%%/json/itemgroups/collections_trades.json +%%DATADIR%%/json/itemgroups/corpses.json +%%DATADIR%%/json/itemgroups/custom_lbvs.json +%%DATADIR%%/json/itemgroups/defense_mode.json +%%DATADIR%%/json/itemgroups/electronics.json +%%DATADIR%%/json/itemgroups/faction_camps.json +%%DATADIR%%/json/itemgroups/food_service.json +%%DATADIR%%/json/itemgroups/furniture.json +%%DATADIR%%/json/itemgroups/mail.json +%%DATADIR%%/json/itemgroups/main.json +%%DATADIR%%/json/itemgroups/military.json +%%DATADIR%%/json/itemgroups/misc.json +%%DATADIR%%/json/itemgroups/oa_shared_item_groups.json +%%DATADIR%%/json/itemgroups/obsolete.json +%%DATADIR%%/json/itemgroups/portal_storm_loot.json +%%DATADIR%%/json/itemgroups/portalmancy.json +%%DATADIR%%/json/itemgroups/roof.json +%%DATADIR%%/json/itemgroups/science_and_tech.json +%%DATADIR%%/json/itemgroups/shops_trades.json +%%DATADIR%%/json/itemgroups/stashes.json +%%DATADIR%%/json/itemgroups/supplies.json +%%DATADIR%%/json/itemgroups/tools.json +%%DATADIR%%/json/itemgroups/trash_and_debris.json +%%DATADIR%%/json/itemgroups/vehicles_fuel_related.json +%%DATADIR%%/json/itemgroups/vending_machines.json +%%DATADIR%%/json/items/ammo.json +%%DATADIR%%/json/items/ammo/10mm.json +%%DATADIR%%/json/items/ammo/12mm.json +%%DATADIR%%/json/items/ammo/20x66mm.json +%%DATADIR%%/json/items/ammo/22.json +%%DATADIR%%/json/items/ammo/223.json +%%DATADIR%%/json/items/ammo/270win.json +%%DATADIR%%/json/items/ammo/300.json +%%DATADIR%%/json/items/ammo/3006.json +%%DATADIR%%/json/items/ammo/300blk.json +%%DATADIR%%/json/items/ammo/308.json +%%DATADIR%%/json/items/ammo/30carbine.json +%%DATADIR%%/json/items/ammo/32.json +%%DATADIR%%/json/items/ammo/357mag.json +%%DATADIR%%/json/items/ammo/357sig.json +%%DATADIR%%/json/items/ammo/36paper.json +%%DATADIR%%/json/items/ammo/38.json +%%DATADIR%%/json/items/ammo/380.json +%%DATADIR%%/json/items/ammo/38super.json +%%DATADIR%%/json/items/ammo/40.json +%%DATADIR%%/json/items/ammo/40x46mm.json +%%DATADIR%%/json/items/ammo/40x53mm.json +%%DATADIR%%/json/items/ammo/410shot.json +%%DATADIR%%/json/items/ammo/44.json +%%DATADIR%%/json/items/ammo/44paper.json +%%DATADIR%%/json/items/ammo/45.json +%%DATADIR%%/json/items/ammo/454.json +%%DATADIR%%/json/items/ammo/4570.json +%%DATADIR%%/json/items/ammo/45colt.json +%%DATADIR%%/json/items/ammo/46.json +%%DATADIR%%/json/items/ammo/460.json +%%DATADIR%%/json/items/ammo/50.json +%%DATADIR%%/json/items/ammo/500.json +%%DATADIR%%/json/items/ammo/545x39.json +%%DATADIR%%/json/items/ammo/57.json +%%DATADIR%%/json/items/ammo/5x50.json +%%DATADIR%%/json/items/ammo/66mm.json +%%DATADIR%%/json/items/ammo/700nx.json +%%DATADIR%%/json/items/ammo/762.json +%%DATADIR%%/json/items/ammo/762R.json +%%DATADIR%%/json/items/ammo/762x25.json +%%DATADIR%%/json/items/ammo/84x246mm.json +%%DATADIR%%/json/items/ammo/8x40mm.json +%%DATADIR%%/json/items/ammo/9mm.json +%%DATADIR%%/json/items/ammo/9x18.json +%%DATADIR%%/json/items/ammo/atgm.json +%%DATADIR%%/json/items/ammo/barb.json +%%DATADIR%%/json/items/ammo/blank.json +%%DATADIR%%/json/items/ammo/cannon.json +%%DATADIR%%/json/items/ammo/chemical_spray.json +%%DATADIR%%/json/items/ammo/exodii.json +%%DATADIR%%/json/items/ammo/flintlock.json +%%DATADIR%%/json/items/ammo/nail.json +%%DATADIR%%/json/items/ammo/paintball.json +%%DATADIR%%/json/items/ammo/rpg.json +%%DATADIR%%/json/items/ammo/shot.json +%%DATADIR%%/json/items/ammo/shotpaper.json +%%DATADIR%%/json/items/ammo/signal_flare.json +%%DATADIR%%/json/items/ammo/sling-ready_grenade.json +%%DATADIR%%/json/items/ammo/weldgas.json +%%DATADIR%%/json/items/ammo_types.json +%%DATADIR%%/json/items/appliances.json +%%DATADIR%%/json/items/armor/altered_object_auras.json +%%DATADIR%%/json/items/armor/ammo_pouch.json +%%DATADIR%%/json/items/armor/arms_armor.json +%%DATADIR%%/json/items/armor/ballistic_armor.json +%%DATADIR%%/json/items/armor/bandolier.json +%%DATADIR%%/json/items/armor/belts.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_bodysuits.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_boots.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_gloves.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_headgear.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_legs.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_overcoats.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_storage.json +%%DATADIR%%/json/items/armor/bespoke_armor/custom_underwear.json +%%DATADIR%%/json/items/armor/bespoke_armor/cuttingroom.json +%%DATADIR%%/json/items/armor/bespoke_armor/utility.json +%%DATADIR%%/json/items/armor/boots.json +%%DATADIR%%/json/items/armor/cloaks.json +%%DATADIR%%/json/items/armor/coats.json +%%DATADIR%%/json/items/armor/exotic.json +%%DATADIR%%/json/items/armor/eyewear.json +%%DATADIR%%/json/items/armor/gloves.json +%%DATADIR%%/json/items/armor/hats.json +%%DATADIR%%/json/items/armor/head_attachments.json +%%DATADIR%%/json/items/armor/helmets.json +%%DATADIR%%/json/items/armor/holster.json +%%DATADIR%%/json/items/armor/hoods.json +%%DATADIR%%/json/items/armor/integrated.json +%%DATADIR%%/json/items/armor/jewelry.json +%%DATADIR%%/json/items/armor/legs_armor.json +%%DATADIR%%/json/items/armor/legs_clothes.json +%%DATADIR%%/json/items/armor/masks.json +%%DATADIR%%/json/items/armor/misc.json +%%DATADIR%%/json/items/armor/pets_cow_armor.json +%%DATADIR%%/json/items/armor/pets_dog_armor.json +%%DATADIR%%/json/items/armor/pets_horse_armor.json +%%DATADIR%%/json/items/armor/power_armor.json +%%DATADIR%%/json/items/armor/robofac_armor.json +%%DATADIR%%/json/items/armor/scarfs.json +%%DATADIR%%/json/items/armor/sheath.json +%%DATADIR%%/json/items/armor/storage.json +%%DATADIR%%/json/items/armor/suits_clothes.json +%%DATADIR%%/json/items/armor/suits_protection.json +%%DATADIR%%/json/items/armor/swimming.json +%%DATADIR%%/json/items/armor/torso_armor.json +%%DATADIR%%/json/items/armor/torso_clothes.json +%%DATADIR%%/json/items/armor/undergarment.json +%%DATADIR%%/json/items/basecamp.json +%%DATADIR%%/json/items/battery.json +%%DATADIR%%/json/items/bionics.json +%%DATADIR%%/json/items/biosignatures.json +%%DATADIR%%/json/items/book/abstract.json +%%DATADIR%%/json/items/book/anthology.json +%%DATADIR%%/json/items/book/archery.json +%%DATADIR%%/json/items/book/barter.json +%%DATADIR%%/json/items/book/bashing.json +%%DATADIR%%/json/items/book/chemistry.json +%%DATADIR%%/json/items/book/computer.json +%%DATADIR%%/json/items/book/cooking.json +%%DATADIR%%/json/items/book/cutting.json +%%DATADIR%%/json/items/book/dodge.json +%%DATADIR%%/json/items/book/driving.json +%%DATADIR%%/json/items/book/electronics.json +%%DATADIR%%/json/items/book/fabrication.json +%%DATADIR%%/json/items/book/firstaid.json +%%DATADIR%%/json/items/book/gun.json +%%DATADIR%%/json/items/book/launcher.json +%%DATADIR%%/json/items/book/lockpick.json +%%DATADIR%%/json/items/book/maps.json +%%DATADIR%%/json/items/book/martial.json +%%DATADIR%%/json/items/book/mechanics.json +%%DATADIR%%/json/items/book/melee.json +%%DATADIR%%/json/items/book/misc.json +%%DATADIR%%/json/items/book/misc_newage.json +%%DATADIR%%/json/items/book/misc_philosophy.json +%%DATADIR%%/json/items/book/misc_pulp.json +%%DATADIR%%/json/items/book/misc_scifi.json +%%DATADIR%%/json/items/book/misc_sports.json +%%DATADIR%%/json/items/book/nonfiction.json +%%DATADIR%%/json/items/book/pistol.json +%%DATADIR%%/json/items/book/rifle.json +%%DATADIR%%/json/items/book/shotgun.json +%%DATADIR%%/json/items/book/smg.json +%%DATADIR%%/json/items/book/speech.json +%%DATADIR%%/json/items/book/spiritual.json +%%DATADIR%%/json/items/book/stabbing.json +%%DATADIR%%/json/items/book/survival.json +%%DATADIR%%/json/items/book/swimming.json +%%DATADIR%%/json/items/book/tailor.json +%%DATADIR%%/json/items/book/throw.json +%%DATADIR%%/json/items/book/traps.json +%%DATADIR%%/json/items/book/unarmed.json +%%DATADIR%%/json/items/book/young.json +%%DATADIR%%/json/items/chemicals_and_resources.json +%%DATADIR%%/json/items/classes/comestible.json +%%DATADIR%%/json/items/classes/gun.json +%%DATADIR%%/json/items/classes/magazine.json +%%DATADIR%%/json/items/comestibles/alcohol.json +%%DATADIR%%/json/items/comestibles/baked.json +%%DATADIR%%/json/items/comestibles/bread.json +%%DATADIR%%/json/items/comestibles/brewing.json +%%DATADIR%%/json/items/comestibles/carnivore.json +%%DATADIR%%/json/items/comestibles/casseroles.json +%%DATADIR%%/json/items/comestibles/cereal.json +%%DATADIR%%/json/items/comestibles/dairy.json +%%DATADIR%%/json/items/comestibles/drink.json +%%DATADIR%%/json/items/comestibles/drink_other.json +%%DATADIR%%/json/items/comestibles/egg.json +%%DATADIR%%/json/items/comestibles/frozen.json +%%DATADIR%%/json/items/comestibles/fruit_dishes.json +%%DATADIR%%/json/items/comestibles/irradiated_fruit.json +%%DATADIR%%/json/items/comestibles/irradiated_veggy.json +%%DATADIR%%/json/items/comestibles/junkfood.json +%%DATADIR%%/json/items/comestibles/meat_dishes.json +%%DATADIR%%/json/items/comestibles/med.json +%%DATADIR%%/json/items/comestibles/mre.json +%%DATADIR%%/json/items/comestibles/mushroom.json +%%DATADIR%%/json/items/comestibles/mutagen.json +%%DATADIR%%/json/items/comestibles/nuts.json +%%DATADIR%%/json/items/comestibles/offal_dishes.json +%%DATADIR%%/json/items/comestibles/other.json +%%DATADIR%%/json/items/comestibles/protein.json +%%DATADIR%%/json/items/comestibles/raw_fruit.json +%%DATADIR%%/json/items/comestibles/raw_veggy.json +%%DATADIR%%/json/items/comestibles/sandwich.json +%%DATADIR%%/json/items/comestibles/seed.json +%%DATADIR%%/json/items/comestibles/soup.json +%%DATADIR%%/json/items/comestibles/spice.json +%%DATADIR%%/json/items/comestibles/veggy_dishes.json +%%DATADIR%%/json/items/comestibles/wheat.json +%%DATADIR%%/json/items/containers.json +%%DATADIR%%/json/items/containers/military.json +%%DATADIR%%/json/items/corpses/corpses.json +%%DATADIR%%/json/items/corpses/dead_exodii.json +%%DATADIR%%/json/items/corpses/dead_yrax.json +%%DATADIR%%/json/items/corpses/inactive_bots.json +%%DATADIR%%/json/items/electronics.json +%%DATADIR%%/json/items/fake.json +%%DATADIR%%/json/items/faults_bionic.json +%%DATADIR%%/json/items/fluff.json +%%DATADIR%%/json/items/fuel.json +%%DATADIR%%/json/items/furniture.json +%%DATADIR%%/json/items/generic.json +%%DATADIR%%/json/items/generic/ammolink.json +%%DATADIR%%/json/items/generic/bathroom_house.json +%%DATADIR%%/json/items/generic/bedding.json +%%DATADIR%%/json/items/generic/casing.json +%%DATADIR%%/json/items/generic/currency.json +%%DATADIR%%/json/items/generic/dining_kitchen.json +%%DATADIR%%/json/items/generic/mail.json +%%DATADIR%%/json/items/generic/music.json +%%DATADIR%%/json/items/generic/skulls.json +%%DATADIR%%/json/items/generic/spares.json +%%DATADIR%%/json/items/generic/storage.json +%%DATADIR%%/json/items/generic/string.json +%%DATADIR%%/json/items/generic/toys_and_sports.json +%%DATADIR%%/json/items/gun/10mm.json +%%DATADIR%%/json/items/gun/12mm.json +%%DATADIR%%/json/items/gun/20x66mm.json +%%DATADIR%%/json/items/gun/22.json +%%DATADIR%%/json/items/gun/223.json +%%DATADIR%%/json/items/gun/270win.json +%%DATADIR%%/json/items/gun/300.json +%%DATADIR%%/json/items/gun/3006.json +%%DATADIR%%/json/items/gun/300BLK.json +%%DATADIR%%/json/items/gun/308.json +%%DATADIR%%/json/items/gun/30carbine.json +%%DATADIR%%/json/items/gun/32.json +%%DATADIR%%/json/items/gun/357sig.json +%%DATADIR%%/json/items/gun/36paper.json +%%DATADIR%%/json/items/gun/38.json +%%DATADIR%%/json/items/gun/380.json +%%DATADIR%%/json/items/gun/38super.json +%%DATADIR%%/json/items/gun/40.json +%%DATADIR%%/json/items/gun/40x46mm.json +%%DATADIR%%/json/items/gun/40x53mm.json +%%DATADIR%%/json/items/gun/410shot.json +%%DATADIR%%/json/items/gun/44.json +%%DATADIR%%/json/items/gun/44paper.json +%%DATADIR%%/json/items/gun/45.json +%%DATADIR%%/json/items/gun/454.json +%%DATADIR%%/json/items/gun/4570.json +%%DATADIR%%/json/items/gun/45colt.json +%%DATADIR%%/json/items/gun/46.json +%%DATADIR%%/json/items/gun/460.json +%%DATADIR%%/json/items/gun/50.json +%%DATADIR%%/json/items/gun/500.json +%%DATADIR%%/json/items/gun/545x39.json +%%DATADIR%%/json/items/gun/57.json +%%DATADIR%%/json/items/gun/5x50.json +%%DATADIR%%/json/items/gun/66mm.json +%%DATADIR%%/json/items/gun/700nx.json +%%DATADIR%%/json/items/gun/762.json +%%DATADIR%%/json/items/gun/762R.json +%%DATADIR%%/json/items/gun/762x25.json +%%DATADIR%%/json/items/gun/84x246mm.json +%%DATADIR%%/json/items/gun/8x40mm.json +%%DATADIR%%/json/items/gun/9mm.json +%%DATADIR%%/json/items/gun/9x18.json +%%DATADIR%%/json/items/gun/artisan_guns.json +%%DATADIR%%/json/items/gun/atgm.json +%%DATADIR%%/json/items/gun/bio.json +%%DATADIR%%/json/items/gun/blunderbuss.json +%%DATADIR%%/json/items/gun/cannon.json +%%DATADIR%%/json/items/gun/chemical_spray.json +%%DATADIR%%/json/items/gun/combination.json +%%DATADIR%%/json/items/gun/exodii.json +%%DATADIR%%/json/items/gun/faults_gun.json +%%DATADIR%%/json/items/gun/flammable.json +%%DATADIR%%/json/items/gun/flintlock.json +%%DATADIR%%/json/items/gun/nail.json +%%DATADIR%%/json/items/gun/paintball.json +%%DATADIR%%/json/items/gun/robofac_gun.json +%%DATADIR%%/json/items/gun/shot.json +%%DATADIR%%/json/items/gun/signal_flare.json +%%DATADIR%%/json/items/gun/ups.json +%%DATADIR%%/json/items/gunmod/accessories.json +%%DATADIR%%/json/items/gunmod/barrel.json +%%DATADIR%%/json/items/gunmod/bionicmods.json +%%DATADIR%%/json/items/gunmod/brass_catcher.json +%%DATADIR%%/json/items/gunmod/conversions.json +%%DATADIR%%/json/items/gunmod/grip.json +%%DATADIR%%/json/items/gunmod/laser_gunmods.json +%%DATADIR%%/json/items/gunmod/loading_port.json +%%DATADIR%%/json/items/gunmod/mechanism.json +%%DATADIR%%/json/items/gunmod/mount.json +%%DATADIR%%/json/items/gunmod/muzzle.json +%%DATADIR%%/json/items/gunmod/rail.json +%%DATADIR%%/json/items/gunmod/sights.json +%%DATADIR%%/json/items/gunmod/sling.json +%%DATADIR%%/json/items/gunmod/stock.json +%%DATADIR%%/json/items/gunmod/underbarrel.json +%%DATADIR%%/json/items/handloaded_bullets.json +%%DATADIR%%/json/items/id_cards.json +%%DATADIR%%/json/items/items_holiday.json +%%DATADIR%%/json/items/magazine/10mm.json +%%DATADIR%%/json/items/magazine/12mm.json +%%DATADIR%%/json/items/magazine/20x60mm.json +%%DATADIR%%/json/items/magazine/22.json +%%DATADIR%%/json/items/magazine/223.json +%%DATADIR%%/json/items/magazine/300.json +%%DATADIR%%/json/items/magazine/3006.json +%%DATADIR%%/json/items/magazine/308.json +%%DATADIR%%/json/items/magazine/30carbine.json +%%DATADIR%%/json/items/magazine/32.json +%%DATADIR%%/json/items/magazine/357sig.json +%%DATADIR%%/json/items/magazine/38.json +%%DATADIR%%/json/items/magazine/380.json +%%DATADIR%%/json/items/magazine/38super.json +%%DATADIR%%/json/items/magazine/40.json +%%DATADIR%%/json/items/magazine/40mm.json +%%DATADIR%%/json/items/magazine/410shot.json +%%DATADIR%%/json/items/magazine/44.json +%%DATADIR%%/json/items/magazine/45.json +%%DATADIR%%/json/items/magazine/454.json +%%DATADIR%%/json/items/magazine/46.json +%%DATADIR%%/json/items/magazine/460.json +%%DATADIR%%/json/items/magazine/50.json +%%DATADIR%%/json/items/magazine/500.json +%%DATADIR%%/json/items/magazine/545x39.json +%%DATADIR%%/json/items/magazine/57.json +%%DATADIR%%/json/items/magazine/5x50.json +%%DATADIR%%/json/items/magazine/66mm.json +%%DATADIR%%/json/items/magazine/762.json +%%DATADIR%%/json/items/magazine/762R.json +%%DATADIR%%/json/items/magazine/762x25.json +%%DATADIR%%/json/items/magazine/8x40mm.json +%%DATADIR%%/json/items/magazine/9mm.json +%%DATADIR%%/json/items/magazine/9x18.json +%%DATADIR%%/json/items/magazine/chemical_spray.json +%%DATADIR%%/json/items/magazine/exodii.json +%%DATADIR%%/json/items/magazine/liquid.json +%%DATADIR%%/json/items/magazine/methanol_fuelcell.json +%%DATADIR%%/json/items/magazine/nail.json +%%DATADIR%%/json/items/magazine/shot.json +%%DATADIR%%/json/items/magazine/weldgas.json +%%DATADIR%%/json/items/melee/bludgeons.json +%%DATADIR%%/json/items/melee/fake.json +%%DATADIR%%/json/items/melee/knives_kitchen.json +%%DATADIR%%/json/items/melee/misc.json +%%DATADIR%%/json/items/melee/spears_and_polearms.json +%%DATADIR%%/json/items/melee/swords_and_blades.json +%%DATADIR%%/json/items/melee/unarmed_weapons.json +%%DATADIR%%/json/items/migration.json +%%DATADIR%%/json/items/mutagen_ingredients.json +%%DATADIR%%/json/items/nether.json +%%DATADIR%%/json/items/newspaper.json +%%DATADIR%%/json/items/obsolete.json +%%DATADIR%%/json/items/ranged/archery.json +%%DATADIR%%/json/items/ranged/crossbows.json +%%DATADIR%%/json/items/ranged/energy.json +%%DATADIR%%/json/items/ranged/launchers.json +%%DATADIR%%/json/items/ranged/pneumatic.json +%%DATADIR%%/json/items/ranged/slings.json +%%DATADIR%%/json/items/ranged/spearguns.json +%%DATADIR%%/json/items/ranged/throwing.json +%%DATADIR%%/json/items/relics/altered_items.json +%%DATADIR%%/json/items/relics/monolith_items.json +%%DATADIR%%/json/items/resources/alien.json +%%DATADIR%%/json/items/resources/appliance_parts.json +%%DATADIR%%/json/items/resources/chemicals.json +%%DATADIR%%/json/items/resources/fasteners.json +%%DATADIR%%/json/items/resources/glass.json +%%DATADIR%%/json/items/resources/home_improvement.json +%%DATADIR%%/json/items/resources/metal.json +%%DATADIR%%/json/items/resources/misc.json +%%DATADIR%%/json/items/resources/plastic.json +%%DATADIR%%/json/items/resources/stone.json +%%DATADIR%%/json/items/resources/tailoring.json +%%DATADIR%%/json/items/resources/wood.json +%%DATADIR%%/json/items/robot_parts.json +%%DATADIR%%/json/items/software.json +%%DATADIR%%/json/items/tool/container.json +%%DATADIR%%/json/items/tool/cooking.json +%%DATADIR%%/json/items/tool/debug_tools.json +%%DATADIR%%/json/items/tool/deployable.json +%%DATADIR%%/json/items/tool/electronics.json +%%DATADIR%%/json/items/tool/entry_tools.json +%%DATADIR%%/json/items/tool/explosives.json +%%DATADIR%%/json/items/tool/fire.json +%%DATADIR%%/json/items/tool/firefighting.json +%%DATADIR%%/json/items/tool/fishing.json +%%DATADIR%%/json/items/tool/handloading.json +%%DATADIR%%/json/items/tool/integrated.json +%%DATADIR%%/json/items/tool/knives.json +%%DATADIR%%/json/items/tool/landscaping.json +%%DATADIR%%/json/items/tool/lighting.json +%%DATADIR%%/json/items/tool/masonry.json +%%DATADIR%%/json/items/tool/med.json +%%DATADIR%%/json/items/tool/metalworking.json +%%DATADIR%%/json/items/tool/misc.json +%%DATADIR%%/json/items/tool/musical_instruments.json +%%DATADIR%%/json/items/tool/pets.json +%%DATADIR%%/json/items/tool/pseudo.json +%%DATADIR%%/json/items/tool/radio_tools.json +%%DATADIR%%/json/items/tool/raincatchers.json +%%DATADIR%%/json/items/tool/science.json +%%DATADIR%%/json/items/tool/shelters.json +%%DATADIR%%/json/items/tool/smoking.json +%%DATADIR%%/json/items/tool/stationary.json +%%DATADIR%%/json/items/tool/stoneworking.json +%%DATADIR%%/json/items/tool/tailoring.json +%%DATADIR%%/json/items/tool/toiletries.json +%%DATADIR%%/json/items/tool/traps.json +%%DATADIR%%/json/items/tool/unfoldable.json +%%DATADIR%%/json/items/tool/woodworking.json +%%DATADIR%%/json/items/tool/workshop.json +%%DATADIR%%/json/items/tool_armor.json +%%DATADIR%%/json/items/toolmod.json +%%DATADIR%%/json/items/vehicle/alternator.json +%%DATADIR%%/json/items/vehicle/animals.json +%%DATADIR%%/json/items/vehicle/armor.json +%%DATADIR%%/json/items/vehicle/battery.json +%%DATADIR%%/json/items/vehicle/boat.json +%%DATADIR%%/json/items/vehicle/cables.json +%%DATADIR%%/json/items/vehicle/cargo.json +%%DATADIR%%/json/items/vehicle/controls.json +%%DATADIR%%/json/items/vehicle/engine.json +%%DATADIR%%/json/items/vehicle/engineering.json +%%DATADIR%%/json/items/vehicle/farming.json +%%DATADIR%%/json/items/vehicle/frames.json +%%DATADIR%%/json/items/vehicle/fuel_storage.json +%%DATADIR%%/json/items/vehicle/lights.json +%%DATADIR%%/json/items/vehicle/manual.json +%%DATADIR%%/json/items/vehicle/mills.json +%%DATADIR%%/json/items/vehicle/motors.json +%%DATADIR%%/json/items/vehicle/noise.json +%%DATADIR%%/json/items/vehicle/plating.json +%%DATADIR%%/json/items/vehicle/rams.json +%%DATADIR%%/json/items/vehicle/rigs.json +%%DATADIR%%/json/items/vehicle/rotor.json +%%DATADIR%%/json/items/vehicle/seating.json +%%DATADIR%%/json/items/vehicle/solar.json +%%DATADIR%%/json/items/vehicle/tables.json +%%DATADIR%%/json/items/vehicle/turrets.json +%%DATADIR%%/json/items/vehicle/utilities.json +%%DATADIR%%/json/items/vehicle/wheel.json +%%DATADIR%%/json/limb_scores.json +%%DATADIR%%/json/loot_zones.json +%%DATADIR%%/json/mapgen/Glassblower.json +%%DATADIR%%/json/mapgen/Metalworker.json +%%DATADIR%%/json/mapgen/Pottery_Sewing_Shops.json +%%DATADIR%%/json/mapgen/Woodworker.json +%%DATADIR%%/json/mapgen/abandoned01.json +%%DATADIR%%/json/mapgen/abandoned_barn.json +%%DATADIR%%/json/mapgen/abandoned_shopping_plaza.json +%%DATADIR%%/json/mapgen/abandoned_textile_mill/abandoned_textile_mill_a.json +%%DATADIR%%/json/mapgen/abandoned_textile_mill/abandoned_textile_mill_b.json +%%DATADIR%%/json/mapgen/abandoned_warehouse.json +%%DATADIR%%/json/mapgen/abstorefront.json +%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_nested_maps.json +%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z-1.json +%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z0.json +%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json +%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json +%%DATADIR%%/json/mapgen/aircraft_carrier/aircraft_carrier_z3.json +%%DATADIR%%/json/mapgen/airliner.json +%%DATADIR%%/json/mapgen/airport/s_airport_private.json +%%DATADIR%%/json/mapgen/airport/s_airport_runway_private.json +%%DATADIR%%/json/mapgen/animalpound.json +%%DATADIR%%/json/mapgen/animalshelter.json +%%DATADIR%%/json/mapgen/antique_store.json +%%DATADIR%%/json/mapgen/apartment_con_new.json +%%DATADIR%%/json/mapgen/apartment_mod_new.json +%%DATADIR%%/json/mapgen/arcade.json +%%DATADIR%%/json/mapgen/art_gallery.json +%%DATADIR%%/json/mapgen/bakery.json +%%DATADIR%%/json/mapgen/bandit_cabin.json +%%DATADIR%%/json/mapgen/bandit_camp.json +%%DATADIR%%/json/mapgen/bandit_garage.json +%%DATADIR%%/json/mapgen/bank.json +%%DATADIR%%/json/mapgen/bar.json +%%DATADIR%%/json/mapgen/basecamps/base/bare_bones_basecamp/bare_bones_basecamp.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_common.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_garage.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lighthouse/fbmc_lighthouse.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_00_beds.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_10_beds.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_lightindustry/fbmc_lightindustry_workshop.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_common.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_expansion.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_mansion/fbmc_mansion_overmap.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_cross.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_outpost/fbmc_outpost_normal.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_blacksmith.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_pottery_cottage/fbmc_pottery_cottage_common.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_beds.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_common.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_log.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_metal.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rock.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wad.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json +%%DATADIR%%/json/mapgen/basecamps/base/fbmc_sealab_small/fbmc_sealab_small_common.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation1.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_firestation_1/modular_firestation_walls_all.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_common.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_defenses.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_log.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_metal.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rock.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_tent.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wad.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wood.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_1/primitive_field.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_common.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_concrete.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_log.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_metal.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rock.json.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_tent.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wad.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wood.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_common.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_log.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_rock.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_standard.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wad.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wood.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json +%%DATADIR%%/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_concrete.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_palettes.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_farm/version_2/modular_farm_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_concrete.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_palettes.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_concrete.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_palettes.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_bookcase.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_concrete.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_dresser.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_locker.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rack.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_warehouse_shelf.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wooden_rack.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_concrete.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_log.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_metal.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_migo_resin.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rammed_earth.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rock.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wad.json +%%DATADIR%%/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wood.json +%%DATADIR%%/json/mapgen/basecamps/expansion/salt_water_pipe.json +%%DATADIR%%/json/mapgen/basecamps/modular_shacks.json +%%DATADIR%%/json/mapgen/basement/basement_bionic.json +%%DATADIR%%/json/mapgen/basement/basement_chem.json +%%DATADIR%%/json/mapgen/basement/basement_game.json +%%DATADIR%%/json/mapgen/basement/basement_guns.json +%%DATADIR%%/json/mapgen/basement/basement_lab_stairs.json +%%DATADIR%%/json/mapgen/basement/basement_messed.json +%%DATADIR%%/json/mapgen/basement/basement_meth.json +%%DATADIR%%/json/mapgen/basement/basement_survival.json +%%DATADIR%%/json/mapgen/basement/basement_weed.json +%%DATADIR%%/json/mapgen/basement/basements.json +%%DATADIR%%/json/mapgen/bike_shop.json +%%DATADIR%%/json/mapgen/bowling_alley.json +%%DATADIR%%/json/mapgen/boxing.json +%%DATADIR%%/json/mapgen/bridges.json +%%DATADIR%%/json/mapgen/bugs/ants.json +%%DATADIR%%/json/mapgen/bugs/nest_dermatik.json +%%DATADIR%%/json/mapgen/bugs/spider_pit.json +%%DATADIR%%/json/mapgen/bugs/wasp_tower.json +%%DATADIR%%/json/mapgen/bunker.json +%%DATADIR%%/json/mapgen/bunker_shop.json +%%DATADIR%%/json/mapgen/bus_station.json +%%DATADIR%%/json/mapgen/butcher.json +%%DATADIR%%/json/mapgen/cabin.json +%%DATADIR%%/json/mapgen/campground.json +%%DATADIR%%/json/mapgen/campsite.json +%%DATADIR%%/json/mapgen/campus/buildings/admin_f0.json +%%DATADIR%%/json/mapgen/campus/buildings/admin_f1.json +%%DATADIR%%/json/mapgen/campus/buildings/admin_f2.json +%%DATADIR%%/json/mapgen/campus/buildings/admin_roof.json +%%DATADIR%%/json/mapgen/campus/buildings/commons_f0.json +%%DATADIR%%/json/mapgen/campus/buildings/commons_f1.json +%%DATADIR%%/json/mapgen/campus/buildings/commons_f2.json +%%DATADIR%%/json/mapgen/campus/buildings/commons_roof.json +%%DATADIR%%/json/mapgen/campus/buildings/health_f0.json +%%DATADIR%%/json/mapgen/campus/buildings/health_f1.json +%%DATADIR%%/json/mapgen/campus/buildings/health_f2.json +%%DATADIR%%/json/mapgen/campus/buildings/health_roof.json +%%DATADIR%%/json/mapgen/campus/buildings/lecture_f0.json +%%DATADIR%%/json/mapgen/campus/buildings/lecture_f1.json +%%DATADIR%%/json/mapgen/campus/buildings/lecture_f2.json +%%DATADIR%%/json/mapgen/campus/buildings/lecture_roof.json +%%DATADIR%%/json/mapgen/campus/buildings/media_f0.json +%%DATADIR%%/json/mapgen/campus/buildings/media_f1.json +%%DATADIR%%/json/mapgen/campus/buildings/media_f2.json +%%DATADIR%%/json/mapgen/campus/buildings/media_f3.json +%%DATADIR%%/json/mapgen/campus/buildings/media_roof.json +%%DATADIR%%/json/mapgen/campus/open_areas/pedestrian_center.json +%%DATADIR%%/json/mapgen/campus/open_areas/pedestrian_westside.json +%%DATADIR%%/json/mapgen/cathedral.json +%%DATADIR%%/json/mapgen/cave.json +%%DATADIR%%/json/mapgen/cemetery_4square.json +%%DATADIR%%/json/mapgen/cemetery_medium.json +%%DATADIR%%/json/mapgen/cemetery_small.json +%%DATADIR%%/json/mapgen/chemist_holdout/chemical_lab.json +%%DATADIR%%/json/mapgen/church.json +%%DATADIR%%/json/mapgen/city_blocks/city_block_2.json +%%DATADIR%%/json/mapgen/city_blocks/urban_13_dense_house_apt_house.json +%%DATADIR%%/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json +%%DATADIR%%/json/mapgen/city_blocks/urban_25_dense_diner_apt.json +%%DATADIR%%/json/mapgen/collapsed_tower.json +%%DATADIR%%/json/mapgen/construction_site.json +%%DATADIR%%/json/mapgen/crater.json +%%DATADIR%%/json/mapgen/cs_car_dealership.json +%%DATADIR%%/json/mapgen/cs_car_showroom.json +%%DATADIR%%/json/mapgen/cs_city_dump_small.json +%%DATADIR%%/json/mapgen/cs_gardening_allotment.json +%%DATADIR%%/json/mapgen/cs_internet_cafe.json +%%DATADIR%%/json/mapgen/cs_market_small.json +%%DATADIR%%/json/mapgen/cs_open_sewer_small.json +%%DATADIR%%/json/mapgen/cs_private_park.json +%%DATADIR%%/json/mapgen/cs_public_art_piece.json +%%DATADIR%%/json/mapgen/cs_public_space.json +%%DATADIR%%/json/mapgen/cs_sex_shop.json +%%DATADIR%%/json/mapgen/cs_tire_shop.json +%%DATADIR%%/json/mapgen/daycare.json +%%DATADIR%%/json/mapgen/debug_ramps.json +%%DATADIR%%/json/mapgen/derelict_property.json +%%DATADIR%%/json/mapgen/diner.json +%%DATADIR%%/json/mapgen/dispensary.json +%%DATADIR%%/json/mapgen/dive_shop.json +%%DATADIR%%/json/mapgen/dock.json +%%DATADIR%%/json/mapgen/dojo.json +%%DATADIR%%/json/mapgen/dollar_store.json +%%DATADIR%%/json/mapgen/drive-in_theater.json +%%DATADIR%%/json/mapgen/dummy/dummy.json +%%DATADIR%%/json/mapgen/dump.json +%%DATADIR%%/json/mapgen/dumpsite.json +%%DATADIR%%/json/mapgen/earth.json +%%DATADIR%%/json/mapgen/exodii/exo_safehouse.json +%%DATADIR%%/json/mapgen/exodii/exodii_base.json +%%DATADIR%%/json/mapgen/exodii/exodii_nested.json +%%DATADIR%%/json/mapgen/exodii/exodii_nested_singletile.json +%%DATADIR%%/json/mapgen/faction_buildings.json +%%DATADIR%%/json/mapgen/farm.json +%%DATADIR%%/json/mapgen/farm_2side.json +%%DATADIR%%/json/mapgen/farm_dairy.json +%%DATADIR%%/json/mapgen/farm_dairy_2.json +%%DATADIR%%/json/mapgen/farm_horse.json +%%DATADIR%%/json/mapgen/farm_stills.json +%%DATADIR%%/json/mapgen/farm_supply.json +%%DATADIR%%/json/mapgen/farm_tiles.json +%%DATADIR%%/json/mapgen/farm_tree.json +%%DATADIR%%/json/mapgen/fema/FEMA.json +%%DATADIR%%/json/mapgen/fema/FEMA_blc_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_blc_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_blc_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_blc_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_brc_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_brc_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_brc_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_brc_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_entrance_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_entrance_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_entrance_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_entrance_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_le_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_le_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_le_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_le_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_mid_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_mid_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_mid_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_mid_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_re_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_re_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_re_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_re_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_te_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_te_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_te_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_te_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_tlc_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_tlc_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_tlc_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_tlc_03.json +%%DATADIR%%/json/mapgen/fema/FEMA_trc_00.json +%%DATADIR%%/json/mapgen/fema/FEMA_trc_01.json +%%DATADIR%%/json/mapgen/fema/FEMA_trc_02.json +%%DATADIR%%/json/mapgen/fema/FEMA_trc_03.json +%%DATADIR%%/json/mapgen/field_baseball.json +%%DATADIR%%/json/mapgen/field_football.json +%%DATADIR%%/json/mapgen/fire_station.json +%%DATADIR%%/json/mapgen/fort.json +%%DATADIR%%/json/mapgen/fortified_scrap_yard/fortified_scrap_yard.json +%%DATADIR%%/json/mapgen/fungal/fungal_bloom.json +%%DATADIR%%/json/mapgen/fungal/fungal_flowers.json +%%DATADIR%%/json/mapgen/fungal/fungal_tower.json +%%DATADIR%%/json/mapgen/gambling_hall.json +%%DATADIR%%/json/mapgen/garage.json +%%DATADIR%%/json/mapgen/garage_gas.json +%%DATADIR%%/json/mapgen/garden_botanical.json +%%DATADIR%%/json/mapgen/garden_community.json +%%DATADIR%%/json/mapgen/garden_public.json +%%DATADIR%%/json/mapgen/gardening_store.json +%%DATADIR%%/json/mapgen/gas_stations/gas_station_bunker.json +%%DATADIR%%/json/mapgen/gas_stations/s_gas.json +%%DATADIR%%/json/mapgen/godco/church_retreat.json +%%DATADIR%%/json/mapgen/godco/godco_eocs.json +%%DATADIR%%/json/mapgen/godco/mapgen_updates.json +%%DATADIR%%/json/mapgen/godco/nested.json +%%DATADIR%%/json/mapgen/golfcourse.json +%%DATADIR%%/json/mapgen/gunsmith.json +%%DATADIR%%/json/mapgen/gym.json +%%DATADIR%%/json/mapgen/hazardous_waste_sarcophagus.json +%%DATADIR%%/json/mapgen/headshop.json +%%DATADIR%%/json/mapgen/helipad.json +%%DATADIR%%/json/mapgen/homeimprovement.json +%%DATADIR%%/json/mapgen/homeimprovement_superstore_new.json +%%DATADIR%%/json/mapgen/homeless_camp.json +%%DATADIR%%/json/mapgen/homeless_shelter.json +%%DATADIR%%/json/mapgen/hospital.json +%%DATADIR%%/json/mapgen/hotel_tower.json +%%DATADIR%%/json/mapgen/house/2storymodern01.json +%%DATADIR%%/json/mapgen/house/2storymodern02.json +%%DATADIR%%/json/mapgen/house/2storymodern03.json +%%DATADIR%%/json/mapgen/house/2storymodern04.json +%%DATADIR%%/json/mapgen/house/bungalow01.json +%%DATADIR%%/json/mapgen/house/bungalow02.json +%%DATADIR%%/json/mapgen/house/bungalow03.json +%%DATADIR%%/json/mapgen/house/bungalow04.json +%%DATADIR%%/json/mapgen/house/bungalow05.json +%%DATADIR%%/json/mapgen/house/bungalow06.json +%%DATADIR%%/json/mapgen/house/bungalow07.json +%%DATADIR%%/json/mapgen/house/bungalow08.json +%%DATADIR%%/json/mapgen/house/crack_house.json +%%DATADIR%%/json/mapgen/house/garden_house_1.json +%%DATADIR%%/json/mapgen/house/house01.json +%%DATADIR%%/json/mapgen/house/house02.json +%%DATADIR%%/json/mapgen/house/house03.json +%%DATADIR%%/json/mapgen/house/house04.json +%%DATADIR%%/json/mapgen/house/house05.json +%%DATADIR%%/json/mapgen/house/house05_ab.json +%%DATADIR%%/json/mapgen/house/house06.json +%%DATADIR%%/json/mapgen/house/house07.json +%%DATADIR%%/json/mapgen/house/house08.json +%%DATADIR%%/json/mapgen/house/house09.json +%%DATADIR%%/json/mapgen/house/house10.json +%%DATADIR%%/json/mapgen/house/house11.json +%%DATADIR%%/json/mapgen/house/house12.json +%%DATADIR%%/json/mapgen/house/house13.json +%%DATADIR%%/json/mapgen/house/house14.json +%%DATADIR%%/json/mapgen/house/house15.json +%%DATADIR%%/json/mapgen/house/house16.json +%%DATADIR%%/json/mapgen/house/house17.json +%%DATADIR%%/json/mapgen/house/house18.json +%%DATADIR%%/json/mapgen/house/house19.json +%%DATADIR%%/json/mapgen/house/house20.json +%%DATADIR%%/json/mapgen/house/house21.json +%%DATADIR%%/json/mapgen/house/house22.json +%%DATADIR%%/json/mapgen/house/house23.json +%%DATADIR%%/json/mapgen/house/house24.json +%%DATADIR%%/json/mapgen/house/house25.json +%%DATADIR%%/json/mapgen/house/house26.json +%%DATADIR%%/json/mapgen/house/house27.json +%%DATADIR%%/json/mapgen/house/house28.json +%%DATADIR%%/json/mapgen/house/house29.json +%%DATADIR%%/json/mapgen/house/house30.json +%%DATADIR%%/json/mapgen/house/house31.json +%%DATADIR%%/json/mapgen/house/house32.json +%%DATADIR%%/json/mapgen/house/house33.json +%%DATADIR%%/json/mapgen/house/house34.json +%%DATADIR%%/json/mapgen/house/house35.json +%%DATADIR%%/json/mapgen/house/house36.json +%%DATADIR%%/json/mapgen/house/house37.json +%%DATADIR%%/json/mapgen/house/house38.json +%%DATADIR%%/json/mapgen/house/house39.json +%%DATADIR%%/json/mapgen/house/house40.json +%%DATADIR%%/json/mapgen/house/house41.json +%%DATADIR%%/json/mapgen/house/house42.json +%%DATADIR%%/json/mapgen/house/house_2story.json +%%DATADIR%%/json/mapgen/house/house_detatched1.json +%%DATADIR%%/json/mapgen/house/house_detatched10.json +%%DATADIR%%/json/mapgen/house/house_detatched2.json +%%DATADIR%%/json/mapgen/house/house_detatched3.json +%%DATADIR%%/json/mapgen/house/house_detatched4.json +%%DATADIR%%/json/mapgen/house/house_detatched5.json +%%DATADIR%%/json/mapgen/house/house_detatched6.json +%%DATADIR%%/json/mapgen/house/house_detatched7.json +%%DATADIR%%/json/mapgen/house/house_detatched8.json +%%DATADIR%%/json/mapgen/house/house_detatched9.json +%%DATADIR%%/json/mapgen/house/house_dogs.json +%%DATADIR%%/json/mapgen/house/house_duplex.json +%%DATADIR%%/json/mapgen/house/house_duplex10.json +%%DATADIR%%/json/mapgen/house/house_duplex11.json +%%DATADIR%%/json/mapgen/house/house_duplex2.json +%%DATADIR%%/json/mapgen/house/house_duplex3.json +%%DATADIR%%/json/mapgen/house/house_duplex4.json +%%DATADIR%%/json/mapgen/house/house_duplex5.json +%%DATADIR%%/json/mapgen/house/house_duplex6.json +%%DATADIR%%/json/mapgen/house/house_duplex7.json +%%DATADIR%%/json/mapgen/house/house_duplex8.json +%%DATADIR%%/json/mapgen/house/house_duplex9.json +%%DATADIR%%/json/mapgen/house/house_fortified.json +%%DATADIR%%/json/mapgen/house/house_garage.json +%%DATADIR%%/json/mapgen/house/house_garage2.json +%%DATADIR%%/json/mapgen/house/house_garage3.json +%%DATADIR%%/json/mapgen/house/house_garage4.json +%%DATADIR%%/json/mapgen/house/house_garage5.json +%%DATADIR%%/json/mapgen/house/house_garage6.json +%%DATADIR%%/json/mapgen/house/house_garage7.json +%%DATADIR%%/json/mapgen/house/house_garage8.json +%%DATADIR%%/json/mapgen/house/house_garage_prepper.json +%%DATADIR%%/json/mapgen/house/house_gardener.json +%%DATADIR%%/json/mapgen/house/house_inner_garden.json +%%DATADIR%%/json/mapgen/house/house_library.json +%%DATADIR%%/json/mapgen/house/house_modern_lx.json +%%DATADIR%%/json/mapgen/house/house_patio.json +%%DATADIR%%/json/mapgen/house/house_porch.json +%%DATADIR%%/json/mapgen/house/house_prepper.json +%%DATADIR%%/json/mapgen/house/house_quiverfull.json +%%DATADIR%%/json/mapgen/house/house_rural.json +%%DATADIR%%/json/mapgen/house/house_rv.json +%%DATADIR%%/json/mapgen/house/house_suicide.json +%%DATADIR%%/json/mapgen/house/house_tool_shed.json +%%DATADIR%%/json/mapgen/house/house_vacant.json +%%DATADIR%%/json/mapgen/house/house_w_1.json +%%DATADIR%%/json/mapgen/house/house_w_2.json +%%DATADIR%%/json/mapgen/house/house_w_3.json +%%DATADIR%%/json/mapgen/house/house_w_4.json +%%DATADIR%%/json/mapgen/house/house_w_5.json +%%DATADIR%%/json/mapgen/house/house_w_6.json +%%DATADIR%%/json/mapgen/house/house_wooded.json +%%DATADIR%%/json/mapgen/house/multi_unit_housing.json +%%DATADIR%%/json/mapgen/house/urban_10_house_brick_pool.json +%%DATADIR%%/json/mapgen/house/urban_11_house_brick.json +%%DATADIR%%/json/mapgen/house/urban_12_house.json +%%DATADIR%%/json/mapgen/house/urban_15_house.json +%%DATADIR%%/json/mapgen/house/urban_16_house_ranch.json +%%DATADIR%%/json/mapgen/house/urban_17_house_ranch.json +%%DATADIR%%/json/mapgen/house/urban_18_victorian.json +%%DATADIR%%/json/mapgen/house/urban_1_house.json +%%DATADIR%%/json/mapgen/house/urban_29_dense_row.json +%%DATADIR%%/json/mapgen/house/urban_2_house.json +%%DATADIR%%/json/mapgen/house/urban_2_house_dd.json +%%DATADIR%%/json/mapgen/house/urban_3_house.json +%%DATADIR%%/json/mapgen/house/urban_4_house_basement.json +%%DATADIR%%/json/mapgen/house/urban_5_house.json +%%DATADIR%%/json/mapgen/house/urban_6_house.json +%%DATADIR%%/json/mapgen/house/urban_7_house_garden.json +%%DATADIR%%/json/mapgen/house/urban_8_house_brick_garden.json +%%DATADIR%%/json/mapgen/house/urban_9_house_garage_loft.json +%%DATADIR%%/json/mapgen/hunting_blind.json +%%DATADIR%%/json/mapgen/hunting_lodge.json +%%DATADIR%%/json/mapgen/irradiator_1.json +%%DATADIR%%/json/mapgen/isherwood_farms/cabin_isherwood.json +%%DATADIR%%/json/mapgen/isherwood_farms/dairy_farm_isherwood.json +%%DATADIR%%/json/mapgen/isherwood_farms/farm_horse_isherwood.json +%%DATADIR%%/json/mapgen/isherwood_farms/farm_isherwood.json +%%DATADIR%%/json/mapgen/isherwood_farms/rural_roads_trails.json +%%DATADIR%%/json/mapgen/isolated_road/isolated_road_home_chunks.json +%%DATADIR%%/json/mapgen/isolated_road/isolated_road_mission_1.json +%%DATADIR%%/json/mapgen/jewel_store.json +%%DATADIR%%/json/mapgen/junkyard.json +%%DATADIR%%/json/mapgen/karting_l.json +%%DATADIR%%/json/mapgen/lab/README.md +%%DATADIR%%/json/mapgen/lab/lab_central.json +%%DATADIR%%/json/mapgen/lab/lab_common.json +%%DATADIR%%/json/mapgen/lab/lab_escape.json +%%DATADIR%%/json/mapgen/lab/lab_floorplan_cross.json +%%DATADIR%%/json/mapgen/lab/lab_floorplans.json +%%DATADIR%%/json/mapgen/lab/lab_floorplans_1side.json +%%DATADIR%%/json/mapgen/lab/lab_floorplans_finale1level.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_1x1_security.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_1x1x2_RES_8_apartments.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2_MUT_Tier_1.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2_MUT_Tier_2.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2_cargo_depot.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_bedrooms.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_2x2x2_RES_8_commons.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_cargo_surface.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_central_hallway.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_health_clinic.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_maintenance_areas.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_effect_on_condition.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_cargo.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_commercial.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_common.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_medical.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mutagen.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_residential.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_science_common.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_security.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_nests_modular/lab_shared_traps.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_parking_lot.json +%%DATADIR%%/json/mapgen/lab/lab_modular/lab_roof.json +%%DATADIR%%/json/mapgen/lab/lab_rooms.json +%%DATADIR%%/json/mapgen/lab/lab_rooms_wall.json +%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json +%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z1.json +%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z2.json +%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z3.json +%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z4.json +%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_big_z5.json +%%DATADIR%%/json/mapgen/lab/lab_surface/lab_surface_nested.json +%%DATADIR%%/json/mapgen/lab/lab_trains.json +%%DATADIR%%/json/mapgen/lab_subway_vent_shaft.json +%%DATADIR%%/json/mapgen/lake.json +%%DATADIR%%/json/mapgen/lake_buildings/cabin_lake.json +%%DATADIR%%/json/mapgen/lake_buildings/freshwater_research_station.json +%%DATADIR%%/json/mapgen/lake_buildings/islands.json +%%DATADIR%%/json/mapgen/lake_buildings/lakeside_cabin.json +%%DATADIR%%/json/mapgen/lake_buildings/lighthouse.json +%%DATADIR%%/json/mapgen/lan_center.json +%%DATADIR%%/json/mapgen/landfill.json +%%DATADIR%%/json/mapgen/landscaping_supply.json +%%DATADIR%%/json/mapgen/laundromat.json +%%DATADIR%%/json/mapgen/library.json +%%DATADIR%%/json/mapgen/lmoe.json +%%DATADIR%%/json/mapgen/looted_buildings.json +%%DATADIR%%/json/mapgen/lot_empty_commercial.json +%%DATADIR%%/json/mapgen/lot_empty_residential.json +%%DATADIR%%/json/mapgen/lumbermill.json +%%DATADIR%%/json/mapgen/lumberyard.json +%%DATADIR%%/json/mapgen/mall/mall_basement.json +%%DATADIR%%/json/mapgen/mall/mall_ground.json +%%DATADIR%%/json/mapgen/mall/mall_roof.json +%%DATADIR%%/json/mapgen/mall/mall_second_floor.json +%%DATADIR%%/json/mapgen/mall/mall_upper_roof.json +%%DATADIR%%/json/mapgen/mansion.json +%%DATADIR%%/json/mapgen/mansion_roof.json +%%DATADIR%%/json/mapgen/map_extras/bugouts.json +%%DATADIR%%/json/mapgen/map_extras/college_kids.json +%%DATADIR%%/json/mapgen/map_extras/crater.json +%%DATADIR%%/json/mapgen/map_extras/drug_dealers.json +%%DATADIR%%/json/mapgen/map_extras/exodii_crashes.json +%%DATADIR%%/json/mapgen/map_extras/grave.json +%%DATADIR%%/json/mapgen/map_extras/lab_extras.json +%%DATADIR%%/json/mapgen/map_extras/marloss_voice.json +%%DATADIR%%/json/mapgen/map_extras/mass_grave.json +%%DATADIR%%/json/mapgen/map_extras/military.json +%%DATADIR%%/json/mapgen/map_extras/nest_dermatik.json +%%DATADIR%%/json/mapgen/map_extras/nest_wasp.json +%%DATADIR%%/json/mapgen/map_extras/portal.json +%%DATADIR%%/json/mapgen/map_extras/prison_bus.json +%%DATADIR%%/json/mapgen/map_extras/prison_van.json +%%DATADIR%%/json/mapgen/map_extras/sand.json +%%DATADIR%%/json/mapgen/map_extras/scientists.json +%%DATADIR%%/json/mapgen/map_extras/sewers.json +%%DATADIR%%/json/mapgen/map_extras/spider.json +%%DATADIR%%/json/mapgen/map_extras/toxic_waste.json +%%DATADIR%%/json/mapgen/map_extras/trapdoor_spider_den.json +%%DATADIR%%/json/mapgen/map_extras/wilderness.json +%%DATADIR%%/json/mapgen/marina.json +%%DATADIR%%/json/mapgen/megastore.json +%%DATADIR%%/json/mapgen/mi-go/mi-go_encampment.json +%%DATADIR%%/json/mapgen/mi-go/mi-go_nested.json +%%DATADIR%%/json/mapgen/mi-go/mi-go_portal.json +%%DATADIR%%/json/mapgen/mi-go/mi-go_scout_tower.json +%%DATADIR%%/json/mapgen/microlab/microlab_connector.json +%%DATADIR%%/json/mapgen/microlab/microlab_distorted/microlab_distorted.json +%%DATADIR%%/json/mapgen/microlab/microlab_distorted/microlab_distorted_chunks.json +%%DATADIR%%/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json +%%DATADIR%%/json/mapgen/microlab/microlab_edge_room_connector.json +%%DATADIR%%/json/mapgen/microlab/microlab_firebreak.json +%%DATADIR%%/json/mapgen/microlab/microlab_generic.json +%%DATADIR%%/json/mapgen/microlab/microlab_generic_edge.json +%%DATADIR%%/json/mapgen/microlab/microlab_hallway.json +%%DATADIR%%/json/mapgen/microlab/microlab_hallway_start.json +%%DATADIR%%/json/mapgen/microlab/microlab_isolated_stairs.json +%%DATADIR%%/json/mapgen/microlab/microlab_portal/microlab_portal_security_checkpoint.json +%%DATADIR%%/json/mapgen/microlab/microlab_portal/microlab_portal_unique.json +%%DATADIR%%/json/mapgen/microlab/microlab_reactor.json +%%DATADIR%%/json/mapgen/microlab/microlab_shifting_hall.json +%%DATADIR%%/json/mapgen/microlab/microlab_special_tiles.json +%%DATADIR%%/json/mapgen/mil_surplus.json +%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z-1.json +%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z0.json +%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z1.json +%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z2.json +%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z3.json +%%DATADIR%%/json/mapgen/military/mil_base/mil_base_z4.json +%%DATADIR%%/json/mapgen/mine/mine_amigara.json +%%DATADIR%%/json/mapgen/mine/mine_entrance.json +%%DATADIR%%/json/mapgen/mine/mine_generic.json +%%DATADIR%%/json/mapgen/mine/mine_shaft.json +%%DATADIR%%/json/mapgen/mine/mine_spiral.json +%%DATADIR%%/json/mapgen/mine/mine_wyrms.json +%%DATADIR%%/json/mapgen/miniature_railway/miniature_railway.json +%%DATADIR%%/json/mapgen/missile_silo.json +%%DATADIR%%/json/mapgen/mobile_home_park/mobile_home.json +%%DATADIR%%/json/mapgen/mobile_home_park/mobile_home_nested.json +%%DATADIR%%/json/mapgen/mobile_home_park/mobile_home_park.json +%%DATADIR%%/json/mapgen/moonshine_camp.json +%%DATADIR%%/json/mapgen/mortuary.json +%%DATADIR%%/json/mapgen/motel.json +%%DATADIR%%/json/mapgen/movie_theater.json +%%DATADIR%%/json/mapgen/museum.json +%%DATADIR%%/json/mapgen/music_venue.json +%%DATADIR%%/json/mapgen/musicstore.json +%%DATADIR%%/json/mapgen/natural_spring.json +%%DATADIR%%/json/mapgen/nested/aux_nested.json +%%DATADIR%%/json/mapgen/nested/basement_nested.json +%%DATADIR%%/json/mapgen/nested/cave_nested.json +%%DATADIR%%/json/mapgen/nested/city_npc_nested_spawns.json +%%DATADIR%%/json/mapgen/nested/farm_nested.json +%%DATADIR%%/json/mapgen/nested/fema_nested.json +%%DATADIR%%/json/mapgen/nested/homeless_missions_nested.json +%%DATADIR%%/json/mapgen/nested/house_nested.json +%%DATADIR%%/json/mapgen/nested/lmoe_nested.json +%%DATADIR%%/json/mapgen/nested/lodge_nested.json +%%DATADIR%%/json/mapgen/nested/logger_missions_nested.json +%%DATADIR%%/json/mapgen/nested/mine_nested.json +%%DATADIR%%/json/mapgen/nested/mini_railway_nested.json +%%DATADIR%%/json/mapgen/nested/nested_chunks_roof.json +%%DATADIR%%/json/mapgen/nested/npc_nested_spawns.json +%%DATADIR%%/json/mapgen/nested/nursing_home_nested.json +%%DATADIR%%/json/mapgen/nested/office_nested.json +%%DATADIR%%/json/mapgen/nested/retail_nested.json +%%DATADIR%%/json/mapgen/nested/rural_outdoors_nested.json +%%DATADIR%%/json/mapgen/nested/shelter_nested.json +%%DATADIR%%/json/mapgen/nested/strip_mall_nested.json +%%DATADIR%%/json/mapgen/nether_fade.json +%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_bowels.json +%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_head.json +%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_misc.json +%%DATADIR%%/json/mapgen/nether_monster_corpse/monster_tentacles.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z0.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z1.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z2.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z3.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z4.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z5.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z6.json +%%DATADIR%%/json/mapgen/nuclear_plant/nuclear_plant_z7.json +%%DATADIR%%/json/mapgen/nursing_home.json +%%DATADIR%%/json/mapgen/occupied_lumber_mill/occupied_lumber_mill.json +%%DATADIR%%/json/mapgen/office_cubical.json +%%DATADIR%%/json/mapgen/office_doctor.json +%%DATADIR%%/json/mapgen/office_small.json +%%DATADIR%%/json/mapgen/office_tower.json +%%DATADIR%%/json/mapgen/office_tower_2.json +%%DATADIR%%/json/mapgen/orchard_apple.json +%%DATADIR%%/json/mapgen/orchard_fruit.json +%%DATADIR%%/json/mapgen/outpost.json +%%DATADIR%%/json/mapgen/paintball_field.json +%%DATADIR%%/json/mapgen/park.json +%%DATADIR%%/json/mapgen/park_mazes.json +%%DATADIR%%/json/mapgen/park_skate.json +%%DATADIR%%/json/mapgen/park_state.json +%%DATADIR%%/json/mapgen/parking_garage.json +%%DATADIR%%/json/mapgen/parking_lot.json +%%DATADIR%%/json/mapgen/pavilion.json +%%DATADIR%%/json/mapgen/pawn_shop.json +%%DATADIR%%/json/mapgen/petstore.json +%%DATADIR%%/json/mapgen/pharmacy.json +%%DATADIR%%/json/mapgen/pizza_parlor.json +%%DATADIR%%/json/mapgen/police_department.json +%%DATADIR%%/json/mapgen/police_station.json +%%DATADIR%%/json/mapgen/pond_fishing.json +%%DATADIR%%/json/mapgen/pond_public.json +%%DATADIR%%/json/mapgen/ponds.json +%%DATADIR%%/json/mapgen/pool.json +%%DATADIR%%/json/mapgen/portal_storm.json +%%DATADIR%%/json/mapgen/post_office.json +%%DATADIR%%/json/mapgen/power_station_large.json +%%DATADIR%%/json/mapgen/power_station_small.json +%%DATADIR%%/json/mapgen/prison/prison.json +%%DATADIR%%/json/mapgen/prison/prison_alcatraz.json +%%DATADIR%%/json/mapgen/prison/prison_island.json +%%DATADIR%%/json/mapgen/private_resort.json +%%DATADIR%%/json/mapgen/public_works.json +%%DATADIR%%/json/mapgen/pump_station.json +%%DATADIR%%/json/mapgen/radio_tower.json +%%DATADIR%%/json/mapgen/railroad/railroad_level_crossing.json +%%DATADIR%%/json/mapgen/railroad/railroad_station.json +%%DATADIR%%/json/mapgen/ranch_camp.json +%%DATADIR%%/json/mapgen/ravine.json +%%DATADIR%%/json/mapgen/recycle_center.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_e.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_n.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_ne.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_nw.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_s.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_se.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_sw.json +%%DATADIR%%/json/mapgen/refugee_center/rc_grounds_w.json +%%DATADIR%%/json/mapgen/refugee_center/refugee_center.json +%%DATADIR%%/json/mapgen/refugee_center/z-1_refugee_center.json +%%DATADIR%%/json/mapgen/refugee_center/z-2_refugee_center.json +%%DATADIR%%/json/mapgen/refugee_center/z-3_refugee_center.json +%%DATADIR%%/json/mapgen/refugee_center/z-4_refugee_center.json +%%DATADIR%%/json/mapgen/refugee_center/z1_refugee_center.json +%%DATADIR%%/json/mapgen/refugee_center/z2_refugee_center.json +%%DATADIR%%/json/mapgen/regional_airport.json +%%DATADIR%%/json/mapgen/restaurant.json +%%DATADIR%%/json/mapgen/restaurant_fast.json +%%DATADIR%%/json/mapgen/reststop.json +%%DATADIR%%/json/mapgen/retirement_community.json +%%DATADIR%%/json/mapgen/river_cave.json +%%DATADIR%%/json/mapgen/river_shipwreck.json +%%DATADIR%%/json/mapgen/riverside/potters_cottage.json +%%DATADIR%%/json/mapgen/riverside/whaleys_boat_rental.json +%%DATADIR%%/json/mapgen/riverside/whaleys_house_river.json +%%DATADIR%%/json/mapgen/roadstop.json +%%DATADIR%%/json/mapgen/robofachq_static.json +%%DATADIR%%/json/mapgen/robofaq_locs/EOC_robofac_hq_updater.json +%%DATADIR%%/json/mapgen/robofaq_locs/ancillia_bar_updater.json +%%DATADIR%%/json/mapgen/robofaq_locs/robofac_hq_chunks.json +%%DATADIR%%/json/mapgen/robofaq_locs/robofac_mission_chunks.json +%%DATADIR%%/json/mapgen/rock_border.json +%%DATADIR%%/json/mapgen/s_apt.json +%%DATADIR%%/json/mapgen/s_apt_2.json +%%DATADIR%%/json/mapgen/s_bookstore.json +%%DATADIR%%/json/mapgen/s_candy.json +%%DATADIR%%/json/mapgen/s_clothing.json +%%DATADIR%%/json/mapgen/s_coffee.json +%%DATADIR%%/json/mapgen/s_cosmetic.json +%%DATADIR%%/json/mapgen/s_electronics.json +%%DATADIR%%/json/mapgen/s_furniture.json +%%DATADIR%%/json/mapgen/s_grocery.json +%%DATADIR%%/json/mapgen/s_gun.json +%%DATADIR%%/json/mapgen/s_hardware.json +%%DATADIR%%/json/mapgen/s_icecream.json +%%DATADIR%%/json/mapgen/s_lightindustry.json +%%DATADIR%%/json/mapgen/s_lightindustry_scen.json +%%DATADIR%%/json/mapgen/s_liquor.json +%%DATADIR%%/json/mapgen/sai.json +%%DATADIR%%/json/mapgen/salon.json +%%DATADIR%%/json/mapgen/school_1.json +%%DATADIR%%/json/mapgen/sewage_treatment.json +%%DATADIR%%/json/mapgen/shelter.json +%%DATADIR%%/json/mapgen/shooting_range.json +%%DATADIR%%/json/mapgen/slime_pit.json +%%DATADIR%%/json/mapgen/smallscrapyard.json +%%DATADIR%%/json/mapgen/smoke_lounge.json +%%DATADIR%%/json/mapgen/sports_store.json +%%DATADIR%%/json/mapgen/stadium_baseball.json +%%DATADIR%%/json/mapgen/stadium_football.json +%%DATADIR%%/json/mapgen/standing_stones.json +%%DATADIR%%/json/mapgen/station_radio.json +%%DATADIR%%/json/mapgen/steel_mill/steel_mill_z1.json +%%DATADIR%%/json/mapgen/steel_mill/steel_mill_z2.json +%%DATADIR%%/json/mapgen/steel_mill/steel_mill_z3.json +%%DATADIR%%/json/mapgen/storage_units_large.json +%%DATADIR%%/json/mapgen/storage_units_medium.json +%%DATADIR%%/json/mapgen/storage_units_small.json +%%DATADIR%%/json/mapgen/store/s_camping.json +%%DATADIR%%/json/mapgen/store/s_cardealer.json +%%DATADIR%%/json/mapgen/store/s_diner.json +%%DATADIR%%/json/mapgen/store/s_electronicstore.json +%%DATADIR%%/json/mapgen/store/s_games.json +%%DATADIR%%/json/mapgen/store/s_gunstore.json +%%DATADIR%%/json/mapgen/store/s_hunting.json +%%DATADIR%%/json/mapgen/strange_temple.json +%%DATADIR%%/json/mapgen/strip_mall.json +%%DATADIR%%/json/mapgen/stripclub.json +%%DATADIR%%/json/mapgen/sub_station.json +%%DATADIR%%/json/mapgen/sugar_house.json +%%DATADIR%%/json/mapgen/swamp_shack.json +%%DATADIR%%/json/mapgen/teashop.json +%%DATADIR%%/json/mapgen/textile_mill_museum.json +%%DATADIR%%/json/mapgen/thrift.json +%%DATADIR%%/json/mapgen/town_hall.json +%%DATADIR%%/json/mapgen/toxic_dump.json +%%DATADIR%%/json/mapgen/trail_nature.json +%%DATADIR%%/json/mapgen/trail_small.json +%%DATADIR%%/json/mapgen/trailhead.json +%%DATADIR%%/json/mapgen/triffid/triffid_fields.json +%%DATADIR%%/json/mapgen/triffid/triffid_grove.json +%%DATADIR%%/json/mapgen/triffid/triffid_grove_roof.json +%%DATADIR%%/json/mapgen/triffid/triffid_grove_z2.json +%%DATADIR%%/json/mapgen/triffid/triffid_grove_z3.json +%%DATADIR%%/json/mapgen/triffid/triffid_heart.json +%%DATADIR%%/json/mapgen/triffid/triffid_roots.json +%%DATADIR%%/json/mapgen/tutorial.json +%%DATADIR%%/json/mapgen/urban_35_hospital.json +%%DATADIR%%/json/mapgen/valhalla_cult/car_spawns.json +%%DATADIR%%/json/mapgen/valhalla_cult/mapgen.json +%%DATADIR%%/json/mapgen/valhalla_cult/mapgen_updates.json +%%DATADIR%%/json/mapgen/veterinarian.json +%%DATADIR%%/json/mapgen/vfw.json +%%DATADIR%%/json/mapgen/warehouse.json +%%DATADIR%%/json/mapgen/wind_turbine.json +%%DATADIR%%/json/mapgen/ws_biker_dump.json +%%DATADIR%%/json/mapgen/ws_fire_lookout_tower.json +%%DATADIR%%/json/mapgen/ws_giant_sinkhole.json +%%DATADIR%%/json/mapgen/ws_regional_dump.json +%%DATADIR%%/json/mapgen/ws_survivor_bunker.json +%%DATADIR%%/json/mapgen/ws_survivor_camp.json +%%DATADIR%%/json/mapgen/zoo.json +%%DATADIR%%/json/mapgen_palettes/abandoned_barn_p.json +%%DATADIR%%/json/mapgen_palettes/abandoned_textile_mill.json +%%DATADIR%%/json/mapgen_palettes/acidia_camp_palette.json +%%DATADIR%%/json/mapgen_palettes/aircraft_carrier_palette.json +%%DATADIR%%/json/mapgen_palettes/airliner_palette.json +%%DATADIR%%/json/mapgen_palettes/apartment.json +%%DATADIR%%/json/mapgen_palettes/bandit_camp.json +%%DATADIR%%/json/mapgen_palettes/basement.json +%%DATADIR%%/json/mapgen_palettes/bike_shop_palette.json +%%DATADIR%%/json/mapgen_palettes/building.json +%%DATADIR%%/json/mapgen_palettes/cabin.json +%%DATADIR%%/json/mapgen_palettes/campground.json +%%DATADIR%%/json/mapgen_palettes/campus/common.json +%%DATADIR%%/json/mapgen_palettes/cathedral_palette.json +%%DATADIR%%/json/mapgen_palettes/cground.json +%%DATADIR%%/json/mapgen_palettes/church.json +%%DATADIR%%/json/mapgen_palettes/church_retreat.json +%%DATADIR%%/json/mapgen_palettes/city_block_palette.json +%%DATADIR%%/json/mapgen_palettes/clothes_store_palette.json +%%DATADIR%%/json/mapgen_palettes/collapsed_tower.json +%%DATADIR%%/json/mapgen_palettes/construction_site_palette.json +%%DATADIR%%/json/mapgen_palettes/electronic_palette.json +%%DATADIR%%/json/mapgen_palettes/exodii/homebase.json +%%DATADIR%%/json/mapgen_palettes/exodii/medieval.json +%%DATADIR%%/json/mapgen_palettes/farm.json +%%DATADIR%%/json/mapgen_palettes/farm_dairy.json +%%DATADIR%%/json/mapgen_palettes/farm_horse.json +%%DATADIR%%/json/mapgen_palettes/farm_lots.json +%%DATADIR%%/json/mapgen_palettes/farm_supply_palette.json +%%DATADIR%%/json/mapgen_palettes/fema.json +%%DATADIR%%/json/mapgen_palettes/field_football.json +%%DATADIR%%/json/mapgen_palettes/fort_palette.json +%%DATADIR%%/json/mapgen_palettes/gunstore.json +%%DATADIR%%/json/mapgen_palettes/helipad.json +%%DATADIR%%/json/mapgen_palettes/hospital.json +%%DATADIR%%/json/mapgen_palettes/hotel_tower_palette.json +%%DATADIR%%/json/mapgen_palettes/house_general_abandoned.json +%%DATADIR%%/json/mapgen_palettes/house_general_palette.json +%%DATADIR%%/json/mapgen_palettes/house_variant_palette.json +%%DATADIR%%/json/mapgen_palettes/house_w_palette.json +%%DATADIR%%/json/mapgen_palettes/hunting_store_palette.json +%%DATADIR%%/json/mapgen_palettes/isolated_artisans.json +%%DATADIR%%/json/mapgen_palettes/junkyard_palette.json +%%DATADIR%%/json/mapgen_palettes/karting_l.json +%%DATADIR%%/json/mapgen_palettes/lab/lab_modular_palette.json +%%DATADIR%%/json/mapgen_palettes/lab_surface_palette.json +%%DATADIR%%/json/mapgen_palettes/library_palette.json +%%DATADIR%%/json/mapgen_palettes/lmoe.json +%%DATADIR%%/json/mapgen_palettes/lodge_palette.json +%%DATADIR%%/json/mapgen_palettes/lumberyard.json +%%DATADIR%%/json/mapgen_palettes/mall_palette.json +%%DATADIR%%/json/mapgen_palettes/mansion.json +%%DATADIR%%/json/mapgen_palettes/mi-go_palette.json +%%DATADIR%%/json/mapgen_palettes/microlab.json +%%DATADIR%%/json/mapgen_palettes/mil_surplus.json +%%DATADIR%%/json/mapgen_palettes/military/mil_base_palette.json +%%DATADIR%%/json/mapgen_palettes/military/mil_base_roof_palette.json +%%DATADIR%%/json/mapgen_palettes/miniature_railway_palette.json +%%DATADIR%%/json/mapgen_palettes/movie_theater_palette.json +%%DATADIR%%/json/mapgen_palettes/nuclear_plant_palette.json +%%DATADIR%%/json/mapgen_palettes/nursing_home_palette.json +%%DATADIR%%/json/mapgen_palettes/office.json +%%DATADIR%%/json/mapgen_palettes/office_doctor.json +%%DATADIR%%/json/mapgen_palettes/orchard_apple.json +%%DATADIR%%/json/mapgen_palettes/park_palette.json +%%DATADIR%%/json/mapgen_palettes/police_dept_palette.json +%%DATADIR%%/json/mapgen_palettes/prison.json +%%DATADIR%%/json/mapgen_palettes/private_resort.json +%%DATADIR%%/json/mapgen_palettes/railroad.json +%%DATADIR%%/json/mapgen_palettes/ranch_camp.json +%%DATADIR%%/json/mapgen_palettes/refugee_center.json +%%DATADIR%%/json/mapgen_palettes/regional_dump_palette.json +%%DATADIR%%/json/mapgen_palettes/restaurant_palette.json +%%DATADIR%%/json/mapgen_palettes/retirement_community_palette.json +%%DATADIR%%/json/mapgen_palettes/road.json +%%DATADIR%%/json/mapgen_palettes/robofachq.json +%%DATADIR%%/json/mapgen_palettes/roof_palette.json +%%DATADIR%%/json/mapgen_palettes/rural_roads_trails_palette.json +%%DATADIR%%/json/mapgen_palettes/sewers_palette.json +%%DATADIR%%/json/mapgen_palettes/shelter.json +%%DATADIR%%/json/mapgen_palettes/stadium_palette.json +%%DATADIR%%/json/mapgen_palettes/steel_mill_palette.json +%%DATADIR%%/json/mapgen_palettes/subway.json +%%DATADIR%%/json/mapgen_palettes/textile_mill_museum.json +%%DATADIR%%/json/mapgen_palettes/triffid.json +%%DATADIR%%/json/mapgen_palettes/underwater_structures_palette.json +%%DATADIR%%/json/mapgen_palettes/wasp_palette.json +%%DATADIR%%/json/martialarts.json +%%DATADIR%%/json/martialarts_fictional.json +%%DATADIR%%/json/materials.json +%%DATADIR%%/json/monster_factions.json +%%DATADIR%%/json/monster_special_attacks/monster_attacks.json +%%DATADIR%%/json/monster_special_attacks/monster_deaths.json +%%DATADIR%%/json/monster_special_attacks/monster_gun.json +%%DATADIR%%/json/monster_special_attacks/spells.json +%%DATADIR%%/json/monster_special_attacks/weapon_spells.json +%%DATADIR%%/json/monster_weakpoints/abomination_weakpoints.json +%%DATADIR%%/json/monster_weakpoints/arthropod_weakpoints.json +%%DATADIR%%/json/monster_weakpoints/bird_weakpoints.json +%%DATADIR%%/json/monster_weakpoints/cyborg_weakpoints.json +%%DATADIR%%/json/monster_weakpoints/generic_weakpoints.json +%%DATADIR%%/json/monster_weakpoints/humanoid_weakpoints.json +%%DATADIR%%/json/monsterdrops/clothing_christmas.json +%%DATADIR%%/json/monsterdrops/feral_humans.json +%%DATADIR%%/json/monsterdrops/marloss.json +%%DATADIR%%/json/monsterdrops/misc.json +%%DATADIR%%/json/monsterdrops/mutant_experimental.json +%%DATADIR%%/json/monsterdrops/nether.json +%%DATADIR%%/json/monsterdrops/robofac.json +%%DATADIR%%/json/monsterdrops/rodentkin.json +%%DATADIR%%/json/monsterdrops/zombie.json +%%DATADIR%%/json/monsterdrops/zombie_child.json +%%DATADIR%%/json/monsterdrops/zombie_cop.json +%%DATADIR%%/json/monsterdrops/zombie_default.json +%%DATADIR%%/json/monsterdrops/zombie_lab.json +%%DATADIR%%/json/monsterdrops/zombie_medical.json +%%DATADIR%%/json/monsterdrops/zombie_milbase_personnel.json +%%DATADIR%%/json/monsterdrops/zombie_military_pilot.json +%%DATADIR%%/json/monsterdrops/zombie_naval_personnel.json +%%DATADIR%%/json/monsterdrops/zombie_prisoner.json +%%DATADIR%%/json/monsterdrops/zombie_resort.json +%%DATADIR%%/json/monsterdrops/zombie_soldier.json +%%DATADIR%%/json/monsterdrops/zombie_survivor.json +%%DATADIR%%/json/monsterdrops/zombie_technician.json +%%DATADIR%%/json/monstergroups/blob.json +%%DATADIR%%/json/monstergroups/bugs.json +%%DATADIR%%/json/monstergroups/eggs.json +%%DATADIR%%/json/monstergroups/exodii.json +%%DATADIR%%/json/monstergroups/fish.json +%%DATADIR%%/json/monstergroups/fungi.json +%%DATADIR%%/json/monstergroups/kraken.json +%%DATADIR%%/json/monstergroups/lab.json +%%DATADIR%%/json/monstergroups/mammal.json +%%DATADIR%%/json/monstergroups/mi-go.json +%%DATADIR%%/json/monstergroups/military.json +%%DATADIR%%/json/monstergroups/misc.json +%%DATADIR%%/json/monstergroups/missions.json +%%DATADIR%%/json/monstergroups/mutant_upgrades.json +%%DATADIR%%/json/monstergroups/nether.json +%%DATADIR%%/json/monstergroups/obsolete.json +%%DATADIR%%/json/monstergroups/resort.json +%%DATADIR%%/json/monstergroups/robots.json +%%DATADIR%%/json/monstergroups/triffid.json +%%DATADIR%%/json/monstergroups/wilderness.json +%%DATADIR%%/json/monstergroups/zanimal_upgrades.json +%%DATADIR%%/json/monstergroups/zombie_amalgamations.json +%%DATADIR%%/json/monstergroups/zombie_upgrades.json +%%DATADIR%%/json/monstergroups/zombies.json +%%DATADIR%%/json/monsters/bird.json +%%DATADIR%%/json/monsters/cyborgs.json +%%DATADIR%%/json/monsters/defense_bot.json +%%DATADIR%%/json/monsters/drones.json +%%DATADIR%%/json/monsters/feral_humans.json +%%DATADIR%%/json/monsters/fish.json +%%DATADIR%%/json/monsters/fungus.json +%%DATADIR%%/json/monsters/fungus_zombie.json +%%DATADIR%%/json/monsters/insect_spider.json +%%DATADIR%%/json/monsters/jabberwock.json +%%DATADIR%%/json/monsters/kraken_spawn.json +%%DATADIR%%/json/monsters/lab_security_drones.json +%%DATADIR%%/json/monsters/mammal.json +%%DATADIR%%/json/monsters/marloss.json +%%DATADIR%%/json/monsters/mechsuits.json +%%DATADIR%%/json/monsters/mi-go.json +%%DATADIR%%/json/monsters/misc.json +%%DATADIR%%/json/monsters/mollusk.json +%%DATADIR%%/json/monsters/monster_goals.json +%%DATADIR%%/json/monsters/mutant.json +%%DATADIR%%/json/monsters/mutant_mammal.json +%%DATADIR%%/json/monsters/nether.json +%%DATADIR%%/json/monsters/obsolete.json +%%DATADIR%%/json/monsters/power_leech.json +%%DATADIR%%/json/monsters/reptile_amphibian.json +%%DATADIR%%/json/monsters/robofac_robots.json +%%DATADIR%%/json/monsters/rodentkin.json +%%DATADIR%%/json/monsters/slimes.json +%%DATADIR%%/json/monsters/starers.json +%%DATADIR%%/json/monsters/triffid.json +%%DATADIR%%/json/monsters/turrets.json +%%DATADIR%%/json/monsters/utility_bot.json +%%DATADIR%%/json/monsters/yrax.json +%%DATADIR%%/json/monsters/zanimal_upgrade.json +%%DATADIR%%/json/monsters/zed-animal.json +%%DATADIR%%/json/monsters/zed-classic.json +%%DATADIR%%/json/monsters/zed-medical.json +%%DATADIR%%/json/monsters/zed-pupating.json +%%DATADIR%%/json/monsters/zed-winged.json +%%DATADIR%%/json/monsters/zed_acid.json +%%DATADIR%%/json/monsters/zed_amalgamation.json +%%DATADIR%%/json/monsters/zed_burned.json +%%DATADIR%%/json/monsters/zed_children.json +%%DATADIR%%/json/monsters/zed_command.json +%%DATADIR%%/json/monsters/zed_electric.json +%%DATADIR%%/json/monsters/zed_explosive.json +%%DATADIR%%/json/monsters/zed_ferrous.json +%%DATADIR%%/json/monsters/zed_fusion.json +%%DATADIR%%/json/monsters/zed_lab.json +%%DATADIR%%/json/monsters/zed_misc.json +%%DATADIR%%/json/monsters/zed_prisoner.json +%%DATADIR%%/json/monsters/zed_radiation.json +%%DATADIR%%/json/monsters/zed_skeletal.json +%%DATADIR%%/json/monsters/zed_soldiers.json +%%DATADIR%%/json/monsters/zed_survivor.json +%%DATADIR%%/json/mood_faces.json +%%DATADIR%%/json/morale_types.json +%%DATADIR%%/json/move_modes.json +%%DATADIR%%/json/mutations/appearance_hair_styles.json +%%DATADIR%%/json/mutations/changing_eocs.json +%%DATADIR%%/json/mutations/cybernetic_traits.json +%%DATADIR%%/json/mutations/migration.json +%%DATADIR%%/json/mutations/mutation_appearance.json +%%DATADIR%%/json/mutations/mutation_category.json +%%DATADIR%%/json/mutations/mutation_eocs.json +%%DATADIR%%/json/mutations/mutation_item_traits.json +%%DATADIR%%/json/mutations/mutation_ordering.json +%%DATADIR%%/json/mutations/mutation_spells.json +%%DATADIR%%/json/mutations/mutation_techs.json +%%DATADIR%%/json/mutations/mutation_type.json +%%DATADIR%%/json/mutations/mutations.json +%%DATADIR%%/json/nether_glass_effect_on_condition.json +%%DATADIR%%/json/npcs/BG_trait_groups.json +%%DATADIR%%/json/npcs/BG_traits.json +%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/Brigitte_LaCroix_Background.json +%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/Lapin_01.json +%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/NC_Farmer_background.json +%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/NC_SURVIVOR_CHEF_background.json +%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/No_Others_01.json +%%DATADIR%%/json/npcs/Backgrounds/OtherSurvivorStories/No_Others_02.json +%%DATADIR%%/json/npcs/Backgrounds/backgrounds_table_of_contents.json +%%DATADIR%%/json/npcs/Backgrounds/bg_pizzaiolo.json +%%DATADIR%%/json/npcs/Backgrounds/burger_flipper_1.json +%%DATADIR%%/json/npcs/Backgrounds/codger.json +%%DATADIR%%/json/npcs/Backgrounds/confused_1.json +%%DATADIR%%/json/npcs/Backgrounds/cop_1.json +%%DATADIR%%/json/npcs/Backgrounds/cop_2.json +%%DATADIR%%/json/npcs/Backgrounds/cop_3.json +%%DATADIR%%/json/npcs/Backgrounds/criminal_1.json +%%DATADIR%%/json/npcs/Backgrounds/criminal_2.json +%%DATADIR%%/json/npcs/Backgrounds/cyborg_1.json +%%DATADIR%%/json/npcs/Backgrounds/dreamer.json +%%DATADIR%%/json/npcs/Backgrounds/evacuee_1.json +%%DATADIR%%/json/npcs/Backgrounds/evacuee_2.json +%%DATADIR%%/json/npcs/Backgrounds/evacuee_3.json +%%DATADIR%%/json/npcs/Backgrounds/evacuee_4.json +%%DATADIR%%/json/npcs/Backgrounds/evacuee_5.json +%%DATADIR%%/json/npcs/Backgrounds/evacuee_6.json +%%DATADIR%%/json/npcs/Backgrounds/fema_evacuee_1.json +%%DATADIR%%/json/npcs/Backgrounds/grad_student_1.json +%%DATADIR%%/json/npcs/Backgrounds/gung_ho_1.json +%%DATADIR%%/json/npcs/Backgrounds/gung_ho_2.json +%%DATADIR%%/json/npcs/Backgrounds/gung_ho_3.json +%%DATADIR%%/json/npcs/Backgrounds/high_school_1.json +%%DATADIR%%/json/npcs/Backgrounds/hospital_1.json +%%DATADIR%%/json/npcs/Backgrounds/hospital_2.json +%%DATADIR%%/json/npcs/Backgrounds/hospital_3.json +%%DATADIR%%/json/npcs/Backgrounds/hunter_1.json +%%DATADIR%%/json/npcs/Backgrounds/hunter_2.json +%%DATADIR%%/json/npcs/Backgrounds/lab_1.json +%%DATADIR%%/json/npcs/Backgrounds/left_for_dead_1.json +%%DATADIR%%/json/npcs/Backgrounds/left_for_dead_2.json +%%DATADIR%%/json/npcs/Backgrounds/left_for_dead_3.json +%%DATADIR%%/json/npcs/Backgrounds/lost_partner_1.json +%%DATADIR%%/json/npcs/Backgrounds/lost_partner_2.json +%%DATADIR%%/json/npcs/Backgrounds/meteorologist.json +%%DATADIR%%/json/npcs/Backgrounds/nerd_1.json +%%DATADIR%%/json/npcs/Backgrounds/no_past_1.json +%%DATADIR%%/json/npcs/Backgrounds/no_past_2.json +%%DATADIR%%/json/npcs/Backgrounds/no_past_3.json +%%DATADIR%%/json/npcs/Backgrounds/no_past_4.json +%%DATADIR%%/json/npcs/Backgrounds/no_past_5.json +%%DATADIR%%/json/npcs/Backgrounds/othersurvivors_table_of_contents.json +%%DATADIR%%/json/npcs/Backgrounds/out_of_town_1.json +%%DATADIR%%/json/npcs/Backgrounds/out_of_town_2.json +%%DATADIR%%/json/npcs/Backgrounds/prepper_1.json +%%DATADIR%%/json/npcs/Backgrounds/prepper_2.json +%%DATADIR%%/json/npcs/Backgrounds/prisoner_1.json +%%DATADIR%%/json/npcs/Backgrounds/professor_1.json +%%DATADIR%%/json/npcs/Backgrounds/religious_1.json +%%DATADIR%%/json/npcs/Backgrounds/religious_2.json +%%DATADIR%%/json/npcs/Backgrounds/rural_1.json +%%DATADIR%%/json/npcs/Backgrounds/rural_2.json +%%DATADIR%%/json/npcs/Backgrounds/scavenger_merc_1.json +%%DATADIR%%/json/npcs/Backgrounds/scientist_1.json +%%DATADIR%%/json/npcs/Backgrounds/scientist_2.json +%%DATADIR%%/json/npcs/Backgrounds/soldier_1.json +%%DATADIR%%/json/npcs/Backgrounds/soldier_2.json +%%DATADIR%%/json/npcs/Backgrounds/wedding_1.json +%%DATADIR%%/json/npcs/Backgrounds/whathappened_table_of_contents.json +%%DATADIR%%/json/npcs/Kindred/NPC_Brigitte_LaCroix.json +%%DATADIR%%/json/npcs/Kindred/NPC_Darren_Cooper.json +%%DATADIR%%/json/npcs/Lighthouse_Family/NPC_lighthouse_girl.json +%%DATADIR%%/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json +%%DATADIR%%/json/npcs/Lighthouse_Family/NPC_lighthouse_woman.json +%%DATADIR%%/json/npcs/Lighthouse_Family/TALK_fix_lighthouse.json +%%DATADIR%%/json/npcs/Lighthouse_Family/npc_survivor.json +%%DATADIR%%/json/npcs/NC_ARMY.json +%%DATADIR%%/json/npcs/NC_ARSONIST.json +%%DATADIR%%/json/npcs/NC_BARTENDER.json +%%DATADIR%%/json/npcs/NC_BOUNTY_HUNTER.json +%%DATADIR%%/json/npcs/NC_CITY_COP.json +%%DATADIR%%/json/npcs/NC_COWBOY.json +%%DATADIR%%/json/npcs/NC_CYBORG.json +%%DATADIR%%/json/npcs/NC_DEBUG.json +%%DATADIR%%/json/npcs/NC_DOCTOR.json +%%DATADIR%%/json/npcs/NC_FARMER.json +%%DATADIR%%/json/npcs/NC_HACKER.json +%%DATADIR%%/json/npcs/NC_HUNTER.json +%%DATADIR%%/json/npcs/NC_JUNK_SHOPKEEP.json +%%DATADIR%%/json/npcs/NC_MARLOSS_VOICE.json +%%DATADIR%%/json/npcs/NC_NINJA.json +%%DATADIR%%/json/npcs/NC_OPS.json +%%DATADIR%%/json/npcs/NC_SCAVENGER.json +%%DATADIR%%/json/npcs/NC_SCIENTIST.json +%%DATADIR%%/json/npcs/NC_SOLDIER.json +%%DATADIR%%/json/npcs/NC_SURVIVOR_CHEF.json +%%DATADIR%%/json/npcs/NC_THUG.json +%%DATADIR%%/json/npcs/NC_TRADER.json +%%DATADIR%%/json/npcs/NC_TRUE_FOODPERSON.json +%%DATADIR%%/json/npcs/TALK_ALLY_TUTORIAL.json +%%DATADIR%%/json/npcs/TALK_CITY_COP.json +%%DATADIR%%/json/npcs/TALK_CYBORG_1.json +%%DATADIR%%/json/npcs/TALK_FACTION_CAMP.json +%%DATADIR%%/json/npcs/TALK_MARLOSS_VOICE.json +%%DATADIR%%/json/npcs/TALK_NC_FARMER.json +%%DATADIR%%/json/npcs/TALK_STRIP_MALL.json +%%DATADIR%%/json/npcs/TALK_SURVIVOR_CHEF.json +%%DATADIR%%/json/npcs/TALK_TEST.json +%%DATADIR%%/json/npcs/TALK_TRUE_FOODPERSON.json +%%DATADIR%%/json/npcs/appearance_trait_groups.json +%%DATADIR%%/json/npcs/bunker_shop/NC_BUNKER_MERCHANT.json +%%DATADIR%%/json/npcs/bunker_shop/TALK_BUNKER_MERCHANT.json +%%DATADIR%%/json/npcs/bunker_shop/classes.json +%%DATADIR%%/json/npcs/bunker_shop/npc.json +%%DATADIR%%/json/npcs/cabin_chemist/chemist_effects.json +%%DATADIR%%/json/npcs/cabin_chemist/chemist_missions.json +%%DATADIR%%/json/npcs/cabin_chemist/chemist_npc.json +%%DATADIR%%/json/npcs/cabin_chemist/item_groups.json +%%DATADIR%%/json/npcs/classes.json +%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_ALLY.json +%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_GREET.json +%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_MISSION.json +%%DATADIR%%/json/npcs/common_chat/TALK_COMMON_OTHER.json +%%DATADIR%%/json/npcs/common_chat/TALK_FRIEND_CONVERSATION.json +%%DATADIR%%/json/npcs/computers/TALK_COMPUTER.json +%%DATADIR%%/json/npcs/computers/TALK_NURSING_HOME.json +%%DATADIR%%/json/npcs/computers/TALK_PREPPER_1_COMPUTER.json +%%DATADIR%%/json/npcs/computers/TALK_RET_COMM.json +%%DATADIR%%/json/npcs/computers/TALK_TRAIN_DATA.json +%%DATADIR%%/json/npcs/destination_locations.json +%%DATADIR%%/json/npcs/exodii/exodii_merchant_definitions.json +%%DATADIR%%/json/npcs/exodii/exodii_merchant_itemlist.json +%%DATADIR%%/json/npcs/exodii/exodii_merchant_missions.json +%%DATADIR%%/json/npcs/exodii/exodii_merchant_talk.json +%%DATADIR%%/json/npcs/exodii/exodii_merchant_talk_exodization.json +%%DATADIR%%/json/npcs/exodii/non-NPC_missions.json +%%DATADIR%%/json/npcs/expertise_traits.json +%%DATADIR%%/json/npcs/factions.json +%%DATADIR%%/json/npcs/godco/NPC_Arturo_Maldonado.json +%%DATADIR%%/json/npcs/godco/NPC_Aunt_Theresa.json +%%DATADIR%%/json/npcs/godco/NPC_Chloe_Taylor_King.json +%%DATADIR%%/json/npcs/godco/NPC_Corrie_Kaja_Dosia.json +%%DATADIR%%/json/npcs/godco/NPC_Darryl_Johnstone.json +%%DATADIR%%/json/npcs/godco/NPC_Father_Greenwood.json +%%DATADIR%%/json/npcs/godco/NPC_Felicity_Powell.json +%%DATADIR%%/json/npcs/godco/NPC_Gemma_Johnstone.json +%%DATADIR%%/json/npcs/godco/NPC_Helena_Misinter.json +%%DATADIR%%/json/npcs/godco/NPC_Jane_Schulz.json +%%DATADIR%%/json/npcs/godco/NPC_Jeremiah_Weaver.json +%%DATADIR%%/json/npcs/godco/NPC_Julian_Ray.json +%%DATADIR%%/json/npcs/godco/NPC_Katherine_Weaver.json +%%DATADIR%%/json/npcs/godco/NPC_Kostas_Walsman.json +%%DATADIR%%/json/npcs/godco/NPC_Maria_Serrano.json +%%DATADIR%%/json/npcs/godco/NPC_Olwen_Powell.json +%%DATADIR%%/json/npcs/godco/NPC_Russell_Connelly.json +%%DATADIR%%/json/npcs/godco/NPC_Sonia_Greene.json +%%DATADIR%%/json/npcs/godco/NPC_Tom_Powell.json +%%DATADIR%%/json/npcs/godco/NPC_Zachary_Montes.json +%%DATADIR%%/json/npcs/godco/classes.json +%%DATADIR%%/json/npcs/godco/cook.json +%%DATADIR%%/json/npcs/godco/foodguard.json +%%DATADIR%%/json/npcs/godco/godco_missions.json +%%DATADIR%%/json/npcs/godco/npcs.json +%%DATADIR%%/json/npcs/hints.json +%%DATADIR%%/json/npcs/holdouts/Mr_Lapin.json +%%DATADIR%%/json/npcs/holdouts/NC_GLOOSCAP.json +%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Friendly.json +%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Hostile.json +%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Nihilist.json +%%DATADIR%%/json/npcs/holdouts/Rural-Cowboy_Trader.json +%%DATADIR%%/json/npcs/holdouts/rural.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json +%%DATADIR%%/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +%%DATADIR%%/json/npcs/island_prison/prisoners.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_cody_dialogue.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_cody_fabricate.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_cody_prototype.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_item_groups.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_jay_convert.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_jay_dialogue.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_missions.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_npcs.json +%%DATADIR%%/json/npcs/isolated_road/isolated_road_worn.json +%%DATADIR%%/json/npcs/items_generic.json +%%DATADIR%%/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json +%%DATADIR%%/json/npcs/lumbermill_employees/TALK_lumbermill_logger.json +%%DATADIR%%/json/npcs/lumbermill_employees/TALK_lumbermill_merchant.json +%%DATADIR%%/json/npcs/lumbermill_employees/lumbermill_effects.json +%%DATADIR%%/json/npcs/lumbermill_employees/lumbermill_employees.json +%%DATADIR%%/json/npcs/lumbermill_employees/lumbermill_missions.json +%%DATADIR%%/json/npcs/mine/spiral_madman.json +%%DATADIR%%/json/npcs/missiondef.json +%%DATADIR%%/json/npcs/npc.json +%%DATADIR%%/json/npcs/npc_behavior.json +%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_Soldier_1.json +%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_officer.json +%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_pilot.json +%%DATADIR%%/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json +%%DATADIR%%/json/npcs/other/NPC_pizzaiolo.json +%%DATADIR%%/json/npcs/other/TALK_NPC_APARTMENT_SURVIVOR.json +%%DATADIR%%/json/npcs/other/TALK_NPC_CAMPER.json +%%DATADIR%%/json/npcs/other/TALK_NPC_MOONSHINER.json +%%DATADIR%%/json/npcs/other/TALK_NPC_PREPPER_SURVIVOR.json +%%DATADIR%%/json/npcs/other/TALK_shelter_survivors.json +%%DATADIR%%/json/npcs/other/homeless/TALK_homeless_survivor.json +%%DATADIR%%/json/npcs/other/homeless/group_camp/TALK_homeless_broker.json +%%DATADIR%%/json/npcs/other/homeless/group_camp/TALK_homeless_group_survivors.json +%%DATADIR%%/json/npcs/other/homeless/group_camp/group_camp_missions.json +%%DATADIR%%/json/npcs/other/homeless/group_camp/homeless_broker_sell.json +%%DATADIR%%/json/npcs/other/homeless/group_camp/nested_homeless_missions.json +%%DATADIR%%/json/npcs/other/meteorologist.json +%%DATADIR%%/json/npcs/prisoners/mi-go_prisoners.json +%%DATADIR%%/json/npcs/random_encounters/free_merchant_caravans.json +%%DATADIR%%/json/npcs/random_encounters/john_bailey.json +%%DATADIR%%/json/npcs/refugee_center/FREE_MERCHANTS_INFO.md +%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json +%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json +%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json +%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json +%%DATADIR%%/json/npcs/refugee_center/beggars/BEGGAR_5_Yusuke_Taylor.json +%%DATADIR%%/json/npcs/refugee_center/missiondef_free_merchants.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Dino_Dave.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Guneet_Singh.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_John_Clemens.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Stan_Borichenko.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json +%%DATADIR%%/json/npcs/refugee_center/surface_refugees/shared_dialogue.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard2.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard3.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard_generic.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_hostile_guard.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_itemlist.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk_fluff.json +%%DATADIR%%/json/npcs/refugee_center/surface_staff/generic_class_definitions.json +%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json +%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_hunter.json +%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json +%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json +%%DATADIR%%/json/npcs/refugee_center/surface_visitors/NPC_visiting_scavenger.json +%%DATADIR%%/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json +%%DATADIR%%/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json +%%DATADIR%%/json/npcs/robofac/NPC_Cranberry_Foster.json +%%DATADIR%%/json/npcs/robofac/NPC_Ulysses_Rourke.json +%%DATADIR%%/json/npcs/robofac/NPC_robofac_generic_security.json +%%DATADIR%%/json/npcs/robofac/ROBOFAC_SURFACE_FREEMERCHANT.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_anchor_seller.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_gunrunner.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_hireable.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_keycard_seller.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_template_seller.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/NPC_BEMS.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json +%%DATADIR%%/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_HQ_GUARD.json +%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Andrea_Dzvonko.json +%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Darla_Novak.json +%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Jonathan_Farrier.json +%%DATADIR%%/json/npcs/robofac/robofac_basement_npcs/NPC_Sunil_Narayana.json +%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom.json +%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json +%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json +%%DATADIR%%/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +%%DATADIR%%/json/npcs/scrap_trader/scrap_trader.json +%%DATADIR%%/json/npcs/scrap_trader/scrap_trader_missions.json +%%DATADIR%%/json/npcs/slaves/npcs.json +%%DATADIR%%/json/npcs/starting_traits.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_barber.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_bartender.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_doctor.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_farmer1.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_farmer2.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_generic.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_guard.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_nurse.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_scrapper.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_sickly_laborer.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json +%%DATADIR%%/json/npcs/tacoma_ranch/NPC_ranch_woodcutter2.json +%%DATADIR%%/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json +%%DATADIR%%/json/npcs/talk_tags.json +%%DATADIR%%/json/npcs/talk_tags_chat.json +%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_gode.json +%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_leader.json +%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_mechanic.json +%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_member.json +%%DATADIR%%/json/npcs/valhalla_cult/TALK_valhallist_shopkeeper.json +%%DATADIR%%/json/npcs/valhalla_cult/missions.json +%%DATADIR%%/json/npcs/valhalla_cult/npcs.json +%%DATADIR%%/json/npcs/valhalla_cult/snippets.json +%%DATADIR%%/json/npcs/valhalla_cult/valhallist_leader_backstory.json +%%DATADIR%%/json/obsolete.json +%%DATADIR%%/json/obsolete_terrains.json +%%DATADIR%%/json/obsoletion/charge_removal.json +%%DATADIR%%/json/obsoletion/fakespecials.json +%%DATADIR%%/json/obsoletion/faults.json +%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolis.json +%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolisB1.json +%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolisB2.json +%%DATADIR%%/json/obsoletion/mapgen/necropolis/necropolisB3.json +%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_a.json +%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_b1.json +%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_b2.json +%%DATADIR%%/json/obsoletion/mapgen_palettes/necropolis_b3.json +%%DATADIR%%/json/obsoletion/mapgen_palettes/obsolete_palette.json +%%DATADIR%%/json/obsoletion/mutations.json +%%DATADIR%%/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Captain.json +%%DATADIR%%/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Commo.json +%%DATADIR%%/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Soldier.json +%%DATADIR%%/json/obsoletion/obsolete_fake.json +%%DATADIR%%/json/obsoletion/obsolete_mapgen.json +%%DATADIR%%/json/obsoletion/overmap/overmap_terrain/overmap_terrain_necropolis.json +%%DATADIR%%/json/obsoletion/overmap/overmap_terrain/overmap_terrain_obsoletion.json +%%DATADIR%%/json/obsoletion/overmap_special/specials.json +%%DATADIR%%/json/obsoletion/professions.json +%%DATADIR%%/json/overmap/map_extras.json +%%DATADIR%%/json/overmap/multitile_city_buildings.json +%%DATADIR%%/json/overmap/overmap_connections.json +%%DATADIR%%/json/overmap/overmap_land_use_codes.json +%%DATADIR%%/json/overmap/overmap_mutable/anthill.json +%%DATADIR%%/json/overmap/overmap_mutable/crater.json +%%DATADIR%%/json/overmap/overmap_mutable/dumpsite_mutable.json +%%DATADIR%%/json/overmap/overmap_mutable/farm_mutable.json +%%DATADIR%%/json/overmap/overmap_mutable/homeless_camp_mutable.json +%%DATADIR%%/json/overmap/overmap_mutable/microlab_mutable.json +%%DATADIR%%/json/overmap/overmap_mutable/mine_mutable.json +%%DATADIR%%/json/overmap/overmap_mutable/mobile_home_park_mutable.json +%%DATADIR%%/json/overmap/overmap_mutable/nether_monster_corpse.json +%%DATADIR%%/json/overmap/overmap_mutable/river_cave.json +%%DATADIR%%/json/overmap/overmap_special/aircraft_carrier.json +%%DATADIR%%/json/overmap/overmap_special/alien.json +%%DATADIR%%/json/overmap/overmap_special/bordered_world.json +%%DATADIR%%/json/overmap/overmap_special/campus.json +%%DATADIR%%/json/overmap/overmap_special/lab_modular/lab_mini_specials.json +%%DATADIR%%/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json +%%DATADIR%%/json/overmap/overmap_special/mine.json +%%DATADIR%%/json/overmap/overmap_special/nuclear_plant.json +%%DATADIR%%/json/overmap/overmap_special/overmap_special_migration.json +%%DATADIR%%/json/overmap/overmap_special/specials.json +%%DATADIR%%/json/overmap/overmap_special/tutorial.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_abstract.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_agricultural.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_alien.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_ants.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_campus.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_cemetery.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_commercial.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_evac_center.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_faction_base.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_fungal.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_industrial.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_lab.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_mall.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_mansion.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_mi-go.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_microlab.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_military.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_nether.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_nether_monster_corpse.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_nuclear_plant.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_private_resort.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_ravines.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_recreational.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_residential.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_retirement_community.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_river.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_robofachq.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_transportation.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_triffid.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json +%%DATADIR%%/json/overmap/overmap_terrain/overmap_terrain_waterbody.json +%%DATADIR%%/json/overmap/overmap_terrain/river_cave.json +%%DATADIR%%/json/overmap/special_locations.json +%%DATADIR%%/json/player_activities.json +%%DATADIR%%/json/portal_dependent_effect_on_condition.json +%%DATADIR%%/json/portal_storm_effect_on_condition.json +%%DATADIR%%/json/professions.json +%%DATADIR%%/json/proficiencies/chemistry.json +%%DATADIR%%/json/proficiencies/comestibles.json +%%DATADIR%%/json/proficiencies/electronics.json +%%DATADIR%%/json/proficiencies/gunsmithing.json +%%DATADIR%%/json/proficiencies/health_care.json +%%DATADIR%%/json/proficiencies/mechanics.json +%%DATADIR%%/json/proficiencies/metalwork.json +%%DATADIR%%/json/proficiencies/misc.json +%%DATADIR%%/json/proficiencies/proficiency_categories.json +%%DATADIR%%/json/proficiencies/tailoring.json +%%DATADIR%%/json/proficiencies/traps.json +%%DATADIR%%/json/proficiencies/weakpoints.json +%%DATADIR%%/json/proficiencies/wilderness.json +%%DATADIR%%/json/proficiencies/woodworking.json +%%DATADIR%%/json/recipes/ammo/40x46mm.json +%%DATADIR%%/json/recipes/ammo/40x53mm.json +%%DATADIR%%/json/recipes/ammo/cannon.json +%%DATADIR%%/json/recipes/ammo/components.json +%%DATADIR%%/json/recipes/ammo/pistol.json +%%DATADIR%%/json/recipes/ammo/rifle.json +%%DATADIR%%/json/recipes/ammo/shot.json +%%DATADIR%%/json/recipes/ammo/sling-ready_grenade.json +%%DATADIR%%/json/recipes/ammo/weldgas.json +%%DATADIR%%/json/recipes/appliances/oven.json +%%DATADIR%%/json/recipes/armor/arms.json +%%DATADIR%%/json/recipes/armor/bespoke_armor/nomad.json +%%DATADIR%%/json/recipes/armor/bespoke_armor/survivor.json +%%DATADIR%%/json/recipes/armor/feet.json +%%DATADIR%%/json/recipes/armor/hands.json +%%DATADIR%%/json/recipes/armor/head.json +%%DATADIR%%/json/recipes/armor/legs.json +%%DATADIR%%/json/recipes/armor/other.json +%%DATADIR%%/json/recipes/armor/pets_cow.json +%%DATADIR%%/json/recipes/armor/pets_dog.json +%%DATADIR%%/json/recipes/armor/pets_horse.json +%%DATADIR%%/json/recipes/armor/storage.json +%%DATADIR%%/json/recipes/armor/suit.json +%%DATADIR%%/json/recipes/armor/torso.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_beds.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_common.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_log.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_metal.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rock.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wad.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wood.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_common.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_garage.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_lighthouse/recipe_modular_lighthouse_common.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_00_beds.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_10_beds.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_lightindustry/recipe_modular_lightindustry_workshop.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+1.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+2.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+3.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_+4.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_mansion/fbmc_mansion_expansion_surveys.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_cross.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_outpost/recipe_modular_outpost_normal.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_pottery_cottage/recipe_pottery_cottage_common.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_beds.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_log.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_metal.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rock.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wad.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wood.json +%%DATADIR%%/json/recipes/basecamps/base/fbmc_sealab_small/recipe_sealab_small_common.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_bare_bones_basecamp/recipe_bare_bones_basecamp.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_firestation_1/modular_firestation_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation1.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_firestation_1/recipe_modular_firestation_walls_all.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_defenses.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_log.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_metal.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rock.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_tent.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wad.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wood.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_primitive_field.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/modular_field_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_common.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_concrete.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_log.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_metal.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_rock.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_tent.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_wad.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_wood.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/modular_shelter_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_common.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_log.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_rock.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_standard.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wad.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wood.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/modular_shelter_1_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/modular_shelter_2_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json +%%DATADIR%%/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json +%%DATADIR%%/json/recipes/basecamps/components.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/modular_canteen_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_concrete.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_farm/version_1/recipe_primitive_farm.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_farm/version_2/recipe_modular_farm_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_1/recipe_primitive_garage.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_concrete.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/modular_livestock_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_concrete.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_stone.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_bookcase.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_concrete.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_dresser.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_locker.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rack.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_warehouse_shelf.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wooden_rack.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wood.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_common.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_concrete.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_log.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_metal.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_migo_resin.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_rammed_earth.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_rock.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_salt_water_pipe.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_wad.json +%%DATADIR%%/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_wood.json +%%DATADIR%%/json/recipes/basecamps/recipe_groups.json +%%DATADIR%%/json/recipes/chem/chemicals.json +%%DATADIR%%/json/recipes/chem/drugs.json +%%DATADIR%%/json/recipes/chem/fuel.json +%%DATADIR%%/json/recipes/chem/mutagens.json +%%DATADIR%%/json/recipes/chem/other.json +%%DATADIR%%/json/recipes/electronics/parts.json +%%DATADIR%%/json/recipes/electronics/toolmod.json +%%DATADIR%%/json/recipes/food/baking.json +%%DATADIR%%/json/recipes/food/bread.json +%%DATADIR%%/json/recipes/food/brewing.json +%%DATADIR%%/json/recipes/food/canned.json +%%DATADIR%%/json/recipes/food/casseroles.json +%%DATADIR%%/json/recipes/food/corn.json +%%DATADIR%%/json/recipes/food/curing.json +%%DATADIR%%/json/recipes/food/dairy_products.json +%%DATADIR%%/json/recipes/food/distill.json +%%DATADIR%%/json/recipes/food/drinks.json +%%DATADIR%%/json/recipes/food/dry.json +%%DATADIR%%/json/recipes/food/frozen.json +%%DATADIR%%/json/recipes/food/meat_dishes.json +%%DATADIR%%/json/recipes/food/offal_dishes.json +%%DATADIR%%/json/recipes/food/other.json +%%DATADIR%%/json/recipes/food/pasta.json +%%DATADIR%%/json/recipes/food/seed.json +%%DATADIR%%/json/recipes/food/vegetable_dishes.json +%%DATADIR%%/json/recipes/nested.json +%%DATADIR%%/json/recipes/other/bots.json +%%DATADIR%%/json/recipes/other/cords_and_ropes.json +%%DATADIR%%/json/recipes/other/materials.json +%%DATADIR%%/json/recipes/other/medical.json +%%DATADIR%%/json/recipes/other/other.json +%%DATADIR%%/json/recipes/other/parts.json +%%DATADIR%%/json/recipes/other/parts_construction.json +%%DATADIR%%/json/recipes/other/parts_rigs.json +%%DATADIR%%/json/recipes/other/power_supplies.json +%%DATADIR%%/json/recipes/other/vehicle.json +%%DATADIR%%/json/recipes/practice/athletics.json +%%DATADIR%%/json/recipes/practice/computers.json +%%DATADIR%%/json/recipes/practice/devices.json +%%DATADIR%%/json/recipes/practice/electronics.json +%%DATADIR%%/json/recipes/practice/fabrication.json +%%DATADIR%%/json/recipes/practice/health.json +%%DATADIR%%/json/recipes/practice/mechanics.json +%%DATADIR%%/json/recipes/practice/melee.json +%%DATADIR%%/json/recipes/practice/ranged.json +%%DATADIR%%/json/recipes/practice/social.json +%%DATADIR%%/json/recipes/practice/survival.json +%%DATADIR%%/json/recipes/practice/tailoring.json +%%DATADIR%%/json/recipes/recipe_ammo.json +%%DATADIR%%/json/recipes/recipe_appliance.json +%%DATADIR%%/json/recipes/recipe_companion.json +%%DATADIR%%/json/recipes/recipe_deconstruction.json +%%DATADIR%%/json/recipes/recipe_food.json +%%DATADIR%%/json/recipes/recipe_furniture.json +%%DATADIR%%/json/recipes/recipe_medsandchemicals.json +%%DATADIR%%/json/recipes/recipe_obsolete.json +%%DATADIR%%/json/recipes/recipe_others.json +%%DATADIR%%/json/recipes/recipe_traps.json +%%DATADIR%%/json/recipes/recipe_vehicle.json +%%DATADIR%%/json/recipes/recipes.json +%%DATADIR%%/json/recipes/recipes_holiday.json +%%DATADIR%%/json/recipes/tools/containers.json +%%DATADIR%%/json/recipes/tools/lights.json +%%DATADIR%%/json/recipes/tools/tool.json +%%DATADIR%%/json/recipes/tools/tools_electronic.json +%%DATADIR%%/json/recipes/tools/tools_hand.json +%%DATADIR%%/json/recipes/tools/tools_primitive.json +%%DATADIR%%/json/recipes/weapon/bashing.json +%%DATADIR%%/json/recipes/weapon/cutting.json +%%DATADIR%%/json/recipes/weapon/explosive.json +%%DATADIR%%/json/recipes/weapon/magazines.json +%%DATADIR%%/json/recipes/weapon/mods.json +%%DATADIR%%/json/recipes/weapon/piercing.json +%%DATADIR%%/json/recipes/weapon/ranged.json +%%DATADIR%%/json/regional_map_settings.json +%%DATADIR%%/json/requirements/ammo.json +%%DATADIR%%/json/requirements/butchery.json +%%DATADIR%%/json/requirements/chemistry.json +%%DATADIR%%/json/requirements/cooking_components.json +%%DATADIR%%/json/requirements/cooking_tools.json +%%DATADIR%%/json/requirements/explosives.json +%%DATADIR%%/json/requirements/materials.json +%%DATADIR%%/json/requirements/ranged.json +%%DATADIR%%/json/requirements/tailoring.json +%%DATADIR%%/json/requirements/toolsets.json +%%DATADIR%%/json/requirements/uncraft.json +%%DATADIR%%/json/requirements/vehicle.json +%%DATADIR%%/json/road_vehicles.json +%%DATADIR%%/json/rotatable_symbols.json +%%DATADIR%%/json/scenarios.json +%%DATADIR%%/json/scent_types.json +%%DATADIR%%/json/scores.json +%%DATADIR%%/json/shop_consumption_rates.json +%%DATADIR%%/json/skillDisplayType.json +%%DATADIR%%/json/skills.json +%%DATADIR%%/json/snippets/addiction.json +%%DATADIR%%/json/snippets/amigara.json +%%DATADIR%%/json/snippets/dimensional_exploration.json +%%DATADIR%%/json/snippets/effect_on_conditions.json +%%DATADIR%%/json/snippets/epilogue_factions.json +%%DATADIR%%/json/snippets/epilogue_npc.json +%%DATADIR%%/json/snippets/fliers.json +%%DATADIR%%/json/snippets/graffiti.json +%%DATADIR%%/json/snippets/grave_labels.json +%%DATADIR%%/json/snippets/harvest_drop_msgs.json +%%DATADIR%%/json/snippets/hazardous_waste_sarcophagus.json +%%DATADIR%%/json/snippets/health_msgs.json +%%DATADIR%%/json/snippets/lab.json +%%DATADIR%%/json/snippets/lab_signs.json +%%DATADIR%%/json/snippets/missing_posters.json +%%DATADIR%%/json/snippets/music.json +%%DATADIR%%/json/snippets/mutant_anatomy.json +%%DATADIR%%/json/snippets/newspapers.json +%%DATADIR%%/json/snippets/nightmares.json +%%DATADIR%%/json/snippets/npc_quips.json +%%DATADIR%%/json/snippets/radio.json +%%DATADIR%%/json/snippets/robot_finds_kitten.json +%%DATADIR%%/json/snippets/schizophrenia.json +%%DATADIR%%/json/snippets/snippets.json +%%DATADIR%%/json/snippets/survivor_notes.json +%%DATADIR%%/json/snippets/tutorial.json +%%DATADIR%%/json/snippets/valentines.json +%%DATADIR%%/json/snippets/weed_messages.json +%%DATADIR%%/json/species.json +%%DATADIR%%/json/speech.json +%%DATADIR%%/json/speed_descriptions.json +%%DATADIR%%/json/start_locations.json +%%DATADIR%%/json/starting_missions.json +%%DATADIR%%/json/statistics.json +%%DATADIR%%/json/techniques.json +%%DATADIR%%/json/test_regions.json +%%DATADIR%%/json/tool_qualities.json +%%DATADIR%%/json/traps.json +%%DATADIR%%/json/ui/activity.json +%%DATADIR%%/json/ui/body_graph.json +%%DATADIR%%/json/ui/body_temp.json +%%DATADIR%%/json/ui/bodypart_armor.json +%%DATADIR%%/json/ui/bodypart_color_text.json +%%DATADIR%%/json/ui/bodypart_status.json +%%DATADIR%%/json/ui/cardio.json +%%DATADIR%%/json/ui/carry_weight.json +%%DATADIR%%/json/ui/compass.json +%%DATADIR%%/json/ui/compass_danger.json +%%DATADIR%%/json/ui/date.json +%%DATADIR%%/json/ui/encumbrance.json +%%DATADIR%%/json/ui/env_temp.json +%%DATADIR%%/json/ui/fatigue.json +%%DATADIR%%/json/ui/focus.json +%%DATADIR%%/json/ui/health.json +%%DATADIR%%/json/ui/hp.json +%%DATADIR%%/json/ui/hunger.json +%%DATADIR%%/json/ui/layout.json +%%DATADIR%%/json/ui/lighting.json +%%DATADIR%%/json/ui/ma_style.json +%%DATADIR%%/json/ui/moon.json +%%DATADIR%%/json/ui/morale.json +%%DATADIR%%/json/ui/movement.json +%%DATADIR%%/json/ui/overmap.json +%%DATADIR%%/json/ui/pain.json +%%DATADIR%%/json/ui/place.json +%%DATADIR%%/json/ui/power.json +%%DATADIR%%/json/ui/radiation.json +%%DATADIR%%/json/ui/safe_mode.json +%%DATADIR%%/json/ui/separator.json +%%DATADIR%%/json/ui/sidebar-legacy-classic.json +%%DATADIR%%/json/ui/sidebar-legacy-compact.json +%%DATADIR%%/json/ui/sidebar-legacy-labels-narrow.json +%%DATADIR%%/json/ui/sidebar-legacy-labels.json +%%DATADIR%%/json/ui/sidebar-legacy-one-padding.json +%%DATADIR%%/json/ui/sidebar-mobile.json +%%DATADIR%%/json/ui/sidebar-thick.json +%%DATADIR%%/json/ui/sidebar.json +%%DATADIR%%/json/ui/sound.json +%%DATADIR%%/json/ui/spacebar/sidebar-spacebar.json +%%DATADIR%%/json/ui/spacebar/spacebar_body_and_health_block.json +%%DATADIR%%/json/ui/spacebar/spacebar_environment_block.json +%%DATADIR%%/json/ui/spacebar/spacebar_location_compass_block.json +%%DATADIR%%/json/ui/spacebar/spacebar_mana.json +%%DATADIR%%/json/ui/spacebar/spacebar_movement_block.json +%%DATADIR%%/json/ui/spacebar/spacebar_player_weariness_mood_block.json +%%DATADIR%%/json/ui/spacebar/spacebar_separators.json +%%DATADIR%%/json/ui/spacebar/spacebar_waepon_ma_block.json +%%DATADIR%%/json/ui/speed.json +%%DATADIR%%/json/ui/stamina.json +%%DATADIR%%/json/ui/stats.json +%%DATADIR%%/json/ui/structured/sidebar-structured.json +%%DATADIR%%/json/ui/structured/structured_bodygraphs.json +%%DATADIR%%/json/ui/structured/structured_bodygraphs_tiny.json +%%DATADIR%%/json/ui/structured/structured_compass_block.json +%%DATADIR%%/json/ui/structured/structured_environment_blocks.json +%%DATADIR%%/json/ui/structured/structured_health_blocks.json +%%DATADIR%%/json/ui/structured/structured_ma_block.json +%%DATADIR%%/json/ui/structured/structured_mana_block.json +%%DATADIR%%/json/ui/structured/structured_overmap.json +%%DATADIR%%/json/ui/structured/structured_speed_vehicle.json +%%DATADIR%%/json/ui/structured/structured_weariness_block.json +%%DATADIR%%/json/ui/structured/structured_wielding.json +%%DATADIR%%/json/ui/thirst.json +%%DATADIR%%/json/ui/time.json +%%DATADIR%%/json/ui/vehicle.json +%%DATADIR%%/json/ui/warmth.json +%%DATADIR%%/json/ui/weariness.json +%%DATADIR%%/json/ui/weather.json +%%DATADIR%%/json/ui/weight.json +%%DATADIR%%/json/ui/wetness.json +%%DATADIR%%/json/ui/wield.json +%%DATADIR%%/json/ui/wind.json +%%DATADIR%%/json/uncraft/ammo/10mm.json +%%DATADIR%%/json/uncraft/ammo/120mm.json +%%DATADIR%%/json/uncraft/ammo/22.json +%%DATADIR%%/json/uncraft/ammo/223.json +%%DATADIR%%/json/uncraft/ammo/270win.json +%%DATADIR%%/json/uncraft/ammo/30-06.json +%%DATADIR%%/json/uncraft/ammo/300.json +%%DATADIR%%/json/uncraft/ammo/300blk.json +%%DATADIR%%/json/uncraft/ammo/308.json +%%DATADIR%%/json/uncraft/ammo/30carbine.json +%%DATADIR%%/json/uncraft/ammo/32.json +%%DATADIR%%/json/uncraft/ammo/357mag.json +%%DATADIR%%/json/uncraft/ammo/357sig.json +%%DATADIR%%/json/uncraft/ammo/38.json +%%DATADIR%%/json/uncraft/ammo/380.json +%%DATADIR%%/json/uncraft/ammo/38super.json +%%DATADIR%%/json/uncraft/ammo/40.json +%%DATADIR%%/json/uncraft/ammo/40x46mm.json +%%DATADIR%%/json/uncraft/ammo/40x53mm.json +%%DATADIR%%/json/uncraft/ammo/410shot.json +%%DATADIR%%/json/uncraft/ammo/44.json +%%DATADIR%%/json/uncraft/ammo/45.json +%%DATADIR%%/json/uncraft/ammo/454.json +%%DATADIR%%/json/uncraft/ammo/4570.json +%%DATADIR%%/json/uncraft/ammo/45colt.json +%%DATADIR%%/json/uncraft/ammo/460.json +%%DATADIR%%/json/uncraft/ammo/46mm.json +%%DATADIR%%/json/uncraft/ammo/500.json +%%DATADIR%%/json/uncraft/ammo/50bmg.json +%%DATADIR%%/json/uncraft/ammo/545.json +%%DATADIR%%/json/uncraft/ammo/556.json +%%DATADIR%%/json/uncraft/ammo/57mm.json +%%DATADIR%%/json/uncraft/ammo/5x50.json +%%DATADIR%%/json/uncraft/ammo/66mm.json +%%DATADIR%%/json/uncraft/ammo/700nx.json +%%DATADIR%%/json/uncraft/ammo/762x25.json +%%DATADIR%%/json/uncraft/ammo/762x39.json +%%DATADIR%%/json/uncraft/ammo/762x51.json +%%DATADIR%%/json/uncraft/ammo/762x54.json +%%DATADIR%%/json/uncraft/ammo/84x246mm.json +%%DATADIR%%/json/uncraft/ammo/9mm.json +%%DATADIR%%/json/uncraft/ammo/9x18mm.json +%%DATADIR%%/json/uncraft/ammo/atgm.json +%%DATADIR%%/json/uncraft/ammo/rpg.json +%%DATADIR%%/json/uncraft/ammo/shot.json +%%DATADIR%%/json/uncraft/armor.json +%%DATADIR%%/json/uncraft/armor/boots.json +%%DATADIR%%/json/uncraft/armor/pets_dog.json +%%DATADIR%%/json/uncraft/armor/scrap_armor.json +%%DATADIR%%/json/uncraft/armor/storage.json +%%DATADIR%%/json/uncraft/armor/suit.json +%%DATADIR%%/json/uncraft/cbm/cbm.json +%%DATADIR%%/json/uncraft/classes/ammo.json +%%DATADIR%%/json/uncraft/containers/military.json +%%DATADIR%%/json/uncraft/generic.json +%%DATADIR%%/json/uncraft/tool/deployable.json +%%DATADIR%%/json/uncraft/tools.json +%%DATADIR%%/json/uncraft/vehicle/alternator.json +%%DATADIR%%/json/uncraft/vehicle/engines.json +%%DATADIR%%/json/uncraft/vehicle/noise.json +%%DATADIR%%/json/uncraft/vehicle/wheels.json +%%DATADIR%%/json/uncraft/weapon/explosive.json +%%DATADIR%%/json/uncraft/weapon/ranged.json +%%DATADIR%%/json/vehicle_groups.json +%%DATADIR%%/json/vehicleparts/alternator.json +%%DATADIR%%/json/vehicleparts/armor.json +%%DATADIR%%/json/vehicleparts/battery.json +%%DATADIR%%/json/vehicleparts/boards.json +%%DATADIR%%/json/vehicleparts/cargo.json +%%DATADIR%%/json/vehicleparts/combustion.json +%%DATADIR%%/json/vehicleparts/doors.json +%%DATADIR%%/json/vehicleparts/engineering.json +%%DATADIR%%/json/vehicleparts/faults.json +%%DATADIR%%/json/vehicleparts/frames.json +%%DATADIR%%/json/vehicleparts/lights.json +%%DATADIR%%/json/vehicleparts/manual.json +%%DATADIR%%/json/vehicleparts/migration.json +%%DATADIR%%/json/vehicleparts/mirrors.json +%%DATADIR%%/json/vehicleparts/motor.json +%%DATADIR%%/json/vehicleparts/obsolete.json +%%DATADIR%%/json/vehicleparts/rams.json +%%DATADIR%%/json/vehicleparts/rotor.json +%%DATADIR%%/json/vehicleparts/seats.json +%%DATADIR%%/json/vehicleparts/tanks.json +%%DATADIR%%/json/vehicleparts/turret.json +%%DATADIR%%/json/vehicleparts/utilities.json +%%DATADIR%%/json/vehicleparts/vehicle_parts.json +%%DATADIR%%/json/vehicleparts/vp_categories.json +%%DATADIR%%/json/vehicleparts/vp_flags.json +%%DATADIR%%/json/vehicleparts/wheel.json +%%DATADIR%%/json/vehicleparts/windshields.json +%%DATADIR%%/json/vehicles/bikes.json +%%DATADIR%%/json/vehicles/boats.json +%%DATADIR%%/json/vehicles/cars.json +%%DATADIR%%/json/vehicles/carts.json +%%DATADIR%%/json/vehicles/custom_vehicles.json +%%DATADIR%%/json/vehicles/emergency.json +%%DATADIR%%/json/vehicles/factional.json +%%DATADIR%%/json/vehicles/farm.json +%%DATADIR%%/json/vehicles/helicopters.json +%%DATADIR%%/json/vehicles/military.json +%%DATADIR%%/json/vehicles/trains.json +%%DATADIR%%/json/vehicles/trucks.json +%%DATADIR%%/json/vehicles/utility.json +%%DATADIR%%/json/vehicles/vans_busses.json +%%DATADIR%%/json/vehicles/vehicles.json +%%DATADIR%%/json/vitamin.json +%%DATADIR%%/json/weapon_categories.json +%%DATADIR%%/json/weather_type.json +%%DATADIR%%/json/zones.json +%%DATADIR%%/mods/Aftershock/README.md +%%DATADIR%%/mods/Aftershock/achievements/achievements.json +%%DATADIR%%/mods/Aftershock/achievements/statistics.json +%%DATADIR%%/mods/Aftershock/ammo_effects.json +%%DATADIR%%/mods/Aftershock/crafting_system.md +%%DATADIR%%/mods/Aftershock/effects.json +%%DATADIR%%/mods/Aftershock/effects_on_condition.json +%%DATADIR%%/mods/Aftershock/emit.json +%%DATADIR%%/mods/Aftershock/field.json +%%DATADIR%%/mods/Aftershock/field_type.json +%%DATADIR%%/mods/Aftershock/harvest.json +%%DATADIR%%/mods/Aftershock/itemgroups/alien_civ_itemgroups.json +%%DATADIR%%/mods/Aftershock/itemgroups/arcology_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/bionics_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/clothing/armor_sets.json +%%DATADIR%%/mods/Aftershock/itemgroups/clothing/civilian_blue_collar_sets.json +%%DATADIR%%/mods/Aftershock/itemgroups/clothing/military_gear.json +%%DATADIR%%/mods/Aftershock/itemgroups/clothing/winter_outfits.json +%%DATADIR%%/mods/Aftershock/itemgroups/clothing_group.json +%%DATADIR%%/mods/Aftershock/itemgroups/food_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/item_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/kitchen_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/loot_corpse_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/nanofab_recipes.json +%%DATADIR%%/mods/Aftershock/itemgroups/nuclear_reactor_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/science_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/scrap_expansion_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/scrap_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/spaceship_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/titanium_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/tool_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/vending_machine_group.json +%%DATADIR%%/mods/Aftershock/itemgroups/weapons/armories.json +%%DATADIR%%/mods/Aftershock/itemgroups/weapons/balistic_gun_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/weapons/grenade_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/weapons/makeshift_gun_groups.json +%%DATADIR%%/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json +%%DATADIR%%/mods/Aftershock/items/afs_harvest.json +%%DATADIR%%/mods/Aftershock/items/alien_organics.json +%%DATADIR%%/mods/Aftershock/items/ammo.json +%%DATADIR%%/mods/Aftershock/items/ammo/10mm.json +%%DATADIR%%/mods/Aftershock/items/ammo/25mm.json +%%DATADIR%%/mods/Aftershock/items/ammo/7.50mm.json +%%DATADIR%%/mods/Aftershock/items/ammo/battery.json +%%DATADIR%%/mods/Aftershock/items/ammo/foam.json +%%DATADIR%%/mods/Aftershock/items/ammo/metal_rail.json +%%DATADIR%%/mods/Aftershock/items/ammo/plasma.json +%%DATADIR%%/mods/Aftershock/items/ammo_effects.json +%%DATADIR%%/mods/Aftershock/items/ammo_type.json +%%DATADIR%%/mods/Aftershock/items/armor.json +%%DATADIR%%/mods/Aftershock/items/armor/civilian_blue_collar.json +%%DATADIR%%/mods/Aftershock/items/armor/cyberpunk.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_ammo.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_components.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_frame.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_guide.md +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_melee.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_modules.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_mutations.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_arms.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_head.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_legs.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_plating_torso.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_ranged.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_recipes.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_spells.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_storage.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_tool.json +%%DATADIR%%/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json +%%DATADIR%%/mods/Aftershock/items/armor/jetpacks.json +%%DATADIR%%/mods/Aftershock/items/armor/winter_masks.json +%%DATADIR%%/mods/Aftershock/items/armor/winter_suits.json +%%DATADIR%%/mods/Aftershock/items/armor_helmets.json +%%DATADIR%%/mods/Aftershock/items/bioparts.json +%%DATADIR%%/mods/Aftershock/items/books.json +%%DATADIR%%/mods/Aftershock/items/casing.json +%%DATADIR%%/mods/Aftershock/items/cast_spell_items.json +%%DATADIR%%/mods/Aftershock/items/cbms.json +%%DATADIR%%/mods/Aftershock/items/comestibles/alienfood.json +%%DATADIR%%/mods/Aftershock/items/comestibles/bug_brew.json +%%DATADIR%%/mods/Aftershock/items/comestibles/cheap_food.json +%%DATADIR%%/mods/Aftershock/items/comestibles/comestibles.json +%%DATADIR%%/mods/Aftershock/items/comestibles/medicine.json +%%DATADIR%%/mods/Aftershock/items/containers.json +%%DATADIR%%/mods/Aftershock/items/corpses.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/abstract_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/circuity_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/cloth_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/heat_transfer_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/magnet_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/material_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json +%%DATADIR%%/mods/Aftershock/items/crafting_scrap/optics.json +%%DATADIR%%/mods/Aftershock/items/ethereal.json +%%DATADIR%%/mods/Aftershock/items/frankenstein_items.json +%%DATADIR%%/mods/Aftershock/items/furniture.json +%%DATADIR%%/mods/Aftershock/items/grenades.json +%%DATADIR%%/mods/Aftershock/items/gun/10mm.json +%%DATADIR%%/mods/Aftershock/items/gun/25mm.json +%%DATADIR%%/mods/Aftershock/items/gun/5x50.json +%%DATADIR%%/mods/Aftershock/items/gun/7.50mm.json +%%DATADIR%%/mods/Aftershock/items/gun/8x40mm.json +%%DATADIR%%/mods/Aftershock/items/gun/advanced.json +%%DATADIR%%/mods/Aftershock/items/gun/foam.json +%%DATADIR%%/mods/Aftershock/items/gun/laser.json +%%DATADIR%%/mods/Aftershock/items/gun/migrations.json +%%DATADIR%%/mods/Aftershock/items/gun/mining_rod.json +%%DATADIR%%/mods/Aftershock/items/gun/plasma.json +%%DATADIR%%/mods/Aftershock/items/gun/projectile.json +%%DATADIR%%/mods/Aftershock/items/gun/voltaic.json +%%DATADIR%%/mods/Aftershock/items/gunmods/laser_gunmods.json +%%DATADIR%%/mods/Aftershock/items/gunmods/sights.json +%%DATADIR%%/mods/Aftershock/items/inactiverobot.json +%%DATADIR%%/mods/Aftershock/items/items.json +%%DATADIR%%/mods/Aftershock/items/lore_items.json +%%DATADIR%%/mods/Aftershock/items/magazine/10mm.json +%%DATADIR%%/mods/Aftershock/items/magazine/25mm.json +%%DATADIR%%/mods/Aftershock/items/magazine/7.50mm.json +%%DATADIR%%/mods/Aftershock/items/magazine/8x40mm.json +%%DATADIR%%/mods/Aftershock/items/magazine/alien.json +%%DATADIR%%/mods/Aftershock/items/magazine/energy_cell.json +%%DATADIR%%/mods/Aftershock/items/magazine/foam.json +%%DATADIR%%/mods/Aftershock/items/magazine/plasma.json +%%DATADIR%%/mods/Aftershock/items/magazine/voltaic.json +%%DATADIR%%/mods/Aftershock/items/materials.json +%%DATADIR%%/mods/Aftershock/items/mutagen.json +%%DATADIR%%/mods/Aftershock/items/nanofab_templates.json +%%DATADIR%%/mods/Aftershock/items/obsolete.json +%%DATADIR%%/mods/Aftershock/items/radio_tools.json +%%DATADIR%%/mods/Aftershock/items/robotparts.json +%%DATADIR%%/mods/Aftershock/items/seed.json +%%DATADIR%%/mods/Aftershock/items/tool_armor.json +%%DATADIR%%/mods/Aftershock/items/tool_quality.json +%%DATADIR%%/mods/Aftershock/items/tools.json +%%DATADIR%%/mods/Aftershock/items/vehicle_items.json +%%DATADIR%%/mods/Aftershock/items/weapons.json +%%DATADIR%%/mods/Aftershock/maps/city_buildings.json +%%DATADIR%%/mods/Aftershock/maps/furniture.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/furniture_alienciv.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_alienciv.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_floraxeno.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_groundxeno.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_wall.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_manufactured.json +%%DATADIR%%/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json +%%DATADIR%%/mods/Aftershock/maps/furniture_lab.json +%%DATADIR%%/mods/Aftershock/maps/lab_cryo_room.json +%%DATADIR%%/mods/Aftershock/maps/lab_vehicle_track.json +%%DATADIR%%/mods/Aftershock/maps/lab_weapons_range.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/arcology_ground.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/astrobiology_lab.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/augmentation_clinic.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/basement_bionic.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/escape_pod.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/formless_ruins/formless_ruins_dynamic.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/fungal_siege.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/houses/houses.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/map_palletes.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/millyficent_lab.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/municipal_microreactor.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/prepnet_orchard.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_first_01.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_second_01.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/robot_dispatch/tpalettes.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/s_gas.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/sadie_large_storage.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/stratoscomm_relay.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/sinkhole.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_ravine_edge.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_river.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_special_chunk.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/tunnels/tunnel_tiles.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/urban_worm_farm.json +%%DATADIR%%/mods/Aftershock/maps/mapgen/whately_lmoe.json +%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_formless_ruins.json +%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_generic_building.json +%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_habitat_structure.json +%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/afs_tunnel.json +%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/arcology.json +%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/augmentation_clinic.json +%%DATADIR%%/mods/Aftershock/maps/mapgen_pallete/houses.json +%%DATADIR%%/mods/Aftershock/maps/mutable_specials/formless_ruin.json +%%DATADIR%%/mods/Aftershock/maps/mutable_specials/ravine_tunnels.json +%%DATADIR%%/mods/Aftershock/maps/nested/arcology/arcology_chunks.json +%%DATADIR%%/mods/Aftershock/maps/nested/arcology/arcology_gate_chunks.json +%%DATADIR%%/mods/Aftershock/maps/nested/basement.json +%%DATADIR%%/mods/Aftershock/maps/nested/lab.json +%%DATADIR%%/mods/Aftershock/maps/nested/road.json +%%DATADIR%%/mods/Aftershock/maps/nested/sadie_spawn.json +%%DATADIR%%/mods/Aftershock/maps/overmap_locations.json +%%DATADIR%%/mods/Aftershock/maps/overmap_map_extras.json +%%DATADIR%%/mods/Aftershock/maps/overmap_specials.json +%%DATADIR%%/mods/Aftershock/maps/overmap_terrain.json +%%DATADIR%%/mods/Aftershock/maps/overmap_terrain/overmap_terrain_tunnels.json +%%DATADIR%%/mods/Aftershock/martialarts.json +%%DATADIR%%/mods/Aftershock/migration.json +%%DATADIR%%/mods/Aftershock/mobs/PrepPhyle_mobs.json +%%DATADIR%%/mods/Aftershock/mobs/abstract_monsters.json +%%DATADIR%%/mods/Aftershock/mobs/aliens.json +%%DATADIR%%/mods/Aftershock/mobs/harvest.json +%%DATADIR%%/mods/Aftershock/mobs/monster_faction.json +%%DATADIR%%/mods/Aftershock/mobs/monster_groups.json +%%DATADIR%%/mods/Aftershock/mobs/monster_groups/fauna_monsters_groups.json +%%DATADIR%%/mods/Aftershock/mobs/monster_groups/moxie_monster_groups.json +%%DATADIR%%/mods/Aftershock/mobs/monster_groups/robot_monster_groups.json +%%DATADIR%%/mods/Aftershock/mobs/mutants.json +%%DATADIR%%/mods/Aftershock/mobs/obsolete.json +%%DATADIR%%/mods/Aftershock/mobs/reavers_and_bandits.json +%%DATADIR%%/mods/Aftershock/mobs/robot_groups.json +%%DATADIR%%/mods/Aftershock/mobs/robots.json +%%DATADIR%%/mods/Aftershock/mobs/scavbots.json +%%DATADIR%%/mods/Aftershock/mobs/species.json +%%DATADIR%%/mods/Aftershock/mobs/turrets.json +%%DATADIR%%/mods/Aftershock/mobs/uplifted_monsters.json +%%DATADIR%%/mods/Aftershock/mobs/water_mobs.json +%%DATADIR%%/mods/Aftershock/mobs/zombies.json +%%DATADIR%%/mods/Aftershock/modinfo.json +%%DATADIR%%/mods/Aftershock/monster_attacks.json +%%DATADIR%%/mods/Aftershock/monsterdrops/monster_default.json +%%DATADIR%%/mods/Aftershock/monsterdrops/monsterdrops.json +%%DATADIR%%/mods/Aftershock/mood_faces.json +%%DATADIR%%/mods/Aftershock/mutations/dreams.json +%%DATADIR%%/mods/Aftershock/mutations/integrated.json +%%DATADIR%%/mods/Aftershock/mutations/mutation_eocs.json +%%DATADIR%%/mods/Aftershock/mutations/mutations.json +%%DATADIR%%/mods/Aftershock/mutations/obsolete.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/criminal_experiment.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/cyberninja.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/ganger_1.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/ganger_2.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/ganger_3.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/npc_classes_mutant.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/radiation_1.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/radiation_2.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/recent_mutation_1.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/selftest.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/trait_groups.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_1.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_2.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_3.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_4.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/uplifted_animal_5.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/vatgrown_1.json +%%DATADIR%%/mods/Aftershock/npcs/Backgrounds/whately.json +%%DATADIR%%/mods/Aftershock/npcs/classes.json +%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/backgrounds/bg_traits_cyborg.json +%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/backgrounds/trait_groups_cyborg.json +%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json +%%DATADIR%%/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json +%%DATADIR%%/mods/Aftershock/npcs/cyropod_classes.json +%%DATADIR%%/mods/Aftershock/npcs/cyrus_whately.json +%%DATADIR%%/mods/Aftershock/npcs/factions.json +%%DATADIR%%/mods/Aftershock/npcs/frankenstein_classes.json +%%DATADIR%%/mods/Aftershock/npcs/milly_whately_dialogue.json +%%DATADIR%%/mods/Aftershock/npcs/mutant_npcs/trait_groups.json +%%DATADIR%%/mods/Aftershock/npcs/npc.json +%%DATADIR%%/mods/Aftershock/npcs/prepnet_dialogue.json +%%DATADIR%%/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json +%%DATADIR%%/mods/Aftershock/npcs/sadie.json +%%DATADIR%%/mods/Aftershock/npcs/threshold_recruit_dialogue.json +%%DATADIR%%/mods/Aftershock/npcs/whately_generic_dialogue.json +%%DATADIR%%/mods/Aftershock/options.json +%%DATADIR%%/mods/Aftershock/player/bionic_eocs.json +%%DATADIR%%/mods/Aftershock/player/bionics.json +%%DATADIR%%/mods/Aftershock/player/obsolete.json +%%DATADIR%%/mods/Aftershock/player/professions.json +%%DATADIR%%/mods/Aftershock/player/techniques.json +%%DATADIR%%/mods/Aftershock/recipes/ammo_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/armor_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/basecamps/recipe_overwrites.json +%%DATADIR%%/mods/Aftershock/recipes/bionic_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/cbm_uncraft.json +%%DATADIR%%/mods/Aftershock/recipes/comestible_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/deconstruction.json +%%DATADIR%%/mods/Aftershock/recipes/deconstruction/bionic_deconstruction.json +%%DATADIR%%/mods/Aftershock/recipes/deconstruction/robot.json +%%DATADIR%%/mods/Aftershock/recipes/electronics_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/frankenstein_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/grenades.json +%%DATADIR%%/mods/Aftershock/recipes/gun_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/mutagens.json +%%DATADIR%%/mods/Aftershock/recipes/obsolete.json +%%DATADIR%%/mods/Aftershock/recipes/recipe_overrides.json +%%DATADIR%%/mods/Aftershock/recipes/recipes.json +%%DATADIR%%/mods/Aftershock/recipes/recipes_categories.json +%%DATADIR%%/mods/Aftershock/recipes/requirements.json +%%DATADIR%%/mods/Aftershock/recipes/robot_recipes.json +%%DATADIR%%/mods/Aftershock/recipes/ultratech_tools.json +%%DATADIR%%/mods/Aftershock/recipes/uncraft.json +%%DATADIR%%/mods/Aftershock/region_settings.json +%%DATADIR%%/mods/Aftershock/requirements.json +%%DATADIR%%/mods/Aftershock/scenarios.json +%%DATADIR%%/mods/Aftershock/skills.json +%%DATADIR%%/mods/Aftershock/snippets/effect_on_condition.json +%%DATADIR%%/mods/Aftershock/snippets/personal_cards.json +%%DATADIR%%/mods/Aftershock/snippets/snippets.json +%%DATADIR%%/mods/Aftershock/speech.json +%%DATADIR%%/mods/Aftershock/spells.json +%%DATADIR%%/mods/Aftershock/spells/enchantments.json +%%DATADIR%%/mods/Aftershock/spells/hologram_spells.json +%%DATADIR%%/mods/Aftershock/spells/jetpack_spells.json +%%DATADIR%%/mods/Aftershock/spells/monster_spells.json +%%DATADIR%%/mods/Aftershock/spells/teleport_spells.json +%%DATADIR%%/mods/Aftershock/start_locations.json +%%DATADIR%%/mods/Aftershock/suit_operating_time.md +%%DATADIR%%/mods/Aftershock/vehicles/migrations.json +%%DATADIR%%/mods/Aftershock/vehicles/part_items.json +%%DATADIR%%/mods/Aftershock/vehicles/vehicle_groups.json +%%DATADIR%%/mods/Aftershock/vehicles/vehicle_overrides.json +%%DATADIR%%/mods/Aftershock/vehicles/vehicle_parts.json +%%DATADIR%%/mods/Aftershock/vehicles/vehicles.json +%%DATADIR%%/mods/Aftershock/vitamin.json +%%DATADIR%%/mods/Backrooms/README.md +%%DATADIR%%/mods/Backrooms/furniture_terrain.json +%%DATADIR%%/mods/Backrooms/itemgroups.json +%%DATADIR%%/mods/Backrooms/items.json +%%DATADIR%%/mods/Backrooms/map_extras.json +%%DATADIR%%/mods/Backrooms/modinfo.json +%%DATADIR%%/mods/Backrooms/monstergroups.json +%%DATADIR%%/mods/Backrooms/overmap_terrain.json +%%DATADIR%%/mods/Backrooms/palettes.json +%%DATADIR%%/mods/Backrooms/portal_storm_effect_on_condition.json +%%DATADIR%%/mods/Backrooms/regional_map_settings.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_bathroom.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_breakroom.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_common.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_empty.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_generic.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_micro_breakroom.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_micro_common.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_micro_storage.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_special.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_storage.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_teleporter.json +%%DATADIR%%/mods/Backrooms/rooms/rooms_whole.json +%%DATADIR%%/mods/Backrooms/scenarios.json +%%DATADIR%%/mods/Backrooms/snippets.json +%%DATADIR%%/mods/Backrooms/teleport.json +%%DATADIR%%/mods/BlazeIndustries/README.txt +%%DATADIR%%/mods/BlazeIndustries/furniture_and_terrain/blaze_appliances.json +%%DATADIR%%/mods/BlazeIndustries/furniture_and_terrain/blaze_furniture.json +%%DATADIR%%/mods/BlazeIndustries/items/gun/grenade.json +%%DATADIR%%/mods/BlazeIndustries/items/items.json +%%DATADIR%%/mods/BlazeIndustries/items/materials.json +%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_engine.json +%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_gun.json +%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_other.json +%%DATADIR%%/mods/BlazeIndustries/items/vehicle/blaze_solar.json +%%DATADIR%%/mods/BlazeIndustries/modinfo.json +%%DATADIR%%/mods/BlazeIndustries/recipes/blaze_construction_recipes.json +%%DATADIR%%/mods/BlazeIndustries/recipes/blaze_gun_recipes.json +%%DATADIR%%/mods/BlazeIndustries/recipes/blaze_other_recipes.json +%%DATADIR%%/mods/BlazeIndustries/recipes/construction_group.json +%%DATADIR%%/mods/BlazeIndustries/snippets.json +%%DATADIR%%/mods/BlazeIndustries/vehicleparts/blaze_combustion.json +%%DATADIR%%/mods/BlazeIndustries/vehicleparts/blaze_other_parts.json +%%DATADIR%%/mods/BlazeIndustries/vehicleparts/migrations.json +%%DATADIR%%/mods/BlazeIndustries/vehicleparts/vehicle_parts.json +%%DATADIR%%/mods/BlazeIndustries/vehicles/part_items.json +%%DATADIR%%/mods/BlazeIndustries/vehicles/vehicle_spawn.json +%%DATADIR%%/mods/BlazeIndustries/vehicles/vehicles.json +%%DATADIR%%/mods/CRT_EXPANSION/construction_group.json +%%DATADIR%%/mods/CRT_EXPANSION/constructions/crt_constructions.json +%%DATADIR%%/mods/CRT_EXPANSION/constructions/crt_terrain.json +%%DATADIR%%/mods/CRT_EXPANSION/crt_gear/advanced_gear.json +%%DATADIR%%/mods/CRT_EXPANSION/effect_on_condition.json +%%DATADIR%%/mods/CRT_EXPANSION/effects.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_ammo.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_ammotypes.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_armor.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_clothes.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_generic.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_gun.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_gunmods.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_item_enchants.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_item_groups.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_makeshift_survival.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_recipes.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_toolarmor.json +%%DATADIR%%/mods/CRT_EXPANSION/items/crt_tools.json +%%DATADIR%%/mods/CRT_EXPANSION/martial/CRT_Bladework.json +%%DATADIR%%/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json +%%DATADIR%%/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json +%%DATADIR%%/mods/CRT_EXPANSION/martial/crt_gun_techniques.json +%%DATADIR%%/mods/CRT_EXPANSION/martial/dragonslayertechn.json +%%DATADIR%%/mods/CRT_EXPANSION/martial/generaltechn.json +%%DATADIR%%/mods/CRT_EXPANSION/martial/stabtechn.json +%%DATADIR%%/mods/CRT_EXPANSION/modinfo.json +%%DATADIR%%/mods/CRT_EXPANSION/monsters/crt_monster.json +%%DATADIR%%/mods/CRT_EXPANSION/monsters/crt_monstergroups.json +%%DATADIR%%/mods/CRT_EXPANSION/monsters/monster.json +%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_mut_itemgroups.json +%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json +%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_vamp_mutations.json +%%DATADIR%%/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json +%%DATADIR%%/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json +%%DATADIR%%/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json +%%DATADIR%%/mods/CRT_EXPANSION/readme/README.md +%%DATADIR%%/mods/CRT_EXPANSION/scenarios/crt_classes.json +%%DATADIR%%/mods/CRT_EXPANSION/scenarios/crt_scenarios.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_aperturepotato.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_comestibles.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_item_groups.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_items.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_missions.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_monstergroups.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_monsters.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_recipes.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_speech.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_spells.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_vehicles.json +%%DATADIR%%/mods/CrazyCataclysm/crazy_widgets.json +%%DATADIR%%/mods/CrazyCataclysm/modinfo.json +%%DATADIR%%/mods/Dark-Skies-Above/DESIGN.md +%%DATADIR%%/mods/Dark-Skies-Above/README.md +%%DATADIR%%/mods/Dark-Skies-Above/TODO.md +%%DATADIR%%/mods/Dark-Skies-Above/ammo_effect.json +%%DATADIR%%/mods/Dark-Skies-Above/blacklists/item_blacklist.json +%%DATADIR%%/mods/Dark-Skies-Above/blacklists/location_blacklist.json +%%DATADIR%%/mods/Dark-Skies-Above/blacklists/mon_blacklist.json +%%DATADIR%%/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json +%%DATADIR%%/mods/Dark-Skies-Above/blacklists/scenario_blacklist.json +%%DATADIR%%/mods/Dark-Skies-Above/blacklists/trait_blacklist.json +%%DATADIR%%/mods/Dark-Skies-Above/effects.json +%%DATADIR%%/mods/Dark-Skies-Above/factions.json +%%DATADIR%%/mods/Dark-Skies-Above/harvest.json +%%DATADIR%%/mods/Dark-Skies-Above/items/alien-scrap.json +%%DATADIR%%/mods/Dark-Skies-Above/items/electronics.json +%%DATADIR%%/mods/Dark-Skies-Above/mapgen/map_extras/bombed_crater.json +%%DATADIR%%/mods/Dark-Skies-Above/mapgen/map_extras/patrols.json +%%DATADIR%%/mods/Dark-Skies-Above/materials.json +%%DATADIR%%/mods/Dark-Skies-Above/modinfo.json +%%DATADIR%%/mods/Dark-Skies-Above/monattack.json +%%DATADIR%%/mods/Dark-Skies-Above/mongun.json +%%DATADIR%%/mods/Dark-Skies-Above/monspell.json +%%DATADIR%%/mods/Dark-Skies-Above/monsters/alien_cyborgs.json +%%DATADIR%%/mods/Dark-Skies-Above/monsters/alien_fauna.json +%%DATADIR%%/mods/Dark-Skies-Above/monsters/alien_robots.json +%%DATADIR%%/mods/Dark-Skies-Above/monsters/mon_groups/alienanimal_spawns.json +%%DATADIR%%/mods/Dark-Skies-Above/monsters/mon_groups/invader_spawns.json +%%DATADIR%%/mods/Dark-Skies-Above/monsters/mon_groups/stray_spawns.json +%%DATADIR%%/mods/Dark-Skies-Above/monsters/strays.json +%%DATADIR%%/mods/Dark-Skies-Above/mutations/traits.json +%%DATADIR%%/mods/Dark-Skies-Above/obsolete.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/armor.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/books.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/carnivore.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/electronic.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/generics.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/newspaper.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/ranged.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/tools.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/vehicle.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/items/weapons.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/locations/cemetery.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/locations/evac_center.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/locations/overmap_special.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/monsters.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/professions.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/region_settings.json +%%DATADIR%%/mods/Dark-Skies-Above/overrides/scenarios.json +%%DATADIR%%/mods/Dark-Skies-Above/recipies/uncraft.json +%%DATADIR%%/mods/Dark-Skies-Above/snippets/fliers.json +%%DATADIR%%/mods/Dark-Skies-Above/snippets/graffiti.json +%%DATADIR%%/mods/Dark-Skies-Above/snippets/newspaper.json +%%DATADIR%%/mods/Dark-Skies-Above/snippets/radio.json +%%DATADIR%%/mods/Dark-Skies-Above/snippets/survnotes.json +%%DATADIR%%/mods/Dark-Skies-Above/species.json +%%DATADIR%%/mods/Dark-Skies-Above/speech/neworder_speech.json +%%DATADIR%%/mods/DinoMod/DESIGN.md +%%DATADIR%%/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json +%%DATADIR%%/mods/DinoMod/NPC/Mr_Lapin.json +%%DATADIR%%/mods/DinoMod/NPC/NC_BO_BARONYX.json +%%DATADIR%%/mods/DinoMod/NPC/NC_Red.json +%%DATADIR%%/mods/DinoMod/NPC/NC_Yoshimi.json +%%DATADIR%%/mods/DinoMod/NPC/NPC_Alonso_Lautrec.json +%%DATADIR%%/mods/DinoMod/NPC/NPC_Brigitte_LaCroix.json +%%DATADIR%%/mods/DinoMod/NPC/NPC_old_guard_representative.json +%%DATADIR%%/mods/DinoMod/NPC/TALK_NC_FARMER.json +%%DATADIR%%/mods/DinoMod/NPC/TALK_SURVIVOR_CHEF.json +%%DATADIR%%/mods/DinoMod/NPC/npc_classes_mutant.json +%%DATADIR%%/mods/DinoMod/NPC/trait_groups.json +%%DATADIR%%/mods/DinoMod/README.md +%%DATADIR%%/mods/DinoMod/achievements/achievements.json +%%DATADIR%%/mods/DinoMod/achievements/statistics.json +%%DATADIR%%/mods/DinoMod/dinosaur_weakpoints.json +%%DATADIR%%/mods/DinoMod/effects.json +%%DATADIR%%/mods/DinoMod/harvest.json +%%DATADIR%%/mods/DinoMod/harvest_dissect.json +%%DATADIR%%/mods/DinoMod/items/biosignatures.json +%%DATADIR%%/mods/DinoMod/items/books.json +%%DATADIR%%/mods/DinoMod/items/carnivore.json +%%DATADIR%%/mods/DinoMod/items/containers.json +%%DATADIR%%/mods/DinoMod/items/egg.json +%%DATADIR%%/mods/DinoMod/items/forage.json +%%DATADIR%%/mods/DinoMod/items/helmets.json +%%DATADIR%%/mods/DinoMod/items/itemgroups.json +%%DATADIR%%/mods/DinoMod/items/items.json +%%DATADIR%%/mods/DinoMod/items/laser_items.json +%%DATADIR%%/mods/DinoMod/items/mutagen.json +%%DATADIR%%/mods/DinoMod/items/mutagen_ingredients.json +%%DATADIR%%/mods/DinoMod/items/petfoods.json +%%DATADIR%%/mods/DinoMod/items/pets.json +%%DATADIR%%/mods/DinoMod/items/pets_bear_armor.json +%%DATADIR%%/mods/DinoMod/items/pets_elephant_armor.json +%%DATADIR%%/mods/DinoMod/items/pets_ostrich_armor.json +%%DATADIR%%/mods/DinoMod/lab_notes.json +%%DATADIR%%/mods/DinoMod/mapgen/DinoLabFinale.json +%%DATADIR%%/mods/DinoMod/mapgen/basement_chem.json +%%DATADIR%%/mods/DinoMod/mapgen/cave.json +%%DATADIR%%/mods/DinoMod/mapgen/church.json +%%DATADIR%%/mods/DinoMod/mapgen/dinoexhibit.json +%%DATADIR%%/mods/DinoMod/mapgen/farm.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/mass_grave.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_achelousaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_acrocanthosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_albertosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_allosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_anchisaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_ankylosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_appalachiosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_aquilops.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_camptosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_centrosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_ceratosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_chasmosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_coelophysis.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_corythosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_daspletosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_deinonychus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dilophosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dromaeosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dryosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dryptosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_dyoplosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_edmontonia.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_edmontosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_einiosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_euoplocephalus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gallimimus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gargoyleosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gastonia.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gorgosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_gryposaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_hadrosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_hesperosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_hypacrosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_issi.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_kosmoceratops.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_lambeosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_maiasaura.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_nanosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_nanuqsaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_nodosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_ornithomimus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_pachycephalosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_pachyrhinosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_panoplosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_parasaurolophus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_pentaceratops.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_prosaurolophus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_sarahsaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_saurolophus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_sauropelta.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_saurornitholestes.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_scolosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_scutellosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_siats.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_stegoceras.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_stegosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_stenonychosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_struthiomimus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_styracosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_tenontosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_thescelosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_torosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_torvosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_triceratops.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_tyrannosaurus.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_utahraptor.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_velociraptor.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_zuniceratops.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/nest_zuul.json +%%DATADIR%%/mods/DinoMod/mapgen/map_extras/portal.json +%%DATADIR%%/mods/DinoMod/mapgen/mi-go_scout_tower.json +%%DATADIR%%/mods/DinoMod/mapgen/microlab_DinoLab.json +%%DATADIR%%/mods/DinoMod/mapgen/nested/shack_nested.json +%%DATADIR%%/mods/DinoMod/mapgen/palettes_DinoLab.json +%%DATADIR%%/mods/DinoMod/mapgen/railroad_station.json +%%DATADIR%%/mods/DinoMod/mapgen/swamp_shack.json +%%DATADIR%%/mods/DinoMod/mapgen/zoo.json +%%DATADIR%%/mods/DinoMod/modinfo.json +%%DATADIR%%/mods/DinoMod/monster_attacks.json +%%DATADIR%%/mods/DinoMod/monster_factions.json +%%DATADIR%%/mods/DinoMod/monstergroups/dinosaur.json +%%DATADIR%%/mods/DinoMod/monstergroups/fungi.json +%%DATADIR%%/mods/DinoMod/monstergroups/lab.json +%%DATADIR%%/mods/DinoMod/monstergroups/misc.json +%%DATADIR%%/mods/DinoMod/monstergroups/monstergroups_egg.json +%%DATADIR%%/mods/DinoMod/monstergroups/wilderness.json +%%DATADIR%%/mods/DinoMod/monstergroups/zinosaur.json +%%DATADIR%%/mods/DinoMod/monsters/dinosaur.json +%%DATADIR%%/mods/DinoMod/monsters/dinosaur_CBM.json +%%DATADIR%%/mods/DinoMod/monsters/fungus.json +%%DATADIR%%/mods/DinoMod/monsters/hatchling.json +%%DATADIR%%/mods/DinoMod/monsters/juvenile.json +%%DATADIR%%/mods/DinoMod/monsters/mutant_dino.json +%%DATADIR%%/mods/DinoMod/monsters/zed-dinosaur.json +%%DATADIR%%/mods/DinoMod/monsters/zed-dinosaur_CBM.json +%%DATADIR%%/mods/DinoMod/monsters/zinosaur_burned.json +%%DATADIR%%/mods/DinoMod/monsters/zinosaur_upgrade.json +%%DATADIR%%/mods/DinoMod/mutations/dreams.json +%%DATADIR%%/mods/DinoMod/mutations/mutations.json +%%DATADIR%%/mods/DinoMod/obsolete/egg.json +%%DATADIR%%/mods/DinoMod/obsolete/fieldoffice.json +%%DATADIR%%/mods/DinoMod/obsolete/monstergroups_egg.json +%%DATADIR%%/mods/DinoMod/obsolete/monsters.json +%%DATADIR%%/mods/DinoMod/overmap/map_extras.json +%%DATADIR%%/mods/DinoMod/overmap/overmap_specials.json +%%DATADIR%%/mods/DinoMod/overmap/overmap_terrain.json +%%DATADIR%%/mods/DinoMod/overmap/overmap_terrain_zoo.json +%%DATADIR%%/mods/DinoMod/proficiencies/weakpoints.json +%%DATADIR%%/mods/DinoMod/recipes/containers.json +%%DATADIR%%/mods/DinoMod/recipes/food_egg.json +%%DATADIR%%/mods/DinoMod/recipes/head.json +%%DATADIR%%/mods/DinoMod/recipes/medsandchemicals.json +%%DATADIR%%/mods/DinoMod/recipes/offal_dishes.json +%%DATADIR%%/mods/DinoMod/recipes/parts_construction.json +%%DATADIR%%/mods/DinoMod/recipes/pets_bear.json +%%DATADIR%%/mods/DinoMod/recipes/pets_elephant.json +%%DATADIR%%/mods/DinoMod/recipes/pets_ostrich.json +%%DATADIR%%/mods/DinoMod/recipes/recipe_food.json +%%DATADIR%%/mods/DinoMod/recipes/recipe_others.json +%%DATADIR%%/mods/DinoMod/recipes/recipes.json +%%DATADIR%%/mods/DinoMod/recipes/uncraft.json +%%DATADIR%%/mods/DinoMod/regional_overlay.json +%%DATADIR%%/mods/DinoMod/requirements/cooking_components.json +%%DATADIR%%/mods/DinoMod/requirements/materials.json +%%DATADIR%%/mods/DinoMod/scenarios.json +%%DATADIR%%/mods/DinoMod/snippets/graffiti.json +%%DATADIR%%/mods/DinoMod/snippets/grave_labels.json +%%DATADIR%%/mods/DinoMod/snippets/hints.json +%%DATADIR%%/mods/DinoMod/snippets/snippets.json +%%DATADIR%%/mods/DinoMod/startlocations.json +%%DATADIR%%/mods/DinoMod/vitamin.json +%%DATADIR%%/mods/Generic_Guns/ammo/black_powder.json +%%DATADIR%%/mods/Generic_Guns/ammo/casings.json +%%DATADIR%%/mods/Generic_Guns/ammo/gg_ammo_migration.json +%%DATADIR%%/mods/Generic_Guns/ammo/gg_casings_migration.json +%%DATADIR%%/mods/Generic_Guns/ammo/grenade.json +%%DATADIR%%/mods/Generic_Guns/ammo/pistol.json +%%DATADIR%%/mods/Generic_Guns/ammo/pistol_magnum.json +%%DATADIR%%/mods/Generic_Guns/ammo/pistol_tiny.json +%%DATADIR%%/mods/Generic_Guns/ammo/rifle.json +%%DATADIR%%/mods/Generic_Guns/ammo/rifle_huge.json +%%DATADIR%%/mods/Generic_Guns/ammo/rocket.json +%%DATADIR%%/mods/Generic_Guns/ammo/shot.json +%%DATADIR%%/mods/Generic_Guns/bandoliers/bandolier.json +%%DATADIR%%/mods/Generic_Guns/bandoliers/holster.json +%%DATADIR%%/mods/Generic_Guns/firearms/black_powder.json +%%DATADIR%%/mods/Generic_Guns/firearms/gg_firearms_migration.json +%%DATADIR%%/mods/Generic_Guns/firearms/grenade.json +%%DATADIR%%/mods/Generic_Guns/firearms/pistol.json +%%DATADIR%%/mods/Generic_Guns/firearms/pistol_magnum.json +%%DATADIR%%/mods/Generic_Guns/firearms/pistol_tiny.json +%%DATADIR%%/mods/Generic_Guns/firearms/rifle.json +%%DATADIR%%/mods/Generic_Guns/firearms/rifle_huge.json +%%DATADIR%%/mods/Generic_Guns/firearms/rocket.json +%%DATADIR%%/mods/Generic_Guns/firearms/shot.json +%%DATADIR%%/mods/Generic_Guns/gg_ammunition_types.json +%%DATADIR%%/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json +%%DATADIR%%/mods/Generic_Guns/gunmods/gg_gunmods_migration.json +%%DATADIR%%/mods/Generic_Guns/gunmods/gunmods.json +%%DATADIR%%/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +%%DATADIR%%/mods/Generic_Guns/magazines/gg_magazines_migration.json +%%DATADIR%%/mods/Generic_Guns/magazines/grenade.json +%%DATADIR%%/mods/Generic_Guns/magazines/pistol.json +%%DATADIR%%/mods/Generic_Guns/magazines/pistol_magnum.json +%%DATADIR%%/mods/Generic_Guns/magazines/pistol_tiny.json +%%DATADIR%%/mods/Generic_Guns/magazines/rifle.json +%%DATADIR%%/mods/Generic_Guns/magazines/rifle_huge.json +%%DATADIR%%/mods/Generic_Guns/magazines/shot.json +%%DATADIR%%/mods/Generic_Guns/modinfo.json +%%DATADIR%%/mods/Generic_Guns/obsolete.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipe_obsolete.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipes_deconstruction.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipes_firearms_repeater.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipes_firearms_single.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipes_grenade_propelled.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipes_pistol.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipes_rifle.json +%%DATADIR%%/mods/Generic_Guns/recipes/recipes_shot.json +%%DATADIR%%/mods/Generic_Guns/recipes/requirements.json +%%DATADIR%%/mods/Generic_Guns/robots/active_bots.json +%%DATADIR%%/mods/Generic_Guns/robots/broken_bots.json +%%DATADIR%%/mods/Generic_Guns/robots/inactive_bots.json +%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/grenade_propelled.json +%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/pistol.json +%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/pistol_magnum.json +%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/pistol_tiny.json +%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/rifle.json +%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/rifle_huge.json +%%DATADIR%%/mods/Generic_Guns/uncraft/ammo/shot.json +%%DATADIR%%/mods/Generic_Guns/vehicles/migrations.json +%%DATADIR%%/mods/Graphical_Overmap/base_colors.json +%%DATADIR%%/mods/Graphical_Overmap/fonts.json.txt +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_abstract.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_agricultural.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_campus.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_cemetery.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_commercial.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_evac_center.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_faction_base.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_fungal.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_hardcoded.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_industrial.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_lab.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_mall.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_mansion.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_mi-go.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_microlab.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_military.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_necropolis.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_private_resort.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_public_institutional.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_ranch_camp.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_recreational.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_residential.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_river.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_robofachq.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_test.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_transportation.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_waste_junk.json +%%DATADIR%%/mods/Graphical_Overmap/go_overmap_terrain_waterbody.json +%%DATADIR%%/mods/Graphical_Overmap/modinfo.json +%%DATADIR%%/mods/Graphical_Overmap/readme.txt +%%DATADIR%%/mods/Graphical_Overmap_Magiclysm/go_overmap_terrain_magical.json +%%DATADIR%%/mods/Graphical_Overmap_Magiclysm/modinfo.json +%%DATADIR%%/mods/MA/MA_overmap.ps1 +%%DATADIR%%/mods/MA/MA_overmap.sql +%%DATADIR%%/mods/MA/MA_overmap/overmap_0_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_0_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_0_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_0_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_0_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_10_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_11_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_12_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_13_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_14_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_15_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_16_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_17_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_18_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_19_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_1_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_20_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_21_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_22_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_23_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_24_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_25_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_26_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_27_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_28_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_29_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_2_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_30_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_31_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_32_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_33_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_34_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_35_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_36_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_37_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_38_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_39_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_3_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_40_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_41_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_42_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_43_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_44_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_45_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_1.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_46_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_1.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_47_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_1.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_48_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_0.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_1.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_49_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_4_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_0.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_1.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_50_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_1.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_2.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_3.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_51_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_52_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_53_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_54_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_36.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_55_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_37.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_56_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_57_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_38.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_58_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_59_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_59_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_59_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_59_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_59_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_5_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_60_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_60_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_60_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_60_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_61_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_61_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_61_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_61_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_61_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_62_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_62_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_62_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_62_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_62_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_62_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_62_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_63_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_64_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_65_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_66_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_23.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_24.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_25.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_34.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_35.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_39.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_40.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_67_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_26.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_27.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_28.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_29.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_30.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_31.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_32.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_33.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_41.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_68_42.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_6_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_7_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_8_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_10.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_11.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_12.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_13.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_14.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_15.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_16.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_17.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_18.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_19.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_20.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_21.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_22.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_4.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_5.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_6.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_7.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_8.omap.gz +%%DATADIR%%/mods/MA/MA_overmap/overmap_9_9.omap.gz +%%DATADIR%%/mods/MA/MA_overmap_cities.xlsx +%%DATADIR%%/mods/MA/MA_overmap_index.png +%%DATADIR%%/mods/MA/README.md +%%DATADIR%%/mods/MA/cities.json +%%DATADIR%%/mods/MA/game_balance.json +%%DATADIR%%/mods/MA/modinfo.json +%%DATADIR%%/mods/MA/scenario_blacklist.json +%%DATADIR%%/mods/MA/scenarios.json +%%DATADIR%%/mods/MA/start_locations.json +%%DATADIR%%/mods/MMA/bludgeons.json +%%DATADIR%%/mods/MMA/exemplar_weapons.json +%%DATADIR%%/mods/MMA/item_groups.json +%%DATADIR%%/mods/MMA/martial.json +%%DATADIR%%/mods/MMA/martialarts.json +%%DATADIR%%/mods/MMA/modinfo.json +%%DATADIR%%/mods/MMA/mutations.json +%%DATADIR%%/mods/MMA/professions.json +%%DATADIR%%/mods/MMA/scenarios.json +%%DATADIR%%/mods/MMA/spells.json +%%DATADIR%%/mods/MMA/swords_and_blades.json +%%DATADIR%%/mods/MMA/techniques.json +%%DATADIR%%/mods/MMA/weapon_categories.json +%%DATADIR%%/mods/Magiclysm/Spells/animist.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Alchemist.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Artificer.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Biotek.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Blood_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Boreal_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Cleansing_Flame.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Crusader.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Earth_Elemental.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Fire_Elemental.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Force_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Gaias_Chosen.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Glacier_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Golemancer.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Gravity_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Ice_Elemental.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Illusionist.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Magnetism_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Overclocker.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Permafrost_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Radiation_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Shaman.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Shapeshifter.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Soulfire.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Storm_Elemental.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Stormcaller.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Sun_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Tundra_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Void_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Vulcanist.json +%%DATADIR%%/mods/Magiclysm/Spells/attunements/Wither_Mage.json +%%DATADIR%%/mods/Magiclysm/Spells/biomancer.json +%%DATADIR%%/mods/Magiclysm/Spells/black_dragon.json +%%DATADIR%%/mods/Magiclysm/Spells/classless.json +%%DATADIR%%/mods/Magiclysm/Spells/consumables.json +%%DATADIR%%/mods/Magiclysm/Spells/debug.json +%%DATADIR%%/mods/Magiclysm/Spells/dragonbreath.json +%%DATADIR%%/mods/Magiclysm/Spells/druid.json +%%DATADIR%%/mods/Magiclysm/Spells/earthshaper.json +%%DATADIR%%/mods/Magiclysm/Spells/item_only.json +%%DATADIR%%/mods/Magiclysm/Spells/kelvinist.json +%%DATADIR%%/mods/Magiclysm/Spells/lizardfolk_shaman.json +%%DATADIR%%/mods/Magiclysm/Spells/magus.json +%%DATADIR%%/mods/Magiclysm/Spells/manatouched.json +%%DATADIR%%/mods/Magiclysm/Spells/monsterspells.json +%%DATADIR%%/mods/Magiclysm/Spells/stormshaper.json +%%DATADIR%%/mods/Magiclysm/Spells/technomancer.json +%%DATADIR%%/mods/Magiclysm/achievements/mutations.json +%%DATADIR%%/mods/Magiclysm/achievements/spells.json +%%DATADIR%%/mods/Magiclysm/achievements/statistics.json +%%DATADIR%%/mods/Magiclysm/bionics.json +%%DATADIR%%/mods/Magiclysm/charge_removal.json +%%DATADIR%%/mods/Magiclysm/construction_group.json +%%DATADIR%%/mods/Magiclysm/cooking_components.json +%%DATADIR%%/mods/Magiclysm/effects/effects.json +%%DATADIR%%/mods/Magiclysm/emitter.json +%%DATADIR%%/mods/Magiclysm/enchantments/Blood_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Boreal_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Cleansing_Flame.json +%%DATADIR%%/mods/Magiclysm/enchantments/Fire_Elemental.json +%%DATADIR%%/mods/Magiclysm/enchantments/Force_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Gaias_Chosen.json +%%DATADIR%%/mods/Magiclysm/enchantments/Glacier_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Golemancer.json +%%DATADIR%%/mods/Magiclysm/enchantments/Gravity_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Ice_Elemental.json +%%DATADIR%%/mods/Magiclysm/enchantments/Magnetism_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Permafrost_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Radiaton_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Shaman.json +%%DATADIR%%/mods/Magiclysm/enchantments/Soulfire.json +%%DATADIR%%/mods/Magiclysm/enchantments/Storm_Elemental.json +%%DATADIR%%/mods/Magiclysm/enchantments/Sun_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Tundra_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Void_Mage.json +%%DATADIR%%/mods/Magiclysm/enchantments/Vulcanist.json +%%DATADIR%%/mods/Magiclysm/enchantments/Wither_Mage.json +%%DATADIR%%/mods/Magiclysm/field.json +%%DATADIR%%/mods/Magiclysm/furniture.json +%%DATADIR%%/mods/Magiclysm/furniture_and_terrain/furniture_plants.json +%%DATADIR%%/mods/Magiclysm/harvest.json +%%DATADIR%%/mods/Magiclysm/itemgroups/death_drops.json +%%DATADIR%%/mods/Magiclysm/itemgroups/itemgroups.json +%%DATADIR%%/mods/Magiclysm/itemgroups/recipe_books.json +%%DATADIR%%/mods/Magiclysm/itemgroups/spellbooks.json +%%DATADIR%%/mods/Magiclysm/items/alchemy_items.json +%%DATADIR%%/mods/Magiclysm/items/ammo_types.json +%%DATADIR%%/mods/Magiclysm/items/archery.json +%%DATADIR%%/mods/Magiclysm/items/armor.json +%%DATADIR%%/mods/Magiclysm/items/bionics.json +%%DATADIR%%/mods/Magiclysm/items/black_dragon_items.json +%%DATADIR%%/mods/Magiclysm/items/books.json +%%DATADIR%%/mods/Magiclysm/items/books_lore.json +%%DATADIR%%/mods/Magiclysm/items/cast_spell_items.json +%%DATADIR%%/mods/Magiclysm/items/class_runes.json +%%DATADIR%%/mods/Magiclysm/items/comestibles.json +%%DATADIR%%/mods/Magiclysm/items/constructs.json +%%DATADIR%%/mods/Magiclysm/items/containers.json +%%DATADIR%%/mods/Magiclysm/items/currency.json +%%DATADIR%%/mods/Magiclysm/items/enchanted.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_belts.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_boots.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_bracelet.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_bracers.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_cloaks.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_clothes.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_gunmods.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_masks.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_melee.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_misc.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_ranged.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_rings.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_tokens.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_tools.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_unarmed.json +%%DATADIR%%/mods/Magiclysm/items/enchanted_wands.json +%%DATADIR%%/mods/Magiclysm/items/ethereal_items.json +%%DATADIR%%/mods/Magiclysm/items/forage.json +%%DATADIR%%/mods/Magiclysm/items/fuel.json +%%DATADIR%%/mods/Magiclysm/items/generic.json +%%DATADIR%%/mods/Magiclysm/items/herbs_and_flowers.json +%%DATADIR%%/mods/Magiclysm/items/mana_crystals.json +%%DATADIR%%/mods/Magiclysm/items/melee.json +%%DATADIR%%/mods/Magiclysm/items/metals.json +%%DATADIR%%/mods/Magiclysm/items/mutagen.json +%%DATADIR%%/mods/Magiclysm/items/obsolete.json +%%DATADIR%%/mods/Magiclysm/items/recipe_books.json +%%DATADIR%%/mods/Magiclysm/items/spell_scrolls.json +%%DATADIR%%/mods/Magiclysm/items/spellbooks.json +%%DATADIR%%/mods/Magiclysm/items/tools.json +%%DATADIR%%/mods/Magiclysm/items/vehicle/frames.json +%%DATADIR%%/mods/Magiclysm/items/vehicle/vehicle_parts.json +%%DATADIR%%/mods/Magiclysm/items/vehicle_parts.json +%%DATADIR%%/mods/Magiclysm/items/weapons.json +%%DATADIR%%/mods/Magiclysm/lore.md +%%DATADIR%%/mods/Magiclysm/magic_balance.md +%%DATADIR%%/mods/Magiclysm/materials.json +%%DATADIR%%/mods/Magiclysm/modinfo.json +%%DATADIR%%/mods/Magiclysm/monster_attacks.json +%%DATADIR%%/mods/Magiclysm/monster_factions.json +%%DATADIR%%/mods/Magiclysm/monstergroups.json +%%DATADIR%%/mods/Magiclysm/monstergroups_egg.json +%%DATADIR%%/mods/Magiclysm/monsters/demon_spider.json +%%DATADIR%%/mods/Magiclysm/monsters/dragon.json +%%DATADIR%%/mods/Magiclysm/monsters/forgedwellers.json +%%DATADIR%%/mods/Magiclysm/monsters/goblin.json +%%DATADIR%%/mods/Magiclysm/monsters/golems.json +%%DATADIR%%/mods/Magiclysm/monsters/holiday_magiclysm.json +%%DATADIR%%/mods/Magiclysm/monsters/lizardfolk.json +%%DATADIR%%/mods/Magiclysm/monsters/mics.json +%%DATADIR%%/mods/Magiclysm/monsters/monsters.json +%%DATADIR%%/mods/Magiclysm/monsters/ogre.json +%%DATADIR%%/mods/Magiclysm/monsters/orcs.json +%%DATADIR%%/mods/Magiclysm/monsters/shadows.json +%%DATADIR%%/mods/Magiclysm/monsters/zombified_monsters.json +%%DATADIR%%/mods/Magiclysm/morale_types.json +%%DATADIR%%/mods/Magiclysm/mutations/debug_mutations.json +%%DATADIR%%/mods/Magiclysm/mutations/dragon_mutation_category.json +%%DATADIR%%/mods/Magiclysm/mutations/dreams.json +%%DATADIR%%/mods/Magiclysm/mutations/mutation_effects.json +%%DATADIR%%/mods/Magiclysm/mutations/mutation_enchantments.json +%%DATADIR%%/mods/Magiclysm/mutations/mutations.json +%%DATADIR%%/mods/Magiclysm/mutations/overlay_ordering.json +%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_ARDELIA.json +%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_HELEN_TAVREL.json +%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_MERCHANT.json +%%DATADIR%%/mods/Magiclysm/npc/TALK_FORGE_PIRATE.json +%%DATADIR%%/mods/Magiclysm/npc/TALK_HEALER_GREY.json +%%DATADIR%%/mods/Magiclysm/npc/TALK_OLD_MAGUS.json +%%DATADIR%%/mods/Magiclysm/npc/TALK_TECHNO_KID.json +%%DATADIR%%/mods/Magiclysm/npc/classes.json +%%DATADIR%%/mods/Magiclysm/npc/factions.json +%%DATADIR%%/mods/Magiclysm/npc/items_worn.json +%%DATADIR%%/mods/Magiclysm/npc/missiondef.json +%%DATADIR%%/mods/Magiclysm/npc/npc.json +%%DATADIR%%/mods/Magiclysm/npc/trait_groups.json +%%DATADIR%%/mods/Magiclysm/professions.json +%%DATADIR%%/mods/Magiclysm/proficiencies.json +%%DATADIR%%/mods/Magiclysm/qualities.json +%%DATADIR%%/mods/Magiclysm/recipes.json +%%DATADIR%%/mods/Magiclysm/recipes/alchemy.json +%%DATADIR%%/mods/Magiclysm/recipes/armor.json +%%DATADIR%%/mods/Magiclysm/recipes/blacksmithing.json +%%DATADIR%%/mods/Magiclysm/recipes/construction.json +%%DATADIR%%/mods/Magiclysm/recipes/cooking.json +%%DATADIR%%/mods/Magiclysm/recipes/deconstruction.json +%%DATADIR%%/mods/Magiclysm/recipes/dragon_black.json +%%DATADIR%%/mods/Magiclysm/recipes/magic_tools.json +%%DATADIR%%/mods/Magiclysm/recipes/mods.json +%%DATADIR%%/mods/Magiclysm/recipes/mutagens.json +%%DATADIR%%/mods/Magiclysm/recipes/nested.json +%%DATADIR%%/mods/Magiclysm/recipes/recipe_potions.json +%%DATADIR%%/mods/Magiclysm/recipes/recipe_vehicle.json +%%DATADIR%%/mods/Magiclysm/recipes/tailoring.json +%%DATADIR%%/mods/Magiclysm/recipes/weapons.json +%%DATADIR%%/mods/Magiclysm/requirements/alchemy.json +%%DATADIR%%/mods/Magiclysm/requirements/cooking_components.json +%%DATADIR%%/mods/Magiclysm/requirements/spell_components.json +%%DATADIR%%/mods/Magiclysm/scenarios.json +%%DATADIR%%/mods/Magiclysm/snippets/lab.json +%%DATADIR%%/mods/Magiclysm/snippets/newspapers.json +%%DATADIR%%/mods/Magiclysm/snippets/survivor_notes.json +%%DATADIR%%/mods/Magiclysm/species.json +%%DATADIR%%/mods/Magiclysm/start_locations.json +%%DATADIR%%/mods/Magiclysm/techniques.json +%%DATADIR%%/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json +%%DATADIR%%/mods/Magiclysm/terrain.json +%%DATADIR%%/mods/Magiclysm/tool_qualities.json +%%DATADIR%%/mods/Magiclysm/traits/attunements.json +%%DATADIR%%/mods/Magiclysm/traits/classes.json +%%DATADIR%%/mods/Magiclysm/traits/manatouched.json +%%DATADIR%%/mods/Magiclysm/traits/mutation.json +%%DATADIR%%/mods/Magiclysm/traits/temporary_demon_traits.json +%%DATADIR%%/mods/Magiclysm/traps.json +%%DATADIR%%/mods/Magiclysm/ui/sidebar.json +%%DATADIR%%/mods/Magiclysm/vehicle_groups.json +%%DATADIR%%/mods/Magiclysm/vehicleparts/frames.json +%%DATADIR%%/mods/Magiclysm/vehicleparts/vehicle_parts.json +%%DATADIR%%/mods/Magiclysm/vehicles/bikes.json +%%DATADIR%%/mods/Magiclysm/vehicles/summoned_vehicles.json +%%DATADIR%%/mods/Magiclysm/vehicles/vans_busses.json +%%DATADIR%%/mods/Magiclysm/vitamin.json +%%DATADIR%%/mods/Magiclysm/worldgen/attunement_altar.json +%%DATADIR%%/mods/Magiclysm/worldgen/black_dragon_lair.json +%%DATADIR%%/mods/Magiclysm/worldgen/demon_spider_lair.json +%%DATADIR%%/mods/Magiclysm/worldgen/forest_tomb.json +%%DATADIR%%/mods/Magiclysm/worldgen/forge_of_wonders.json +%%DATADIR%%/mods/Magiclysm/worldgen/goblin_encampment.json +%%DATADIR%%/mods/Magiclysm/worldgen/house_technomancer.json +%%DATADIR%%/mods/Magiclysm/worldgen/lake_retreat.json +%%DATADIR%%/mods/Magiclysm/worldgen/magic_academy.json +%%DATADIR%%/mods/Magiclysm/worldgen/magic_basement.json +%%DATADIR%%/mods/Magiclysm/worldgen/magic_cabin.json +%%DATADIR%%/mods/Magiclysm/worldgen/magic_field.json +%%DATADIR%%/mods/Magiclysm/worldgen/magic_shop.json +%%DATADIR%%/mods/Magiclysm/worldgen/mine_balrog.json +%%DATADIR%%/mods/Magiclysm/worldgen/multitile_city_buildings.json +%%DATADIR%%/mods/Magiclysm/worldgen/nested_mapgen.json +%%DATADIR%%/mods/Magiclysm/worldgen/orc_village.json +%%DATADIR%%/mods/Magiclysm/worldgen/overmap_specials.json +%%DATADIR%%/mods/Magiclysm/worldgen/overmap_terrain.json +%%DATADIR%%/mods/Magiclysm/worldgen/regional_overlay.json +%%DATADIR%%/mods/Magiclysm/worldgen/small_magic_field.json +%%DATADIR%%/mods/Magiclysm/worldgen/used_bookstore.json +%%DATADIR%%/mods/Magiclysm/worldgen/wizard-towers.json +%%DATADIR%%/mods/Megafauna/construction.json +%%DATADIR%%/mods/Megafauna/furniture_and_terrain/terrain-manufactured.json +%%DATADIR%%/mods/Megafauna/harvest.json +%%DATADIR%%/mods/Megafauna/items/animal_products.json +%%DATADIR%%/mods/Megafauna/items/tool/shelters.json +%%DATADIR%%/mods/Megafauna/megafauna_factions.json +%%DATADIR%%/mods/Megafauna/modinfo.json +%%DATADIR%%/mods/Megafauna/monstergroups/misc.json +%%DATADIR%%/mods/Megafauna/monstergroups/wilderness.json +%%DATADIR%%/mods/Megafauna/monsters/fauna_blacklist.json +%%DATADIR%%/mods/Megafauna/monsters/mf_domestic.json +%%DATADIR%%/mods/Megafauna/monsters/mf_predators.json +%%DATADIR%%/mods/Megafauna/monsters/mf_wild.json +%%DATADIR%%/mods/Megafauna/readme.md +%%DATADIR%%/mods/Megafauna/recipes/recipe_others.json +%%DATADIR%%/mods/Military_Professions/modinfo.json +%%DATADIR%%/mods/Military_Professions/npc/NC_ARMY.json +%%DATADIR%%/mods/Military_Professions/npc/NC_OPS.json +%%DATADIR%%/mods/Military_Professions/npc/classes.json +%%DATADIR%%/mods/Military_Professions/prof/army.json +%%DATADIR%%/mods/Military_Professions/prof/itemgroups_prof.json +%%DATADIR%%/mods/Military_Professions/prof/spc.json +%%DATADIR%%/mods/Military_Professions/scenarios.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/modinfo.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_comestibles.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_effect.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_field_type.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_flesh.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_furniture.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_harvest.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_item_groups.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_items.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_locations.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_specials.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_terrain.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_materials.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_med.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_monster_factions.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_monster_groups.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_monsters.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mutation_category.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_mutations.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_professions.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_recipe.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_scenarios.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_scent_types.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_snippets.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_species.json +%%DATADIR%%/mods/My_Sweet_Cataclysm/sweet_start_locations.json +%%DATADIR%%/mods/Mythos/README.md +%%DATADIR%%/mods/Mythos/blacklists/item_blacklist.json +%%DATADIR%%/mods/Mythos/blacklists/location_blacklist.json +%%DATADIR%%/mods/Mythos/blacklists/recipes_blacklist.json +%%DATADIR%%/mods/Mythos/blacklists/trait_blacklist.json +%%DATADIR%%/mods/Mythos/furniture_and_terrain/1920s_furniture-appliances.json +%%DATADIR%%/mods/Mythos/game_balance.json +%%DATADIR%%/mods/Mythos/harvest.json +%%DATADIR%%/mods/Mythos/items/appliances.json +%%DATADIR%%/mods/Mythos/items/corpses/mythos.json +%%DATADIR%%/mods/Mythos/mapgen_palettes/1920s_house_general_abandoned.json +%%DATADIR%%/mods/Mythos/mapgen_palettes/1920s_house_general_palette.json +%%DATADIR%%/mods/Mythos/mapgen_palettes/1920s_house_w_palette.json +%%DATADIR%%/mods/Mythos/modinfo.json +%%DATADIR%%/mods/Mythos/monster_factions.json +%%DATADIR%%/mods/Mythos/monstergroups/blob.json +%%DATADIR%%/mods/Mythos/monstergroups/misc.json +%%DATADIR%%/mods/Mythos/monstergroups/mythos.json +%%DATADIR%%/mods/Mythos/monstergroups/nether.json +%%DATADIR%%/mods/Mythos/monstergroups/wilderness.json +%%DATADIR%%/mods/Mythos/monsters/mythos.json +%%DATADIR%%/mods/Mythos/species.json +%%DATADIR%%/mods/No_Fungi/comestibles.json +%%DATADIR%%/mods/No_Fungi/furniture.json +%%DATADIR%%/mods/No_Fungi/modinfo.json +%%DATADIR%%/mods/No_Fungi/terrain.json +%%DATADIR%%/mods/No_Hope/Mapgen/2storymodern01.json +%%DATADIR%%/mods/No_Hope/Mapgen/FEMA_tlc_03.json +%%DATADIR%%/mods/No_Hope/Mapgen/abandoned_barn.json +%%DATADIR%%/mods/No_Hope/Mapgen/antique_store.json +%%DATADIR%%/mods/No_Hope/Mapgen/arcade.json +%%DATADIR%%/mods/No_Hope/Mapgen/bandit_cabin.json +%%DATADIR%%/mods/No_Hope/Mapgen/bandit_garage.json +%%DATADIR%%/mods/No_Hope/Mapgen/bar.json +%%DATADIR%%/mods/No_Hope/Mapgen/basement_bionic.json +%%DATADIR%%/mods/No_Hope/Mapgen/basement_chem.json +%%DATADIR%%/mods/No_Hope/Mapgen/basement_guns.json +%%DATADIR%%/mods/No_Hope/Mapgen/basement_survival.json +%%DATADIR%%/mods/No_Hope/Mapgen/bike_shop.json +%%DATADIR%%/mods/No_Hope/Mapgen/bunker.json +%%DATADIR%%/mods/No_Hope/Mapgen/bus_station.json +%%DATADIR%%/mods/No_Hope/Mapgen/butcher.json +%%DATADIR%%/mods/No_Hope/Mapgen/cabin_isherwood.json +%%DATADIR%%/mods/No_Hope/Mapgen/cabin_lake.json +%%DATADIR%%/mods/No_Hope/Mapgen/campground.json +%%DATADIR%%/mods/No_Hope/Mapgen/city_npc_nested_spawns.json +%%DATADIR%%/mods/No_Hope/Mapgen/collapsed_tower.json +%%DATADIR%%/mods/No_Hope/Mapgen/construction_site.json +%%DATADIR%%/mods/No_Hope/Mapgen/cs_car_dealership.json +%%DATADIR%%/mods/No_Hope/Mapgen/cs_car_showroom.json +%%DATADIR%%/mods/No_Hope/Mapgen/cs_internet_cafe.json +%%DATADIR%%/mods/No_Hope/Mapgen/dairy_farm_isherwood.json +%%DATADIR%%/mods/No_Hope/Mapgen/daycare.json +%%DATADIR%%/mods/No_Hope/Mapgen/dojo.json +%%DATADIR%%/mods/No_Hope/Mapgen/farm_2side.json +%%DATADIR%%/mods/No_Hope/Mapgen/farm_horse.json +%%DATADIR%%/mods/No_Hope/Mapgen/farm_horse_isherwood.json +%%DATADIR%%/mods/No_Hope/Mapgen/farm_isherwood.json +%%DATADIR%%/mods/No_Hope/Mapgen/fire_station.json +%%DATADIR%%/mods/No_Hope/Mapgen/freshwater_research_station.json +%%DATADIR%%/mods/No_Hope/Mapgen/garage.json +%%DATADIR%%/mods/No_Hope/Mapgen/garage_gas.json +%%DATADIR%%/mods/No_Hope/Mapgen/garden_house_1.json +%%DATADIR%%/mods/No_Hope/Mapgen/gunsmith.json +%%DATADIR%%/mods/No_Hope/Mapgen/helipad.json +%%DATADIR%%/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json +%%DATADIR%%/mods/No_Hope/Mapgen/hotel_tower.json +%%DATADIR%%/mods/No_Hope/Mapgen/house03.json +%%DATADIR%%/mods/No_Hope/Mapgen/house11.json +%%DATADIR%%/mods/No_Hope/Mapgen/house13.json +%%DATADIR%%/mods/No_Hope/Mapgen/house14.json +%%DATADIR%%/mods/No_Hope/Mapgen/house21.json +%%DATADIR%%/mods/No_Hope/Mapgen/house23.json +%%DATADIR%%/mods/No_Hope/Mapgen/house24.json +%%DATADIR%%/mods/No_Hope/Mapgen/house33.json +%%DATADIR%%/mods/No_Hope/Mapgen/house36.json +%%DATADIR%%/mods/No_Hope/Mapgen/house37.json +%%DATADIR%%/mods/No_Hope/Mapgen/house38.json +%%DATADIR%%/mods/No_Hope/Mapgen/house39.json +%%DATADIR%%/mods/No_Hope/Mapgen/house41.json +%%DATADIR%%/mods/No_Hope/Mapgen/house42.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_detatched2.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_duplex9.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_fortified.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_garage.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_garage2.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_garage_prepper.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_inner_garden.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_nested.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_prepper.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_quiverfull.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_rv.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_tool_shed.json +%%DATADIR%%/mods/No_Hope/Mapgen/house_w_5.json +%%DATADIR%%/mods/No_Hope/Mapgen/irradiator_1.json +%%DATADIR%%/mods/No_Hope/Mapgen/islands.json +%%DATADIR%%/mods/No_Hope/Mapgen/jewel_store.json +%%DATADIR%%/mods/No_Hope/Mapgen/junkyard.json +%%DATADIR%%/mods/No_Hope/Mapgen/lab_parking_lot.json +%%DATADIR%%/mods/No_Hope/Mapgen/lab_surface_big_z1.json +%%DATADIR%%/mods/No_Hope/Mapgen/landscaping_supply.json +%%DATADIR%%/mods/No_Hope/Mapgen/lighthouse.json +%%DATADIR%%/mods/No_Hope/Mapgen/lmoe.json +%%DATADIR%%/mods/No_Hope/Mapgen/lot_empty_commercial.json +%%DATADIR%%/mods/No_Hope/Mapgen/lumbermill.json +%%DATADIR%%/mods/No_Hope/Mapgen/mall_basement.json +%%DATADIR%%/mods/No_Hope/Mapgen/mall_ground.json +%%DATADIR%%/mods/No_Hope/Mapgen/mall_roof.json +%%DATADIR%%/mods/No_Hope/Mapgen/mall_second_floor.json +%%DATADIR%%/mods/No_Hope/Mapgen/mansion.json +%%DATADIR%%/mods/No_Hope/Mapgen/map_extras/map_extras.json +%%DATADIR%%/mods/No_Hope/Mapgen/map_extras/mapgen_updates.json +%%DATADIR%%/mods/No_Hope/Mapgen/megastore.json +%%DATADIR%%/mods/No_Hope/Mapgen/microlab_special_tiles.json +%%DATADIR%%/mods/No_Hope/Mapgen/mil_base_z-1.json +%%DATADIR%%/mods/No_Hope/Mapgen/mil_base_z0.json +%%DATADIR%%/mods/No_Hope/Mapgen/military_outpost.json +%%DATADIR%%/mods/No_Hope/Mapgen/mine_entrance.json +%%DATADIR%%/mods/No_Hope/Mapgen/missile_silo.json +%%DATADIR%%/mods/No_Hope/Mapgen/mortuary.json +%%DATADIR%%/mods/No_Hope/Mapgen/motel.json +%%DATADIR%%/mods/No_Hope/Mapgen/museum.json +%%DATADIR%%/mods/No_Hope/Mapgen/necropolis.json +%%DATADIR%%/mods/No_Hope/Mapgen/necropolisB1.json +%%DATADIR%%/mods/No_Hope/Mapgen/necropolisB2.json +%%DATADIR%%/mods/No_Hope/Mapgen/nested/aux_nested.json +%%DATADIR%%/mods/No_Hope/Mapgen/nested/basement_nested.json +%%DATADIR%%/mods/No_Hope/Mapgen/nested/retail_nested.json +%%DATADIR%%/mods/No_Hope/Mapgen/nested/rural_outdoors_nested.json +%%DATADIR%%/mods/No_Hope/Mapgen/office_cubical.json +%%DATADIR%%/mods/No_Hope/Mapgen/office_doctor.json +%%DATADIR%%/mods/No_Hope/Mapgen/office_tower_2.json +%%DATADIR%%/mods/No_Hope/Mapgen/outpost.json +%%DATADIR%%/mods/No_Hope/Mapgen/park.json +%%DATADIR%%/mods/No_Hope/Mapgen/park_skate.json +%%DATADIR%%/mods/No_Hope/Mapgen/parking_garage.json +%%DATADIR%%/mods/No_Hope/Mapgen/parking_lot.json +%%DATADIR%%/mods/No_Hope/Mapgen/pawn_shop.json +%%DATADIR%%/mods/No_Hope/Mapgen/petstore.json +%%DATADIR%%/mods/No_Hope/Mapgen/pharmacy.json +%%DATADIR%%/mods/No_Hope/Mapgen/pizza_parlor.json +%%DATADIR%%/mods/No_Hope/Mapgen/police_station.json +%%DATADIR%%/mods/No_Hope/Mapgen/post_office.json +%%DATADIR%%/mods/No_Hope/Mapgen/power_station_small.json +%%DATADIR%%/mods/No_Hope/Mapgen/prison_1.json +%%DATADIR%%/mods/No_Hope/Mapgen/private_resort.json +%%DATADIR%%/mods/No_Hope/Mapgen/public_works.json +%%DATADIR%%/mods/No_Hope/Mapgen/ranch_camp.json +%%DATADIR%%/mods/No_Hope/Mapgen/recycle_center.json +%%DATADIR%%/mods/No_Hope/Mapgen/refugee_center.json +%%DATADIR%%/mods/No_Hope/Mapgen/regional_airport.json +%%DATADIR%%/mods/No_Hope/Mapgen/restaurant.json +%%DATADIR%%/mods/No_Hope/Mapgen/robofac_hq_chunks.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_airport_private.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_bookstore.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_camping.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_cardealer.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_clothing.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_electronics.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_gas.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_gas_b11.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_hardware.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_hunting.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_lightindustry.json +%%DATADIR%%/mods/No_Hope/Mapgen/s_lightindustry_scen.json +%%DATADIR%%/mods/No_Hope/Mapgen/school_1.json +%%DATADIR%%/mods/No_Hope/Mapgen/sewage_treatment.json +%%DATADIR%%/mods/No_Hope/Mapgen/shelter.json +%%DATADIR%%/mods/No_Hope/Mapgen/sports_store.json +%%DATADIR%%/mods/No_Hope/Mapgen/storage_units_large.json +%%DATADIR%%/mods/No_Hope/Mapgen/storage_units_medium.json +%%DATADIR%%/mods/No_Hope/Mapgen/storage_units_small.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_10_house_brick_pool.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_11_house_brick.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_12_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_13_dense_house_apt_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_15_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_16_house_ranch.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_17_house_ranch.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_18_victorian.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_1_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_25_dense_diner_apt.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_29_dense_row.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_2_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_35_hospital.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_3_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_4_house_basement.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_5_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_6_house.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_7_house_garden.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_8_house_brick_garden.json +%%DATADIR%%/mods/No_Hope/Mapgen/urban_9_house_garage_loft.json +%%DATADIR%%/mods/No_Hope/Mapgen/whaleys_house_river.json +%%DATADIR%%/mods/No_Hope/Mapgen/ws_biker_dump.json +%%DATADIR%%/mods/No_Hope/Mapgen/ws_fire_lookout_tower.json +%%DATADIR%%/mods/No_Hope/Mapgen/ws_regional_dump.json +%%DATADIR%%/mods/No_Hope/Mapgen/ws_survivor_bunker.json +%%DATADIR%%/mods/No_Hope/NPC/npc.json +%%DATADIR%%/mods/No_Hope/NPC/npc_classes_bandits.json +%%DATADIR%%/mods/No_Hope/NPC/npc_classes_mutant.json +%%DATADIR%%/mods/No_Hope/NPC/trait_groups.json +%%DATADIR%%/mods/No_Hope/README.md +%%DATADIR%%/mods/No_Hope/effects.json +%%DATADIR%%/mods/No_Hope/enchantments.json +%%DATADIR%%/mods/No_Hope/game_balance.json +%%DATADIR%%/mods/No_Hope/item_groups.json +%%DATADIR%%/mods/No_Hope/items.json +%%DATADIR%%/mods/No_Hope/modinfo.json +%%DATADIR%%/mods/No_Hope/monster_attacks.json +%%DATADIR%%/mods/No_Hope/monster_drops.json +%%DATADIR%%/mods/No_Hope/monster_groups.json +%%DATADIR%%/mods/No_Hope/monsters.json +%%DATADIR%%/mods/No_Hope/overmap_specials.json +%%DATADIR%%/mods/No_Hope/overmap_terrain.json +%%DATADIR%%/mods/No_Hope/palettes.json +%%DATADIR%%/mods/No_Hope/regional_map_settings.json +%%DATADIR%%/mods/No_Hope/terrain.json +%%DATADIR%%/mods/No_Hope/vehicle_groups.json +%%DATADIR%%/mods/No_Hope/vehicle_placement.json +%%DATADIR%%/mods/No_Hope/vehicle_spawn.json +%%DATADIR%%/mods/No_Hope/vehicles.json +%%DATADIR%%/mods/No_NPC_Food/modinfo.json +%%DATADIR%%/mods/No_Rail_Stations/modinfo.json +%%DATADIR%%/mods/No_Rail_Stations/overmap_specials.json +%%DATADIR%%/mods/No_Rail_Stations/region_overlay.json +%%DATADIR%%/mods/Only_Wildlife/modinfo.json +%%DATADIR%%/mods/Personal_Portal_Storms/modinfo.json +%%DATADIR%%/mods/Personal_Portal_Storms/monster_factions.json +%%DATADIR%%/mods/Rummaging/modinfo.json +%%DATADIR%%/mods/Standard_Combat_Tests/modinfo.json +%%DATADIR%%/mods/StatsThroughSkills/modinfo.json +%%DATADIR%%/mods/TEST_DATA/EOC.json +%%DATADIR%%/mods/TEST_DATA/README.md +%%DATADIR%%/mods/TEST_DATA/addictions.json +%%DATADIR%%/mods/TEST_DATA/ammo.json +%%DATADIR%%/mods/TEST_DATA/appliance.json +%%DATADIR%%/mods/TEST_DATA/basecamp.json +%%DATADIR%%/mods/TEST_DATA/bionics.json +%%DATADIR%%/mods/TEST_DATA/body_parts.json +%%DATADIR%%/mods/TEST_DATA/books.json +%%DATADIR%%/mods/TEST_DATA/character_modifiers.json +%%DATADIR%%/mods/TEST_DATA/construction.json +%%DATADIR%%/mods/TEST_DATA/construction_group.json +%%DATADIR%%/mods/TEST_DATA/effect_on_condition.json +%%DATADIR%%/mods/TEST_DATA/effects.json +%%DATADIR%%/mods/TEST_DATA/enchantments.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/axes_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/clubs_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/fist_weapons_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/knives_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/polearms_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/shortswords_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/spears_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/staves_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/swords_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_axes_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_clubs_hammers_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_flails_dps.json +%%DATADIR%%/mods/TEST_DATA/expected_dps_data/two_handed_swords_dps.json +%%DATADIR%%/mods/TEST_DATA/factions.json +%%DATADIR%%/mods/TEST_DATA/furniture.json +%%DATADIR%%/mods/TEST_DATA/itemgroups.json +%%DATADIR%%/mods/TEST_DATA/items.json +%%DATADIR%%/mods/TEST_DATA/known_bad_density.json +%%DATADIR%%/mods/TEST_DATA/lang/.gitignore +%%DATADIR%%/mods/TEST_DATA/lang/mo/ru/LC_MESSAGES/INVALID_RAND.mo +%%DATADIR%%/mods/TEST_DATA/lang/po/ru.po +%%DATADIR%%/mods/TEST_DATA/magic.json +%%DATADIR%%/mods/TEST_DATA/mapgen-test.json +%%DATADIR%%/mods/TEST_DATA/martialarts.json +%%DATADIR%%/mods/TEST_DATA/metal.json +%%DATADIR%%/mods/TEST_DATA/missions.json +%%DATADIR%%/mods/TEST_DATA/modinfo.json +%%DATADIR%%/mods/TEST_DATA/monster_factions.json +%%DATADIR%%/mods/TEST_DATA/monstergroups.json +%%DATADIR%%/mods/TEST_DATA/monsters.json +%%DATADIR%%/mods/TEST_DATA/mutations.json +%%DATADIR%%/mods/TEST_DATA/npc_shop_cons_rates.json +%%DATADIR%%/mods/TEST_DATA/option_sliders.json +%%DATADIR%%/mods/TEST_DATA/overmap_specials.json +%%DATADIR%%/mods/TEST_DATA/proficiencies.json +%%DATADIR%%/mods/TEST_DATA/proficiency_categories.json +%%DATADIR%%/mods/TEST_DATA/recipes.json +%%DATADIR%%/mods/TEST_DATA/scenarios.json +%%DATADIR%%/mods/TEST_DATA/speed_descriptions.json +%%DATADIR%%/mods/TEST_DATA/terrain.json +%%DATADIR%%/mods/TEST_DATA/traits.json +%%DATADIR%%/mods/TEST_DATA/uncraft.json +%%DATADIR%%/mods/TEST_DATA/vehicle.json +%%DATADIR%%/mods/TEST_DATA/vehicle_drag_test.json +%%DATADIR%%/mods/TEST_DATA/vehicle_efficiency_test.json +%%DATADIR%%/mods/TEST_DATA/vitamins.json +%%DATADIR%%/mods/TEST_DATA/weakpoint_sets.json +%%DATADIR%%/mods/TEST_DATA/weapons.json +%%DATADIR%%/mods/TEST_DATA/widgets.json +%%DATADIR%%/mods/Tamable_Wildlife/bird.json +%%DATADIR%%/mods/Tamable_Wildlife/fish.json +%%DATADIR%%/mods/Tamable_Wildlife/insect_spider.json +%%DATADIR%%/mods/Tamable_Wildlife/items/comestibles/eggs.json +%%DATADIR%%/mods/Tamable_Wildlife/items/comestibles/other.json +%%DATADIR%%/mods/Tamable_Wildlife/mammal.json +%%DATADIR%%/mods/Tamable_Wildlife/modinfo.json +%%DATADIR%%/mods/Tamable_Wildlife/monstergroups/eggs.json +%%DATADIR%%/mods/Tamable_Wildlife/recipes/nested.json +%%DATADIR%%/mods/Tamable_Wildlife/recipes/recipe_egg.json +%%DATADIR%%/mods/Tamable_Wildlife/recipes/recipe_food.json +%%DATADIR%%/mods/Tamable_Wildlife/reptile_amphibian.json +%%DATADIR%%/mods/TropiCataclysm/blacklists/default_blacklist.json +%%DATADIR%%/mods/TropiCataclysm/effects.json +%%DATADIR%%/mods/TropiCataclysm/furniture_and_terrain/terrain_fungal_termite.json +%%DATADIR%%/mods/TropiCataclysm/furniture_and_terrain/tropical_terrain_flora.json +%%DATADIR%%/mods/TropiCataclysm/furniture_and_terrain/tropical_terrain_nether.json +%%DATADIR%%/mods/TropiCataclysm/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json +%%DATADIR%%/mods/TropiCataclysm/itemgroups/agriculture.json +%%DATADIR%%/mods/TropiCataclysm/items/comestibles/carnivore.json +%%DATADIR%%/mods/TropiCataclysm/items/comestibles/egg.json +%%DATADIR%%/mods/TropiCataclysm/items/comestibles/raw_veggy.json +%%DATADIR%%/mods/TropiCataclysm/items/comestibles/seed.json +%%DATADIR%%/mods/TropiCataclysm/mapgen/bugs/termites.json +%%DATADIR%%/mods/TropiCataclysm/mapgen/fungal/overtaken_lot.json +%%DATADIR%%/mods/TropiCataclysm/mapgen/nether/portal_reef.json +%%DATADIR%%/mods/TropiCataclysm/mapgen/triffid/overgrown_lot.json +%%DATADIR%%/mods/TropiCataclysm/mapgen/triffid/triffid_blossom.json +%%DATADIR%%/mods/TropiCataclysm/mapgen/triffid/triffid_garden.json +%%DATADIR%%/mods/TropiCataclysm/modinfo.json +%%DATADIR%%/mods/TropiCataclysm/monster_special_attacks/monster_deaths,json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/eggs.json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/fungi.json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/misc.json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/nether.json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/triffid.json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/tropical_bugs.json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/wilderness.json +%%DATADIR%%/mods/TropiCataclysm/monstergroups/zombie_upgrades.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_bird.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_fish.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_fungus.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_insect_spider.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_mammal.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_nether.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_triffid.json +%%DATADIR%%/mods/TropiCataclysm/monsters/tropical_zombies.json +%%DATADIR%%/mods/TropiCataclysm/monsters/zed_plant.json +%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_mutable/termitemound.json +%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_special/specials.json +%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_nether.json +%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_residential.json +%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_termites.json +%%DATADIR%%/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_triffid.json +%%DATADIR%%/mods/TropiCataclysm/recipes/recipe_food.json +%%DATADIR%%/mods/TropiCataclysm/spells.json +%%DATADIR%%/mods/TropiCataclysm/tropical_harvest.json +%%DATADIR%%/mods/TropiCataclysm/tropical_monster_factions.json +%%DATADIR%%/mods/TropiCataclysm/tropical_overmap_connections.json +%%DATADIR%%/mods/TropiCataclysm/tropical_overmap_terrain.json +%%DATADIR%%/mods/TropiCataclysm/tropical_regional_map_settings.json +%%DATADIR%%/mods/TropiCataclysm/tropical_special_locations.json +%%DATADIR%%/mods/TropiCataclysm/tropical_terrain.json +%%DATADIR%%/mods/Xedra_Evolved/README.md +%%DATADIR%%/mods/Xedra_Evolved/achievements/achievements.json +%%DATADIR%%/mods/Xedra_Evolved/achievements/statistics.json +%%DATADIR%%/mods/Xedra_Evolved/addiction_eocs.json +%%DATADIR%%/mods/Xedra_Evolved/addictions.json +%%DATADIR%%/mods/Xedra_Evolved/disease.json +%%DATADIR%%/mods/Xedra_Evolved/dissect.json +%%DATADIR%%/mods/Xedra_Evolved/effects/effect_on_condition.json +%%DATADIR%%/mods/Xedra_Evolved/effects/effects.json +%%DATADIR%%/mods/Xedra_Evolved/effects/emit.json +%%DATADIR%%/mods/Xedra_Evolved/effects/field_type.json +%%DATADIR%%/mods/Xedra_Evolved/effects/vampvirus.json +%%DATADIR%%/mods/Xedra_Evolved/furniture_and_terrain/furniture.json +%%DATADIR%%/mods/Xedra_Evolved/furniture_and_terrain/terrain-doors.json +%%DATADIR%%/mods/Xedra_Evolved/harvest.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/itemgroups.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/map_extra_itemgroups.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/monster_drops.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/classless.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/dreamer.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/dreamsmith.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/eater.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/inventor.json +%%DATADIR%%/mods/Xedra_Evolved/itemgroups/spell_artifacts/main.json +%%DATADIR%%/mods/Xedra_Evolved/items/ammo.json +%%DATADIR%%/mods/Xedra_Evolved/items/ammo_type.json +%%DATADIR%%/mods/Xedra_Evolved/items/armor/armor.json +%%DATADIR%%/mods/Xedra_Evolved/items/armor/headgear.json +%%DATADIR%%/mods/Xedra_Evolved/items/armor/integrated.json +%%DATADIR%%/mods/Xedra_Evolved/items/biosignatures.json +%%DATADIR%%/mods/Xedra_Evolved/items/book_lore.json +%%DATADIR%%/mods/Xedra_Evolved/items/carnivore.json +%%DATADIR%%/mods/Xedra_Evolved/items/casing.json +%%DATADIR%%/mods/Xedra_Evolved/items/cbms.json +%%DATADIR%%/mods/Xedra_Evolved/items/clothes.json +%%DATADIR%%/mods/Xedra_Evolved/items/containers.json +%%DATADIR%%/mods/Xedra_Evolved/items/drugs.json +%%DATADIR%%/mods/Xedra_Evolved/items/ethereal_items.json +%%DATADIR%%/mods/Xedra_Evolved/items/gun_magazine.json +%%DATADIR%%/mods/Xedra_Evolved/items/gunmod.json +%%DATADIR%%/mods/Xedra_Evolved/items/guns.json +%%DATADIR%%/mods/Xedra_Evolved/items/inventor/artifacts.json +%%DATADIR%%/mods/Xedra_Evolved/items/inventor/spark_artifact_items.json +%%DATADIR%%/mods/Xedra_Evolved/items/melee.json +%%DATADIR%%/mods/Xedra_Evolved/items/notes_and_news.json +%%DATADIR%%/mods/Xedra_Evolved/items/pets.json +%%DATADIR%%/mods/Xedra_Evolved/items/resources.json +%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_classless.json +%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_dreamer.json +%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_dreamsmith.json +%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json +%%DATADIR%%/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_inventor.json +%%DATADIR%%/mods/Xedra_Evolved/items/xedra_gear.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/cave.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/map_extras.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/multitile_city_buildings.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/nested/field_office_nests.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/nested/spiders.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/nested/vampires.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/overmap_special.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/overmap_terrain.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/safehouse.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/vampire_cathedral.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/vampire_locations.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen/xedra_field_office.json +%%DATADIR%%/mods/Xedra_Evolved/mapgen_palettes/field_office_palette.json +%%DATADIR%%/mods/Xedra_Evolved/material.json +%%DATADIR%%/mods/Xedra_Evolved/missions.json +%%DATADIR%%/mods/Xedra_Evolved/modinfo.json +%%DATADIR%%/mods/Xedra_Evolved/monster_special_attacks/monster_special_attacks.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/bloodsuckers.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/changeling.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/monfaction.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/monster.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/monster_evolutions.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/monster_spells.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/monsterattacks.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/monstergroup.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/nightmares_and_chimeras.json +%%DATADIR%%/mods/Xedra_Evolved/monsters/species.json +%%DATADIR%%/mods/Xedra_Evolved/mutations/classes.json +%%DATADIR%%/mods/Xedra_Evolved/mutations/cybernetic_traits.json +%%DATADIR%%/mods/Xedra_Evolved/mutations/mutation_eocs.json +%%DATADIR%%/mods/Xedra_Evolved/mutations/mutations.json +%%DATADIR%%/mods/Xedra_Evolved/mutations/spells.json +%%DATADIR%%/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json +%%DATADIR%%/mods/Xedra_Evolved/npc/mr_lapin.json +%%DATADIR%%/mods/Xedra_Evolved/npc/npc_classes.json +%%DATADIR%%/mods/Xedra_Evolved/npc/talk_rescue.json +%%DATADIR%%/mods/Xedra_Evolved/npc/trait_groups.json +%%DATADIR%%/mods/Xedra_Evolved/player/cbm_eoc.json +%%DATADIR%%/mods/Xedra_Evolved/player/cbm_spells.json +%%DATADIR%%/mods/Xedra_Evolved/player/professions.json +%%DATADIR%%/mods/Xedra_Evolved/player/renfield_cbms.json +%%DATADIR%%/mods/Xedra_Evolved/recipes/vampire.json +%%DATADIR%%/mods/Xedra_Evolved/regional_overlay.json +%%DATADIR%%/mods/Xedra_Evolved/requirements/spell_components.json +%%DATADIR%%/mods/Xedra_Evolved/requirements/toolsets.json +%%DATADIR%%/mods/Xedra_Evolved/scenario.json +%%DATADIR%%/mods/Xedra_Evolved/skills.json +%%DATADIR%%/mods/Xedra_Evolved/snippets/changeling_speech.json +%%DATADIR%%/mods/Xedra_Evolved/snippets/effect_on_condition.json +%%DATADIR%%/mods/Xedra_Evolved/snippets/migo_speech.json +%%DATADIR%%/mods/Xedra_Evolved/snippets/snippet.json +%%DATADIR%%/mods/Xedra_Evolved/snippets/vampire_speech.json +%%DATADIR%%/mods/Xedra_Evolved/snippets/xedra.json +%%DATADIR%%/mods/Xedra_Evolved/spells/classless_spells.json +%%DATADIR%%/mods/Xedra_Evolved/spells/dreamer_spells.json +%%DATADIR%%/mods/Xedra_Evolved/spells/dreamsmithing.json +%%DATADIR%%/mods/Xedra_Evolved/spells/eater_spells.json +%%DATADIR%%/mods/Xedra_Evolved/spells/inventor_spells.json +%%DATADIR%%/mods/Xedra_Evolved/spells/item_spells.json +%%DATADIR%%/mods/Xedra_Evolved/spells/spell_eocs.json +%%DATADIR%%/mods/Xedra_Evolved/spells/vampire_spells.json +%%DATADIR%%/mods/Xedra_Evolved/tool_qualities.json +%%DATADIR%%/mods/Xedra_Evolved/ui/sidebar.json +%%DATADIR%%/mods/Xedra_Evolved/vehicles/migrations.json +%%DATADIR%%/mods/Xedra_Evolved/vehicles/vehicle_groups.json +%%DATADIR%%/mods/Xedra_Evolved/vehicles/xedra.json +%%DATADIR%%/mods/Xedra_Evolved/vitamin.json +%%DATADIR%%/mods/aftershock_exoplanet/Map/mapgen/bridge.json +%%DATADIR%%/mods/aftershock_exoplanet/Map/mapgen/glacer.json +%%DATADIR%%/mods/aftershock_exoplanet/Map/mapgen/road.json +%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_connections.json +%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_location.json +%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_terrain/ice_fields.json +%%DATADIR%%/mods/aftershock_exoplanet/Map/overmap_terrain/overmap_terrain_transportation.json +%%DATADIR%%/mods/aftershock_exoplanet/game_balance.json +%%DATADIR%%/mods/aftershock_exoplanet/modinfo.json +%%DATADIR%%/mods/aftershock_exoplanet/region_settings.json +%%DATADIR%%/mods/aftershock_exoplanet/scenarios.json +%%DATADIR%%/mods/aftershock_exoplanet/setting_blacklists/location_blacklist.json +%%DATADIR%%/mods/aftershock_exoplanet/setting_blacklists/mon_blacklist.json +%%DATADIR%%/mods/aftershock_exoplanet/setting_blacklists/scenario_blacklist.json +%%DATADIR%%/mods/aftershock_exoplanet/weather_type.json +%%DATADIR%%/mods/alt_map_key/modinfo.json +%%DATADIR%%/mods/alt_map_key/overmap_terrain.json +%%DATADIR%%/mods/alt_map_key/readme.txt +%%DATADIR%%/mods/cbm_slots/game_balance.json +%%DATADIR%%/mods/cbm_slots/modinfo.json +%%DATADIR%%/mods/classic_zombies/alberta_regional_map_settings.json +%%DATADIR%%/mods/classic_zombies/contagion/effect.json +%%DATADIR%%/mods/classic_zombies/design-doc.md +%%DATADIR%%/mods/classic_zombies/exclusions.json +%%DATADIR%%/mods/classic_zombies/items/blacklists.json +%%DATADIR%%/mods/classic_zombies/items/guns.json +%%DATADIR%%/mods/classic_zombies/items/migration.json +%%DATADIR%%/mods/classic_zombies/missiondef.json +%%DATADIR%%/mods/classic_zombies/modinfo.json +%%DATADIR%%/mods/classic_zombies/monsters/species.json +%%DATADIR%%/mods/classic_zombies/monsters/weakpoints.json +%%DATADIR%%/mods/classic_zombies/place_names.md +%%DATADIR%%/mods/dda/modinfo.json +%%DATADIR%%/mods/deadly_bites/effect_on_conditions.json +%%DATADIR%%/mods/deadly_bites/effects.json +%%DATADIR%%/mods/deadly_bites/itemgroups.json +%%DATADIR%%/mods/deadly_bites/items.json +%%DATADIR%%/mods/deadly_bites/modinfo.json +%%DATADIR%%/mods/deadly_bites/scenarios.json +%%DATADIR%%/mods/default.json +%%DATADIR%%/mods/desert_region/desert_insect_spider.json +%%DATADIR%%/mods/desert_region/desert_mammal.json +%%DATADIR%%/mods/desert_region/desert_monsters.json +%%DATADIR%%/mods/desert_region/desert_overmap_connections.json +%%DATADIR%%/mods/desert_region/desert_regional_map_settings.json +%%DATADIR%%/mods/desert_region/desert_reptile_amphibian.json +%%DATADIR%%/mods/desert_region/desert_special_locations.json +%%DATADIR%%/mods/desert_region/furniture-and-terrain/desert_furniture.json +%%DATADIR%%/mods/desert_region/furniture-and-terrain/desert_terrain.json +%%DATADIR%%/mods/desert_region/itemgroups/nature.json +%%DATADIR%%/mods/desert_region/mapgen/earth.json +%%DATADIR%%/mods/desert_region/modinfo.json +%%DATADIR%%/mods/desert_region/monsters/desert_monster_factions.json +%%DATADIR%%/mods/desert_region/monsters/desert_monstergroups.json +%%DATADIR%%/mods/desert_region/overmap/desert_overmap_terrain.json +%%DATADIR%%/mods/desert_region/overmap/location_blacklist.json +%%DATADIR%%/mods/desert_region/overmap/mutable/canyon_mutable.json +%%DATADIR%%/mods/desert_region/overmap/mutable/dumpsite_mutable.json +%%DATADIR%%/mods/desert_region/overmap/mutable/mesa_mutable.json +%%DATADIR%%/mods/desert_region/overmap/specials.json +%%DATADIR%%/mods/desert_region/weather/desert_weather_type.json +%%DATADIR%%/mods/desert_region/weather/dust_storm_snippets.json +%%DATADIR%%/mods/desert_region/weather/fd_dust.json +%%DATADIR%%/mods/desert_region/weather/weather_eoc.json +%%DATADIR%%/mods/extra_mut_scen/modinfo.json +%%DATADIR%%/mods/extra_mut_scen/mutation_scenarios.json +%%DATADIR%%/mods/innawood/construction.json +%%DATADIR%%/mods/innawood/construction_group.json +%%DATADIR%%/mods/innawood/furniture_and_terrain/appliances.json +%%DATADIR%%/mods/innawood/furniture_and_terrain/furniture-flora.json +%%DATADIR%%/mods/innawood/furniture_and_terrain/furniture-tools.json +%%DATADIR%%/mods/innawood/furniture_and_terrain/terrain-floors-outdoors.json +%%DATADIR%%/mods/innawood/furniture_and_terrain/terrain-flora.json +%%DATADIR%%/mods/innawood/harvest.json +%%DATADIR%%/mods/innawood/hobbies.json +%%DATADIR%%/mods/innawood/itemgroups/Location_MapExtras_locations.json +%%DATADIR%%/mods/innawood/itemgroups/clothing.json +%%DATADIR%%/mods/innawood/itemgroups/guns.json +%%DATADIR%%/mods/innawood/itemgroups/military.json +%%DATADIR%%/mods/innawood/itemgroups/monster_drops_lairs.json +%%DATADIR%%/mods/innawood/itemgroups/science_and_tech.json +%%DATADIR%%/mods/innawood/itemgroups/tools.json +%%DATADIR%%/mods/innawood/itemgroups/trash_and_debris.json +%%DATADIR%%/mods/innawood/items/electronics.json +%%DATADIR%%/mods/innawood/items/food_other.json +%%DATADIR%%/mods/innawood/items/lighting.json +%%DATADIR%%/mods/innawood/items/medical_primitive.json +%%DATADIR%%/mods/innawood/items/misc.json +%%DATADIR%%/mods/innawood/items/tool_tailoring.json +%%DATADIR%%/mods/innawood/items/tool_workshop.json +%%DATADIR%%/mods/innawood/items/vehicle_battery.json +%%DATADIR%%/mods/innawood/mapgen/cave.json +%%DATADIR%%/mods/innawood/mapgen/crater.json +%%DATADIR%%/mods/innawood/mapgen/map_extras/trapdoor_spider_den.json +%%DATADIR%%/mods/innawood/mapgen/ponds.json +%%DATADIR%%/mods/innawood/materials.json +%%DATADIR%%/mods/innawood/mining/construction.json +%%DATADIR%%/mods/innawood/mining/construction_group.json +%%DATADIR%%/mods/innawood/mining/furniture_and_terrain/furniture-tools.json +%%DATADIR%%/mods/innawood/mining/furniture_and_terrain/terrain-walls.json +%%DATADIR%%/mods/innawood/mining/furniture_and_terrain/veins.json +%%DATADIR%%/mods/innawood/mining/itemgroups/Location_MapExtras_locations.json +%%DATADIR%%/mods/innawood/mining/items/fake.json +%%DATADIR%%/mods/innawood/mining/items/ore.json +%%DATADIR%%/mods/innawood/mining/recipes/smelting.json +%%DATADIR%%/mods/innawood/modinfo.json +%%DATADIR%%/mods/innawood/monsterdrops/zombie.json +%%DATADIR%%/mods/innawood/monsterdrops/zombie_child.json +%%DATADIR%%/mods/innawood/monsterdrops/zombie_default.json +%%DATADIR%%/mods/innawood/monsters/insect_spider.json +%%DATADIR%%/mods/innawood/monsters/mon_blacklist.json +%%DATADIR%%/mods/innawood/monsters/nether.json +%%DATADIR%%/mods/innawood/mutations/mutations.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/codger.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/confused_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/cop_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/cop_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/cop_3.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/criminal_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/criminal_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/dreamer.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_3.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_4.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_5.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/evacuee_6.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/grad_student_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/gung_ho_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/gung_ho_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/gung_ho_3.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/high_school_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/hospital_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/hospital_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/hospital_3.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/hunter_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/hunter_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/lab_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/left_for_dead_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/left_for_dead_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/left_for_dead_3.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/lost_partner_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/lost_partner_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/nerd_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_3.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/no_past_4.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/out_of_town_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/out_of_town_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/prepper_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/prepper_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/prisoner_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/professor_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/religious_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/religious_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/rural_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/rural_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/scientist_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/soldier_1.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/soldier_2.json +%%DATADIR%%/mods/innawood/npcs/Backgrounds/wedding_1.json +%%DATADIR%%/mods/innawood/npcs/NC_ARMY.json +%%DATADIR%%/mods/innawood/npcs/NC_OPS.json +%%DATADIR%%/mods/innawood/npcs/class_item_groups.json +%%DATADIR%%/mods/innawood/npcs/items_generic.json +%%DATADIR%%/mods/innawood/npcs/missiondef.json +%%DATADIR%%/mods/innawood/overmap/connections.json +%%DATADIR%%/mods/innawood/overmap/specials_kept.json +%%DATADIR%%/mods/innawood/overmap/terrain_hardcoded.json +%%DATADIR%%/mods/innawood/portal_storm_effect_on_condition.json +%%DATADIR%%/mods/innawood/professions.json +%%DATADIR%%/mods/innawood/readme.md +%%DATADIR%%/mods/innawood/recipes/armor/arms.json +%%DATADIR%%/mods/innawood/recipes/armor/head.json +%%DATADIR%%/mods/innawood/recipes/armor/other.json +%%DATADIR%%/mods/innawood/recipes/brewing.json +%%DATADIR%%/mods/innawood/recipes/chem_fuel.json +%%DATADIR%%/mods/innawood/recipes/chem_other.json +%%DATADIR%%/mods/innawood/recipes/distill.json +%%DATADIR%%/mods/innawood/recipes/electronic_parts.json +%%DATADIR%%/mods/innawood/recipes/food_drinks.json +%%DATADIR%%/mods/innawood/recipes/medsandchemicals.json +%%DATADIR%%/mods/innawood/recipes/other/construction.json +%%DATADIR%%/mods/innawood/recipes/other/materials.json +%%DATADIR%%/mods/innawood/recipes/other/medical.json +%%DATADIR%%/mods/innawood/recipes/other/parts.json +%%DATADIR%%/mods/innawood/recipes/other/parts_rigs.json +%%DATADIR%%/mods/innawood/recipes/other/power_supplies.json +%%DATADIR%%/mods/innawood/recipes/other/vehicle.json +%%DATADIR%%/mods/innawood/recipes/practice/mechanics.json +%%DATADIR%%/mods/innawood/recipes/practice/melee.json +%%DATADIR%%/mods/innawood/recipes/practice/tailoring.json +%%DATADIR%%/mods/innawood/recipes/recipe_deconstruction.json +%%DATADIR%%/mods/innawood/recipes/recipe_food.json +%%DATADIR%%/mods/innawood/recipes/recipe_others.json +%%DATADIR%%/mods/innawood/recipes/recipe_vehicle.json +%%DATADIR%%/mods/innawood/recipes/tool.json +%%DATADIR%%/mods/innawood/recipes/tools_containers.json +%%DATADIR%%/mods/innawood/recipes/tools_electronic.json +%%DATADIR%%/mods/innawood/recipes/tools_hand.json +%%DATADIR%%/mods/innawood/recipes/tools_lights.json +%%DATADIR%%/mods/innawood/recipes/weapon/bashing.json +%%DATADIR%%/mods/innawood/recipes/weapon/cutting.json +%%DATADIR%%/mods/innawood/recipes/weapon/mods.json +%%DATADIR%%/mods/innawood/recipes/weapon/piercing.json +%%DATADIR%%/mods/innawood/recipes/weapon/ranged.json +%%DATADIR%%/mods/innawood/region_overlay.json +%%DATADIR%%/mods/innawood/requirements/materials.json +%%DATADIR%%/mods/innawood/requirements/tailoring.json +%%DATADIR%%/mods/innawood/scenario_whitelist.json +%%DATADIR%%/mods/innawood/scenarios.json +%%DATADIR%%/mods/innawood/start_locations.json +%%DATADIR%%/mods/innawood/traps.json +%%DATADIR%%/mods/innawood/vehicleparts/battery.json +%%DATADIR%%/mods/no_fungal_growth/modinfo.json +%%DATADIR%%/mods/package_bionic_professions/bionic_missions.json +%%DATADIR%%/mods/package_bionic_professions/bionic_professions.json +%%DATADIR%%/mods/package_bionic_professions/modinfo.json +%%DATADIR%%/mods/package_bionic_professions/scenarios.json +%%DATADIR%%/mods/replacements.json +%%DATADIR%%/mods/rural_biome/modinfo.json +%%DATADIR%%/mods/rural_biome/rural_regional_map_settings.json +%%DATADIR%%/mods/sees_player_hitbutton/mod_tileset.json +%%DATADIR%%/mods/sees_player_hitbutton/modinfo.json +%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_green.png +%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_pink.png +%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_red.png +%%DATADIR%%/mods/sees_player_hitbutton/sees_player_hitbutton_yellow.png +%%DATADIR%%/mods/sees_player_retro/mod_tileset.json +%%DATADIR%%/mods/sees_player_retro/modinfo.json +%%DATADIR%%/mods/sees_player_retro/sees_player_retro.png +%%DATADIR%%/mods/speedydex/modinfo.json +%%DATADIR%%/mods/stats_through_kills/modinfo.json +%%DATADIR%%/mods/translate-dialogue/modinfo.json +%%DATADIR%%/mods/translate-dialogue/rubik.json +%%DATADIR%%/motd/ar.motd +%%DATADIR%%/motd/cs.motd +%%DATADIR%%/motd/de.motd +%%DATADIR%%/motd/el.motd +%%DATADIR%%/motd/en.motd +%%DATADIR%%/motd/es_AR.motd +%%DATADIR%%/motd/es_ES.motd +%%DATADIR%%/motd/fil_PH.motd +%%DATADIR%%/motd/fr.motd +%%DATADIR%%/motd/ga_IE.motd +%%DATADIR%%/motd/hu.motd +%%DATADIR%%/motd/id.motd +%%DATADIR%%/motd/it_IT.motd +%%DATADIR%%/motd/ja.motd +%%DATADIR%%/motd/ko.motd +%%DATADIR%%/motd/nb.motd +%%DATADIR%%/motd/pl.motd +%%DATADIR%%/motd/pt_BR.motd +%%DATADIR%%/motd/ru.motd +%%DATADIR%%/motd/tr.motd +%%DATADIR%%/motd/uk_UA.motd +%%DATADIR%%/motd/zh_CN.motd +%%DATADIR%%/motd/zh_TW.motd +%%DATADIR%%/names/en.json +%%DATADIR%%/names/ja.json +%%DATADIR%%/names/ko.json +%%DATADIR%%/names/ru.json +%%DATADIR%%/names/zh_CN.json +%%DATADIR%%/names/zh_TW.json +%%DATADIR%%/raw/color_templates/default.json +%%DATADIR%%/raw/color_templates/no_bright_background.json +%%DATADIR%%/raw/color_themes/base_colors-articblush.json +%%DATADIR%%/raw/color_themes/base_colors-dark.json +%%DATADIR%%/raw/color_themes/base_colors-default-sleek.json +%%DATADIR%%/raw/color_themes/base_colors-default.json +%%DATADIR%%/raw/color_themes/base_colors-green.json +%%DATADIR%%/raw/color_themes/base_colors-iceberg.json +%%DATADIR%%/raw/color_themes/base_colors-iceberg_light.json +%%DATADIR%%/raw/color_themes/base_colors-kanagawa.json +%%DATADIR%%/raw/color_themes/base_colors-vintage.json +%%DATADIR%%/raw/color_themes/base_colors-white.json +%%DATADIR%%/raw/color_themes/base_colors_amber.json +%%DATADIR%%/raw/color_themes/base_colors_gruvbox-light.json +%%DATADIR%%/raw/color_themes/base_colors_gruvbox.json +%%DATADIR%%/raw/color_themes/base_colors_one-dark.json +%%DATADIR%%/raw/colors.json +%%DATADIR%%/raw/keybindings.json +%%DATADIR%%/raw/keybindings/vehicle.json +%%DATADIR%%/raw/sokoban.txt +%%DATADIR%%/screenshots/ultica-showcase-sep-2021.png %%TILES%%%%DATADIR%%/sound/Basic/menu_error.ogg %%TILES%%%%DATADIR%%/sound/Basic/menu_move.ogg %%TILES%%%%DATADIR%%/sound/Basic/musicset.json %%TILES%%%%DATADIR%%/sound/Basic/soundpack.txt %%TILES%%%%DATADIR%%/sound/Basic/soundset.json -%%CURSES%%%%DATADIR%%/title/en.alt1 -%%CURSES%%%%DATADIR%%/title/en.christmas -%%CURSES%%%%DATADIR%%/title/en.easter -%%CURSES%%%%DATADIR%%/title/en.halloween -%%CURSES%%%%DATADIR%%/title/en.independence_day -%%CURSES%%%%DATADIR%%/title/en.new_year -%%CURSES%%%%DATADIR%%/title/en.thanksgiving -%%CURSES%%%%DATADIR%%/title/en.title -%%CURSES%%%%DATADIR%%/title/ru.alt1 -%%CURSES%%%%DATADIR%%/title/ru.title -%%CURSES%%%%DATADIR%%/title/zh_CN.title +%%DATADIR%%/title/en.alt1 +%%DATADIR%%/title/en.christmas +%%DATADIR%%/title/en.easter +%%DATADIR%%/title/en.halloween +%%DATADIR%%/title/en.independence_day +%%DATADIR%%/title/en.new_year +%%DATADIR%%/title/en.thanksgiving +%%DATADIR%%/title/en.title +%%DATADIR%%/title/ru.alt1 +%%DATADIR%%/title/ru.title +%%DATADIR%%/title/zh_CN.title %%TILES%%%%DATADIR%%/xdg/org.cataclysmdda.CataclysmDDA.appdata.xml %%TILES%%%%DATADIR%%/xdg/org.cataclysmdda.CataclysmDDA.desktop %%TILES%%%%DATADIR%%/xdg/org.cataclysmdda.CataclysmDDA.svg -%%CURSES%%%%NLS%%share/locale/ar/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/cs/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/da/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/de/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/el/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/fil_PH/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/fr/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/ga_IE/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/hu/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/id/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/is/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/ja/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/ko/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/nb/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/nl/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/pl/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/ro/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/ru/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/sr/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/tr/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/uk_UA/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo -%%CURSES%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/ar/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/cs/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/da/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/de/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/el/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/fil_PH/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/fr/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/ga_IE/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/hu/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/id/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/is/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/ja/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/ko/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/nb/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/nl/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/pl/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/ro/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/ru/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/sr/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/tr/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/uk_UA/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo diff --git a/games/sgt-puzzles/Makefile b/games/sgt-puzzles/Makefile index ec468c8a7ec..a797bc58be7 100644 --- a/games/sgt-puzzles/Makefile +++ b/games/sgt-puzzles/Makefile @@ -1,5 +1,5 @@ PORTNAME= puzzles -PORTVERSION= 20230814 +PORTVERSION= 20230822 CATEGORIES= games # upstream does not preserve older versions, mirroring is mandatory MASTER_SITES= https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ \ @@ -20,7 +20,7 @@ USES= cmake gnome magick:build perl5 pkgconfig USE_PERL5= build CMAKE_ARGS= -DNAME_PREFIX:STRING=sgt- -COMMITHASH= a409cfe +COMMITHASH= 56781e6 DATADIR= ${PREFIX}/share/sgt-puzzles PORTDATA= * diff --git a/games/sgt-puzzles/distinfo b/games/sgt-puzzles/distinfo index 1d99362e381..4b7dcc07fe2 100644 --- a/games/sgt-puzzles/distinfo +++ b/games/sgt-puzzles/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692035992 -SHA256 (puzzles-20230814.a409cfe.tar.gz) = f7517f16abb4afd4862c98759231e8a12fc3110c9e8d182dbee3651bd5c5d1a9 -SIZE (puzzles-20230814.a409cfe.tar.gz) = 2486826 +TIMESTAMP = 1692703590 +SHA256 (puzzles-20230822.56781e6.tar.gz) = 461c9fb58742a2dce5ab2c7c3df1bc367fc8717ceb80464608dfd6afb8b74fee +SIZE (puzzles-20230822.56781e6.tar.gz) = 2487089 diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index e33786dd56b..e444d23913d 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -1,6 +1,6 @@ PORTNAME= filament DISTVERSIONPREFIX= v -DISTVERSION= 1.41.0 +DISTVERSION= 1.42.0 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/filament/distinfo b/graphics/filament/distinfo index 0b8aa3ed9e5..cacf737e858 100644 --- a/graphics/filament/distinfo +++ b/graphics/filament/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692162464 -SHA256 (google-filament-v1.41.0_GH0.tar.gz) = 4a18018dbb4128f3ed4ceb5cdb3c4cdba7838f0c5c4f43c5293871e9f0ff53a1 -SIZE (google-filament-v1.41.0_GH0.tar.gz) = 501951257 +TIMESTAMP = 1692764450 +SHA256 (google-filament-v1.42.0_GH0.tar.gz) = b3f042885c6a1d84c2d36016925f3d46140c516af67cb87e902156d7c7305732 +SIZE (google-filament-v1.42.0_GH0.tar.gz) = 501957967 diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 07f72e13a7f..f4883160ae5 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 23.2.0-branchpoint-2627 -DISTVERSIONSUFFIX= -g51a911cfa10 +DISTVERSION= 23.2.0-branchpoint-2706 +DISTVERSIONSUFFIX= -g6079c3ca499 CATEGORIES= graphics PKGNAMESUFFIX= -devel diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 573e50947f5..7e8ed17ee7f 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1692401856 -SHA256 (mesa3d-mesa-23.2.0-branchpoint-2627-g51a911cfa10_GH0.tar.gz) = 438c0d17862bc57d432b1b1272039509e3356f8bcc0c29636cd513294a4d4e18 -SIZE (mesa3d-mesa-23.2.0-branchpoint-2627-g51a911cfa10_GH0.tar.gz) = 30676952 +TIMESTAMP = 1692657081 +SHA256 (mesa3d-mesa-23.2.0-branchpoint-2706-g6079c3ca499_GH0.tar.gz) = bebb037711086f077b34a8fef7e82759c8930f916f3c6e0ffdc46b4838584e82 +SIZE (mesa3d-mesa-23.2.0-branchpoint-2706-g6079c3ca499_GH0.tar.gz) = 30710636 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008 SIZE (700efacda59c.patch) = 983 SHA256 (3043f16d66bf.patch) = b596e02eb42d2cdd0b47cc4de98db4981b36069d0ab857c6f1a441c1fd72e8a1 diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 8618dbdb26f..e28f2b2430b 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -82,6 +82,12 @@ post-patch: @${REINPLACE_CMD} -e 's|pkg-config|false|g' ${WRKSRC}/GNUmakefile @${REINPLACE_CMD} ${_DISABLE_TESTS:@.test.@-e '/${.test.}/d'@} \ ${WRKSRC}/test/Test-Order +.ifdef WITH_PIE +.for dn in buildtools test + @${REINPLACE_CMD} -e '/^all:/s/^/CFLAGS_FOR_BUILD+=${PIE_CFLAGS}\n/' \ + ${WRKSRC}/${dn}/Makefile +.endfor +.endif post-patch-STATIC-on: @${REINPLACE_CMD} -e 's|$$(LD)|$$(LD) -static|g' \ @@ -122,7 +128,7 @@ NETPBM_SERIES= advanced netpbm-version-check: @REV=`svnlite info ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk | ${SED} -n 's/Last Changed Rev: //p'`; \ - VERSION=`(svnlite cat -r$$REV ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk; \ + VERSION=`(svnlite ${CAT} -r$$REV ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk; \ echo 'all:'; \ echo ' @printf "%02d.%02d.%02d" \'; \ echo ' $${NETPBM_MAJOR_RELEASE} \' ; \ diff --git a/graphics/p5-Image-Info/Makefile b/graphics/p5-Image-Info/Makefile index a4df768a87b..d9c3d39bfd7 100644 --- a/graphics/p5-Image-Info/Makefile +++ b/graphics/p5-Image-Info/Makefile @@ -1,5 +1,5 @@ PORTNAME= Image-Info -PORTVERSION= 1.43 +PORTVERSION= 1.44 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Image-Info/distinfo b/graphics/p5-Image-Info/distinfo index 291653010da..34360d42136 100644 --- a/graphics/p5-Image-Info/distinfo +++ b/graphics/p5-Image-Info/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665073212 -SHA256 (Image-Info-1.43.tar.gz) = 4bc417889395efa91976e3aea7b1210dbd84bb64e7ee04ec6140900fdb5d71f9 -SIZE (Image-Info-1.43.tar.gz) = 322216 +TIMESTAMP = 1692212101 +SHA256 (Image-Info-1.44.tar.gz) = cb7fc65dd1effe01eb47c1c79a52dd1654f428e3a97db1ef23b126ce01636f0d +SIZE (Image-Info-1.44.tar.gz) = 334092 diff --git a/graphics/p5-Image-Info/pkg-plist b/graphics/p5-Image-Info/pkg-plist index 63798726fa6..935caa75eca 100644 --- a/graphics/p5-Image-Info/pkg-plist +++ b/graphics/p5-Image-Info/pkg-plist @@ -4,6 +4,7 @@ %%SITE_PERL%%/Bundle/Image/Info/XBM.pm %%SITE_PERL%%/Bundle/Image/Info/XPM.pm %%SITE_PERL%%/Image/Info.pm +%%SITE_PERL%%/Image/Info/AVIF.pm %%SITE_PERL%%/Image/Info/BMP.pm %%SITE_PERL%%/Image/Info/GIF.pm %%SITE_PERL%%/Image/Info/ICO.pm @@ -25,6 +26,7 @@ %%PERL5_MAN3%%/Bundle::Image::Info::XBM.3.gz %%PERL5_MAN3%%/Bundle::Image::Info::XPM.3.gz %%PERL5_MAN3%%/Image::Info.3.gz +%%PERL5_MAN3%%/Image::Info::AVIF.3.gz %%PERL5_MAN3%%/Image::Info::BMP.3.gz %%PERL5_MAN3%%/Image::Info::GIF.3.gz %%PERL5_MAN3%%/Image::Info::ICO.3.gz diff --git a/graphics/py-cairosvg/Makefile b/graphics/py-cairosvg/Makefile index 28b76ee0f30..6862549680b 100644 --- a/graphics/py-cairosvg/Makefile +++ b/graphics/py-cairosvg/Makefile @@ -1,5 +1,5 @@ PORTNAME= cairosvg -PORTVERSION= 2.7.0 +PORTVERSION= 2.7.1 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-cairosvg/distinfo b/graphics/py-cairosvg/distinfo index f3eff5de439..ea9d4301c5e 100644 --- a/graphics/py-cairosvg/distinfo +++ b/graphics/py-cairosvg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679498772 -SHA256 (CairoSVG-2.7.0.tar.gz) = ac4dc7c1d38b3a15717db2633a3a383012e0be664c727c911637e6af6a49293c -SIZE (CairoSVG-2.7.0.tar.gz) = 8398722 +TIMESTAMP = 1692211789 +SHA256 (CairoSVG-2.7.1.tar.gz) = 432531d72347291b9a9ebfb6777026b607563fd8719c46ee742db0aef7271ba0 +SIZE (CairoSVG-2.7.1.tar.gz) = 8399085 diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile index 4a49c992808..2cd52decf9e 100644 --- a/graphics/py-cartopy/Makefile +++ b/graphics/py-cartopy/Makefile @@ -1,6 +1,5 @@ PORTNAME= cartopy -PORTVERSION= 0.21.1 -PORTREVISION= 1 +PORTVERSION= 0.22.0 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,29 +12,31 @@ WWW= https://github.com/SciTools/cartopy LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -BUILD_DEPENDS= geos>=3.7.2:graphics/geos \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.19,1:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} -LIB_DEPENDS= libgeos.so:graphics/geos -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.1:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.19,1:math/py-numpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyproj>=3.0.0:graphics/py-pyproj@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.0.0:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyproj>=3.1.0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyshp>=2.1:devel/py-pyshp@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}shapely>=1.7:devel/py-shapely@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent cython distutils +USE_PYTHON= autoplist concurrent cython pep517 -OPTIONS_DEFINE= OWS PLOTTING +OPTIONS_DEFINE= OWS PLOTTING SPEEDUPS OWS_DESC= OGC Web Service support PLOTTING_DESC= Plotting support +SPEEDUPS_DESC= Speed up -OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ +OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.20.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR} -PLOTTING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdal>=2.3.2:graphics/py-gdal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR} \ +PLOTTING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=6.1.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.3.1:science/py-scipy@${PY_FLAVOR} +SPEEDUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pykdtree>=0:devel/py-pykdtree@${PY_FLAVOR} post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/graphics/py-cartopy/distinfo b/graphics/py-cartopy/distinfo index b30e08f7373..2782fcd5170 100644 --- a/graphics/py-cartopy/distinfo +++ b/graphics/py-cartopy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589934 -SHA256 (Cartopy-0.21.1.tar.gz) = 89d5649712c8582231c6e11825a04c85f6f0cee94dbb89e4db23eabca1cc250a -SIZE (Cartopy-0.21.1.tar.gz) = 10917080 +TIMESTAMP = 1692211791 +SHA256 (Cartopy-0.22.0.tar.gz) = b300f90120931d43f11ef87c064ea1dacec1b59a4940aa76ebf82cf09548bb49 +SIZE (Cartopy-0.22.0.tar.gz) = 10938577 diff --git a/graphics/py-cartopy/files/patch-pyproject.toml b/graphics/py-cartopy/files/patch-pyproject.toml new file mode 100644 index 00000000000..6bd998ddad3 --- /dev/null +++ b/graphics/py-cartopy/files/patch-pyproject.toml @@ -0,0 +1,19 @@ +--- pyproject.toml.orig 2023-08-05 00:47:19 UTC ++++ pyproject.toml +@@ -3,13 +3,13 @@ requires = [ + "wheel", + "setuptools >= 40.6.0", + "Cython >= 0.29.24", +- "oldest-supported-numpy", +- "setuptools_scm >= 7.0.0", ++ "numpy", ++ "setuptools_scm >= 6.0.0", + ] + build-backend = "setuptools.build_meta" + + [project] +-name = "Cartopy" ++name = "cartopy" + authors = [ + {name = "UK Met Office"}, + ] diff --git a/graphics/py-osmnet/Makefile b/graphics/py-osmnet/Makefile index bb74b08664f..a4fe87901bb 100644 --- a/graphics/py-osmnet/Makefile +++ b/graphics/py-osmnet/Makefile @@ -1,6 +1,5 @@ PORTNAME= osmnet -PORTVERSION= 0.1.6 -PORTREVISION= 2 +PORTVERSION= 0.1.7 CATEGORIES= graphics python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,11 +11,11 @@ WWW= https://github.com/UDST/osmnet LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0.7:graphics/py-geopandas@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}geopandas>=0.11:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.10,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.23,1:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}shapely>=1.5:devel/py-shapely@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}shapely>=1.8:devel/py-shapely@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils diff --git a/graphics/py-osmnet/distinfo b/graphics/py-osmnet/distinfo index 833c9d7c307..7cdfaf1bd8b 100644 --- a/graphics/py-osmnet/distinfo +++ b/graphics/py-osmnet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614794176 -SHA256 (osmnet-0.1.6.tar.gz) = 3cfb73317e59286797913e68ea3134205786ff1221111bbc5044b76ed8d26335 -SIZE (osmnet-0.1.6.tar.gz) = 27311 +TIMESTAMP = 1692211793 +SHA256 (osmnet-0.1.7.tar.gz) = 21f856ea4cc63c15fc7dc65dce7db8cd3f01c58f0b09d8cc9e860496bd0a419a +SIZE (osmnet-0.1.7.tar.gz) = 27086 diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile index 419b7a07c98..f614371c95a 100644 --- a/graphics/py-pillow/Makefile +++ b/graphics/py-pillow/Makefile @@ -20,13 +20,13 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0,1:devel/py-pytest@${PY_FLAVOR} -USES= cpe localbase python +USES= cpe jpeg localbase python USE_PYTHON= autoplist concurrent pep517 CPE_VENDOR= python -OPTIONS_DEFINE= FREETYPE IMAGEQUANT JPEG JPEG2000 LCMS OLE PNG RAQM TIFF TKINTER WEBP XCB -OPTIONS_DEFAULT=FREETYPE IMAGEQUANT JPEG JPEG2000 LCMS OLE PNG RAQM TIFF TKINTER WEBP XCB +OPTIONS_DEFINE= FREETYPE IMAGEQUANT JPEG2000 LCMS OLE PNG RAQM TIFF TKINTER WEBP XCB +OPTIONS_DEFAULT=FREETYPE IMAGEQUANT JPEG2000 LCMS OLE PNG RAQM TIFF TKINTER WEBP XCB IMAGEQUANT_DESC= Image Quantization support LCMS_DESC= Little Color Management System OLE_DESC= Microsoft OLE2 file format support @@ -40,9 +40,6 @@ FREETYPE_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-freetype IMAGEQUANT_LIB_DEPENDS= libimagequant.so:graphics/libimagequant IMAGEQUANT_VARS= PYDISTUTILS_BUILDARGS+=--enable-imagequant IMAGEQUANT_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-imagequant -JPEG_USES= jpeg -JPEG_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg -JPEG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg JPEG2000_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg2000 JPEG2000_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg2000 diff --git a/graphics/rubygem-clutter-gdk/Makefile b/graphics/rubygem-clutter-gdk/Makefile index 0887b1a8a0e..6d7e18da595 100644 --- a/graphics/rubygem-clutter-gdk/Makefile +++ b/graphics/rubygem-clutter-gdk/Makefile @@ -1,5 +1,5 @@ PORTNAME= clutter-gdk -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/rubygem-clutter-gdk/distinfo b/graphics/rubygem-clutter-gdk/distinfo index 3d79dcda21c..439c1cee1e1 100644 --- a/graphics/rubygem-clutter-gdk/distinfo +++ b/graphics/rubygem-clutter-gdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167238 -SHA256 (rubygem/clutter-gdk-4.1.8.gem) = 6b00d45de9fe444fa8138470d4aa13b17a432b5b88ee29ff442cee969de83cfa -SIZE (rubygem/clutter-gdk-4.1.8.gem) = 14848 +TIMESTAMP = 1692212067 +SHA256 (rubygem/clutter-gdk-4.1.9.gem) = cdd97c357cef463185b35761d363851f9546b6e99d5ec5da9c59a504bca17c40 +SIZE (rubygem/clutter-gdk-4.1.9.gem) = 14848 diff --git a/graphics/rubygem-clutter-gtk/Makefile b/graphics/rubygem-clutter-gtk/Makefile index 2c2742b67f0..42e431d2d8a 100644 --- a/graphics/rubygem-clutter-gtk/Makefile +++ b/graphics/rubygem-clutter-gtk/Makefile @@ -1,5 +1,5 @@ PORTNAME= clutter-gtk -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/rubygem-clutter-gtk/distinfo b/graphics/rubygem-clutter-gtk/distinfo index 2dc30145b31..be8fc426d98 100644 --- a/graphics/rubygem-clutter-gtk/distinfo +++ b/graphics/rubygem-clutter-gtk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167240 -SHA256 (rubygem/clutter-gtk-4.1.8.gem) = 7feade8a7ad36d5d6d58b445f2137de56d71d0cbf1bacc611b8ca1d999876aea -SIZE (rubygem/clutter-gtk-4.1.8.gem) = 30720 +TIMESTAMP = 1692212069 +SHA256 (rubygem/clutter-gtk-4.1.9.gem) = 20cba7eea50093545747cc61b201e6eeb8eb2f09a30993f510ecd41e438d1fa0 +SIZE (rubygem/clutter-gtk-4.1.9.gem) = 30720 diff --git a/graphics/rubygem-clutter/Makefile b/graphics/rubygem-clutter/Makefile index f4591b7f594..214da650e58 100644 --- a/graphics/rubygem-clutter/Makefile +++ b/graphics/rubygem-clutter/Makefile @@ -1,5 +1,5 @@ PORTNAME= clutter -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/rubygem-clutter/distinfo b/graphics/rubygem-clutter/distinfo index d131ed121d3..9046a6a6bd8 100644 --- a/graphics/rubygem-clutter/distinfo +++ b/graphics/rubygem-clutter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167236 -SHA256 (rubygem/clutter-4.1.8.gem) = 587b905d37a296d30ff86cf4918054466ec3d1051b1f3ffb3110ce913e377a09 -SIZE (rubygem/clutter-4.1.8.gem) = 42496 +TIMESTAMP = 1692212065 +SHA256 (rubygem/clutter-4.1.9.gem) = e8c74fb6fad0096eaacf9982f4f43016b2217019fc6f51fcf9fed110f8720260 +SIZE (rubygem/clutter-4.1.9.gem) = 42496 diff --git a/graphics/rubygem-gdk_pixbuf2/Makefile b/graphics/rubygem-gdk_pixbuf2/Makefile index 414212a505e..5d7e66a380f 100644 --- a/graphics/rubygem-gdk_pixbuf2/Makefile +++ b/graphics/rubygem-gdk_pixbuf2/Makefile @@ -1,5 +1,5 @@ PORTNAME= gdk_pixbuf2 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/rubygem-gdk_pixbuf2/distinfo b/graphics/rubygem-gdk_pixbuf2/distinfo index 49995a9475b..97cb53465d2 100644 --- a/graphics/rubygem-gdk_pixbuf2/distinfo +++ b/graphics/rubygem-gdk_pixbuf2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167242 -SHA256 (rubygem/gdk_pixbuf2-4.1.8.gem) = 433b847235272f5523284419641dd97103f4a1d3963689d1b238db71896d2063 -SIZE (rubygem/gdk_pixbuf2-4.1.8.gem) = 34816 +TIMESTAMP = 1692212071 +SHA256 (rubygem/gdk_pixbuf2-4.1.9.gem) = 4a5e13bfd5f5971f6476b1c531caed4d9ad683896e81d26bafb3fb85f11825bf +SIZE (rubygem/gdk_pixbuf2-4.1.9.gem) = 34816 diff --git a/graphics/rubygem-rsvg2/Makefile b/graphics/rubygem-rsvg2/Makefile index 11b1dddf97e..f9d270e1768 100644 --- a/graphics/rubygem-rsvg2/Makefile +++ b/graphics/rubygem-rsvg2/Makefile @@ -1,5 +1,5 @@ PORTNAME= rsvg2 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/rubygem-rsvg2/distinfo b/graphics/rubygem-rsvg2/distinfo index 3b157780261..afe8e034a62 100644 --- a/graphics/rubygem-rsvg2/distinfo +++ b/graphics/rubygem-rsvg2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167244 -SHA256 (rubygem/rsvg2-4.1.8.gem) = 8b8d259ac8416677c0656b0e87de2f2a9f94b4d0fba5dfcad4b2afa4cbbdf3fc -SIZE (rubygem/rsvg2-4.1.8.gem) = 29696 +TIMESTAMP = 1692212073 +SHA256 (rubygem/rsvg2-4.1.9.gem) = bb3db9b6f17eae3dd913e35223d333f8f8d857ee89e8594c30e1bdff21f881da +SIZE (rubygem/rsvg2-4.1.9.gem) = 29696 diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 68472403ae8..db119f58446 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -13,7 +13,6 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= bash:shells/bash @@ -27,7 +26,6 @@ MESON_ARGS= --default-library=both \ -Ddeprecated=true \ -Ddoxygen=false \ -Dexamples=true \ - -Dfontconfig=enabled \ -Dintrospection=false \ -Dmodules=disabled \ -Dnifti=disabled \ @@ -45,10 +43,11 @@ PLIST_SUB= VERSION=${PORTVERSION:R} SHEBANG_FILES= tools/vipsprofile -OPTIONS_DEFINE= CFITSIO DOCS FFTW GIF GSF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP +OPTIONS_DEFINE= CFITSIO DOCS FFTW FONTCONFIG GIF GSF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP OPTIONS_RADIO= MAGICK OPTIONS_RADIO_MAGICK= IMAGEMAGICK GRAPHMAGICK -OPTIONS_DEFAULT=CFITSIO FFTW GIF GSF HEIF IMAGEMAGICK JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP +OPTIONS_DEFAULT=CFITSIO FFTW FONTCONFIG GIF GSF HEIF IMAGEMAGICK JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP +FONTCONFIG_IMPLIES= PANGO GSF_DESC= Structured file formats support IMAGEQUANT_DESC=Image Quantization support ORC_DESC= ORC language support @@ -60,6 +59,8 @@ DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc DOCS_MESON_TRUE= gtk_doc FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_MESON_ENABLED= fftw +FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig +FONTCONFIG_MESON_ENABLED= fontconfig GIF_BUILD_DEPENDS= cgif>=0.2.0:graphics/cgif GIF_LIB_DEPENDS= libcgif.so:graphics/cgif GIF_MESON_ENABLED= cgif diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile index e738680b0c8..ac86dfc0745 100644 --- a/lang/nickle/Makefile +++ b/lang/nickle/Makefile @@ -1,5 +1,5 @@ PORTNAME= nickle -PORTVERSION= 2.92 +PORTVERSION= 2.93 CATEGORIES= lang MASTER_SITES= http://www.nickle.org/release/ diff --git a/lang/nickle/distinfo b/lang/nickle/distinfo index a6f44b2ad18..70d4be166e2 100644 --- a/lang/nickle/distinfo +++ b/lang/nickle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687172048 -SHA256 (nickle-2.92.tar.gz) = d7ebe2e23806a3690a75c6f380f06fd815dfd92334c6143aed95f7111bf08efe -SIZE (nickle-2.92.tar.gz) = 2548373 +TIMESTAMP = 1692688920 +SHA256 (nickle-2.93.tar.gz) = a04327343e18a52eb3d86f267708532b2bf0b258c147ca74520a2511a060c858 +SIZE (nickle-2.93.tar.gz) = 2550308 diff --git a/lang/php83/Makefile b/lang/php83/Makefile index dcc3063dcf5..446229c7e66 100644 --- a/lang/php83/Makefile +++ b/lang/php83/Makefile @@ -1,5 +1,5 @@ PORTNAME= php83 -DISTVERSION= 8.3.0beta2 +DISTVERSION= 8.3.0beta3 CATEGORIES?= lang devel www MASTER_SITES= https://downloads.php.net/~jakub/ \ https://downloads.php.net/~eric/ diff --git a/lang/php83/distinfo b/lang/php83/distinfo index 846a9b11b8d..9da7f5ccb6c 100644 --- a/lang/php83/distinfo +++ b/lang/php83/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690963406 -SHA256 (php-8.3.0beta2.tar.xz) = 343d4e96648cb41c5313fd2a7e0cb70b3fe0174f1e233c9d5365bf78a839f304 -SIZE (php-8.3.0beta2.tar.xz) = 12358628 +TIMESTAMP = 1692763139 +SHA256 (php-8.3.0beta3.tar.xz) = 5d6dedf413ac045bd38585c5eba7da565f15c8c2c507e3a2ee1e39bd652613a6 +SIZE (php-8.3.0beta3.tar.xz) = 12379580 diff --git a/mail/Makefile b/mail/Makefile index 152720912a4..b69353d75e0 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -724,7 +724,6 @@ SUBDIR += vacation SUBDIR += vbsfilter SUBDIR += vexim - SUBDIR += vmailmgr SUBDIR += vpopmail SUBDIR += vqadmin SUBDIR += vrfy diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile index 73beb07aff0..f163639a437 100644 --- a/mail/claws-mail-clamd/Makefile +++ b/mail/claws-mail-clamd/Makefile @@ -1,5 +1,4 @@ PORTNAME= clamd -PORTREVISION= 1 COMMENT= ClamAV based antivirus plugin for Claws Mail WWW= https://www.claws-mail.org/plugins.php diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile index 8c9e34eca31..23b92717b8b 100644 --- a/mail/claws-mail-pdf_viewer/Makefile +++ b/mail/claws-mail-pdf_viewer/Makefile @@ -1,5 +1,4 @@ PORTNAME= pdf_viewer -PORTREVISION= 10 COMMENT= PDF and PostScript viewer plugin for Claws Mail WWW= https://www.claws-mail.org/plugin.php?plugin=pdf_viewer diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index ea6c4f919f6..45481eaac6a 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,5 +1,4 @@ PORTNAME= claws-mail -PORTREVISION= 1 CATEGORIES= mail news COMMENT= Lightweight and featureful GTK+ based e-mail and news client diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws index 53ee30e6631..dc05c10dedf 100644 --- a/mail/claws-mail/Makefile.claws +++ b/mail/claws-mail/Makefile.claws @@ -13,10 +13,6 @@ CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static .include "${.CURDIR}/../claws-mail/Makefile.ver" .include "${.CURDIR}/../claws-mail/Makefile.claws.plugins" -.if ${MASTER_OPTIONS:MGTK2} -EXTRA_PATCHES+= ${.CURDIR}/../claws-mail/files/extra-patch-configure.ac -.endif - .for p in ${CLAWS_PLUGINS} CONFIGURE_ARGS+= --disable-${p}-plugin .endfor diff --git a/mail/claws-mail/Makefile.ver b/mail/claws-mail/Makefile.ver index 919bdfbb00d..c4b79c88c63 100644 --- a/mail/claws-mail/Makefile.ver +++ b/mail/claws-mail/Makefile.ver @@ -3,8 +3,8 @@ MASTER_OPTIONS!= ${MAKE} -C ${.CURDIR}/../claws-mail -V PORT_OPTIONS .endif .if ${MASTER_OPTIONS:MGTK2} -PORTVERSION= 3.19.0 +PORTVERSION= 3.19.1 .endif .if ${MASTER_OPTIONS:MGTK3} -PORTVERSION= 4.1.0 +PORTVERSION= 4.1.1 .endif diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo index 02ecfa0e2b1..1c240e132d3 100644 --- a/mail/claws-mail/distinfo +++ b/mail/claws-mail/distinfo @@ -1,6 +1,5 @@ -TIMESTAMP = 1667251029 -SHA256 (claws-mail-3.19.0.tar.xz) = 0d0c757a9975da1f97bf5309cd051c18ad6c765fefe9319276aa3a9e48229fa2 -SIZE (claws-mail-3.19.0.tar.xz) = 6543188 -TIMESTAMP = 1667290477 -SHA256 (claws-mail-4.1.0.tar.xz) = 0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e -SIZE (claws-mail-4.1.0.tar.xz) = 6471604 +TIMESTAMP = 1691825727 +SHA256 (claws-mail-3.19.1.tar.xz) = ac57fa557cf15c62e5f8fad247585fc609f0a696f6da54ed42cc000b6c6d6813 +SIZE (claws-mail-3.19.1.tar.xz) = 6580844 +SHA256 (claws-mail-4.1.1.tar.xz) = b189e700c1896f5e0deb0b76d4bfa820eb7ac1935ee10aa9afbada3cf53a0344 +SIZE (claws-mail-4.1.1.tar.xz) = 6523688 diff --git a/mail/claws-mail/files/extra-patch-configure.ac b/mail/claws-mail/files/extra-patch-configure.ac deleted file mode 100644 index 7be834dbee9..00000000000 --- a/mail/claws-mail/files/extra-patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2022-10-31 21:17:54 UTC -+++ configure.ac -@@ -2116,7 +2116,7 @@ AM_CONDITIONAL(BUILD_DILLO_PLUGIN, test x"$enable_dil - AM_CONDITIONAL(BUILD_FANCY_PLUGIN, test x"$enable_fancy_plugin" != xno) - AM_CONDITIONAL(BUILD_FETCHINFO_PLUGIN, test x"$enable_fetchinfo_plugin" != xno) - AM_CONDITIONAL(BUILD_GDATA_PLUGIN, test x"$enable_gdata_plugin" != xno) --AM_CONDITIONAL(BUILD_KEYWORD_WARNER_PLUGIN, test x"$enable_keywordwarner_plugin" != xno) -+AM_CONDITIONAL(BUILD_KEYWORD_WARNER_PLUGIN, test x"$enable_keyword_warner_plugin" != xno) - AM_CONDITIONAL(BUILD_LIBRAVATAR_PLUGIN, test x"$enable_libravatar_plugin" != xno) - AM_CONDITIONAL(BUILD_LITEHTML_VIEWER_PLUGIN, test x"$enable_litehtml_viewer_plugin" != xno) - AM_CONDITIONAL(BUILD_MAILMBOX_PLUGIN, test x"$enable_mailmbox_plugin" != xno) diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 0de0f35d888..ed0c6aa188d 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -12,7 +12,7 @@ WWW= https://marlam.de/msmtp/ LICENSE= GPLv3 GNU_CONFIGURE= yes -USES= autoreconf cpe gmake makeinfo pkgconfig tar:xz +USES= cpe gmake makeinfo pkgconfig tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO= msmtp diff --git a/mail/p5-Mail-Box-IMAP4/Makefile b/mail/p5-Mail-Box-IMAP4/Makefile index 4a2fb4ce1cb..63a056bf8b6 100644 --- a/mail/p5-Mail-Box-IMAP4/Makefile +++ b/mail/p5-Mail-Box-IMAP4/Makefile @@ -1,5 +1,5 @@ PORTNAME= Mail-Box-IMAP4 -PORTVERSION= 3.007 +PORTVERSION= 3.008 CATEGORIES= mail perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \ p5-Mail-Box>=3.007:mail/p5-Mail-Box \ p5-Mail-IMAPClient>=3.42:mail/p5-Mail-IMAPClient \ - p5-Mail-Message>=3:mail/p5-Mail-Message \ + p5-Mail-Message>=3.013:mail/p5-Mail-Message \ p5-Mail-Transport>=3.004:mail/p5-Mail-Transport USES= perl5 diff --git a/mail/p5-Mail-Box-IMAP4/distinfo b/mail/p5-Mail-Box-IMAP4/distinfo index 1a084fe6ccd..3fccb26fd1c 100644 --- a/mail/p5-Mail-Box-IMAP4/distinfo +++ b/mail/p5-Mail-Box-IMAP4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560537262 -SHA256 (Mail-Box-IMAP4-3.007.tar.gz) = eb3af4f544f15c8689d9e11590e4741ea1e9a022b3ae34663d360521d2057fb0 -SIZE (Mail-Box-IMAP4-3.007.tar.gz) = 44532 +TIMESTAMP = 1692211679 +SHA256 (Mail-Box-IMAP4-3.008.tar.gz) = faf911b85b8755bb719256ba82a9a368a95e0cd8fe9314d4a0378ddc5f6ba7ab +SIZE (Mail-Box-IMAP4-3.008.tar.gz) = 44744 diff --git a/mail/rubygem-actionmailbox70/Makefile b/mail/rubygem-actionmailbox70/Makefile index 1ea973928a5..52e10564d01 100644 --- a/mail/rubygem-actionmailbox70/Makefile +++ b/mail/rubygem-actionmailbox70/Makefile @@ -1,5 +1,5 @@ PORTNAME= actionmailbox -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= mail rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/mail/rubygem-actionmailbox70/distinfo b/mail/rubygem-actionmailbox70/distinfo index a96431f7569..f782e09484e 100644 --- a/mail/rubygem-actionmailbox70/distinfo +++ b/mail/rubygem-actionmailbox70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167210 -SHA256 (rubygem/actionmailbox-7.0.6.gem) = 083ac338246640b13cb10c93777fe734e30ce89f82411f46b3929e7c9bf3b38b -SIZE (rubygem/actionmailbox-7.0.6.gem) = 22528 +TIMESTAMP = 1692212039 +SHA256 (rubygem/actionmailbox-7.0.7.gem) = 7a2dfbb8ed5b618fbd4cc4a2a141aa0f97449bb3ee25aefb0bbb57ac0f07c424 +SIZE (rubygem/actionmailbox-7.0.7.gem) = 22528 diff --git a/mail/rubygem-actionmailer70/Makefile b/mail/rubygem-actionmailer70/Makefile index c8dd4d5259c..250b8059203 100644 --- a/mail/rubygem-actionmailer70/Makefile +++ b/mail/rubygem-actionmailer70/Makefile @@ -1,5 +1,5 @@ PORTNAME= actionmailer -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= mail rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/mail/rubygem-actionmailer70/distinfo b/mail/rubygem-actionmailer70/distinfo index 52b9a62a5f1..fd6910fe850 100644 --- a/mail/rubygem-actionmailer70/distinfo +++ b/mail/rubygem-actionmailer70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167212 -SHA256 (rubygem/actionmailer-7.0.6.gem) = 33b442a99408d4b96558365ce92debb6c53204f8eaa8237741c594e7640ca107 -SIZE (rubygem/actionmailer-7.0.6.gem) = 30720 +TIMESTAMP = 1692212041 +SHA256 (rubygem/actionmailer-7.0.7.gem) = a069d1c9df4c47bbac44adad5edf6402860189735ad1accba73170cde229d196 +SIZE (rubygem/actionmailer-7.0.7.gem) = 30720 diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile deleted file mode 100644 index 4ad5cf85a59..00000000000 --- a/mail/vmailmgr/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -PORTNAME= vmailmgr -PORTVERSION= 0.97 -PORTREVISION= 2 -CATEGORIES= mail -MASTER_SITES= http://vault.101011010.xyz/distfiles/ GENTOO - -MAINTAINER= mij@bitchx.it -COMMENT= Virtual domain manager for qmail -WWW= http://www.vmailmgr.org - -LICENSE= GPLv2+ - -DEPRECATED= Last upstream release was in 2005 and upstream points to different site -EXPIRATION_DATE= 2023-08-22 - -# get python paths (PYTHON_SITELIBDIR) in case we install the python API -USES= autoreconf gmake perl5 python -USE_CXXSTD= c++14 -USE_PERL5= build - -GNU_CONFIGURE= yes - -BINARY_ALIAS= python=${PYTHON_CMD} - -PORTDOCS= AUTHORS ChangeLog NEWS README TODO - -OPTIONS_DEFINE= DOCS GDBM PYTHON -OPTIONS_SUB= yes - -GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm -GDBM_USES= localbase -GDBM_CONFIGURE_ON= --with-vpwtable=gdbm -PYTHON_BROKEN= Do not support recent python versions -PYTHON_CONFIGURE_ON= --with-pythonapi=${PYTHON_SITELIBDIR} - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.include diff --git a/mail/vmailmgr/distinfo b/mail/vmailmgr/distinfo deleted file mode 100644 index 28be3cb81d3..00000000000 --- a/mail/vmailmgr/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (vmailmgr-0.97.tar.gz) = 6266873db29991bf74c912e8423cee5ebf11b3b944ea413682d6b75634c399c2 -SIZE (vmailmgr-0.97.tar.gz) = 635160 diff --git a/mail/vmailmgr/files/patch-lib_vpwtable_cdb__write.cc b/mail/vmailmgr/files/patch-lib_vpwtable_cdb__write.cc deleted file mode 100644 index bbf81b5fa6f..00000000000 --- a/mail/vmailmgr/files/patch-lib_vpwtable_cdb__write.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/vpwtable/cdb_write.cc.orig 2002-11-20 15:54:44 UTC -+++ lib/vpwtable/cdb_write.cc -@@ -23,8 +23,8 @@ - class cdb_vpwtable_writer : public vpwtable_writer - { - private: -- const mystring& tmpname; -- const mystring& cdbname; -+ const mystring tmpname; -+ const mystring cdbname; - cdb_writer out; - bool opened; - public: diff --git a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__del.cc b/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__del.cc deleted file mode 100644 index d59f740c6e2..00000000000 --- a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__del.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/vpwtable/gdbm_del.cc.orig 2002-11-20 15:54:44 UTC -+++ lib/vpwtable/gdbm_del.cc -@@ -23,7 +23,7 @@ bool vpwtable::del(const mystring& name) const - GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_WRITER, 0, 0); - if(!db) - return false; -- datum key = { (char*)name.c_str(), name.length() }; -+ datum key = { (char*)name.c_str(), static_cast(name.length()) }; - bool result = gdbm_delete(db, key) == 0; - gdbm_close(db); - return result; diff --git a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__exists.cc b/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__exists.cc deleted file mode 100644 index 9d6ad551a1c..00000000000 --- a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__exists.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/vpwtable/gdbm_exists.cc.orig 2002-11-20 15:54:44 UTC -+++ lib/vpwtable/gdbm_exists.cc -@@ -23,7 +23,7 @@ bool vpwtable::exists(const mystring& name) const - GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_READER, 0, 0); - if(!db) - return false; -- datum key = { (char*)name.c_str(), name.length() }; -+ datum key = { (char*)name.c_str(), static_cast(name.length()) }; - bool result = gdbm_exists(db, key); - gdbm_close(db); - return result; diff --git a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__getbyname.cc b/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__getbyname.cc deleted file mode 100644 index 0661672f72f..00000000000 --- a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__getbyname.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/vpwtable/gdbm_getbyname.cc.orig 2002-11-20 15:54:44 UTC -+++ lib/vpwtable/gdbm_getbyname.cc -@@ -24,7 +24,7 @@ vpwentry* vpwtable::getbyname(const mystring& name) co - if(!db) - return 0; - mystring lower = name.lower(); -- datum key = { (char*)lower.c_str(), lower.length() }; -+ datum key = { (char*)lower.c_str(), static_cast(lower.length()) }; - datum result = gdbm_fetch(db, key); - gdbm_close(db); - return vpwentry::new_from_record(name, mystring(result.dptr, result.dsize)); diff --git a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__put.cc b/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__put.cc deleted file mode 100644 index e049864a5d1..00000000000 --- a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__put.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/vpwtable/gdbm_put.cc.orig 2002-11-20 15:54:44 UTC -+++ lib/vpwtable/gdbm_put.cc -@@ -25,9 +25,9 @@ bool vpwtable::put(const vpwentry* vpw, bool onlyadd) - if(!db) - return false; - mystring name = vpw->name.lower(); -- datum key = { (char*)name.c_str(), name.length() }; -+ datum key = { (char*)name.c_str(), static_cast(name.length()) }; - mystring binary = vpw->to_record(); -- datum data = { (char*)binary.c_str(), binary.length() }; -+ datum data = { (char*)binary.c_str(), static_cast(binary.length()) }; - bool result = gdbm_store(db, key, data, - onlyadd ? GDBM_INSERT : GDBM_REPLACE) == 0; - gdbm_close(db); diff --git a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__write.cc b/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__write.cc deleted file mode 100644 index f883e52f30d..00000000000 --- a/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__write.cc +++ /dev/null @@ -1,33 +0,0 @@ ---- lib/vpwtable/gdbm_write.cc.orig 2002-11-20 15:54:44 UTC -+++ lib/vpwtable/gdbm_write.cc -@@ -18,12 +18,13 @@ - #include - #include "vpwtable.h" - #include -+#include - - class gdbm_vpwtable_writer : public vpwtable_writer - { - private: -- const mystring& tmpname; -- const mystring& destname; -+ const mystring tmpname; -+ const mystring destname; - GDBM_FILE out; - bool opened; - public: -@@ -59,10 +60,10 @@ bool gdbm_vpwtable_writer::operator!() const - - bool gdbm_vpwtable_writer::put(const vpwentry& vpw) - { -- mystring name = vpw->name.lower(); -- datum key = { (char*)name.c_str(), name.length() }; -- mystring binary = vpw->to_record(); -- datum data = { (char*)binary.c_str(), binary.length() }; -+ mystring name = vpw.name.lower(); -+ datum key = { (char*)name.c_str(), static_cast(name.length()) }; -+ mystring binary = vpw.to_record(); -+ datum data = { (char*)binary.c_str(), static_cast(binary.length()) }; - return gdbm_store(out, key, data, GDBM_INSERT) == 0; - } - diff --git a/mail/vmailmgr/files/patch-recursive.diff b/mail/vmailmgr/files/patch-recursive.diff deleted file mode 100644 index 869736df45e..00000000000 --- a/mail/vmailmgr/files/patch-recursive.diff +++ /dev/null @@ -1,190 +0,0 @@ -diff -ruN ../vmailmgr-0.97_orig/Makefile.am ./Makefile.am ---- ../vmailmgr-0.97_orig/Makefile.am 2004-03-15 18:58:59.000000000 +0100 -+++ ./Makefile.am 2010-02-06 02:07:54.000000000 +0100 -@@ -1,7 +1,7 @@ - if WANTPYTHON --SUBDIRS = python php lib authenticate commands daemon cgi doc scripts -+SUBDIRS = python lib authenticate commands daemon cgi doc scripts - else --SUBDIRS = php lib authenticate commands daemon cgi doc scripts -+SUBDIRS = lib authenticate commands daemon cgi doc scripts - endif - - dist-hook: -diff -ruN ../vmailmgr-0.97_orig/authenticate/Makefile.am ./authenticate/Makefile.am ---- ../vmailmgr-0.97_orig/authenticate/Makefile.am 2003-12-02 04:46:43.000000000 +0100 -+++ ./authenticate/Makefile.am 2010-02-06 02:07:54.000000000 +0100 -@@ -1,5 +1,5 @@ - bin_PROGRAMS = checkvpw vauthenticate --authlib_PROGRAMS = authvmailmgr -+#authlib_PROGRAMS = authvmailmgr - authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/ - - noinst_PODS = checkvpw.pod vauthenticate.pod -@@ -25,8 +25,8 @@ - checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h - checkvpw_LDADD = ../lib/libvmailmgr.a - --authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h --authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod -+#authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h -+#authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod - - vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h - vauthenticate_LDADD = ../lib/libvmailmgr.a -diff -ruN ../vmailmgr-0.97_orig/cgi/Makefile.am ./cgi/Makefile.am ---- ../vmailmgr-0.97_orig/cgi/Makefile.am 2003-12-02 04:46:47.000000000 +0100 -+++ ./cgi/Makefile.am 2010-02-06 02:07:54.000000000 +0100 -@@ -1,5 +1,6 @@ - EXTRA_DIST = listvdomain.html vaddalias.html vadduser.html vchalias.html \ - vchattr.html vchforwards.html vdeluser.html vpasswd.html -+cgidir=$(PREFIX)/libexec/vmailmgr/cgi-bin - cgi_PROGRAMS = vpasswd vadduser vdeluser vaddalias vchattr vchforwards \ - listvdomain - -diff -ruN ../vmailmgr-0.97_orig/commands/vdeliver.cc ./commands/vdeliver.cc ---- ../vmailmgr-0.97_orig/commands/vdeliver.cc 2005-09-04 06:19:36.000000000 +0200 -+++ ./commands/vdeliver.cc 2010-02-06 02:07:54.000000000 +0100 -@@ -262,7 +262,7 @@ - close(pipe2[1]); - if((dup2(pipe1[0], 0) != 0) || (dup2(pipe2[0], 1) != 1)) - exit(111); -- execl(qq.c_str(), qq.c_str(), 0); -+ execl(qq.c_str(), qq.c_str(), (char *)0); - die_temp("Exec of qmail-queue failed."); - default: - close(pipe1[0]); -diff -ruN ../vmailmgr-0.97_orig/configure.in ./configure.in ---- ../vmailmgr-0.97_orig/configure.in 2002-11-20 16:54:41.000000000 +0100 -+++ ./configure.in 2010-02-06 02:07:54.000000000 +0100 -@@ -52,37 +52,36 @@ - AC_PATH_PROG(LN, ln) - - AC_PATH_PROG(PYTHON, python) --AC_CACHE_CHECK(Python library path, local_cv_python_lib_dir, --[[if test -x "$PYTHON"; then -- local_cv_python_lib_dir=`$PYTHON -c "import sys;print sys.path[1]"` --else -- local_cv_python_lib_dir=NONE --fi]]) -+AC_ARG_WITH(pythonapi, -+ [ --with-pythonapi= do install the python API in pythonlibdir], -+ [ local_cv_python_lib_dir="$withval" ], -+ [ local_cv_python_lib_dir=NONE ] -+ ) - pythonlibdir="$local_cv_python_lib_dir/vmailmgr" - AC_SUBST(pythonlibdir) - AM_CONDITIONAL(WANTPYTHON, test x$local_cv_python_lib_dir != xNONE) - --phpdir="/home/httpd/php" --AC_SUBST(phpdir) -- - AC_PATH_PROG(W3M, w3m) - AC_PATH_PROG(LYNX, lynx) - if test "x$W3M" != x; then - echo Using w3m to format html pages. -- HTML2TXT="w3m -dump" -+ HTML2TXT=$W3M" -dump" - elif test "x$LYNX" != x; then - echo Using lynx to format html pages. -- HTML2TXT="lynx -dump -nolist" -+ HTML2TXT=$LYNX" -dump -nolist" - else - echo "Can't find either w3m or lynx, building the plain text" - echo "documentation files will fail." - HTML2TXT="false" - fi - AC_SUBST(HTML2TXT) -+AM_CONDITIONAL(MAKE_TXTS, test x$HTML2TXT != xfalse) - - TODAY=`date +%Y-%m-%d` --POD2MAN="pod2man --release='vmailmgr ${VERSION}' --center='VMailMgr Tools Documentation' --date='${TODAY}'" --POD2HTML="pod2html --noindex" -+AC_PATH_PROG(POD2MAN,pod2man) -+AC_PATH_PROG(POD2HTML,pod2html) -+POD2MAN=$POD2MAN" --release='vmailmgr ${VERSION}' --center='VMailMgr Tools Documentation' --date='${TODAY}'" -+POD2HTML=$POD2HTML" --noindex" - SUFFIXES="$SUFFIXES .1 .5 .7 .8 .pod .html .texi .txt .ps .fig .sgml .py .pyc .pyo" - AC_SUBST(POD2MAN) - AC_SUBST(POD2HTML) -@@ -135,5 +134,4 @@ - lib/vpwentry/Makefile - lib/vpwtable/Makefile - scripts/Makefile -- php/Makefile - python/Makefile) -diff -ruN ../vmailmgr-0.97_orig/doc/Makefile.am ./doc/Makefile.am ---- ../vmailmgr-0.97_orig/doc/Makefile.am 2004-03-15 17:48:01.000000000 +0100 -+++ ./doc/Makefile.am 2010-02-06 02:07:54.000000000 +0100 -@@ -2,21 +2,23 @@ - noinst_TEXINFOS = FAQ.texi HOWTO.texi configuration.texi vmailmgr-cgi.texi - noinst_HTMLS = vmailmgr.html HOWTO.html FAQ.html NEWS.html \ - configuration.html ChangeLog.html vmailmgr-cgi.html -+if MAKE_TXTS - noinst_TXTS = HOWTO.txt FAQ.txt \ - configuration.txt vmailmgr-cgi.txt protocol.txt \ - record-format.txt -+else -+noinst_TXTS = -+endif - noinst_PODS = vmailmgr.pod --noinst_MISC = FAQ.info FAQ.pdf HOWTO.info HOWTO.pdf \ -- configuration.info translation.pdf translation.ps -+noinst_MISC = FAQ.info HOWTO.info configuration.info - EXTRA_DIST = ChangeLog-pre-vmailmgr ChangeLog-pre-0.70 \ - changelog2html.pl news2html.pl \ -- YEAR2000 translation.fig \ -+ YEAR2000 \ - $(man_MANS) \ - $(noinst_PODS) \ - $(noinst_TEXINFOS) \ - $(noinst_HTMLS) \ -- $(noinst_MISC) \ -- $(noinst_TXTS) -+ $(noinst_MISC) $(noinst_TXTS) - CLEANFILES = $(noinst_HTMLS) $(man_MANS) $(noinst_MISC) \ - HOWTO.txt FAQ.txt configuration.txt vmailmgr-cgi.txt \ - pod2htmd.tmp pod2htmi.tmp -diff -ruN ../vmailmgr-0.97_orig/lib/fdbuf/fdobuf.h ./lib/fdbuf/fdobuf.h ---- ../vmailmgr-0.97_orig/lib/fdbuf/fdobuf.h 2005-09-04 06:24:03.000000000 +0200 -+++ ./lib/fdbuf/fdobuf.h 2010-02-06 02:07:54.000000000 +0100 -@@ -18,6 +18,8 @@ - #ifndef FDBUF__FDOBUF__H__ - #define FDBUF__FDOBUF__H__ - -+#include -+ - class fdobuf : protected fdbuf - { - public: -diff -ruN ../vmailmgr-0.97_orig/lib/misc/maildir.cc ./lib/misc/maildir.cc ---- ../vmailmgr-0.97_orig/lib/misc/maildir.cc 2005-01-19 20:29:31.000000000 +0100 -+++ ./lib/misc/maildir.cc 2010-02-06 02:07:54.000000000 +0100 -@@ -36,7 +36,7 @@ - if(mkdirp(dirname.left(i), 0755)) - return -1; - } -- if(i != dirname.length() - 1) -+ if(i != (int)dirname.length() - 1) - return mkdir(dirname.c_str(), mode); - return 0; - } -diff -ruN ../vmailmgr-0.97_orig/lib/misc/server.cc ./lib/misc/server.cc ---- ../vmailmgr-0.97_orig/lib/misc/server.cc 2002-11-20 16:54:45.000000000 +0100 -+++ ./lib/misc/server.cc 2010-02-06 02:07:54.000000000 +0100 -@@ -17,6 +17,7 @@ - #include - #include "server.h" - #include -+#include - #include - #include "un.h" - #include "debug.h" -diff -ruN ../vmailmgr-0.97_orig/php/Makefile.am ./php/Makefile.am ---- ../vmailmgr-0.97_orig/php/Makefile.am 2002-11-20 16:54:41.000000000 +0100 -+++ ./php/Makefile.am 2010-02-06 02:07:54.000000000 +0100 -@@ -1,3 +1,4 @@ -+phpdir=$(PREFIX)/libexec/vmailmgr/php/ - php_DATA = vmail.inc - EXTRA_DIST = vmail.features vmail.inc - diff --git a/mail/vmailmgr/pkg-descr b/mail/vmailmgr/pkg-descr deleted file mode 100644 index fc0b4092a27..00000000000 --- a/mail/vmailmgr/pkg-descr +++ /dev/null @@ -1,21 +0,0 @@ -VMailMgr (short for Virtual MAIL ManaGeR) is a package of programs designed to -manage multiple domains of mail addresses and mailboxes on a single host. It -co-operates with qmail for mail delivery and program control. It features: - - * A password checking interface between qmail-popup and qmail-pop3d which - replaces the usual checkpassword, as well as an authentication module for - Courier IMAP, that provide access to the virtual mailboxes by one of three - methods: - o IP-based virtual server access (invisible to the POP3 user) - o username-based access (username-virtualuser) - o hostname-based access (virtualuser@virtual.host or - virtualuser:virtual.host) - * CDB-based password tables to speed up access for domains of any size. - * Tools to setup a virtual domain, add and delete individual virtual users - and aliases, and to change passwords. CGI programs to accomplish the - * above tasks from a set of web pages. - * A native PHP library to complement or replace the CGIs. - * A daemon process that securely directs the operation of the CGIs and PHP - code. - * A separate delivery agent that automatically deals with any address - inside a virtual domain from a single .qmail-default file. diff --git a/mail/vmailmgr/pkg-plist b/mail/vmailmgr/pkg-plist deleted file mode 100644 index a776f567bba..00000000000 --- a/mail/vmailmgr/pkg-plist +++ /dev/null @@ -1,63 +0,0 @@ -bin/showvconfig -bin/checkvpw -bin/vauthenticate -bin/dumpvuser -bin/listvdomain -bin/vadduser -bin/vaddusers -bin/vchattr -bin/vchforwards -bin/vdeliver -bin/vdeluser -bin/vpasswd -bin/vpasswds -bin/vrehash -bin/vsetup -bin/vupgrade -bin/vaddalias -bin/vconf2dir -libexec/vmailmgr/cgi-bin/vpasswd -libexec/vmailmgr/cgi-bin/vadduser -libexec/vmailmgr/cgi-bin/vdeluser -libexec/vmailmgr/cgi-bin/vaddalias -libexec/vmailmgr/cgi-bin/vchattr -libexec/vmailmgr/cgi-bin/vchforwards -libexec/vmailmgr/cgi-bin/listvdomain -sbin/vmailmgrd -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/__init__.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/__init__.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/commands.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/commands.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/commands.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/config.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/config.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/config.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/constants.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/constants.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/constants.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/daemon.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/daemon.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/daemon.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/local.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/local.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/local.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/types.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/types.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/types.pyo -man/man1/checkvpw.1.gz -man/man1/dumpvuser.1.gz -man/man1/listvdomain.1.gz -man/man1/vadduser.1.gz -man/man1/vauthenticate.1.gz -man/man1/vchattr.1.gz -man/man1/vchforwards.1.gz -man/man1/vdeliver.1.gz -man/man1/vdeluser.1.gz -man/man1/vpasswd.1.gz -man/man1/vpasswds.1.gz -man/man1/vrehash.1.gz -man/man1/vsetup.1.gz -man/man1/vupgrade.1.gz -man/man7/vmailmgr.7.gz -man/man8/vmailmgrd.8.gz diff --git a/math/R-cran-gss/Makefile b/math/R-cran-gss/Makefile index 0747f01d666..2fe60803380 100644 --- a/math/R-cran-gss/Makefile +++ b/math/R-cran-gss/Makefile @@ -1,5 +1,5 @@ PORTNAME= gss -DISTVERSION= 2.2-6 +DISTVERSION= 2.2-7 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/math/R-cran-gss/distinfo b/math/R-cran-gss/distinfo index 21e38623ec6..222ca83a57d 100644 --- a/math/R-cran-gss/distinfo +++ b/math/R-cran-gss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691669381 -SHA256 (gss_2.2-6.tar.gz) = 2c7e466a3531a78297abc32228e2748cbaef04f334603d3c8d8b1a32e2a102ce -SIZE (gss_2.2-6.tar.gz) = 544259 +TIMESTAMP = 1692685710 +SHA256 (gss_2.2-7.tar.gz) = 3b13144702c570c83462b4ea2ad17f4bd630cff5bf2ab0347a33c7e86a4f3f6a +SIZE (gss_2.2-7.tar.gz) = 544255 diff --git a/math/R-cran-quantreg/Makefile b/math/R-cran-quantreg/Makefile index 762db556680..82b0643a210 100644 --- a/math/R-cran-quantreg/Makefile +++ b/math/R-cran-quantreg/Makefile @@ -1,5 +1,5 @@ PORTNAME= quantreg -PORTVERSION= 5.96 +PORTVERSION= 5.97 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/math/R-cran-quantreg/distinfo b/math/R-cran-quantreg/distinfo index 7b9c09bb585..f3278584175 100644 --- a/math/R-cran-quantreg/distinfo +++ b/math/R-cran-quantreg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689996931 -SHA256 (quantreg_5.96.tar.gz) = a2aa0638cdd626d8da0e573856177c4637841c6de143463a3fc0bbe268e6fd92 -SIZE (quantreg_5.96.tar.gz) = 1026000 +TIMESTAMP = 1692748924 +SHA256 (quantreg_5.97.tar.gz) = 87e7de5776dee936ef0809dcc9ac2e0d51a7580368e6defa12ec21276a676da1 +SIZE (quantreg_5.97.tar.gz) = 1026052 diff --git a/math/ambit/Makefile b/math/ambit/Makefile index db3e31513e1..1d9f31d0a5e 100644 --- a/math/ambit/Makefile +++ b/math/ambit/Makefile @@ -1,6 +1,6 @@ PORTNAME= ambit DISTVERSIONPREFIX= v -DISTVERSION= 0.7 +DISTVERSION= 0.7.1 CATEGORIES= math PKGNAMESUFFIX= -tensor # avoid clash with shells/ambit diff --git a/math/ambit/distinfo b/math/ambit/distinfo index 22974df3fad..0af7051c6a3 100644 --- a/math/ambit/distinfo +++ b/math/ambit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684643393 -SHA256 (jturney-ambit-v0.7_GH0.tar.gz) = 97a4360db5cad6c9d2bc0932fc8641a3feb34a809c192c99886880073e87f8c2 -SIZE (jturney-ambit-v0.7_GH0.tar.gz) = 336129 +TIMESTAMP = 1692764457 +SHA256 (jturney-ambit-v0.7.1_GH0.tar.gz) = 3725c5340dd64fbb789638924434895bb74aa9beabf13fe9a034518850c053b7 +SIZE (jturney-ambit-v0.7.1_GH0.tar.gz) = 336226 diff --git a/math/cimod/Makefile b/math/cimod/Makefile index aff718147d6..e8728f431ab 100644 --- a/math/cimod/Makefile +++ b/math/cimod/Makefile @@ -1,6 +1,6 @@ PORTNAME= cimod DISTVERSIONPREFIX= v -DISTVERSION= 1.5.0 +DISTVERSION= 1.5.1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/cimod/distinfo b/math/cimod/distinfo index 62381745dfe..36c18c5ab7d 100644 --- a/math/cimod/distinfo +++ b/math/cimod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690878228 -SHA256 (OpenJij-cimod-v1.5.0_GH0.tar.gz) = c9db10d1f06277f2d2f0c5d555f851703f3caea0e7d63a2a69943dace13cbd64 -SIZE (OpenJij-cimod-v1.5.0_GH0.tar.gz) = 139843 +TIMESTAMP = 1692765263 +SHA256 (OpenJij-cimod-v1.5.1_GH0.tar.gz) = d8e0b3306d187196d0f089a7231b0adb0d7a3c6b9e48e72f63c15457a4d3586e +SIZE (OpenJij-cimod-v1.5.1_GH0.tar.gz) = 139855 diff --git a/math/eprover/Makefile b/math/eprover/Makefile index d9be294abe9..fd4ffa2bcf4 100644 --- a/math/eprover/Makefile +++ b/math/eprover/Makefile @@ -34,7 +34,7 @@ ALL_TARGET= all man BINARY_ALIAS= make=${GMAKE} \ gcc=${CC} -PORTSCOUT= limit:^.*[0-9]\.[0-9].* # prevent versions like git-export-2012-06-29 +PORTSCOUT= limit:^.*[0-9]\.[0-9].*$$ # prevent versions like git-export-2012-06-29 post-install: # strip binaries diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile index 3afa688e131..944c82754dd 100644 --- a/math/libqalculate/Makefile +++ b/math/libqalculate/Makefile @@ -1,5 +1,5 @@ PORTNAME= libqalculate -PORTVERSION= 4.7.0 +PORTVERSION= 4.8.0 CATEGORIES= math MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/ diff --git a/math/libqalculate/distinfo b/math/libqalculate/distinfo index 29b645aeaad..d43af2058cd 100644 --- a/math/libqalculate/distinfo +++ b/math/libqalculate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688402952 -SHA256 (libqalculate-4.7.0.tar.gz) = 16135bcd07a905ffc27a3f1abe5e6feb6cda6c40e5f6bb35127fefdb50ccfd02 -SIZE (libqalculate-4.7.0.tar.gz) = 2618347 +TIMESTAMP = 1692639110 +SHA256 (libqalculate-4.8.0.tar.gz) = c2761626a061b772da3cec9135c21e9b7ce5aa87a6bb47c9ddd7d82fc8f0f46c +SIZE (libqalculate-4.8.0.tar.gz) = 2625669 diff --git a/math/libqalculate/pkg-plist b/math/libqalculate/pkg-plist index 3a2fa4734e0..83a39516159 100644 --- a/math/libqalculate/pkg-plist +++ b/math/libqalculate/pkg-plist @@ -16,7 +16,7 @@ include/libqalculate/util.h lib/libqalculate.a lib/libqalculate.so lib/libqalculate.so.22 -lib/libqalculate.so.22.19.0 +lib/libqalculate.so.22.20.0 libdata/pkgconfig/libqalculate.pc man/man1/qalc.1.gz %%NLS%%share/locale/ca/LC_MESSAGES/libqalculate.mo diff --git a/math/octave-forge-pythonic/Makefile b/math/octave-forge-pythonic/Makefile index f4a54e162de..e55672e8dda 100644 --- a/math/octave-forge-pythonic/Makefile +++ b/math/octave-forge-pythonic/Makefile @@ -1,5 +1,5 @@ PORTNAME= octave-forge-pythonic -DISTVERSION= 0.1.2 +DISTVERSION= 0.1.3 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/p5-Math-GMPq/Makefile b/math/p5-Math-GMPq/Makefile index 5d7599cc4d7..13fe24fb29d 100644 --- a/math/p5-Math-GMPq/Makefile +++ b/math/p5-Math-GMPq/Makefile @@ -1,5 +1,5 @@ PORTNAME= Math-GMPq -PORTVERSION= 0.53 +PORTVERSION= 0.55 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/math/p5-Math-GMPq/distinfo b/math/p5-Math-GMPq/distinfo index 162a0d3ae87..475c2a9f423 100644 --- a/math/p5-Math-GMPq/distinfo +++ b/math/p5-Math-GMPq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677771137 -SHA256 (Math-GMPq-0.53.tar.gz) = 6c855a7998c6c38f0c4629b0887ae5ac983de0e0eb1dff569c9c2deeec92df00 -SIZE (Math-GMPq-0.53.tar.gz) = 56967 +TIMESTAMP = 1692211681 +SHA256 (Math-GMPq-0.55.tar.gz) = 81b209e460d1de6d1031e85dbb2961548741aad7ddf311c26d8a3587511402a7 +SIZE (Math-GMPq-0.55.tar.gz) = 58729 diff --git a/math/p5-Math-GMPz/Makefile b/math/p5-Math-GMPz/Makefile index 27afba6b4d9..e95c3b457d6 100644 --- a/math/p5-Math-GMPz/Makefile +++ b/math/p5-Math-GMPz/Makefile @@ -1,5 +1,5 @@ PORTNAME= Math-GMPz -PORTVERSION= 0.56 +PORTVERSION= 0.58 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/math/p5-Math-GMPz/distinfo b/math/p5-Math-GMPz/distinfo index fe3119ee917..df4442308bb 100644 --- a/math/p5-Math-GMPz/distinfo +++ b/math/p5-Math-GMPz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677771139 -SHA256 (Math-GMPz-0.56.tar.gz) = b39f179609ae63cdc6d035406df27672a18289071a9e45169cdde0e4ea709649 -SIZE (Math-GMPz-0.56.tar.gz) = 100274 +TIMESTAMP = 1692211683 +SHA256 (Math-GMPz-0.58.tar.gz) = bcefe03898cf99a0ae247efa92ddf68c4091f30cb069e7a1fcd475e1de60a6dc +SIZE (Math-GMPz-0.58.tar.gz) = 107228 diff --git a/math/py-ambit/Makefile b/math/py-ambit/Makefile index b7e07dffffd..5eace52b40c 100644 --- a/math/py-ambit/Makefile +++ b/math/py-ambit/Makefile @@ -1,6 +1,6 @@ PORTNAME= ambit DISTVERSIONPREFIX= v -DISTVERSION= 0.7 +DISTVERSION= 0.7.1 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-ambit/distinfo b/math/py-ambit/distinfo index 22974df3fad..39cabe5589f 100644 --- a/math/py-ambit/distinfo +++ b/math/py-ambit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684643393 -SHA256 (jturney-ambit-v0.7_GH0.tar.gz) = 97a4360db5cad6c9d2bc0932fc8641a3feb34a809c192c99886880073e87f8c2 -SIZE (jturney-ambit-v0.7_GH0.tar.gz) = 336129 +TIMESTAMP = 1692764533 +SHA256 (jturney-ambit-v0.7.1_GH0.tar.gz) = 3725c5340dd64fbb789638924434895bb74aa9beabf13fe9a034518850c053b7 +SIZE (jturney-ambit-v0.7.1_GH0.tar.gz) = 336226 diff --git a/math/py-awkward-cpp/Makefile b/math/py-awkward-cpp/Makefile index 28681e1c3d6..cc706b5b026 100644 --- a/math/py-awkward-cpp/Makefile +++ b/math/py-awkward-cpp/Makefile @@ -1,5 +1,5 @@ PORTNAME= awkward-cpp -PORTVERSION= 21 +PORTVERSION= 22 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-awkward-cpp/distinfo b/math/py-awkward-cpp/distinfo index ced09f55f26..e2d56249263 100644 --- a/math/py-awkward-cpp/distinfo +++ b/math/py-awkward-cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069902 -SHA256 (awkward-cpp-21.tar.gz) = b286e63de803048ff812f769c6b636f13b0d3bcbf22e1b91b15f6cfb9593851e -SIZE (awkward-cpp-21.tar.gz) = 1419403 +TIMESTAMP = 1692211797 +SHA256 (awkward-cpp-22.tar.gz) = 21679636fb21cfe3715f88a32326a579199384db2da4a62995c310502d7fe85f +SIZE (awkward-cpp-22.tar.gz) = 1420660 diff --git a/math/py-awkward/Makefile b/math/py-awkward/Makefile index 1d6bd755e0c..45025a48c4a 100644 --- a/math/py-awkward/Makefile +++ b/math/py-awkward/Makefile @@ -1,5 +1,5 @@ PORTNAME= awkward -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.3 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>=1.10.0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}awkward-cpp>=21<21_99:math/py-awkward-cpp@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}awkward-cpp>=22<22_99:math/py-awkward-cpp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.18.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ diff --git a/math/py-awkward/distinfo b/math/py-awkward/distinfo index c171a6dfecc..69b40e2bbfa 100644 --- a/math/py-awkward/distinfo +++ b/math/py-awkward/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069900 -SHA256 (awkward-2.3.1.tar.gz) = 34b44e5c46e1e0c2af045ba3fb8f966b6bb7ecff6fb90d16c3c90af82616b791 -SIZE (awkward-2.3.1.tar.gz) = 5065864 +TIMESTAMP = 1692640062 +SHA256 (awkward-2.3.3.tar.gz) = 66a454184c91efba071f4a0574bfe57f4e50a0d5d9bd4931edfd429139242bb8 +SIZE (awkward-2.3.3.tar.gz) = 5324161 diff --git a/math/py-pyhdfe/Makefile b/math/py-pyhdfe/Makefile index 7be5904e987..fe571755c50 100644 --- a/math/py-pyhdfe/Makefile +++ b/math/py-pyhdfe/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyhdfe -DISTVERSION= 0.1.2 -PORTREVISION= 1 +DISTVERSION= 0.2.0 CATEGORIES= math python # statistics MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-pyhdfe/distinfo b/math/py-pyhdfe/distinfo index 0ecb0c682e7..190005f9f5b 100644 --- a/math/py-pyhdfe/distinfo +++ b/math/py-pyhdfe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678612136 -SHA256 (pyhdfe-0.1.2.tar.gz) = a906e5d0922a65503333028e944d993ce15f4ee44e2b3ace2f79049623888432 -SIZE (pyhdfe-0.1.2.tar.gz) = 28048 +TIMESTAMP = 1692772057 +SHA256 (pyhdfe-0.2.0.tar.gz) = 8cddc5f5a09148d3281fca3c787146a85ecc5a7517be3ae5762bfe507907b7fb +SIZE (pyhdfe-0.2.0.tar.gz) = 28978 diff --git a/math/py-pyreadr/Makefile b/math/py-pyreadr/Makefile index 5bcf10ffd3d..0bf53ebfa4c 100644 --- a/math/py-pyreadr/Makefile +++ b/math/py-pyreadr/Makefile @@ -1,6 +1,5 @@ PORTNAME= pyreadr -PORTVERSION= 0.4.7 -PORTREVISION= 1 +PORTVERSION= 0.4.9 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +10,13 @@ WWW= https://github.com/ofajardo/pyreadr LICENSE= AGPLv3+ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= librdata.so:math/librdata RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=1.2.0,1:math/py-pandas@${PY_FLAVOR} USES= localbase python -USE_PYTHON= autoplist concurrent cython distutils +USE_PYTHON= autoplist concurrent cython pep517 post-patch: # Clean up bundled libraries diff --git a/math/py-pyreadr/distinfo b/math/py-pyreadr/distinfo index bede5b09b5f..c38a3f00b3a 100644 --- a/math/py-pyreadr/distinfo +++ b/math/py-pyreadr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664767968 -SHA256 (pyreadr-0.4.7.tar.gz) = 901110d62b4bedaef288f4db81425fb696edc721fe2c34c1083f5fb11050a73c -SIZE (pyreadr-0.4.7.tar.gz) = 1183279 +TIMESTAMP = 1692211801 +SHA256 (pyreadr-0.4.9.tar.gz) = 448440079ee5be06bc03192f691314c55c9f94bc4e06c44da166a7baa56c2602 +SIZE (pyreadr-0.4.9.tar.gz) = 2275025 diff --git a/math/py-pyreadr/files/patch-pyreadr-librdata.c b/math/py-pyreadr/files/patch-pyreadr-librdata.c index a42f31378cf..4f1e7dcff11 100644 --- a/math/py-pyreadr/files/patch-pyreadr-librdata.c +++ b/math/py-pyreadr/files/patch-pyreadr-librdata.c @@ -1,29 +1,29 @@ ---- pyreadr/librdata.c.orig 2022-09-24 13:35:34 UTC +--- pyreadr/librdata.c.orig 2023-08-09 09:41:49 UTC +++ pyreadr/librdata.c -@@ -4,8 +4,6 @@ - { +@@ -5,8 +5,6 @@ "distutils": { "depends": [ + "pyreadr/conditional_includes.h", - "pyreadr/libs/librdata/src/rdata.h", - "pyreadr/libs/librdata/src/rdata_io_unistd.h" ], "extra_compile_args": [ "-DHAVE_ZLIB", -@@ -23,13 +21,6 @@ +@@ -24,13 +22,6 @@ "name": "pyreadr.librdata", "sources": [ "pyreadr/librdata.pyx", +- "pyreadr/libs/librdata/src/rdata_write.c", - "pyreadr/libs/librdata/src/rdata_bits.c", -- "pyreadr/libs/librdata/src/rdata_io_unistd.c", +- "pyreadr/libs/librdata/src/rdata_read.c", +- "pyreadr/libs/librdata/src/rdata_parser.c", - "pyreadr/libs/librdata/src/CKHashTable.c", - "pyreadr/libs/librdata/src/rdata_error.c", -- "pyreadr/libs/librdata/src/rdata_read.c", -- "pyreadr/libs/librdata/src/rdata_write.c", -- "pyreadr/libs/librdata/src/rdata_parser.c" +- "pyreadr/libs/librdata/src/rdata_io_unistd.c" ] }, "module_name": "pyreadr.librdata" -@@ -645,8 +636,8 @@ static CYTHON_INLINE float __PYX_NAN() { +@@ -1117,8 +1108,8 @@ static CYTHON_INLINE float __PYX_NAN() { #include #include #include @@ -31,6 +31,6 @@ -#include "libs/librdata/src/rdata_io_unistd.h" +#include +#include - #include - #include - #include + #include "conditional_includes.h" + #include + #ifdef _OPENMP diff --git a/math/py-pyreadr/files/patch-setup.py b/math/py-pyreadr/files/patch-setup.py index 546a0790998..9d4d9a7b11c 100644 --- a/math/py-pyreadr/files/patch-setup.py +++ b/math/py-pyreadr/files/patch-setup.py @@ -1,23 +1,24 @@ ---- setup.py.orig 2021-06-07 06:47:51 UTC +--- setup.py.orig 2023-08-09 07:13:10 UTC +++ setup.py -@@ -13,7 +13,6 @@ from setuptools import setup, Extension +@@ -13,12 +13,7 @@ from setuptools import setup, Extension from Cython.Build import cythonize + import Cython +-cyver = int(Cython.__version__.split(".")[0]) +-if cyver < 3: +- raise Exception("cython 3.0.0 or newer is required") +- librdata_source_files = [] -librdata_source_files += glob.glob('pyreadr/libs/librdata/src/*.c') librdata_source_files += ['pyreadr/librdata.pyx'] library_dirs = [] -@@ -52,10 +51,11 @@ elif platform.system() == 'Windows': +@@ -54,7 +49,7 @@ elif platform.system() == 'Windows': libraries.append('bz2') libraries.append('lzma') -elif platform.system() == 'Linux': -+elif platform.system() == 'FreeBSD' or platform.system() == 'Linux': ++elif platform.system() == 'FreeBSD': libraries.append('z') libraries.append('bz2') libraries.append('lzma') -+ libraries.append('rdata') - #extra_compile_args.append("--std=gnu99") - else: - raise RuntimeError('Unsupported OS') diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile index eb9f7f1d591..8ce86097923 100644 --- a/math/qalculate-gtk/Makefile +++ b/math/qalculate-gtk/Makefile @@ -1,5 +1,5 @@ PORTNAME= qalculate-gtk -PORTVERSION= 4.7.0 +PORTVERSION= 4.8.0 CATEGORIES= math MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/ diff --git a/math/qalculate-gtk/distinfo b/math/qalculate-gtk/distinfo index 044c7f4e849..68e977c2dce 100644 --- a/math/qalculate-gtk/distinfo +++ b/math/qalculate-gtk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688403242 -SHA256 (qalculate-gtk-4.7.0.tar.gz) = 4500b9a6567868821f3d21f1403faf8491422bec1e5692397678a7fcc41a52ab -SIZE (qalculate-gtk-4.7.0.tar.gz) = 2836490 +TIMESTAMP = 1692639343 +SHA256 (qalculate-gtk-4.8.0.tar.gz) = 5d8ef3e5e613f000177172f220243f88c83afcfaa19ef0465d5c723f4859bd26 +SIZE (qalculate-gtk-4.8.0.tar.gz) = 2811851 diff --git a/math/qalculate-gtk/pkg-plist b/math/qalculate-gtk/pkg-plist index 59ccf57be03..67916a59f53 100644 --- a/math/qalculate-gtk/pkg-plist +++ b/math/qalculate-gtk/pkg-plist @@ -8,7 +8,7 @@ share/dbus-1/services/io.github.Qalculate.SearchProvider.service %%DOCSDIR%%/html/figures/completion.png %%DOCSDIR%%/html/figures/convert-number-bases.png %%DOCSDIR%%/html/figures/convert-unit.png -%%DOCSDIR%%/html/figures/edit-function-simplified.png +%%DOCSDIR%%/html/figures/edit-function-details.png %%DOCSDIR%%/html/figures/edit-function.png %%DOCSDIR%%/html/figures/edit-matrix.png %%DOCSDIR%%/html/figures/edit-unit-relation.png @@ -40,6 +40,7 @@ share/dbus-1/services/io.github.Qalculate.SearchProvider.service %%DOCSDIR%%/html/qalculate-introduction.html %%DOCSDIR%%/html/qalculate-mode.html %%DOCSDIR%%/html/qalculate-plotting.html +%%DOCSDIR%%/html/qalculate-qt.html %%DOCSDIR%%/html/qalculate-units.html %%DOCSDIR%%/html/qalculate-user-interface.html %%DOCSDIR%%/html/qalculate-variables.html diff --git a/math/qalculate-qt/Makefile b/math/qalculate-qt/Makefile index 41021a1b851..c5038c56798 100644 --- a/math/qalculate-qt/Makefile +++ b/math/qalculate-qt/Makefile @@ -1,5 +1,5 @@ PORTNAME= qalculate-qt -PORTVERSION= 4.7.0 +PORTVERSION= 4.8.0 CATEGORIES= math MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= ${FLAVOR:S/qt//} diff --git a/math/qalculate-qt/distinfo b/math/qalculate-qt/distinfo index 9af0364071c..640fb826da6 100644 --- a/math/qalculate-qt/distinfo +++ b/math/qalculate-qt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688403379 -SHA256 (qalculate-qt-4.7.0.tar.gz) = 32783fc5efae00af8b27b3f117b88410fe20ca8810fb659d519e8fc2eaa37f06 -SIZE (qalculate-qt-4.7.0.tar.gz) = 1297152 +TIMESTAMP = 1692640208 +SHA256 (qalculate-qt-4.8.0.tar.gz) = 291ed711b5513272dc0b7c4fd846b884738401da2432a2f3d1c83004af2b932a +SIZE (qalculate-qt-4.8.0.tar.gz) = 1304320 diff --git a/math/sundials/Makefile b/math/sundials/Makefile index 3d7d28f1d6f..29ba63c6f51 100644 --- a/math/sundials/Makefile +++ b/math/sundials/Makefile @@ -1,5 +1,5 @@ PORTNAME= sundials -DISTVERSION= 6.5.1 +DISTVERSION= 6.6.0 CATEGORIES= math MASTER_SITES= https://github.com/LLNL/sundials/releases/download/v${DISTVERSION}/ diff --git a/math/sundials/distinfo b/math/sundials/distinfo index b7cdd37da08..d3b57c0b415 100644 --- a/math/sundials/distinfo +++ b/math/sundials/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691461675 -SHA256 (sundials-6.5.1.tar.gz) = 4252303805171e4dbdd19a01e52c1dcfe0dafc599c3cfedb0a5c2ffb045a8a75 -SIZE (sundials-6.5.1.tar.gz) = 90035806 +TIMESTAMP = 1692767874 +SHA256 (sundials-6.6.0.tar.gz) = f90029b8da846c8faff5530fd1fa4847079188d040554f55c1d5d1e04743d29d +SIZE (sundials-6.6.0.tar.gz) = 91658584 diff --git a/math/sundials/pkg-plist b/math/sundials/pkg-plist index a5bed832e97..d745bd6a749 100644 --- a/math/sundials/pkg-plist +++ b/math/sundials/pkg-plist @@ -8,6 +8,8 @@ include/arkode/arkode_butcher_erk.h include/arkode/arkode_erkstep.h include/arkode/arkode_ls.h include/arkode/arkode_mristep.h +include/arkode/arkode_sprk.h +include/arkode/arkode_sprkstep.h include/cvode/cvode.h include/cvode/cvode_bandpre.h include/cvode/cvode_bbdpre.h @@ -97,82 +99,82 @@ lib/cmake/sundials/SUNDIALSTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/sundials/SUNDIALSTargets.cmake lib/libsundials_arkode.so lib/libsundials_arkode.so.5 -lib/libsundials_arkode.so.5.5.1 +lib/libsundials_arkode.so.5.6.0 lib/libsundials_cvode.so lib/libsundials_cvode.so.6 -lib/libsundials_cvode.so.6.5.1 +lib/libsundials_cvode.so.6.6.0 lib/libsundials_cvodes.so lib/libsundials_cvodes.so.6 -lib/libsundials_cvodes.so.6.5.1 +lib/libsundials_cvodes.so.6.6.0 lib/libsundials_generic.so lib/libsundials_generic.so.6 -lib/libsundials_generic.so.6.5.1 +lib/libsundials_generic.so.6.6.0 lib/libsundials_ida.so lib/libsundials_ida.so.6 -lib/libsundials_ida.so.6.5.1 +lib/libsundials_ida.so.6.6.0 lib/libsundials_idas.so lib/libsundials_idas.so.5 -lib/libsundials_idas.so.5.5.1 +lib/libsundials_idas.so.5.6.0 lib/libsundials_kinsol.so lib/libsundials_kinsol.so.6 -lib/libsundials_kinsol.so.6.5.1 +lib/libsundials_kinsol.so.6.6.0 lib/libsundials_nvecmanyvector.so lib/libsundials_nvecmanyvector.so.6 -lib/libsundials_nvecmanyvector.so.6.5.1 +lib/libsundials_nvecmanyvector.so.6.6.0 %%MPI%%lib/libsundials_nvecmpimanyvector.so %%MPI%%lib/libsundials_nvecmpimanyvector.so.6 -%%MPI%%lib/libsundials_nvecmpimanyvector.so.6.5.1 +%%MPI%%lib/libsundials_nvecmpimanyvector.so.6.6.0 %%MPI%%lib/libsundials_nvecmpiplusx.so %%MPI%%lib/libsundials_nvecmpiplusx.so.6 -%%MPI%%lib/libsundials_nvecmpiplusx.so.6.5.1 +%%MPI%%lib/libsundials_nvecmpiplusx.so.6.6.0 %%OPENMP%%lib/libsundials_nvecopenmp.so %%OPENMP%%lib/libsundials_nvecopenmp.so.6 -%%OPENMP%%lib/libsundials_nvecopenmp.so.6.5.1 +%%OPENMP%%lib/libsundials_nvecopenmp.so.6.6.0 %%MPI%%lib/libsundials_nvecparallel.so %%MPI%%lib/libsundials_nvecparallel.so.6 -%%MPI%%lib/libsundials_nvecparallel.so.6.5.1 +%%MPI%%lib/libsundials_nvecparallel.so.6.6.0 %%HYPRE%%lib/libsundials_nvecparhyp.so %%HYPRE%%lib/libsundials_nvecparhyp.so.6 -%%HYPRE%%lib/libsundials_nvecparhyp.so.6.5.1 +%%HYPRE%%lib/libsundials_nvecparhyp.so.6.6.0 %%PETSC%%lib/libsundials_nvecpetsc.so %%PETSC%%lib/libsundials_nvecpetsc.so.6 -%%PETSC%%lib/libsundials_nvecpetsc.so.6.5.1 +%%PETSC%%lib/libsundials_nvecpetsc.so.6.6.0 lib/libsundials_nvecpthreads.so lib/libsundials_nvecpthreads.so.6 -lib/libsundials_nvecpthreads.so.6.5.1 +lib/libsundials_nvecpthreads.so.6.6.0 lib/libsundials_nvecserial.so lib/libsundials_nvecserial.so.6 -lib/libsundials_nvecserial.so.6.5.1 +lib/libsundials_nvecserial.so.6.6.0 lib/libsundials_sunlinsolband.so -lib/libsundials_sunlinsolband.so.4.5.1 +lib/libsundials_sunlinsolband.so.4.6.0 lib/libsundials_sunlinsoldense.so -lib/libsundials_sunlinsoldense.so.4.5.1 +lib/libsundials_sunlinsoldense.so.4.6.0 %%KLU%%lib/libsundials_sunlinsolklu.so -%%KLU%%lib/libsundials_sunlinsolklu.so.4.5.1 +%%KLU%%lib/libsundials_sunlinsolklu.so.4.6.0 %%LAPACK%%lib/libsundials_sunlinsollapackband.so -%%LAPACK%%lib/libsundials_sunlinsollapackband.so.4.5.1 +%%LAPACK%%lib/libsundials_sunlinsollapackband.so.4.6.0 %%LAPACK%%lib/libsundials_sunlinsollapackdense.so -%%LAPACK%%lib/libsundials_sunlinsollapackdense.so.4.5.1 +%%LAPACK%%lib/libsundials_sunlinsollapackdense.so.4.6.0 lib/libsundials_sunlinsolpcg.so -lib/libsundials_sunlinsolpcg.so.4.5.1 +lib/libsundials_sunlinsolpcg.so.4.6.0 lib/libsundials_sunlinsolspbcgs.so -lib/libsundials_sunlinsolspbcgs.so.4.5.1 +lib/libsundials_sunlinsolspbcgs.so.4.6.0 lib/libsundials_sunlinsolspfgmr.so -lib/libsundials_sunlinsolspfgmr.so.4.5.1 +lib/libsundials_sunlinsolspfgmr.so.4.6.0 lib/libsundials_sunlinsolspgmr.so -lib/libsundials_sunlinsolspgmr.so.4.5.1 +lib/libsundials_sunlinsolspgmr.so.4.6.0 lib/libsundials_sunlinsolsptfqmr.so -lib/libsundials_sunlinsolsptfqmr.so.4.5.1 +lib/libsundials_sunlinsolsptfqmr.so.4.6.0 lib/libsundials_sunmatrixband.so lib/libsundials_sunmatrixband.so.4 -lib/libsundials_sunmatrixband.so.4.5.1 +lib/libsundials_sunmatrixband.so.4.6.0 lib/libsundials_sunmatrixdense.so lib/libsundials_sunmatrixdense.so.4 -lib/libsundials_sunmatrixdense.so.4.5.1 +lib/libsundials_sunmatrixdense.so.4.6.0 lib/libsundials_sunmatrixsparse.so lib/libsundials_sunmatrixsparse.so.4 -lib/libsundials_sunmatrixsparse.so.4.5.1 +lib/libsundials_sunmatrixsparse.so.4.6.0 lib/libsundials_sunnonlinsolfixedpoint.so -lib/libsundials_sunnonlinsolfixedpoint.so.3.5.1 +lib/libsundials_sunnonlinsolfixedpoint.so.3.6.0 lib/libsundials_sunnonlinsolnewton.so -lib/libsundials_sunnonlinsolnewton.so.3.5.1 +lib/libsundials_sunnonlinsolnewton.so.3.6.0 diff --git a/misc/broot/Makefile b/misc/broot/Makefile index 3b4efd27d9a..681c25f9c9c 100644 --- a/misc/broot/Makefile +++ b/misc/broot/Makefile @@ -1,7 +1,6 @@ PORTNAME= broot DISTVERSIONPREFIX= v -DISTVERSION= 1.22.1 -PORTREVISION= 2 +DISTVERSION= 1.25.0 CATEGORIES= misc MAINTAINER= lcook@FreeBSD.org @@ -22,7 +21,7 @@ GH_ACCOUNT= canop SUB_FILES= pkg-message PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz -PORTDOCS= CHANGELOG.md README.md documentation.md features.md +PORTDOCS= CHANGELOG.md README.md features.md OPTIONS_DEFINE= CLIPBOARD DOCS OPTIONS_DEFAULT= CLIPBOARD diff --git a/misc/broot/Makefile.crates b/misc/broot/Makefile.crates index 42fd43064ee..b3978721f16 100644 --- a/misc/broot/Makefile.crates +++ b/misc/broot/Makefile.crates @@ -1,73 +1,85 @@ CARGO_CRATES= adler-1.0.2 \ ahash-0.4.7 \ - ahash-0.7.6 \ - aho-corasick-1.0.1 \ + ahash-0.8.3 \ + aho-corasick-1.0.2 \ + android-tzdata-0.1.1 \ android_system_properties-0.1.5 \ - ansi_colours-1.2.1 \ + ansi_colours-1.2.2 \ + anstream-0.3.2 \ + anstyle-1.0.1 \ + anstyle-parse-0.2.1 \ + anstyle-query-1.0.0 \ + anstyle-wincon-1.0.1 \ anyhow-1.0.71 \ argh-0.1.10 \ argh_derive-0.1.10 \ argh_shared-0.1.10 \ arrayref-0.3.7 \ - arrayvec-0.7.2 \ - atty-0.2.14 \ + arrayvec-0.7.4 \ autocfg-1.1.0 \ base64-0.13.1 \ - base64-0.21.0 \ + base64-0.21.2 \ bet-1.0.2 \ bincode-1.3.3 \ bit_field-0.10.2 \ bitflags-1.3.2 \ + bitflags-2.3.3 \ block-0.1.6 \ - bstr-1.4.0 \ - bumpalo-3.12.2 \ + bstr-1.6.0 \ + bumpalo-3.13.0 \ bytemuck-1.13.1 \ byteorder-1.4.3 \ cc-1.0.79 \ cfg-if-1.0.0 \ char_reader-0.1.1 \ - chrono-0.4.24 \ - clap-3.2.25 \ - clap_complete-3.2.5 \ - clap_derive-3.2.25 \ - clap_lex-0.2.4 \ + chrono-0.4.26 \ + clap-4.3.11 \ + clap-help-0.6.1 \ + clap_builder-4.3.11 \ + clap_complete-4.3.2 \ + clap_derive-4.3.2 \ + clap_lex-0.5.0 \ + clap_mangen-0.2.12 \ cli-log-2.0.0 \ clipboard-win-4.5.0 \ clipboard_macos-0.1.0 \ color_quant-1.1.0 \ + colorchoice-1.0.0 \ coolor-0.5.0 \ core-foundation-sys-0.8.4 \ crc32fast-1.3.2 \ crokey-0.4.3 \ crokey-proc_macros-0.4.0 \ - crossbeam-0.8.0 \ + crossbeam-0.8.2 \ crossbeam-channel-0.5.8 \ crossbeam-deque-0.8.3 \ - crossbeam-epoch-0.9.14 \ + crossbeam-epoch-0.9.15 \ crossbeam-queue-0.3.8 \ - crossbeam-utils-0.8.15 \ + crossbeam-utils-0.8.16 \ crossterm-0.23.2 \ - crossterm_winapi-0.9.0 \ + crossterm_winapi-0.9.1 \ crunchy-0.2.2 \ - csv-1.2.1 \ + csv-1.2.2 \ csv-core-0.1.10 \ csv2svg-0.1.9 \ custom_error-1.9.2 \ data-url-0.2.0 \ - deser-hjson-1.1.1 \ + deser-hjson-2.1.0 \ directories-4.0.1 \ directories-next-2.0.0 \ dirs-sys-0.3.7 \ dirs-sys-next-0.1.2 \ doc-comment-0.3.3 \ either-1.8.1 \ + equivalent-1.0.0 \ errno-0.3.1 \ errno-dragonfly-0.1.2 \ error-code-2.3.1 \ - exr-1.6.3 \ + exr-1.7.0 \ fallible-iterator-0.2.0 \ fallible-streaming-iterator-0.1.9 \ fastrand-1.9.0 \ + fdeflate-0.3.0 \ file-size-1.0.3 \ flate2-1.0.26 \ float-cmp-0.9.0 \ @@ -75,10 +87,10 @@ CARGO_CRATES= adler-1.0.2 \ fnv-1.0.7 \ fontconfig-parser-0.5.2 \ fontdb-0.14.1 \ - form_urlencoded-1.1.0 \ + form_urlencoded-1.2.0 \ futures-core-0.3.28 \ futures-sink-0.3.28 \ - getrandom-0.2.9 \ + getrandom-0.2.10 \ gif-0.12.0 \ git2-0.14.4 \ glassbench-0.3.5 \ @@ -86,92 +98,92 @@ CARGO_CRATES= adler-1.0.2 \ half-2.2.1 \ hashbrown-0.9.1 \ hashbrown-0.12.3 \ + hashbrown-0.14.0 \ hashlink-0.6.0 \ heck-0.4.1 \ - hermit-abi-0.1.19 \ - hermit-abi-0.2.6 \ - hermit-abi-0.3.1 \ - iana-time-zone-0.1.56 \ + hermit-abi-0.3.2 \ + iana-time-zone-0.1.57 \ iana-time-zone-haiku-0.1.2 \ id-arena-2.2.1 \ - idna-0.3.0 \ + idna-0.4.0 \ image-0.24.6 \ imagesize-0.12.0 \ include_dir-0.7.3 \ include_dir_macros-0.7.3 \ indexmap-1.9.3 \ + indexmap-2.0.0 \ instant-0.1.12 \ - io-lifetimes-1.0.10 \ + io-lifetimes-1.0.11 \ + is-terminal-0.4.9 \ is_executable-1.0.1 \ - itoa-1.0.6 \ + itoa-1.0.8 \ jobserver-0.1.26 \ jpeg-decoder-0.3.0 \ - js-sys-0.3.63 \ + js-sys-0.3.64 \ kurbo-0.9.5 \ lazy-regex-2.5.0 \ + lazy-regex-3.0.1 \ lazy-regex-proc_macros-2.4.1 \ + lazy-regex-proc_macros-3.0.1 \ lazy_static-1.4.0 \ lebe-0.5.2 \ lfs-core-0.11.1 \ - libc-0.2.144 \ + libc-0.2.147 \ libgit2-sys-0.13.5+1.4.5 \ libsqlite3-sys-0.20.1 \ libz-sys-1.1.9 \ line-wrap-0.1.1 \ linked-hash-map-0.5.6 \ - linux-raw-sys-0.3.7 \ - lock_api-0.4.9 \ - log-0.4.17 \ + linux-raw-sys-0.3.8 \ + linux-raw-sys-0.4.3 \ + lock_api-0.4.10 \ + log-0.4.19 \ malloc_buf-0.0.6 \ memchr-2.5.0 \ - memmap2-0.6.1 \ + memmap2-0.6.2 \ memoffset-0.6.5 \ - memoffset-0.8.0 \ + memoffset-0.9.0 \ minimad-0.9.1 \ - minimad-0.11.0 \ - miniz_oxide-0.5.4 \ - miniz_oxide-0.6.2 \ + minimad-0.12.0 \ + minimad-0.13.0 \ miniz_oxide-0.7.1 \ - mio-0.8.6 \ + mio-0.8.8 \ nanorand-0.7.0 \ nix-0.22.3 \ num-integer-0.1.45 \ num-rational-0.4.1 \ num-traits-0.2.15 \ - num_cpus-1.15.0 \ + num_cpus-1.16.0 \ objc-0.2.7 \ objc-foundation-0.1.1 \ objc_id-0.1.1 \ - once_cell-1.17.1 \ + once_cell-1.18.0 \ onig-6.4.0 \ onig_sys-69.8.1 \ open-1.7.1 \ opener-0.5.2 \ - os_str_bytes-6.5.0 \ parking_lot-0.12.1 \ - parking_lot_core-0.9.7 \ + parking_lot_core-0.9.8 \ pathdiff-0.2.1 \ - percent-encoding-2.2.0 \ + percent-encoding-2.3.0 \ phf-0.10.1 \ phf_generator-0.10.0 \ phf_macros-0.10.0 \ phf_shared-0.10.0 \ pico-args-0.5.0 \ - pin-project-1.1.0 \ - pin-project-internal-1.1.0 \ + pin-project-1.1.2 \ + pin-project-internal-1.1.2 \ pkg-config-0.3.27 \ - plist-1.4.3 \ - png-0.17.6 \ + plist-1.5.0 \ + png-0.17.9 \ ppv-lite86-0.2.17 \ - proc-macro-error-1.0.4 \ - proc-macro-error-attr-1.0.4 \ proc-macro-hack-0.5.20+deprecated \ - proc-macro2-1.0.58 \ + proc-macro2-1.0.64 \ proc-status-0.1.1 \ qoi-0.4.1 \ quick-xml-0.22.0 \ - quick-xml-0.28.2 \ - quote-1.0.27 \ + quick-xml-0.29.0 \ + quote-1.0.29 \ rand-0.8.5 \ rand_chacha-0.3.1 \ rand_core-0.6.4 \ @@ -181,25 +193,27 @@ CARGO_CRATES= adler-1.0.2 \ redox_syscall-0.2.16 \ redox_syscall-0.3.5 \ redox_users-0.4.3 \ - regex-1.8.1 \ - regex-automata-0.1.10 \ + regex-1.9.1 \ + regex-automata-0.3.2 \ regex-syntax-0.6.29 \ - regex-syntax-0.7.1 \ - resvg-0.33.0 \ + regex-syntax-0.7.3 \ + resvg-0.35.0 \ rgb-0.8.36 \ - rosvgtree-0.3.0 \ + roff-0.2.1 \ roxmltree-0.18.0 \ rusqlite-0.24.2 \ - rustix-0.37.19 \ + rustix-0.37.23 \ + rustix-0.38.4 \ rustybuzz-0.7.0 \ - ryu-1.0.13 \ + ryu-1.0.14 \ safemem-0.3.3 \ same-file-1.0.6 \ scopeguard-1.1.0 \ secular-1.0.1 \ - serde-1.0.163 \ - serde_derive-1.0.163 \ - serde_json-1.0.96 \ + serde-1.0.171 \ + serde_derive-1.0.171 \ + serde_json-1.0.100 \ + serde_spanned-0.6.3 \ signal-hook-0.3.15 \ signal-hook-mio-0.2.3 \ signal-hook-registry-1.4.1 \ @@ -207,69 +221,70 @@ CARGO_CRATES= adler-1.0.2 \ simplecss-0.2.1 \ siphasher-0.3.10 \ slotmap-1.0.6 \ - smallvec-1.10.0 \ - snafu-0.7.4 \ - snafu-derive-0.7.4 \ + smallvec-1.11.0 \ + snafu-0.7.5 \ + snafu-derive-0.7.5 \ spin-0.9.8 \ splitty-1.0.1 \ str-buf-1.0.6 \ strict-0.1.4 \ - strict-num-0.1.0 \ + strict-num-0.1.1 \ strsim-0.10.0 \ svg-0.13.1 \ - svgfilters-0.4.0 \ svgtypes-0.11.0 \ syn-1.0.109 \ - syn-2.0.16 \ + syn-2.0.25 \ syntect-no-panic-4.6.1 \ - tempfile-3.5.0 \ - termcolor-1.2.0 \ + tempfile-3.6.0 \ termimad-0.20.6 \ - termimad-0.22.0 \ + termimad-0.23.2 \ + termimad-0.24.1 \ terminal-clipboard-0.4.0 \ terminal-light-1.1.1 \ termux-clipboard-0.1.0 \ - textwrap-0.16.0 \ - thiserror-1.0.40 \ - thiserror-impl-1.0.40 \ + thiserror-1.0.43 \ + thiserror-impl-1.0.43 \ tiff-0.8.1 \ time-0.1.45 \ - time-0.3.21 \ + time-0.3.23 \ time-core-0.1.1 \ - time-macros-0.2.9 \ - tiny-skia-0.9.1 \ - tiny-skia-path-0.9.0 \ + time-macros-0.2.10 \ + tiny-skia-0.10.0 \ + tiny-skia-path-0.10.0 \ tinyvec-1.6.0 \ tinyvec_macros-0.1.1 \ - toml-0.5.11 \ + toml-0.7.6 \ + toml_datetime-0.6.3 \ + toml_edit-0.19.12 \ ttf-parser-0.18.1 \ - ttf-parser-0.19.0 \ + ttf-parser-0.19.1 \ umask-2.1.0 \ unicode-bidi-0.3.13 \ unicode-bidi-mirroring-0.1.0 \ unicode-ccc-0.1.2 \ unicode-general-category-0.6.0 \ - unicode-ident-1.0.8 \ + unicode-ident-1.0.10 \ unicode-normalization-0.1.22 \ unicode-script-0.5.5 \ unicode-vo-0.1.0 \ unicode-width-0.1.10 \ - url-2.3.1 \ + url-2.4.0 \ users-0.11.0 \ - usvg-0.33.0 \ - usvg-parser-0.33.0 \ - usvg-text-layout-0.33.0 \ - usvg-tree-0.33.0 \ + usvg-0.35.0 \ + usvg-parser-0.35.0 \ + usvg-text-layout-0.35.0 \ + usvg-tree-0.35.0 \ + utf8parse-0.2.1 \ vcpkg-0.2.15 \ version_check-0.9.4 \ walkdir-2.3.3 \ wasi-0.10.0+wasi-snapshot-preview1 \ wasi-0.11.0+wasi-snapshot-preview1 \ - wasm-bindgen-0.2.86 \ - wasm-bindgen-backend-0.2.86 \ - wasm-bindgen-macro-0.2.86 \ - wasm-bindgen-macro-support-0.2.86 \ - wasm-bindgen-shared-0.2.86 \ + wasm-bindgen-0.2.87 \ + wasm-bindgen-backend-0.2.87 \ + wasm-bindgen-macro-0.2.87 \ + wasm-bindgen-macro-support-0.2.87 \ + wasm-bindgen-shared-0.2.87 \ weezl-0.1.7 \ which-4.4.0 \ winapi-0.3.9 \ @@ -277,24 +292,16 @@ CARGO_CRATES= adler-1.0.2 \ winapi-util-0.1.5 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ windows-0.48.0 \ - windows-sys-0.45.0 \ windows-sys-0.48.0 \ - windows-targets-0.42.2 \ - windows-targets-0.48.0 \ - windows_aarch64_gnullvm-0.42.2 \ + windows-targets-0.48.1 \ windows_aarch64_gnullvm-0.48.0 \ - windows_aarch64_msvc-0.42.2 \ windows_aarch64_msvc-0.48.0 \ - windows_i686_gnu-0.42.2 \ windows_i686_gnu-0.48.0 \ - windows_i686_msvc-0.42.2 \ windows_i686_msvc-0.48.0 \ - windows_x86_64_gnu-0.42.2 \ windows_x86_64_gnu-0.48.0 \ - windows_x86_64_gnullvm-0.42.2 \ windows_x86_64_gnullvm-0.48.0 \ - windows_x86_64_msvc-0.42.2 \ windows_x86_64_msvc-0.48.0 \ + winnow-0.4.9 \ x11-clipboard-0.5.3 \ xcb-0.10.1 \ xmlparser-0.13.5 \ diff --git a/misc/broot/distinfo b/misc/broot/distinfo index 338735770ef..25449e5595a 100644 --- a/misc/broot/distinfo +++ b/misc/broot/distinfo @@ -1,16 +1,28 @@ -TIMESTAMP = 1684973797 +TIMESTAMP = 1692657376 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe SIZE (rust/crates/adler-1.0.2.crate) = 12778 SHA256 (rust/crates/ahash-0.4.7.crate) = 739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e SIZE (rust/crates/ahash-0.4.7.crate) = 51474 -SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 -SIZE (rust/crates/ahash-0.7.6.crate) = 38030 -SHA256 (rust/crates/aho-corasick-1.0.1.crate) = 67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04 -SIZE (rust/crates/aho-corasick-1.0.1.crate) = 167320 +SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f +SIZE (rust/crates/ahash-0.8.3.crate) = 42416 +SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41 +SIZE (rust/crates/aho-corasick-1.0.2.crate) = 167694 +SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0 +SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243 -SHA256 (rust/crates/ansi_colours-1.2.1.crate) = 7db9d9767fde724f83933a716ee182539788f293828244e9d999695ce0f7ba1e -SIZE (rust/crates/ansi_colours-1.2.1.crate) = 21866 +SHA256 (rust/crates/ansi_colours-1.2.2.crate) = 6a1558bd2075d341b9ca698ec8eb6fcc55a746b1fc4255585aad5b141d918a80 +SIZE (rust/crates/ansi_colours-1.2.2.crate) = 21374 +SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163 +SIZE (rust/crates/anstream-0.3.2.crate) = 19504 +SHA256 (rust/crates/anstyle-1.0.1.crate) = 3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd +SIZE (rust/crates/anstyle-1.0.1.crate) = 13977 +SHA256 (rust/crates/anstyle-parse-0.2.1.crate) = 938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333 +SIZE (rust/crates/anstyle-parse-0.2.1.crate) = 24802 +SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b +SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620 +SHA256 (rust/crates/anstyle-wincon-1.0.1.crate) = 180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188 +SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718 SHA256 (rust/crates/anyhow-1.0.71.crate) = 9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8 SIZE (rust/crates/anyhow-1.0.71.crate) = 43808 SHA256 (rust/crates/argh-0.1.10.crate) = ab257697eb9496bf75526f0217b5ed64636a9cfafa78b8365c71bd283fcef93e @@ -21,16 +33,14 @@ SHA256 (rust/crates/argh_shared-0.1.10.crate) = 64cb94155d965e3d37ffbbe7cc5b82c3 SIZE (rust/crates/argh_shared-0.1.10.crate) = 4308 SHA256 (rust/crates/arrayref-0.3.7.crate) = 6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545 SIZE (rust/crates/arrayref-0.3.7.crate) = 9620 -SHA256 (rust/crates/arrayvec-0.7.2.crate) = 8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6 -SIZE (rust/crates/arrayvec-0.7.2.crate) = 29341 -SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 -SIZE (rust/crates/atty-0.2.14.crate) = 5470 +SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711 +SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8 SIZE (rust/crates/base64-0.13.1.crate) = 61002 -SHA256 (rust/crates/base64-0.21.0.crate) = a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a -SIZE (rust/crates/base64-0.21.0.crate) = 72180 +SHA256 (rust/crates/base64-0.21.2.crate) = 604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d +SIZE (rust/crates/base64-0.21.2.crate) = 76389 SHA256 (rust/crates/bet-1.0.2.crate) = 1673d13ad9c8d4b5e3d17a38730714157d428d1a249c18dd96e77e969623ac98 SIZE (rust/crates/bet-1.0.2.crate) = 7388 SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad @@ -39,12 +49,14 @@ SHA256 (rust/crates/bit_field-0.10.2.crate) = dc827186963e592360843fb5ba4b973e14 SIZE (rust/crates/bit_field-0.10.2.crate) = 10568 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 +SHA256 (rust/crates/bitflags-2.3.3.crate) = 630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42 +SIZE (rust/crates/bitflags-2.3.3.crate) = 34320 SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a SIZE (rust/crates/block-0.1.6.crate) = 4077 -SHA256 (rust/crates/bstr-1.4.0.crate) = c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09 -SIZE (rust/crates/bstr-1.4.0.crate) = 345921 -SHA256 (rust/crates/bumpalo-3.12.2.crate) = 3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b -SIZE (rust/crates/bumpalo-3.12.2.crate) = 81706 +SHA256 (rust/crates/bstr-1.6.0.crate) = 6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05 +SIZE (rust/crates/bstr-1.6.0.crate) = 385877 +SHA256 (rust/crates/bumpalo-3.13.0.crate) = a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1 +SIZE (rust/crates/bumpalo-3.13.0.crate) = 82114 SHA256 (rust/crates/bytemuck-1.13.1.crate) = 17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea SIZE (rust/crates/bytemuck-1.13.1.crate) = 42309 SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610 @@ -55,16 +67,22 @@ SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582eb SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/char_reader-0.1.1.crate) = 37a59b22dec21ca7d6c173bd543eeab4cd2f36cf21f039a4134905034c87ed3a SIZE (rust/crates/char_reader-0.1.1.crate) = 4896 -SHA256 (rust/crates/chrono-0.4.24.crate) = 4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b -SIZE (rust/crates/chrono-0.4.24.crate) = 191330 -SHA256 (rust/crates/clap-3.2.25.crate) = 4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123 -SIZE (rust/crates/clap-3.2.25.crate) = 219403 -SHA256 (rust/crates/clap_complete-3.2.5.crate) = 3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8 -SIZE (rust/crates/clap_complete-3.2.5.crate) = 31625 -SHA256 (rust/crates/clap_derive-3.2.25.crate) = ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008 -SIZE (rust/crates/clap_derive-3.2.25.crate) = 28212 -SHA256 (rust/crates/clap_lex-0.2.4.crate) = 2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5 -SIZE (rust/crates/clap_lex-0.2.4.crate) = 9652 +SHA256 (rust/crates/chrono-0.4.26.crate) = ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5 +SIZE (rust/crates/chrono-0.4.26.crate) = 191501 +SHA256 (rust/crates/clap-4.3.11.crate) = 1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d +SIZE (rust/crates/clap-4.3.11.crate) = 54864 +SHA256 (rust/crates/clap-help-0.6.1.crate) = dde34b8d3b5e54c710fc5ae4ebe9b020177574be41eb6fae5026cc91db4dbf19 +SIZE (rust/crates/clap-help-0.6.1.crate) = 523759 +SHA256 (rust/crates/clap_builder-4.3.11.crate) = 98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b +SIZE (rust/crates/clap_builder-4.3.11.crate) = 160795 +SHA256 (rust/crates/clap_complete-4.3.2.crate) = 5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce +SIZE (rust/crates/clap_complete-4.3.2.crate) = 34104 +SHA256 (rust/crates/clap_derive-4.3.2.crate) = b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f +SIZE (rust/crates/clap_derive-4.3.2.crate) = 29053 +SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b +SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792 +SHA256 (rust/crates/clap_mangen-0.2.12.crate) = 8f2e32b579dae093c2424a8b7e2bea09c89da01e1ce5065eb2f0a6f1cc15cc1f +SIZE (rust/crates/clap_mangen-0.2.12.crate) = 15045 SHA256 (rust/crates/cli-log-2.0.0.crate) = 3d2ab00dc4c82ec28af25ac085aecc11ffeabf353755715a3113a7aa044ca5cc SIZE (rust/crates/cli-log-2.0.0.crate) = 5302 SHA256 (rust/crates/clipboard-win-4.5.0.crate) = 7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362 @@ -73,6 +91,8 @@ SHA256 (rust/crates/clipboard_macos-0.1.0.crate) = 145a7f9e9b89453bc0a5e32d16645 SIZE (rust/crates/clipboard_macos-0.1.0.crate) = 5958 SHA256 (rust/crates/color_quant-1.1.0.crate) = 3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b SIZE (rust/crates/color_quant-1.1.0.crate) = 6649 +SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7 +SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857 SHA256 (rust/crates/coolor-0.5.0.crate) = af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad SIZE (rust/crates/coolor-0.5.0.crate) = 101974 SHA256 (rust/crates/core-foundation-sys-0.8.4.crate) = e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa @@ -83,26 +103,26 @@ SHA256 (rust/crates/crokey-0.4.3.crate) = 2bf153da078e5e4429867d210b984ef96a15a8 SIZE (rust/crates/crokey-0.4.3.crate) = 32424 SHA256 (rust/crates/crokey-proc_macros-0.4.0.crate) = 4d4832efaa2189caf3fbcf30a96e1f614503140712f7da8da4032ac1c841ac78 SIZE (rust/crates/crokey-proc_macros-0.4.0.crate) = 2243 -SHA256 (rust/crates/crossbeam-0.8.0.crate) = fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80 -SIZE (rust/crates/crossbeam-0.8.0.crate) = 10993 +SHA256 (rust/crates/crossbeam-0.8.2.crate) = 2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c +SIZE (rust/crates/crossbeam-0.8.2.crate) = 10502 SHA256 (rust/crates/crossbeam-channel-0.5.8.crate) = a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200 SIZE (rust/crates/crossbeam-channel-0.5.8.crate) = 90455 SHA256 (rust/crates/crossbeam-deque-0.8.3.crate) = ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef SIZE (rust/crates/crossbeam-deque-0.8.3.crate) = 21746 -SHA256 (rust/crates/crossbeam-epoch-0.9.14.crate) = 46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695 -SIZE (rust/crates/crossbeam-epoch-0.9.14.crate) = 48524 +SHA256 (rust/crates/crossbeam-epoch-0.9.15.crate) = ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7 +SIZE (rust/crates/crossbeam-epoch-0.9.15.crate) = 48553 SHA256 (rust/crates/crossbeam-queue-0.3.8.crate) = d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add SIZE (rust/crates/crossbeam-queue-0.3.8.crate) = 16731 -SHA256 (rust/crates/crossbeam-utils-0.8.15.crate) = 3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b -SIZE (rust/crates/crossbeam-utils-0.8.15.crate) = 42326 +SHA256 (rust/crates/crossbeam-utils-0.8.16.crate) = 5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294 +SIZE (rust/crates/crossbeam-utils-0.8.16.crate) = 42508 SHA256 (rust/crates/crossterm-0.23.2.crate) = a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17 SIZE (rust/crates/crossterm-0.23.2.crate) = 106712 -SHA256 (rust/crates/crossterm_winapi-0.9.0.crate) = 2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c -SIZE (rust/crates/crossterm_winapi-0.9.0.crate) = 15561 +SHA256 (rust/crates/crossterm_winapi-0.9.1.crate) = acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b +SIZE (rust/crates/crossterm_winapi-0.9.1.crate) = 16027 SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7 SIZE (rust/crates/crunchy-0.2.2.crate) = 2995 -SHA256 (rust/crates/csv-1.2.1.crate) = 0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad -SIZE (rust/crates/csv-1.2.1.crate) = 887936 +SHA256 (rust/crates/csv-1.2.2.crate) = 626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086 +SIZE (rust/crates/csv-1.2.2.crate) = 887958 SHA256 (rust/crates/csv-core-0.1.10.crate) = 2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90 SIZE (rust/crates/csv-core-0.1.10.crate) = 25668 SHA256 (rust/crates/csv2svg-0.1.9.crate) = 04c54ac47e2618880ac953cbb50dc9c8884d1551dfd64f99c67de5372452f8c0 @@ -111,8 +131,8 @@ SHA256 (rust/crates/custom_error-1.9.2.crate) = 4f8a51dd197fa6ba5b4dc98a990a43cc SIZE (rust/crates/custom_error-1.9.2.crate) = 10826 SHA256 (rust/crates/data-url-0.2.0.crate) = 8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5 SIZE (rust/crates/data-url-0.2.0.crate) = 20553 -SHA256 (rust/crates/deser-hjson-1.1.1.crate) = 4141a83522b248ef3f7c5d251ef2702c169400aa9f4312320974ff49d7054e34 -SIZE (rust/crates/deser-hjson-1.1.1.crate) = 17432 +SHA256 (rust/crates/deser-hjson-2.1.0.crate) = edc4f43e1fa39fc7d2e48824106097c78749ee5962e580c1e0b8564de7f138d3 +SIZE (rust/crates/deser-hjson-2.1.0.crate) = 18699 SHA256 (rust/crates/directories-4.0.1.crate) = f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210 SIZE (rust/crates/directories-4.0.1.crate) = 16040 SHA256 (rust/crates/directories-next-2.0.0.crate) = 339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc @@ -125,20 +145,24 @@ SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054 SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123 SHA256 (rust/crates/either-1.8.1.crate) = 7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91 SIZE (rust/crates/either-1.8.1.crate) = 16027 +SHA256 (rust/crates/equivalent-1.0.0.crate) = 88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1 +SIZE (rust/crates/equivalent-1.0.0.crate) = 6621 SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a SIZE (rust/crates/errno-0.3.1.crate) = 10348 SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810 SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21 SIZE (rust/crates/error-code-2.3.1.crate) = 5324 -SHA256 (rust/crates/exr-1.6.3.crate) = bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4 -SIZE (rust/crates/exr-1.6.3.crate) = 242130 +SHA256 (rust/crates/exr-1.7.0.crate) = d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18 +SIZE (rust/crates/exr-1.7.0.crate) = 245602 SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7 SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509 SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be SIZE (rust/crates/fastrand-1.9.0.crate) = 11910 +SHA256 (rust/crates/fdeflate-0.3.0.crate) = d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10 +SIZE (rust/crates/fdeflate-0.3.0.crate) = 21790 SHA256 (rust/crates/file-size-1.0.3.crate) = 9544f10105d33957765016b8a9baea7e689bf1f0f2f32c2fa2f568770c38d2b3 SIZE (rust/crates/file-size-1.0.3.crate) = 1819 SHA256 (rust/crates/flate2-1.0.26.crate) = 3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743 @@ -153,14 +177,14 @@ SHA256 (rust/crates/fontconfig-parser-0.5.2.crate) = 4ab2e12762761366dcb876ab8b6 SIZE (rust/crates/fontconfig-parser-0.5.2.crate) = 36759 SHA256 (rust/crates/fontdb-0.14.1.crate) = af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e SIZE (rust/crates/fontdb-0.14.1.crate) = 107231 -SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8 -SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734 +SHA256 (rust/crates/form_urlencoded-1.2.0.crate) = a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652 +SIZE (rust/crates/form_urlencoded-1.2.0.crate) = 8923 SHA256 (rust/crates/futures-core-0.3.28.crate) = 4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c SIZE (rust/crates/futures-core-0.3.28.crate) = 14780 SHA256 (rust/crates/futures-sink-0.3.28.crate) = f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e SIZE (rust/crates/futures-sink-0.3.28.crate) = 7852 -SHA256 (rust/crates/getrandom-0.2.9.crate) = c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4 -SIZE (rust/crates/getrandom-0.2.9.crate) = 34457 +SHA256 (rust/crates/getrandom-0.2.10.crate) = be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427 +SIZE (rust/crates/getrandom-0.2.10.crate) = 34955 SHA256 (rust/crates/gif-0.12.0.crate) = 80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045 SIZE (rust/crates/gif-0.12.0.crate) = 634734 SHA256 (rust/crates/git2-0.14.4.crate) = d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c @@ -175,24 +199,22 @@ SHA256 (rust/crates/hashbrown-0.9.1.crate) = d7afe4a420e3fe79967a00898cc1f4db7c8 SIZE (rust/crates/hashbrown-0.9.1.crate) = 77734 SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888 SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968 +SHA256 (rust/crates/hashbrown-0.14.0.crate) = 2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a +SIZE (rust/crates/hashbrown-0.14.0.crate) = 116103 SHA256 (rust/crates/hashlink-0.6.0.crate) = d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8 SIZE (rust/crates/hashlink-0.6.0.crate) = 24952 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8 SIZE (rust/crates/heck-0.4.1.crate) = 11567 -SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 -SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979 -SHA256 (rust/crates/hermit-abi-0.2.6.crate) = ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7 -SIZE (rust/crates/hermit-abi-0.2.6.crate) = 13027 -SHA256 (rust/crates/hermit-abi-0.3.1.crate) = fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286 -SIZE (rust/crates/hermit-abi-0.3.1.crate) = 13793 -SHA256 (rust/crates/iana-time-zone-0.1.56.crate) = 0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c -SIZE (rust/crates/iana-time-zone-0.1.56.crate) = 19517 +SHA256 (rust/crates/hermit-abi-0.3.2.crate) = 443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b +SIZE (rust/crates/hermit-abi-0.3.2.crate) = 13783 +SHA256 (rust/crates/iana-time-zone-0.1.57.crate) = 2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613 +SIZE (rust/crates/iana-time-zone-0.1.57.crate) = 19785 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185 SHA256 (rust/crates/id-arena-2.2.1.crate) = 25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005 SIZE (rust/crates/id-arena-2.2.1.crate) = 12203 -SHA256 (rust/crates/idna-0.3.0.crate) = e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6 -SIZE (rust/crates/idna-0.3.0.crate) = 271128 +SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c +SIZE (rust/crates/idna-0.4.0.crate) = 271429 SHA256 (rust/crates/image-0.24.6.crate) = 527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a SIZE (rust/crates/image-0.24.6.crate) = 273618 SHA256 (rust/crates/imagesize-0.12.0.crate) = 029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284 @@ -203,34 +225,42 @@ SHA256 (rust/crates/include_dir_macros-0.7.3.crate) = b139284b5cf57ecfa712bcc669 SIZE (rust/crates/include_dir_macros-0.7.3.crate) = 3700 SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99 SIZE (rust/crates/indexmap-1.9.3.crate) = 54653 +SHA256 (rust/crates/indexmap-2.0.0.crate) = d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d +SIZE (rust/crates/indexmap-2.0.0.crate) = 64038 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c SIZE (rust/crates/instant-0.1.12.crate) = 6128 -SHA256 (rust/crates/io-lifetimes-1.0.10.crate) = 9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220 -SIZE (rust/crates/io-lifetimes-1.0.10.crate) = 37294 +SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2 +SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346 +SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b +SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109 SHA256 (rust/crates/is_executable-1.0.1.crate) = fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8 SIZE (rust/crates/is_executable-1.0.1.crate) = 9550 -SHA256 (rust/crates/itoa-1.0.6.crate) = 453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6 -SIZE (rust/crates/itoa-1.0.6.crate) = 10410 +SHA256 (rust/crates/itoa-1.0.8.crate) = 62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a +SIZE (rust/crates/itoa-1.0.8.crate) = 10465 SHA256 (rust/crates/jobserver-0.1.26.crate) = 936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2 SIZE (rust/crates/jobserver-0.1.26.crate) = 22645 SHA256 (rust/crates/jpeg-decoder-0.3.0.crate) = bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e SIZE (rust/crates/jpeg-decoder-0.3.0.crate) = 742671 -SHA256 (rust/crates/js-sys-0.3.63.crate) = 2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790 -SIZE (rust/crates/js-sys-0.3.63.crate) = 80154 +SHA256 (rust/crates/js-sys-0.3.64.crate) = c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a +SIZE (rust/crates/js-sys-0.3.64.crate) = 80313 SHA256 (rust/crates/kurbo-0.9.5.crate) = bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b SIZE (rust/crates/kurbo-0.9.5.crate) = 108513 SHA256 (rust/crates/lazy-regex-2.5.0.crate) = ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4 SIZE (rust/crates/lazy-regex-2.5.0.crate) = 4703 +SHA256 (rust/crates/lazy-regex-3.0.1.crate) = 57451d19ad5e289ff6c3d69c2a2424652995c42b79dafa11e9c4d5508c913c01 +SIZE (rust/crates/lazy-regex-3.0.1.crate) = 5736 SHA256 (rust/crates/lazy-regex-proc_macros-2.4.1.crate) = 8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22 SIZE (rust/crates/lazy-regex-proc_macros-2.4.1.crate) = 3967 +SHA256 (rust/crates/lazy-regex-proc_macros-3.0.1.crate) = 0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f +SIZE (rust/crates/lazy-regex-proc_macros-3.0.1.crate) = 4168 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 SHA256 (rust/crates/lebe-0.5.2.crate) = 03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8 SIZE (rust/crates/lebe-0.5.2.crate) = 8422 SHA256 (rust/crates/lfs-core-0.11.1.crate) = 2c4441d37490f59d2fdc631e6be973ce8712435e4bfebe9615125b11603cd41f SIZE (rust/crates/lfs-core-0.11.1.crate) = 8566 -SHA256 (rust/crates/libc-0.2.144.crate) = 2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1 -SIZE (rust/crates/libc-0.2.144.crate) = 682092 +SHA256 (rust/crates/libc-0.2.147.crate) = b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3 +SIZE (rust/crates/libc-0.2.147.crate) = 686772 SHA256 (rust/crates/libgit2-sys-0.13.5+1.4.5.crate) = 51e5ea06c26926f1002dd553fded6cfcdc9784c1f60feeb58368b4d9b07b6dba SIZE (rust/crates/libgit2-sys-0.13.5+1.4.5.crate) = 1713465 SHA256 (rust/crates/libsqlite3-sys-0.20.1.crate) = 64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd @@ -241,34 +271,34 @@ SHA256 (rust/crates/line-wrap-0.1.1.crate) = f30344350a2a51da54c1d53be93fade8a23 SIZE (rust/crates/line-wrap-0.1.1.crate) = 10010 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049 -SHA256 (rust/crates/linux-raw-sys-0.3.7.crate) = ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f -SIZE (rust/crates/linux-raw-sys-0.3.7.crate) = 1013423 -SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df -SIZE (rust/crates/lock_api-0.4.9.crate) = 25685 -SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e -SIZE (rust/crates/log-0.4.17.crate) = 38028 +SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519 +SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776 +SHA256 (rust/crates/linux-raw-sys-0.4.3.crate) = 09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0 +SIZE (rust/crates/linux-raw-sys-0.4.3.crate) = 1116245 +SHA256 (rust/crates/lock_api-0.4.10.crate) = c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16 +SIZE (rust/crates/lock_api-0.4.10.crate) = 26713 +SHA256 (rust/crates/log-0.4.19.crate) = b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4 +SIZE (rust/crates/log-0.4.19.crate) = 38073 SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239 SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d SIZE (rust/crates/memchr-2.5.0.crate) = 65812 -SHA256 (rust/crates/memmap2-0.6.1.crate) = a0aa1b505aeecb0adb017db2b6a79a17a38e64f882a201f05e9de8a982cd6096 -SIZE (rust/crates/memmap2-0.6.1.crate) = 27120 +SHA256 (rust/crates/memmap2-0.6.2.crate) = 6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872 +SIZE (rust/crates/memmap2-0.6.2.crate) = 27221 SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce SIZE (rust/crates/memoffset-0.6.5.crate) = 7686 -SHA256 (rust/crates/memoffset-0.8.0.crate) = d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1 -SIZE (rust/crates/memoffset-0.8.0.crate) = 8912 +SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c +SIZE (rust/crates/memoffset-0.9.0.crate) = 9033 SHA256 (rust/crates/minimad-0.9.1.crate) = 277639f0198568f70f8fe4ab88a52a67c96bca12f27ba5c17a76acdcb8b45834 SIZE (rust/crates/minimad-0.9.1.crate) = 19494 -SHA256 (rust/crates/minimad-0.11.0.crate) = 7f0c6050964e706796ad6e94b036ab0b7ca97e871905e1caab6b6771366e946d -SIZE (rust/crates/minimad-0.11.0.crate) = 20969 -SHA256 (rust/crates/miniz_oxide-0.5.4.crate) = 96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34 -SIZE (rust/crates/miniz_oxide-0.5.4.crate) = 53485 -SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa -SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536 +SHA256 (rust/crates/minimad-0.12.0.crate) = 38b136454924e4d020e55c4992e07c105b40d5c41b84662862f0e15bc0a2efef +SIZE (rust/crates/minimad-0.12.0.crate) = 21057 +SHA256 (rust/crates/minimad-0.13.0.crate) = f6c4610f430e49b882fcaad0186134150d4d74fc76080b0a61f7000460c2e268 +SIZE (rust/crates/minimad-0.13.0.crate) = 21049 SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7 SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194 -SHA256 (rust/crates/mio-0.8.6.crate) = 5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9 -SIZE (rust/crates/mio-0.8.6.crate) = 93658 +SHA256 (rust/crates/mio-0.8.8.crate) = 927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2 +SIZE (rust/crates/mio-0.8.8.crate) = 94264 SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3 SIZE (rust/crates/nanorand-0.7.0.crate) = 18437 SHA256 (rust/crates/nix-0.22.3.crate) = e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf @@ -279,16 +309,16 @@ SHA256 (rust/crates/num-rational-0.4.1.crate) = 0638a1c9d0a3c0914158145bc76cff37 SIZE (rust/crates/num-rational-0.4.1.crate) = 27889 SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd SIZE (rust/crates/num-traits-0.2.15.crate) = 49262 -SHA256 (rust/crates/num_cpus-1.15.0.crate) = 0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b -SIZE (rust/crates/num_cpus-1.15.0.crate) = 15680 +SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43 +SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713 SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1 SIZE (rust/crates/objc-0.2.7.crate) = 22036 SHA256 (rust/crates/objc-foundation-0.1.1.crate) = 1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9 SIZE (rust/crates/objc-foundation-0.1.1.crate) = 9063 SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b SIZE (rust/crates/objc_id-0.1.1.crate) = 3258 -SHA256 (rust/crates/once_cell-1.17.1.crate) = b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3 -SIZE (rust/crates/once_cell-1.17.1.crate) = 32856 +SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d +SIZE (rust/crates/once_cell-1.18.0.crate) = 32969 SHA256 (rust/crates/onig-6.4.0.crate) = 8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f SIZE (rust/crates/onig-6.4.0.crate) = 32616 SHA256 (rust/crates/onig_sys-69.8.1.crate) = 7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7 @@ -297,16 +327,14 @@ SHA256 (rust/crates/open-1.7.1.crate) = dcea7a30d6b81a2423cc59c43554880feff7b57d SIZE (rust/crates/open-1.7.1.crate) = 6129 SHA256 (rust/crates/opener-0.5.2.crate) = 293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005 SIZE (rust/crates/opener-0.5.2.crate) = 16345 -SHA256 (rust/crates/os_str_bytes-6.5.0.crate) = ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267 -SIZE (rust/crates/os_str_bytes-6.5.0.crate) = 23166 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 -SHA256 (rust/crates/parking_lot_core-0.9.7.crate) = 9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521 -SIZE (rust/crates/parking_lot_core-0.9.7.crate) = 32412 +SHA256 (rust/crates/parking_lot_core-0.9.8.crate) = 93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447 +SIZE (rust/crates/parking_lot_core-0.9.8.crate) = 32383 SHA256 (rust/crates/pathdiff-0.2.1.crate) = 8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd SIZE (rust/crates/pathdiff-0.2.1.crate) = 7142 -SHA256 (rust/crates/percent-encoding-2.2.0.crate) = 478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e -SIZE (rust/crates/percent-encoding-2.2.0.crate) = 10075 +SHA256 (rust/crates/percent-encoding-2.3.0.crate) = 9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94 +SIZE (rust/crates/percent-encoding-2.3.0.crate) = 10196 SHA256 (rust/crates/phf-0.10.1.crate) = fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259 SIZE (rust/crates/phf-0.10.1.crate) = 5406 SHA256 (rust/crates/phf_generator-0.10.0.crate) = 5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6 @@ -317,36 +345,32 @@ SHA256 (rust/crates/phf_shared-0.10.0.crate) = b6796ad771acdc0123d2a88dc428b5e38 SIZE (rust/crates/phf_shared-0.10.0.crate) = 4095 SHA256 (rust/crates/pico-args-0.5.0.crate) = 5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315 SIZE (rust/crates/pico-args-0.5.0.crate) = 11545 -SHA256 (rust/crates/pin-project-1.1.0.crate) = c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead -SIZE (rust/crates/pin-project-1.1.0.crate) = 57895 -SHA256 (rust/crates/pin-project-internal-1.1.0.crate) = 39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07 -SIZE (rust/crates/pin-project-internal-1.1.0.crate) = 27855 +SHA256 (rust/crates/pin-project-1.1.2.crate) = 030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842 +SIZE (rust/crates/pin-project-1.1.2.crate) = 57540 +SHA256 (rust/crates/pin-project-internal-1.1.2.crate) = ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c +SIZE (rust/crates/pin-project-internal-1.1.2.crate) = 27825 SHA256 (rust/crates/pkg-config-0.3.27.crate) = 26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964 SIZE (rust/crates/pkg-config-0.3.27.crate) = 18838 -SHA256 (rust/crates/plist-1.4.3.crate) = 9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590 -SIZE (rust/crates/plist-1.4.3.crate) = 46598 -SHA256 (rust/crates/png-0.17.6.crate) = 8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c -SIZE (rust/crates/png-0.17.6.crate) = 80695 +SHA256 (rust/crates/plist-1.5.0.crate) = bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06 +SIZE (rust/crates/plist-1.5.0.crate) = 47670 +SHA256 (rust/crates/png-0.17.9.crate) = 59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11 +SIZE (rust/crates/png-0.17.9.crate) = 88839 SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242 -SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c -SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293 -SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869 -SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971 SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068 SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045 -SHA256 (rust/crates/proc-macro2-1.0.58.crate) = fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8 -SIZE (rust/crates/proc-macro2-1.0.58.crate) = 44519 +SHA256 (rust/crates/proc-macro2-1.0.64.crate) = 78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da +SIZE (rust/crates/proc-macro2-1.0.64.crate) = 44848 SHA256 (rust/crates/proc-status-0.1.1.crate) = f0e0c0ac915e7b76b47850ba4ffc377abde6c6ff9eeace61d0a89623db449712 SIZE (rust/crates/proc-status-0.1.1.crate) = 4136 SHA256 (rust/crates/qoi-0.4.1.crate) = 7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001 SIZE (rust/crates/qoi-0.4.1.crate) = 71135 SHA256 (rust/crates/quick-xml-0.22.0.crate) = 8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b SIZE (rust/crates/quick-xml-0.22.0.crate) = 132066 -SHA256 (rust/crates/quick-xml-0.28.2.crate) = 0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1 -SIZE (rust/crates/quick-xml-0.28.2.crate) = 156462 -SHA256 (rust/crates/quote-1.0.27.crate) = 8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500 -SIZE (rust/crates/quote-1.0.27.crate) = 28416 +SHA256 (rust/crates/quick-xml-0.29.0.crate) = 81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51 +SIZE (rust/crates/quick-xml-0.29.0.crate) = 160308 +SHA256 (rust/crates/quote-1.0.29.crate) = 573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105 +SIZE (rust/crates/quote-1.0.29.crate) = 28345 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404 SIZE (rust/crates/rand-0.8.5.crate) = 87113 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88 @@ -365,30 +389,32 @@ SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2e SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 -SHA256 (rust/crates/regex-1.8.1.crate) = af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370 -SIZE (rust/crates/regex-1.8.1.crate) = 248412 -SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132 -SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533 +SHA256 (rust/crates/regex-1.9.1.crate) = b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575 +SIZE (rust/crates/regex-1.9.1.crate) = 251978 +SHA256 (rust/crates/regex-automata-0.3.2.crate) = 83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf +SIZE (rust/crates/regex-automata-0.3.2.crate) = 603895 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752 -SHA256 (rust/crates/regex-syntax-0.7.1.crate) = a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c -SIZE (rust/crates/regex-syntax-0.7.1.crate) = 339705 -SHA256 (rust/crates/resvg-0.33.0.crate) = 1df5f3de3bb51d8a4766a1ef5d85851f2737716dea899516248d25e313a51b0d -SIZE (rust/crates/resvg-0.33.0.crate) = 72969 +SHA256 (rust/crates/regex-syntax-0.7.3.crate) = 2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846 +SIZE (rust/crates/regex-syntax-0.7.3.crate) = 343354 +SHA256 (rust/crates/resvg-0.35.0.crate) = b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1 +SIZE (rust/crates/resvg-0.35.0.crate) = 85493 SHA256 (rust/crates/rgb-0.8.36.crate) = 20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59 SIZE (rust/crates/rgb-0.8.36.crate) = 16576 -SHA256 (rust/crates/rosvgtree-0.3.0.crate) = ad747e7384940e7bf33b15ba433b7bad9f44c0c6d5287a67c2cb22cd1743d497 -SIZE (rust/crates/rosvgtree-0.3.0.crate) = 25888 +SHA256 (rust/crates/roff-0.2.1.crate) = b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316 +SIZE (rust/crates/roff-0.2.1.crate) = 10605 SHA256 (rust/crates/roxmltree-0.18.0.crate) = d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8 SIZE (rust/crates/roxmltree-0.18.0.crate) = 42463 SHA256 (rust/crates/rusqlite-0.24.2.crate) = d5f38ee71cbab2c827ec0ac24e76f82eca723cee92c509a65f67dee393c25112 SIZE (rust/crates/rusqlite-0.24.2.crate) = 120103 -SHA256 (rust/crates/rustix-0.37.19.crate) = acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d -SIZE (rust/crates/rustix-0.37.19.crate) = 323809 +SHA256 (rust/crates/rustix-0.37.23.crate) = 4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06 +SIZE (rust/crates/rustix-0.37.23.crate) = 328010 +SHA256 (rust/crates/rustix-0.38.4.crate) = 0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5 +SIZE (rust/crates/rustix-0.38.4.crate) = 323637 SHA256 (rust/crates/rustybuzz-0.7.0.crate) = 162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a SIZE (rust/crates/rustybuzz-0.7.0.crate) = 219739 -SHA256 (rust/crates/ryu-1.0.13.crate) = f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041 -SIZE (rust/crates/ryu-1.0.13.crate) = 46823 +SHA256 (rust/crates/ryu-1.0.14.crate) = fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9 +SIZE (rust/crates/ryu-1.0.14.crate) = 46861 SHA256 (rust/crates/safemem-0.3.3.crate) = ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072 SIZE (rust/crates/safemem-0.3.3.crate) = 7778 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 @@ -397,12 +423,14 @@ SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab1 SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 SHA256 (rust/crates/secular-1.0.1.crate) = c3dc3eccdf599b53eba8a34a1190bd47394948258d1c43dca9cceb2426e25bb5 SIZE (rust/crates/secular-1.0.1.crate) = 184234 -SHA256 (rust/crates/serde-1.0.163.crate) = 2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2 -SIZE (rust/crates/serde-1.0.163.crate) = 77030 -SHA256 (rust/crates/serde_derive-1.0.163.crate) = 8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e -SIZE (rust/crates/serde_derive-1.0.163.crate) = 54447 -SHA256 (rust/crates/serde_json-1.0.96.crate) = 057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1 -SIZE (rust/crates/serde_json-1.0.96.crate) = 144652 +SHA256 (rust/crates/serde-1.0.171.crate) = 30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9 +SIZE (rust/crates/serde-1.0.171.crate) = 77630 +SHA256 (rust/crates/serde_derive-1.0.171.crate) = 389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682 +SIZE (rust/crates/serde_derive-1.0.171.crate) = 55183 +SHA256 (rust/crates/serde_json-1.0.100.crate) = 0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c +SIZE (rust/crates/serde_json-1.0.100.crate) = 145170 +SHA256 (rust/crates/serde_spanned-0.6.3.crate) = 96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186 +SIZE (rust/crates/serde_spanned-0.6.3.crate) = 7737 SHA256 (rust/crates/signal-hook-0.3.15.crate) = 732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9 SIZE (rust/crates/signal-hook-0.3.15.crate) = 50138 SHA256 (rust/crates/signal-hook-mio-0.2.3.crate) = 29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af @@ -417,12 +445,12 @@ SHA256 (rust/crates/siphasher-0.3.10.crate) = 7bd3e3206899af3f8b12af284fafc038cc SIZE (rust/crates/siphasher-0.3.10.crate) = 9889 SHA256 (rust/crates/slotmap-1.0.6.crate) = e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342 SIZE (rust/crates/slotmap-1.0.6.crate) = 58954 -SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 -SIZE (rust/crates/smallvec-1.10.0.crate) = 31564 -SHA256 (rust/crates/snafu-0.7.4.crate) = cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045 -SIZE (rust/crates/snafu-0.7.4.crate) = 64092 -SHA256 (rust/crates/snafu-derive-0.7.4.crate) = 475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2 -SIZE (rust/crates/snafu-derive-0.7.4.crate) = 28207 +SHA256 (rust/crates/smallvec-1.11.0.crate) = 62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9 +SIZE (rust/crates/smallvec-1.11.0.crate) = 34680 +SHA256 (rust/crates/snafu-0.7.5.crate) = e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6 +SIZE (rust/crates/snafu-0.7.5.crate) = 65229 +SHA256 (rust/crates/snafu-derive-0.7.5.crate) = 990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf +SIZE (rust/crates/snafu-derive-0.7.5.crate) = 28208 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67 SIZE (rust/crates/spin-0.9.8.crate) = 38958 SHA256 (rust/crates/splitty-1.0.1.crate) = 8dae68aa5bd5dc2d3a2137b0f6bcdd8255dce1983dc155fe0246572e179c9c3a @@ -431,66 +459,66 @@ SHA256 (rust/crates/str-buf-1.0.6.crate) = 9e08d8363704e6c71fc928674353e6b7c23dc SIZE (rust/crates/str-buf-1.0.6.crate) = 3828 SHA256 (rust/crates/strict-0.1.4.crate) = 991af58f8bd0512b0c76abc87f8f6a8a492c314ebcd13189b426c00c95f6f0ee SIZE (rust/crates/strict-0.1.4.crate) = 3436 -SHA256 (rust/crates/strict-num-0.1.0.crate) = 9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1 -SIZE (rust/crates/strict-num-0.1.0.crate) = 4692 +SHA256 (rust/crates/strict-num-0.1.1.crate) = 6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731 +SIZE (rust/crates/strict-num-0.1.1.crate) = 5104 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 SIZE (rust/crates/strsim-0.10.0.crate) = 11355 SHA256 (rust/crates/svg-0.13.1.crate) = 02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112 SIZE (rust/crates/svg-0.13.1.crate) = 17320 -SHA256 (rust/crates/svgfilters-0.4.0.crate) = 639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce -SIZE (rust/crates/svgfilters-0.4.0.crate) = 22597 SHA256 (rust/crates/svgtypes-0.11.0.crate) = ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7 SIZE (rust/crates/svgtypes-0.11.0.crate) = 35681 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 SIZE (rust/crates/syn-1.0.109.crate) = 237611 -SHA256 (rust/crates/syn-2.0.16.crate) = a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01 -SIZE (rust/crates/syn-2.0.16.crate) = 240928 +SHA256 (rust/crates/syn-2.0.25.crate) = 15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2 +SIZE (rust/crates/syn-2.0.25.crate) = 241421 SHA256 (rust/crates/syntect-no-panic-4.6.1.crate) = bee6d840027be11d9fae1432a799c548eaf0332a9a8dbe8526281d55a9600e4f SIZE (rust/crates/syntect-no-panic-4.6.1.crate) = 732925 -SHA256 (rust/crates/tempfile-3.5.0.crate) = b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998 -SIZE (rust/crates/tempfile-3.5.0.crate) = 31129 -SHA256 (rust/crates/termcolor-1.2.0.crate) = be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6 -SIZE (rust/crates/termcolor-1.2.0.crate) = 17917 +SHA256 (rust/crates/tempfile-3.6.0.crate) = 31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6 +SIZE (rust/crates/tempfile-3.6.0.crate) = 31812 SHA256 (rust/crates/termimad-0.20.6.crate) = cfab44b4bc17601cf226cce31c87462a4a5bd5d325948c8ebbc9e715660a1287 SIZE (rust/crates/termimad-0.20.6.crate) = 354740 -SHA256 (rust/crates/termimad-0.22.0.crate) = 56f87b17ba3babbffcbfe44d5e29fa90d80c5449034a799c9d87017358000e5f -SIZE (rust/crates/termimad-0.22.0.crate) = 356094 +SHA256 (rust/crates/termimad-0.23.2.crate) = 2e32883199fc52cda7e431958dee8bc3ec6898afabc152b76959b9e0e74e2202 +SIZE (rust/crates/termimad-0.23.2.crate) = 356902 +SHA256 (rust/crates/termimad-0.24.1.crate) = b3f1b37b6c42513bd3ed17c94c7d644ec72054d5bb972bd557f645a6658d7df2 +SIZE (rust/crates/termimad-0.24.1.crate) = 364867 SHA256 (rust/crates/terminal-clipboard-0.4.0.crate) = bb56a93aa750a8e07858eb8f6692fce91b78ed4b129b8ba4bb477dfcaf3b8ab8 SIZE (rust/crates/terminal-clipboard-0.4.0.crate) = 6188 SHA256 (rust/crates/terminal-light-1.1.1.crate) = 9077b39afb70f12391e4c1fcf46319999cfc32b45d605a668052bc4d1b4511af SIZE (rust/crates/terminal-light-1.1.1.crate) = 39344 SHA256 (rust/crates/termux-clipboard-0.1.0.crate) = 9f6aff13ca3293315b94f6dbd9c69e1c958fe421c294681e2ffda80c9858e36f SIZE (rust/crates/termux-clipboard-0.1.0.crate) = 2033 -SHA256 (rust/crates/textwrap-0.16.0.crate) = 222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d -SIZE (rust/crates/textwrap-0.16.0.crate) = 53722 -SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac -SIZE (rust/crates/thiserror-1.0.40.crate) = 18709 -SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f -SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138 +SHA256 (rust/crates/thiserror-1.0.43.crate) = a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42 +SIZE (rust/crates/thiserror-1.0.43.crate) = 18735 +SHA256 (rust/crates/thiserror-impl-1.0.43.crate) = 463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f +SIZE (rust/crates/thiserror-impl-1.0.43.crate) = 15062 SHA256 (rust/crates/tiff-0.8.1.crate) = 7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471 SIZE (rust/crates/tiff-0.8.1.crate) = 1417977 SHA256 (rust/crates/time-0.1.45.crate) = 1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a SIZE (rust/crates/time-0.1.45.crate) = 28911 -SHA256 (rust/crates/time-0.3.21.crate) = 8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc -SIZE (rust/crates/time-0.3.21.crate) = 111598 +SHA256 (rust/crates/time-0.3.23.crate) = 59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446 +SIZE (rust/crates/time-0.3.23.crate) = 115028 SHA256 (rust/crates/time-core-0.1.1.crate) = 7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb SIZE (rust/crates/time-core-0.1.1.crate) = 7197 -SHA256 (rust/crates/time-macros-0.2.9.crate) = 372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b -SIZE (rust/crates/time-macros-0.2.9.crate) = 23684 -SHA256 (rust/crates/tiny-skia-0.9.1.crate) = ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c -SIZE (rust/crates/tiny-skia-0.9.1.crate) = 198973 -SHA256 (rust/crates/tiny-skia-path-0.9.0.crate) = f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47 -SIZE (rust/crates/tiny-skia-path-0.9.0.crate) = 45879 +SHA256 (rust/crates/time-macros-0.2.10.crate) = 96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4 +SIZE (rust/crates/time-macros-0.2.10.crate) = 23680 +SHA256 (rust/crates/tiny-skia-0.10.0.crate) = 7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc +SIZE (rust/crates/tiny-skia-0.10.0.crate) = 200442 +SHA256 (rust/crates/tiny-skia-path-0.10.0.crate) = 2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c +SIZE (rust/crates/tiny-skia-path-0.10.0.crate) = 46740 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865 -SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234 -SIZE (rust/crates/toml-0.5.11.crate) = 54910 +SHA256 (rust/crates/toml-0.7.6.crate) = c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542 +SIZE (rust/crates/toml-0.7.6.crate) = 49220 +SHA256 (rust/crates/toml_datetime-0.6.3.crate) = 7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b +SIZE (rust/crates/toml_datetime-0.6.3.crate) = 10770 +SHA256 (rust/crates/toml_edit-0.19.12.crate) = c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78 +SIZE (rust/crates/toml_edit-0.19.12.crate) = 96151 SHA256 (rust/crates/ttf-parser-0.18.1.crate) = 0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633 SIZE (rust/crates/ttf-parser-0.18.1.crate) = 156167 -SHA256 (rust/crates/ttf-parser-0.19.0.crate) = 44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746 -SIZE (rust/crates/ttf-parser-0.19.0.crate) = 158901 +SHA256 (rust/crates/ttf-parser-0.19.1.crate) = a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33 +SIZE (rust/crates/ttf-parser-0.19.1.crate) = 158243 SHA256 (rust/crates/umask-2.1.0.crate) = ec9a46c2549e35c054e0ffe281a3a6ec0007793db4df106604d37ed3f4d73d1c SIZE (rust/crates/umask-2.1.0.crate) = 6817 SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460 @@ -501,8 +529,8 @@ SHA256 (rust/crates/unicode-ccc-0.1.2.crate) = cc2520efa644f8268dce4dcd3050eaa7f SIZE (rust/crates/unicode-ccc-0.1.2.crate) = 8848 SHA256 (rust/crates/unicode-general-category-0.6.0.crate) = 2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7 SIZE (rust/crates/unicode-general-category-0.6.0.crate) = 35177 -SHA256 (rust/crates/unicode-ident-1.0.8.crate) = e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4 -SIZE (rust/crates/unicode-ident-1.0.8.crate) = 41962 +SHA256 (rust/crates/unicode-ident-1.0.10.crate) = 22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73 +SIZE (rust/crates/unicode-ident-1.0.10.crate) = 42039 SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921 SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604 SHA256 (rust/crates/unicode-script-0.5.5.crate) = 7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc @@ -511,18 +539,20 @@ SHA256 (rust/crates/unicode-vo-0.1.0.crate) = b1d386ff53b415b7fe27b50bb44679e2cc SIZE (rust/crates/unicode-vo-0.1.0.crate) = 8084 SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968 -SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643 -SIZE (rust/crates/url-2.3.1.crate) = 72777 +SHA256 (rust/crates/url-2.4.0.crate) = 50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb +SIZE (rust/crates/url-2.4.0.crate) = 75670 SHA256 (rust/crates/users-0.11.0.crate) = 24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032 SIZE (rust/crates/users-0.11.0.crate) = 21980 -SHA256 (rust/crates/usvg-0.33.0.crate) = ae32eb823aab35fc343b19c4d354f70e713b442ce34cdfa8497bf6c39af8a342 -SIZE (rust/crates/usvg-0.33.0.crate) = 28103 -SHA256 (rust/crates/usvg-parser-0.33.0.crate) = c7529174e721c8078d62b08399258469b1d68b4e5f2983b347d6a9d39779366c -SIZE (rust/crates/usvg-parser-0.33.0.crate) = 46082 -SHA256 (rust/crates/usvg-text-layout-0.33.0.crate) = 6e672fbc19261c6553113cc04ff2ff38ae52fadbd90f2d814040857795fb5c50 -SIZE (rust/crates/usvg-text-layout-0.33.0.crate) = 21532 -SHA256 (rust/crates/usvg-tree-0.33.0.crate) = 3a56e9cd3be5eb6d6744477e95b82d52d393fc1dba4b5b090912c33af337c20b -SIZE (rust/crates/usvg-tree-0.33.0.crate) = 26188 +SHA256 (rust/crates/usvg-0.35.0.crate) = 14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6 +SIZE (rust/crates/usvg-0.35.0.crate) = 28068 +SHA256 (rust/crates/usvg-parser-0.35.0.crate) = d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408 +SIZE (rust/crates/usvg-parser-0.35.0.crate) = 64912 +SHA256 (rust/crates/usvg-text-layout-0.35.0.crate) = 035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4 +SIZE (rust/crates/usvg-text-layout-0.35.0.crate) = 21695 +SHA256 (rust/crates/usvg-tree-0.35.0.crate) = 7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92 +SIZE (rust/crates/usvg-tree-0.35.0.crate) = 20078 +SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a +SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426 SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f @@ -533,16 +563,16 @@ SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793 SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 -SHA256 (rust/crates/wasm-bindgen-0.2.86.crate) = 5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73 -SIZE (rust/crates/wasm-bindgen-0.2.86.crate) = 174170 -SHA256 (rust/crates/wasm-bindgen-backend-0.2.86.crate) = 19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb -SIZE (rust/crates/wasm-bindgen-backend-0.2.86.crate) = 26792 -SHA256 (rust/crates/wasm-bindgen-macro-0.2.86.crate) = 14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258 -SIZE (rust/crates/wasm-bindgen-macro-0.2.86.crate) = 13888 -SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.86.crate) = e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8 -SIZE (rust/crates/wasm-bindgen-macro-support-0.2.86.crate) = 20027 -SHA256 (rust/crates/wasm-bindgen-shared-0.2.86.crate) = ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93 -SIZE (rust/crates/wasm-bindgen-shared-0.2.86.crate) = 7246 +SHA256 (rust/crates/wasm-bindgen-0.2.87.crate) = 7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342 +SIZE (rust/crates/wasm-bindgen-0.2.87.crate) = 175052 +SHA256 (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd +SIZE (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 26821 +SHA256 (rust/crates/wasm-bindgen-macro-0.2.87.crate) = dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d +SIZE (rust/crates/wasm-bindgen-macro-0.2.87.crate) = 13897 +SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b +SIZE (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 20006 +SHA256 (rust/crates/wasm-bindgen-shared-0.2.87.crate) = ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1 +SIZE (rust/crates/wasm-bindgen-shared-0.2.87.crate) = 7248 SHA256 (rust/crates/weezl-0.1.7.crate) = 9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb SIZE (rust/crates/weezl-0.1.7.crate) = 42166 SHA256 (rust/crates/which-4.4.0.crate) = 2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269 @@ -557,42 +587,26 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f SIZE (rust/crates/windows-0.48.0.crate) = 11864177 -SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0 -SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9 SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884 -SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071 -SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492 -SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5 -SIZE (rust/crates/windows-targets-0.48.0.crate) = 7466 -SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8 -SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071 +SHA256 (rust/crates/windows-targets-0.48.1.crate) = 05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f +SIZE (rust/crates/windows-targets-0.48.1.crate) = 6902 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc SIZE (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 366543 -SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43 -SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981 SHA256 (rust/crates/windows_aarch64_msvc-0.48.0.crate) = b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3 SIZE (rust/crates/windows_aarch64_msvc-0.48.0.crate) = 671479 -SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f -SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236 SHA256 (rust/crates/windows_i686_gnu-0.48.0.crate) = 622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241 SIZE (rust/crates/windows_i686_gnu-0.48.0.crate) = 741490 -SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060 -SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951 SHA256 (rust/crates/windows_i686_msvc-0.48.0.crate) = 4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00 SIZE (rust/crates/windows_i686_msvc-0.48.0.crate) = 730056 -SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36 -SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373 SHA256 (rust/crates/windows_x86_64_gnu-0.48.0.crate) = ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1 SIZE (rust/crates/windows_x86_64_gnu-0.48.0.crate) = 703595 -SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3 -SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068 SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536 -SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0 -SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936 SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422 +SHA256 (rust/crates/winnow-0.4.9.crate) = 81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529 +SIZE (rust/crates/winnow-0.4.9.crate) = 143537 SHA256 (rust/crates/x11-clipboard-0.5.3.crate) = 473068b7b80ac86a18328824f1054e5e007898c47b5bbc281bd7abe32bc3653c SIZE (rust/crates/x11-clipboard-0.5.3.crate) = 7789 SHA256 (rust/crates/xcb-0.10.1.crate) = 771e2b996df720cd1c6dd9ff90f62d91698fd3610cc078388d0564bdd6622a9c @@ -609,5 +623,5 @@ SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783 SHA256 (rust/crates/zune-inflate-0.2.54.crate) = 73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02 SIZE (rust/crates/zune-inflate-0.2.54.crate) = 37973 -SHA256 (canop-broot-v1.22.1_GH0.tar.gz) = cc133b7d8f9430178309f97252a39466cb44d704cbcaa7333508ba519d1c1815 -SIZE (canop-broot-v1.22.1_GH0.tar.gz) = 11147450 +SHA256 (canop-broot-v1.25.0_GH0.tar.gz) = 5b34f7e975e6bbf954f81f87af720559aa6a5916950275242d43fade906f20b1 +SIZE (canop-broot-v1.25.0_GH0.tar.gz) = 11245135 diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile index c94a106b983..61643191069 100644 --- a/misc/libpri/Makefile +++ b/misc/libpri/Makefile @@ -1,5 +1,5 @@ PORTNAME= libpri -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.1 CATEGORIES= misc MASTER_SITES= http://downloads.asterisk.org/pub/telephony/libpri/releases/ diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo index 689c1c29363..c9b0615bc6e 100644 --- a/misc/libpri/distinfo +++ b/misc/libpri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544570232 -SHA256 (libpri-1.6.0.tar.gz) = 7225ea7ec334a115f9dc08e71f55589c38cb4e00b13964cd2f08cc4e6123e3f6 -SIZE (libpri-1.6.0.tar.gz) = 340578 +TIMESTAMP = 1692260005 +SHA256 (libpri-1.6.1.tar.gz) = d4d1a62766695455f1b616f5f7603458e6d23df787ebabc31ffda1c6298d0509 +SIZE (libpri-1.6.1.tar.gz) = 334119 diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile index d68dccf3a0c..032dc86ae07 100644 --- a/misc/libpri/files/patch-Makefile +++ b/misc/libpri/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2017-01-27 23:25:12.000000000 +0700 -+++ Makefile 2018-12-12 06:20:14.634544000 +0700 +--- Makefile.orig 2023-08-16 15:52:02 UTC ++++ Makefile @@ -24,7 +24,7 @@ # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING #ALERTING=-DALERTING_NO_PROGRESS @@ -8,8 +8,8 @@ +CC?=gcc GREP=grep AWK=awk - -@@ -34,7 +34,7 @@ + AR=ar +@@ -36,7 +36,7 @@ PROC?=$(shell uname -m) # SONAME version; should be changed on every ABI change # please don't change it needlessly; it's perfectly fine to have a SONAME # of 1.2 and a version of 1.4.x @@ -18,12 +18,12 @@ STATIC_LIBRARY=libpri.a DYNAMIC_LIBRARY:=libpri.so.$(SONAME) -@@ -68,10 +68,10 @@ +@@ -70,10 +70,10 @@ DYNAMIC_OBJS= \ $(STATIC_OBJS) CFLAGS ?= -g CFLAGS += $(CPPFLAGS) --CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -+CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes +-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wno-zero-length-bounds -Wno-stringop-overflow ++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-zero-length-bounds -Wno-stringop-overflow CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS) -INSTALL_PREFIX=$(DESTDIR) -INSTALL_BASE=/usr @@ -32,7 +32,7 @@ libdir?=$(INSTALL_BASE)/lib ifneq ($(findstring Darwin,$(OSARCH)),) SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace -@@ -89,7 +89,7 @@ +@@ -91,7 +91,7 @@ else ifeq (${OSARCH},FreeBSD) LDCONFIG_FLAGS=-m CFLAGS += -I../zaptel -I../zapata @@ -41,7 +41,7 @@ endif endif ifeq (${OSARCH},SunOS) -@@ -149,12 +149,12 @@ +@@ -151,12 +151,12 @@ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) mkdir -p $(INSTALL_PREFIX)$(libdir) mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include ifneq (${OSARCH},SunOS) @@ -58,7 +58,7 @@ else install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY) -@@ -190,7 +190,7 @@ +@@ -192,7 +192,7 @@ MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< %.lo: %.c @@ -66,8 +66,8 @@ + $(CC) $(CFLAGS) $(MAKE_DEPS) -fPIC -c -o $@ $< $(STATIC_LIBRARY): $(STATIC_OBJS) - ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS) -@@ -198,7 +198,7 @@ + $(AR) rcs $(STATIC_LIBRARY) $(STATIC_OBJS) +@@ -200,7 +200,7 @@ $(STATIC_LIBRARY): $(STATIC_OBJS) $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) diff --git a/misc/ncnn/Makefile b/misc/ncnn/Makefile index 89bdc783cc8..87faec798dd 100644 --- a/misc/ncnn/Makefile +++ b/misc/ncnn/Makefile @@ -1,5 +1,5 @@ PORTNAME= ncnn -DISTVERSION= 20230517 +DISTVERSION= 20230816 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org diff --git a/misc/ncnn/distinfo b/misc/ncnn/distinfo index 082c729008a..59c7afea034 100644 --- a/misc/ncnn/distinfo +++ b/misc/ncnn/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1684712023 -SHA256 (Tencent-ncnn-20230517_GH0.tar.gz) = 71c1960e5fbbe68d2c3cf572cbf4dd08bb387ef20d2c560c074c5969c6b44bde -SIZE (Tencent-ncnn-20230517_GH0.tar.gz) = 12569535 +TIMESTAMP = 1692672964 +SHA256 (Tencent-ncnn-20230816_GH0.tar.gz) = 6b14105b6aba1e5fc87321b161c1d996c507f9b671a961831c8cd9987e807aa1 +SIZE (Tencent-ncnn-20230816_GH0.tar.gz) = 12628885 SHA256 (KhronosGroup-glslang-88fd417_GH0.tar.gz) = 7349344acf4ce49e0c0b7f2555e0165a6bd538cc927adece7c81571ce350e487 SIZE (KhronosGroup-glslang-88fd417_GH0.tar.gz) = 3656236 diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 0a87d4b6a91..04935a8cd99 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -1,6 +1,6 @@ PORTNAME= nut PORTVERSION= 20.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -26,16 +26,10 @@ FLTK_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libfltk_images.so:x11-toolkits/fltk FLTK_USES= xorg -FLTK_USE= XORG=x11,xau,xcb,xdmcp,xext,xft,xinerama,xpm,xrender +FLTK_USE= XORG=x11,xau,xcb,xcursor,xdmcp,xext,xfixes,xft,xinerama,xpm,xrender FLTK_MAKE_ENV= HAVE_FLTK=1 FLTK_NUT="fltk/Nut" FLTK_MAKE_ENV_OFF= HAVE_FLTK=0 FLTK_NUT="" - -.include - -.if ${PORT_OPTIONS:MFLTK} -DESKTOP_ENTRIES="Nut" "" "nuticon" "Nut" \ - "Science;Biology;MedicalSoftware;" false -.endif +FLTK_DESKTOP_ENTRIES= "Nut" "" "nuticon" "Nut" "Science;Biology;MedicalSoftware;" false post-patch: @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ @@ -48,10 +42,6 @@ post-patch: s|$$(OPT)||' do-install: -.if ${PORT_OPTIONS:MFLTK} - ${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/nuticon.xpm ${STAGEDIR}${PREFIX}/share/pixmaps -.endif ${INSTALL_PROGRAM} ${WRKSRC}/nut ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/nut.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DATADIR} @@ -59,4 +49,8 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +do-install-FLTK-on: + ${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/nuticon.xpm ${STAGEDIR}${PREFIX}/share/pixmaps + .include diff --git a/misc/nut/files/patch-anameal.c b/misc/nut/files/patch-anameal.c new file mode 100644 index 00000000000..10bfd40f6e4 --- /dev/null +++ b/misc/nut/files/patch-anameal.c @@ -0,0 +1,28 @@ +Fix linker error when FLTK option is enabled. + +ld: error: duplicate symbol: foodwork +>>> defined at anameal.c +>>> ../anameal.o:(foodwork) +>>> defined at PersonalOptions.cc +>>> PersonalOptions.o:(.bss+0x0) + +--- anameal.c.orig 2023-08-21 10:50:52 UTC ++++ anameal.c +@@ -29,7 +29,7 @@ + #include + #include + +-struct food *foodwork; ++struct food *foodwork_cli; + int max; + + void analyze_meals(struct meal *meal_ptr_origin, int specialheader) +@@ -43,7 +43,7 @@ float prodefic, thispct, totaldefic, serving_ratio; + float deficpct[DV_COUNT], food_abacus[MAX_FOOD], serving_ratio_abacus[MAX_FOOD]; + int deficnut[DV_COUNT]; + float prodefic, thispct, totaldefic, serving_ratio; +-foodwork = &food_work; ++foodwork_cli = &food_work; + options.temp_meal_root = meal_ptr_origin; + mealcount = meal_count(meal_ptr_origin); + max = mealcount; diff --git a/misc/p5-Business-ISBN-Data/Makefile b/misc/p5-Business-ISBN-Data/Makefile index a320e7850a6..9c2b9320eb4 100644 --- a/misc/p5-Business-ISBN-Data/Makefile +++ b/misc/p5-Business-ISBN-Data/Makefile @@ -1,5 +1,5 @@ PORTNAME= Business-ISBN-Data -PORTVERSION= 20230729.001 +PORTVERSION= 20230811.001 CATEGORIES= misc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/misc/p5-Business-ISBN-Data/distinfo b/misc/p5-Business-ISBN-Data/distinfo index 659ebd5cf83..7a76d2663b8 100644 --- a/misc/p5-Business-ISBN-Data/distinfo +++ b/misc/p5-Business-ISBN-Data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690967183 -SHA256 (Business-ISBN-Data-20230729.001.tar.gz) = 43c22684842334d73fc345539234f44716ab8016cd9a882cb05c28d0a9e0c590 -SIZE (Business-ISBN-Data-20230729.001.tar.gz) = 31541 +TIMESTAMP = 1692212103 +SHA256 (Business-ISBN-Data-20230811.001.tar.gz) = 5831919c25cf261c322ad012d7bc3ea91193d1e40e7a385040e65a4c85bb0a83 +SIZE (Business-ISBN-Data-20230811.001.tar.gz) = 31550 diff --git a/misc/py-openai/Makefile b/misc/py-openai/Makefile index 96242fb6a17..7ba7adef35b 100644 --- a/misc/py-openai/Makefile +++ b/misc/py-openai/Makefile @@ -1,5 +1,5 @@ PORTNAME= openai -DISTVERSION= 0.27.8 +DISTVERSION= 0.27.9 CATEGORIES= misc # machine-learning MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/py-openai/distinfo b/misc/py-openai/distinfo index d26babbc2d1..1d240211223 100644 --- a/misc/py-openai/distinfo +++ b/misc/py-openai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687582487 -SHA256 (openai-0.27.8.tar.gz) = 2483095c7db1eee274cebac79e315a986c4e55207bb4fa7b82d185b3a2ed9536 -SIZE (openai-0.27.8.tar.gz) = 60012 +TIMESTAMP = 1692765671 +SHA256 (openai-0.27.9.tar.gz) = b687761c82f5ebb6f61efc791b2083d2d068277b94802d4d1369efe39851813d +SIZE (openai-0.27.9.tar.gz) = 60539 diff --git a/misc/py-tqdm/Makefile b/misc/py-tqdm/Makefile index 21a91967870..1b5f5d80b9a 100644 --- a/misc/py-tqdm/Makefile +++ b/misc/py-tqdm/Makefile @@ -1,18 +1,19 @@ PORTNAME= tqdm -PORTVERSION= 4.65.0 +PORTVERSION= 4.66.1 CATEGORIES= misc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Fast, extensible progress bar for Python -WWW= https://github.com/tqdm/tqdm +WWW= https://tqdm.github.io/ \ + https://github.com/tqdm/tqdm LICENSE= MIT MPL20 LICENSE_COMB= multi LICENSE_FILE_MIT= ${WRKSRC}/LICENCE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} @@ -23,9 +24,13 @@ NO_ARCH= yes CPE_VENDOR= tqdm_project -OPTIONS_DEFINE= TELEGRAM +OPTIONS_DEFINE= NOTEBOOK SLACK TELEGRAM +NOTEBOOK_DESC= Notebook support +SLACK_DESC= Slack support TELEGRAM_DESC= Telegram support +NOTEBOOK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipywidgets>=6:devel/py-ipywidgets@${PY_FLAVOR} +SLACK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}slack-sdk>=0:net-im/py-slack-sdk@${PY_FLAVOR} TELEGRAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} .include diff --git a/misc/py-tqdm/distinfo b/misc/py-tqdm/distinfo index c32ae74caca..3812c0b37b3 100644 --- a/misc/py-tqdm/distinfo +++ b/misc/py-tqdm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679498786 -SHA256 (tqdm-4.65.0.tar.gz) = 1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5 -SIZE (tqdm-4.65.0.tar.gz) = 167542 +TIMESTAMP = 1692211803 +SHA256 (tqdm-4.66.1.tar.gz) = d88e651f9db8d8551a62556d3cff9e3034274ca5d66e93197cf2490e2dcb69c7 +SIZE (tqdm-4.66.1.tar.gz) = 169147 diff --git a/misc/rubygem-mime-types-data/Makefile b/misc/rubygem-mime-types-data/Makefile index cfd9bb83ba0..ac27b33219b 100644 --- a/misc/rubygem-mime-types-data/Makefile +++ b/misc/rubygem-mime-types-data/Makefile @@ -1,5 +1,5 @@ PORTNAME= mime-types-data -PORTVERSION= 3.2023.0218.1 +PORTVERSION= 3.2023.0808 CATEGORIES= misc rubygems MASTER_SITES= RG diff --git a/misc/rubygem-mime-types-data/distinfo b/misc/rubygem-mime-types-data/distinfo index 7f090d1b51d..ba1a0ff4f03 100644 --- a/misc/rubygem-mime-types-data/distinfo +++ b/misc/rubygem-mime-types-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684104680 -SHA256 (rubygem/mime-types-data-3.2023.0218.1.gem) = e90f027e54346bbbf7bd993a97e9cb7270cd4fe41c535ef84bf5d1aefe1e7ede -SIZE (rubygem/mime-types-data-3.2023.0218.1.gem) = 201216 +TIMESTAMP = 1692211977 +SHA256 (rubygem/mime-types-data-3.2023.0808.gem) = aad85663d2607e1f4b84e4b6aacff78ba3733bb958ee93189205e63f4f8ded9f +SIZE (rubygem/mime-types-data-3.2023.0808.gem) = 203776 diff --git a/misc/rubygem-mime-types/Makefile b/misc/rubygem-mime-types/Makefile index ea10f21c6b2..df8d0d76d7a 100644 --- a/misc/rubygem-mime-types/Makefile +++ b/misc/rubygem-mime-types/Makefile @@ -1,5 +1,5 @@ PORTNAME= mime-types -PORTVERSION= 3.4.1 +PORTVERSION= 3.5.0 CATEGORIES= misc rubygems MASTER_SITES= RG diff --git a/misc/rubygem-mime-types/distinfo b/misc/rubygem-mime-types/distinfo index 93a31735d40..98fff63b9dc 100644 --- a/misc/rubygem-mime-types/distinfo +++ b/misc/rubygem-mime-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641046902 -SHA256 (rubygem/mime-types-3.4.1.gem) = 6bcf8b0e656b6ae9977bdc1351ef211d0383252d2f759a59ef4bcf254542fc46 -SIZE (rubygem/mime-types-3.4.1.gem) = 36864 +TIMESTAMP = 1692212133 +SHA256 (rubygem/mime-types-3.5.0.gem) = 5d9c39f04074b5b545aea4f6fa853160daf30070c6fd8c9fbb999779afb725e9 +SIZE (rubygem/mime-types-3.5.0.gem) = 37888 diff --git a/misc/rubygem-octicons/Makefile b/misc/rubygem-octicons/Makefile index 7725d5f2cd4..bb41626530d 100644 --- a/misc/rubygem-octicons/Makefile +++ b/misc/rubygem-octicons/Makefile @@ -1,5 +1,5 @@ PORTNAME= octicons -PORTVERSION= 19.5.0 +PORTVERSION= 19.6.0 CATEGORIES= misc rubygems MASTER_SITES= RG diff --git a/misc/rubygem-octicons/distinfo b/misc/rubygem-octicons/distinfo index 6f917c07feb..f9b8aad5b93 100644 --- a/misc/rubygem-octicons/distinfo +++ b/misc/rubygem-octicons/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070416 -SHA256 (rubygem/octicons-19.5.0.gem) = 5d86f7412264dae3059b28aaa8fd250350bb85634a546fb047805c654c83b35e -SIZE (rubygem/octicons-19.5.0.gem) = 209920 +TIMESTAMP = 1692640086 +SHA256 (rubygem/octicons-19.6.0.gem) = 7a2eaac188e0ac8a0a4a9cc00e1c9d48de70bb1ea8e4f5d5a4f3e95a46fac35e +SIZE (rubygem/octicons-19.6.0.gem) = 212480 diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile index 06912428dad..7dc1bfad981 100644 --- a/misc/xfce4-appfinder/Makefile +++ b/misc/xfce4-appfinder/Makefile @@ -1,6 +1,5 @@ PORTNAME= xfce4-appfinder -PORTVERSION= 4.18.0 -PORTREVISION= 1 +PORTVERSION= 4.18.1 CATEGORIES= misc xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo index 7c86814afb1..ee476a88042 100644 --- a/misc/xfce4-appfinder/distinfo +++ b/misc/xfce4-appfinder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671101646 -SHA256 (xfce4/xfce4-appfinder-4.18.0.tar.bz2) = 962a98d7b327d2073ed4cd0f78bce7945ed51b97d52fd60196e8b02ef819c18c -SIZE (xfce4/xfce4-appfinder-4.18.0.tar.bz2) = 562219 +TIMESTAMP = 1692735376 +SHA256 (xfce4/xfce4-appfinder-4.18.1.tar.bz2) = 9854ea653981be544ad545850477716c4c92d0c43eb47b75f78534837c0893f9 +SIZE (xfce4/xfce4-appfinder-4.18.1.tar.bz2) = 564600 diff --git a/multimedia/Makefile b/multimedia/Makefile index 580bdb4c2ed..4b9e628c7cf 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -1,7 +1,6 @@ COMMENT = Multimedia software SUBDIR += Bento4 - SUBDIR += QtAV SUBDIR += ab-av1 SUBDIR += ab25 SUBDIR += acidrip diff --git a/multimedia/QtAV/Makefile b/multimedia/QtAV/Makefile deleted file mode 100644 index 37b84518e48..00000000000 --- a/multimedia/QtAV/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -PORTNAME= QtAV -DISTVERSIONPREFIX= v -DISTVERSION= 1.13.0 -PORTREVISION= 6 -CATEGORIES= multimedia -DIST_SUBDIR= KDE - -PATCH_SITES= https://github.com/wang-bin/QtAV/commit/ -PATCHFILES= 5abba7f0505e75fceabd4dd8992a7e02bb149d64.patch:-p1 - -MAINTAINER= kde@FreeBSD.org -COMMENT= Cross-platform multimedia framwork based on Qt and ffmpeg -WWW= https://github.com/wang-bin/QtAV - -LICENSE= LGPL21+ -LICENSE_FILE= ${WRKSRC}/lgpl-2.1.txt - -DEPRECATED= Abandoned project and broken with FFmpeg 6 -EXPIRATION_DATE= 2023-08-17 -BROKEN= fails to build with FFmpeg 6 (PR 270213) - -LIB_DEPENDS= libass.so:multimedia/libass \ - libavcodec.so:multimedia/ffmpeg - -USES= compiler:c++11-lang gl qmake:outsource qt:5 xorg -USE_GL= gl -USE_QT= core declarative gui network opengl sql widgets \ - buildtools:build qmake:build -USE_XORG= x11 xext xv - -OPTIONS_DEFINE= OPENAL UCHARDET VAAPI PULSEAUDIO -OPTIONS_DEFAULT= OPENAL UCHARDET VAAPI -OPTIONS_SUB= yes - -OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft -OPENAL_QMAKE_OFF= CONFIG+=no-openal - -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_QMAKE_OFF= CONFIG+=no-pulseaudio - -UCHARDET_DESC= Guess subtitle encoding via uchardet -UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet -UCHARDET_QMAKE_OFF= CONFIG+=no-uchardet - -VAAPI_LIB_DEPENDS= libva.so:multimedia/libva -VAAPI_QMAKE_OFF= CONFIG+=no-vaapi - -PLIST_SUB= QT_VERSION="${_QT_VERSION}" - -USE_GITHUB= yes -GH_ACCOUNT= wang-bin - -# The examples are GLPv3 licencensed and have too generic names, like 'Player', -# so don't install them. -QMAKE_ARGS= CONFIG+=no-examples - -.include diff --git a/multimedia/QtAV/distinfo b/multimedia/QtAV/distinfo deleted file mode 100644 index a3f2e094788..00000000000 --- a/multimedia/QtAV/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1584858326 -SHA256 (KDE/wang-bin-QtAV-v1.13.0_GH0.tar.gz) = a493d54d105b32c526f05188e4d7a8cf3508ecac697aae088721ffad20982288 -SIZE (KDE/wang-bin-QtAV-v1.13.0_GH0.tar.gz) = 2213489 -SHA256 (KDE/5abba7f0505e75fceabd4dd8992a7e02bb149d64.patch) = cf6e80e5102356e4a72706f1f7a13396a3911954afe900a957112c56f5c280d5 -SIZE (KDE/5abba7f0505e75fceabd4dd8992a7e02bb149d64.patch) = 616 diff --git a/multimedia/QtAV/files/patch-deploy.pri b/multimedia/QtAV/files/patch-deploy.pri deleted file mode 100644 index 9b25d334bde..00000000000 --- a/multimedia/QtAV/files/patch-deploy.pri +++ /dev/null @@ -1,45 +0,0 @@ ---- deploy.pri.orig 2017-04-06 20:22:41 UTC -+++ deploy.pri -@@ -4,7 +4,7 @@ INSTALL_PREFIX = /usr/local - share.files = $$PROJECTROOT/qtc_packaging/common/changelog \ - $$PROJECTROOT/qtc_packaging/common/copyright \ - $$PROJECTROOT/qtc_packaging/common/README --share.path = /usr/share/doc/$${TARGET} -+share.path = $$[QT_INSTALL_PREFIX]/share/doc/$${TARGET} - - isEqual(TEMPLATE, app) { - unix:!symbian { -@@ -25,9 +25,9 @@ isEqual(TEMPLATE, app) { - #debian.files = $$PROJECTROOT/qtc_packaging/fremantle/control - } else { - desktopfile.files = $$PROJECTROOT/qtc_packaging/debian_generic/$${TARGET}.desktop -- desktopfile.path = /usr/share/applications -+ desktopfile.path = $$[QT_INSTALL_PREFIX]/share/applications - icon.files = $$PROJECTROOT/qtc_packaging/debian_generic/$${TARGET}.png -- icon.path = /usr/share/icons/hicolor/64x64/apps -+ icon.path = $$[QT_INSTALL_PREFIX]/share/icons/hicolor/64x64/apps - #debian.files = $$PROJECTROOT/qtc_packaging/generic/control - } - INSTALLS += desktopfile icon -@@ -41,9 +41,9 @@ isEqual(TEMPLATE, app) { - isEmpty(SDK_HEADERS) { - sdkheaders.files = $$HEADERS - } -- sdkheaders.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -- sdkheaders_private.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$MODULE_VERSION/$$MODULE_INCNAME/private -- !plugin: target.path = $$[QT_INSTALL_LIBS] -+ sdkheaders.path = $$[QT_INSTALL_PREFIX]/include/$$MODULE_INCNAME -+ sdkheaders_private.path = $$[QT_INSTALL_PREFIX]/include/$$MODULE_INCNAME/$$MODULE_VERSION/$$MODULE_INCNAME/private -+ !plugin: target.path = $$[QT_INSTALL_PREFIX]/lib - INSTALLS += sdkheaders sdkheaders_private - } - } -@@ -51,7 +51,7 @@ isEqual(TEMPLATE, app) { - INSTALLS *= target share - - for(bin, BIN_INSTALLS) { -- eval($${bin}.path = $${INSTALL_PREFIX}/bin) -+ eval($${bin}.path = $$[QT_INSTALL_PREFIX]/bin) - message("adding $$bin to bin install targets...") - INSTALLS += $$bin - } diff --git a/multimedia/QtAV/files/patch-src_QtAV_FilterContext.h b/multimedia/QtAV/files/patch-src_QtAV_FilterContext.h deleted file mode 100644 index 8c68a24d493..00000000000 --- a/multimedia/QtAV/files/patch-src_QtAV_FilterContext.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/QtAV/FilterContext.h.orig 2020-05-21 11:58:15 UTC -+++ src/QtAV/FilterContext.h -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - /* - * QPainterFilterContext, D2DFilterContext, ... - */ diff --git a/multimedia/QtAV/files/patch-src_codec_video_SurfaceInteropCUDA.cpp b/multimedia/QtAV/files/patch-src_codec_video_SurfaceInteropCUDA.cpp deleted file mode 100644 index 738ea50c67a..00000000000 --- a/multimedia/QtAV/files/patch-src_codec_video_SurfaceInteropCUDA.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/codec/video/SurfaceInteropCUDA.cpp.orig 2020-08-26 17:34:29 UTC -+++ src/codec/video/SurfaceInteropCUDA.cpp -@@ -132,7 +132,7 @@ bool HostInteropResource::map(int picIndex, const CUVI - if (!ensureResource(pitch, H)) //copy height is coded height - return false; - // the same thread (context) as cuMemAllocHost, so no ccontext switch is needed -- CUDA_ENSURE(cuMemcpyDtoH(host_mem.data, devptr, pitch*H*3/2), NULL); -+ CUDA_ENSURE(cuMemcpyDtoH(host_mem.data, devptr, pitch*H*3/2), false); - host_mem.index = picIndex; - } - // map to texture -@@ -173,7 +173,7 @@ bool HostInteropResource::ensureResource(int pitch, in - if (!share_ctx) // cuMemFreeHost will be called in dtor which is not the current thread. - CUDA_WARN(cuCtxPushCurrent(ctx)); - // NV12 -- CUDA_ENSURE(cuMemAllocHost((void**)&host_mem.data, pitch*height*3/2), NULL); -+ CUDA_ENSURE(cuMemAllocHost((void**)&host_mem.data, pitch*height*3/2), false); - if (!share_ctx) - CUDA_WARN(cuCtxPopCurrent(NULL)); //can be null or &ctx - return true; diff --git a/multimedia/QtAV/files/patch-src_libQtAV.pro b/multimedia/QtAV/files/patch-src_libQtAV.pro deleted file mode 100644 index f35a19d3874..00000000000 --- a/multimedia/QtAV/files/patch-src_libQtAV.pro +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libQtAV.pro.orig 2017-06-21 01:47:15 UTC -+++ src/libQtAV.pro -@@ -614,7 +614,7 @@ mac { - - unix:!mac:!cross_compile { - icon.files = $$PWD/$${TARGET}.svg --icon.path = /usr/share/icons/hicolor/scalable/apps -+icon.path = $$[QT_INSTALL_PREFIX]/share/icons/hicolor/scalable/apps - INSTALLS += icon - #debian - DEB_INSTALL_LIST = .$$[QT_INSTALL_LIBS]/libQt*AV.so.* diff --git a/multimedia/QtAV/pkg-descr b/multimedia/QtAV/pkg-descr deleted file mode 100644 index 61eead2def8..00000000000 --- a/multimedia/QtAV/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A cross-platform multimedia framework based on Qt and FFmpeg. -High performance. User & developer friendly. Supports Android, -iOS, Windows store and desktops. diff --git a/multimedia/QtAV/pkg-plist b/multimedia/QtAV/pkg-plist deleted file mode 100644 index d5aab177336..00000000000 --- a/multimedia/QtAV/pkg-plist +++ /dev/null @@ -1,108 +0,0 @@ -include/QtAV/%%QT_VERSION%%/QtAV/private/AVCompat.h -include/QtAV/%%QT_VERSION%%/QtAV/private/AVDecoder_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/AVEncoder_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/AVOutput_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/AudioOutputBackend.h -include/QtAV/%%QT_VERSION%%/QtAV/private/AudioResampler_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/Filter_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/Frame_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/MediaIO_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/OpenGLRendererBase_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/PlayerSubtitle.h -include/QtAV/%%QT_VERSION%%/QtAV/private/QPainterRenderer_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/SubtitleProcessor.h -include/QtAV/%%QT_VERSION%%/QtAV/private/VideoRenderer_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/VideoShader_p.h -include/QtAV/%%QT_VERSION%%/QtAV/private/factory.h -include/QtAV/%%QT_VERSION%%/QtAV/private/mkid.h -include/QtAV/%%QT_VERSION%%/QtAV/private/prepost.h -include/QtAV/%%QT_VERSION%%/QtAV/private/singleton.h -include/QtAV/AVClock.h -include/QtAV/AVDecoder.h -include/QtAV/AVDemuxer.h -include/QtAV/AVEncoder.h -include/QtAV/AVError.h -include/QtAV/AVMuxer.h -include/QtAV/AVOutput.h -include/QtAV/AVPlayer.h -include/QtAV/AVTranscoder.h -include/QtAV/AudioDecoder.h -include/QtAV/AudioEncoder.h -include/QtAV/AudioFormat.h -include/QtAV/AudioFrame.h -include/QtAV/AudioOutput.h -include/QtAV/AudioResampler.h -include/QtAV/ConvolutionShader.h -include/QtAV/EncodeFilter.h -include/QtAV/FactoryDefine.h -include/QtAV/Filter.h -include/QtAV/FilterContext.h -include/QtAV/Frame.h -include/QtAV/FrameReader.h -include/QtAV/GLSLFilter.h -include/QtAV/Geometry.h -include/QtAV/GeometryRenderer.h -include/QtAV/LibAVFilter.h -include/QtAV/MediaIO.h -include/QtAV/OpenGLRendererBase.h -include/QtAV/OpenGLTypes.h -include/QtAV/OpenGLVideo.h -include/QtAV/OpenGLWindowRenderer.h -include/QtAV/Packet.h -include/QtAV/QPainterRenderer.h -include/QtAV/QtAV -include/QtAV/QtAV.h -include/QtAV/QtAV_Global.h -include/QtAV/Statistics.h -include/QtAV/SubImage.h -include/QtAV/Subtitle.h -include/QtAV/SubtitleFilter.h -include/QtAV/SurfaceInterop.h -include/QtAV/VideoCapture.h -include/QtAV/VideoDecoder.h -include/QtAV/VideoEncoder.h -include/QtAV/VideoFormat.h -include/QtAV/VideoFrame.h -include/QtAV/VideoFrameExtractor.h -include/QtAV/VideoOutput.h -include/QtAV/VideoRenderer.h -include/QtAV/VideoShader.h -include/QtAV/VideoShaderObject.h -include/QtAV/dptr.h -include/QtAV/version.h -include/QtAVWidgets/GLWidgetRenderer2.h -include/QtAVWidgets/GraphicsItemRenderer.h -include/QtAVWidgets/OpenGLWidgetRenderer.h -include/QtAVWidgets/QtAVWidgets -include/QtAVWidgets/QtAVWidgets.h -include/QtAVWidgets/VideoPreviewWidget.h -include/QtAVWidgets/WidgetRenderer.h -include/QtAVWidgets/global.h -include/QtAVWidgets/version.h -lib/libQtAV.prl -lib/libQtAV.so -lib/libQtAV.so.1 -lib/libQtAV.so.1.13 -lib/libQtAV.so.1.13.0 -lib/libQtAVWidgets.prl -lib/libQtAVWidgets.so -lib/libQtAVWidgets.so.1 -lib/libQtAVWidgets.so.1.13 -lib/libQtAVWidgets.so.1.13.0 -%%QT_MKSPECDIR%%/features/av.prf -%%QT_MKSPECDIR%%/features/avwidgets.prf -%%QT_MKSPECDIR%%/modules/qt_lib_av.pri -%%QT_MKSPECDIR%%/modules/qt_lib_av_private.pri -%%QT_MKSPECDIR%%/modules/qt_lib_avwidgets.pri -%%QT_MKSPECDIR%%/modules/qt_lib_avwidgets_private.pri -%%QT_QMLDIR%%/QtAV/Video.qml -%%QT_QMLDIR%%/QtAV/libQmlAV.so -%%QT_QMLDIR%%/QtAV/plugins.qmltypes -%%QT_QMLDIR%%/QtAV/qmldir -%%DOCSDIR%%/README -%%DOCSDIR%%/changelog -%%DOCSDIR%%/copyright -%%DOCSDIR%%Widgets/README -%%DOCSDIR%%Widgets/changelog -%%DOCSDIR%%Widgets/copyright -share/icons/hicolor/scalable/apps/QtAV.svg diff --git a/multimedia/gstreamer1-plugins-rust/Makefile b/multimedia/gstreamer1-plugins-rust/Makefile index 7e92308e46d..835a38e70c1 100644 --- a/multimedia/gstreamer1-plugins-rust/Makefile +++ b/multimedia/gstreamer1-plugins-rust/Makefile @@ -55,7 +55,6 @@ DAV1D_DESC= AV1 video decoding via libdav1d DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d DAV1D_MESON_ENABLED= dav1d -GTK4_DESC= ${GTK3_DESC:S/3/4/} GTK4_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene GTK4_USE= GNOME=gtk40 GTK4_MESON_ENABLED= gtk4 diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile index b79bd303be1..5b3103533bd 100644 --- a/multimedia/mlt7/Makefile +++ b/multimedia/mlt7/Makefile @@ -106,8 +106,8 @@ PLUSGPL_DESC= Enable plus GPL module PLUSGPL_CMAKE_BOOL= MOD_PLUSGPL PLUS_DESC= Enable plus module -PLUS_LIB_DEPENDS= libebur128.so:audio/ebur128 \ - libfftw3.so:math/fftw3 +PLUS_USES= ebur128 +PLUS_LIB_DEPENDS= libfftw3.so:math/fftw3 PLUS_CMAKE_BOOL= MOD_PLUS RESAMPLE_DESC= Enable resample module diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 9aacf870611..ada934566e6 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,13 +1,14 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.36.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia audio PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 3bdf702b1de8.patch:-p1 # https://github.com/mpv-player/mpv/pull/10871 PATCHFILES+= 48eb77207bff.patch:-p1 # https://github.com/mpv-player/mpv/pull/12012 +PATCHFILES+= f2453b60ee27.patch:-p1 # https://github.com/mpv-player/mpv/pull/11304 MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 5d163c58715..7480a09dcae 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -5,3 +5,5 @@ SHA256 (3bdf702b1de8.patch) = 5f44653c0a2af1d5490d5839f6c79ac21a0579377a76b6a2b5 SIZE (3bdf702b1de8.patch) = 1559 SHA256 (48eb77207bff.patch) = 7b844bfe00d1160a8dcd9814c5ea6e5b2e126d9f658b0b548c86364aa7018ea4 SIZE (48eb77207bff.patch) = 1931 +SHA256 (f2453b60ee27.patch) = 8b9677757b5106a8be30284aefabf6d0af53d905dd381a93ecdc3c6ab2878d61 +SIZE (f2453b60ee27.patch) = 1657 diff --git a/multimedia/rubygem-clutter-gstreamer/Makefile b/multimedia/rubygem-clutter-gstreamer/Makefile index 07be06cd6b2..bff12bd5acf 100644 --- a/multimedia/rubygem-clutter-gstreamer/Makefile +++ b/multimedia/rubygem-clutter-gstreamer/Makefile @@ -1,5 +1,5 @@ PORTNAME= clutter-gstreamer -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= multimedia rubygems MASTER_SITES= RG diff --git a/multimedia/rubygem-clutter-gstreamer/distinfo b/multimedia/rubygem-clutter-gstreamer/distinfo index 22c6e95c168..f2818264917 100644 --- a/multimedia/rubygem-clutter-gstreamer/distinfo +++ b/multimedia/rubygem-clutter-gstreamer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167246 -SHA256 (rubygem/clutter-gstreamer-4.1.8.gem) = ac32059011634487c425be53de676502ef6b39eaf2a86944dceaf525a4aae553 -SIZE (rubygem/clutter-gstreamer-4.1.8.gem) = 124928 +TIMESTAMP = 1692212075 +SHA256 (rubygem/clutter-gstreamer-4.1.9.gem) = dca939ff278df9e4c828dda806a8a37c2052ad25363f09d7ef1225699f44c63b +SIZE (rubygem/clutter-gstreamer-4.1.9.gem) = 124928 diff --git a/multimedia/rubygem-gstreamer/Makefile b/multimedia/rubygem-gstreamer/Makefile index f825c560f2a..78470ff9932 100644 --- a/multimedia/rubygem-gstreamer/Makefile +++ b/multimedia/rubygem-gstreamer/Makefile @@ -1,5 +1,5 @@ PORTNAME= gstreamer -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= multimedia rubygems MASTER_SITES= RG diff --git a/multimedia/rubygem-gstreamer/distinfo b/multimedia/rubygem-gstreamer/distinfo index e9424127321..215fce24d94 100644 --- a/multimedia/rubygem-gstreamer/distinfo +++ b/multimedia/rubygem-gstreamer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167248 -SHA256 (rubygem/gstreamer-4.1.8.gem) = acdd039a2eb718df039e62b25b04d4cb6234ebbde1a6c4f7632655aa762c68c3 -SIZE (rubygem/gstreamer-4.1.8.gem) = 29696 +TIMESTAMP = 1692212077 +SHA256 (rubygem/gstreamer-4.1.9.gem) = 959b300ebc2dc115ba8e3de7eb09bf4693889786718ce9dcd7ba967ea7721c1b +SIZE (rubygem/gstreamer-4.1.9.gem) = 29696 diff --git a/net-mgmt/check_nwc_health/Makefile b/net-mgmt/check_nwc_health/Makefile index 13ec925bb5b..dfb3ba598a1 100644 --- a/net-mgmt/check_nwc_health/Makefile +++ b/net-mgmt/check_nwc_health/Makefile @@ -1,5 +1,5 @@ PORTNAME= check_nwc_health -PORTVERSION= 10.12.1.2 +PORTVERSION= 11.0.1 CATEGORIES= net-mgmt MASTER_SITES= https://labs.consol.de/assets/downloads/nagios/ diff --git a/net-mgmt/check_nwc_health/distinfo b/net-mgmt/check_nwc_health/distinfo index c90c88608fe..d8e245fbefa 100644 --- a/net-mgmt/check_nwc_health/distinfo +++ b/net-mgmt/check_nwc_health/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683674616 -SHA256 (check_nwc_health-10.12.1.2.tar.gz) = d460edf4ffc6c4c5d17e853d6279999f8c110e3138c91940be6ce9e20cb8c229 -SIZE (check_nwc_health-10.12.1.2.tar.gz) = 812177 +TIMESTAMP = 1692740801 +SHA256 (check_nwc_health-11.0.1.tar.gz) = 58b3a4e82798eacc037aab844d1d8a3640a519cd9dc234c21a92a075fb58a9ca +SIZE (check_nwc_health-11.0.1.tar.gz) = 816081 diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 290ff8c4554..3865be12ea1 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,6 +1,5 @@ PORTNAME= librenms -PORTVERSION= 23.7.0 -PORTREVISION= 2 +PORTVERSION= 23.8.2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -45,7 +44,6 @@ SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf ../librenms-vendor-${PORTVERSION}/justinrainbow/json-schema/bin/validate-json \ ../librenms-vendor-${PORTVERSION}/nesbot/carbon/bin/carbon \ ../librenms-vendor-${PORTVERSION}/nikic/php-parser/bin/php-parse \ - ../librenms-vendor-${PORTVERSION}/predis/predis/bin/create-command-test \ ../librenms-vendor-${PORTVERSION}/psy/psysh/bin/psysh \ ../librenms-vendor-${PORTVERSION}/symfony/error-handler/Resources/bin/extract-tentative-return-types.php \ ../librenms-vendor-${PORTVERSION}/symfony/error-handler/Resources/bin/patch-type-declarations \ @@ -127,10 +125,10 @@ _SCRIPT_FILES= daily.sh lnms # _RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 # It sits here so you remember to update it with each release -_RELEASE_TIMESTAMP= 1689568961 +_RELEASE_TIMESTAMP= 1692632893 _ROOT_DIRS= LibreNMS app bootstrap config database doc html \ includes lang licenses mibs misc resources routes \ - scripts sql-schema tests + scripts tests _DOCS= AUTHORS.md CHANGELOG.md CONTRIBUTING.md LICENSE.txt \ README.md @@ -150,9 +148,13 @@ post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/LibreNMS/Util/Version.php ${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/LibreNMS/Util/Version.php ${REINPLACE_CMD} 's|%%RELEASE_TIMESTAMP%%|${_RELEASE_TIMESTAMP}|g' ${WRKSRC}/LibreNMS/Util/Version.php + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/LibreNMS/Validations/System.php ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/includes/html/output/capture.inc.php ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config.php.default ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/dist/librenms-scheduler.cron + ${REINPLACE_CMD} 's|%%WWWDIR%%|${WWWDIR}|g' ${WRKSRC}/dist/librenms-scheduler.cron + ${REINPLACE_CMD} 's|%%USER%%|${WWWOWN}|g' ${WRKSRC}/dist/librenms-scheduler.cron ${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php ${RM} -rf ${WRKSRC}/logs @@ -181,10 +183,6 @@ do-install: ${MV} ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang/* ${STAGEDIR}/${WWWDIR}/html/js/lang/ ${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang -# Make daily.sh executable -# ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh -# lnms does not fall into any other +x category -# ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/lnms # Files in scripts dir should be executable ${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; # Ensure PHP and Python scripts are executable @@ -238,4 +236,14 @@ post-install: ${ECHO_CMD} "@dir etc/newsyslog.conf.d" >> ${TMPPLIST} ${ECHO_CMD} "@sample etc/newsyslog.conf.d/librenms.conf.sample" >> ${TMPPLIST} + ${MKDIR} ${STAGEDIR}/${WWWDIR} ${STAGEDIR}${PREFIX}/etc/cron.d/ + ${INSTALL_DATA} ${WRKSRC}/dist/librenms-scheduler.cron ${STAGEDIR}${PREFIX}/etc/cron.d/librenms + ${ECHO_CMD} "@dir etc/cron.d" >> ${TMPPLIST} + ${ECHO_CMD} "etc/cron.d/librenms" >> ${TMPPLIST} + + # avoid the "Global lnms shortcut not installed." validataion warning. + # this can also be run as root. + ${RLN} ${STAGEDIR}${WWWDIR}/lnms ${STAGEDIR}${PREFIX}/bin/lnms + ${ECHO_CMD} "bin/lnms" >> ${TMPPLIST} + .include diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index 944426062ff..7b9c2fbf337 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1689616753 -SHA256 (librenms-vendor-23.7.0.tar.gz) = a452f2e4488e637de673be1975e8d5e0a898f9281ac45d01cd5d70fd0b2dc9f0 -SIZE (librenms-vendor-23.7.0.tar.gz) = 27501794 -SHA256 (librenms-librenms-23.7.0_GH0.tar.gz) = c9a8be8a830b292a490eeb491367b831a463336934629272c4c1f205e792dae3 -SIZE (librenms-librenms-23.7.0_GH0.tar.gz) = 57749912 +TIMESTAMP = 1692633919 +SHA256 (librenms-vendor-23.8.2.tar.gz) = 015bc3d79bd7312fcafbf14161f93093e1f395d134311c38c54daf7d47c445f3 +SIZE (librenms-vendor-23.8.2.tar.gz) = 27762415 +SHA256 (librenms-librenms-23.8.2_GH0.tar.gz) = e232f39bdf2e3238bbcbc60122b59ac7141f5760d7552aee41f3f9382f95a710 +SIZE (librenms-librenms-23.8.2_GH0.tar.gz) = 57980278 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php new file mode 100644 index 00000000000..744b3533df0 --- /dev/null +++ b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php @@ -0,0 +1,24 @@ +--- LibreNMS/Validations/System.php.orig 2023-08-21 20:59:01 UTC ++++ LibreNMS/Validations/System.php +@@ -40,19 +40,12 @@ class System extends BaseValidation + { + $install_dir = $validator->getBaseDir(); + +- $lnms = str_replace('lnms:', '', rtrim(`whereis -b lnms 2>/dev/null`)); ++ $lnms = rtrim(`/usr/bin/find /usr/local/bin -name lnms`); + $path = rtrim(`echo "\$PATH"`); + + // if couldn't find lnms and we have PATH + if (empty($lnms) && ! empty($path)) { +- $paths = explode(':', $path); +- $bin = Arr::first(array_intersect([ +- '/usr/local/bin', +- '/usr/bin', +- '/bin', +- ], $paths), null, Arr::last($paths)); +- +- $validator->warn('Global lnms shortcut not installed. lnms command must be run with full path', "sudo ln -s $install_dir/lnms $bin/lnms"); ++ $validator->warn('Global lnms shortcut not installed. lnms command must be run with full path', "sudo ln -s $install_dir/lnms %%LOCALBASE%%/bin/lnms"); + } + + $bash_completion_dir = '/etc/bash_completion.d/'; diff --git a/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py b/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py index dd8aae6e73d..d0f9187b21c 100644 --- a/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py +++ b/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py @@ -1,11 +1,11 @@ ---- LibreNMS/wrapper.py.orig 2023-07-30 23:13:00 UTC +--- LibreNMS/wrapper.py.orig 2023-08-21 15:25:48 UTC +++ LibreNMS/wrapper.py -@@ -278,7 +278,7 @@ def poll_worker( +@@ -280,7 +280,7 @@ def poll_worker( os.path.dirname(os.path.dirname(os.path.realpath(__file__))), wrappers[wrapper_type]["executable"], ) - command = "/usr/bin/env php {} -h {}".format(executable, device_id) -+ command = "/usr/local/bin/php {} -h {}".format(executable, device_id) - if debug: - command = command + " -d" - exit_code, output = command_runner( ++ command = "/usr/local/bin/php php {} -h {}".format(executable, device_id) + if modules is not None and len(str(modules).strip()): + module_str = re.sub("\s", "", str(modules).strip()) + command = command + " -m {}".format(module_str) diff --git a/net-mgmt/librenms/files/patch-dist_librenms-scheduler.cron b/net-mgmt/librenms/files/patch-dist_librenms-scheduler.cron new file mode 100644 index 00000000000..8e501913132 --- /dev/null +++ b/net-mgmt/librenms/files/patch-dist_librenms-scheduler.cron @@ -0,0 +1,6 @@ +--- dist/librenms-scheduler.cron.orig 2023-08-21 17:05:45 UTC ++++ dist/librenms-scheduler.cron +@@ -1 +1,2 @@ +-* * * * * php /opt/librenms/artisan schedule:run --no-ansi --no-interaction > /dev/null 2>&1 ++#minute hour mday month wday who command ++* * * * * %%USER%% %%LOCALBASE%%/bin/php %%WWWDIR%%/artisan schedule:run --no-ansi --no-interaction > /dev/null 2>&1 diff --git a/net-mgmt/librenms/files/pkg-message.in b/net-mgmt/librenms/files/pkg-message.in index de2af2e0d07..9baa7ecdf16 100644 --- a/net-mgmt/librenms/files/pkg-message.in +++ b/net-mgmt/librenms/files/pkg-message.in @@ -100,22 +100,13 @@ EOM message: <=2.68:devel/glib20 \ - gssdp>=1.6.0:net/gssdp \ + gssdp>=1.6.2:net/gssdp \ gtk3>=3.10:x11-toolkits/gtk30 \ gupnp>=1.6.0:net/gupnp \ libsoup3>=3.0:devel/libsoup3 diff --git a/net/gupnp-tools/distinfo b/net/gupnp-tools/distinfo index ad8b9e6fb7f..e2139bd8a4b 100644 --- a/net/gupnp-tools/distinfo +++ b/net/gupnp-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665646710 -SHA256 (gupnp-tools-0.12.0.tar.xz) = 5ea7607ee365642c555927fedc5b5e1fe08e74f061d0c3eb08bd901b5eb20082 -SIZE (gupnp-tools-0.12.0.tar.xz) = 181736 +TIMESTAMP = 1692211647 +SHA256 (gupnp-tools-0.12.1.tar.xz) = 53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba +SIZE (gupnp-tools-0.12.1.tar.xz) = 183488 diff --git a/net/gupnp-tools/files/patch-meson b/net/gupnp-tools/files/patch-meson index 37deaa3b9bc..029d2ad3ad6 100644 --- a/net/gupnp-tools/files/patch-meson +++ b/net/gupnp-tools/files/patch-meson @@ -1,35 +1,20 @@ Reference: https://github.com/mesonbuild/meson/commit/6f4973abad9eec9fcc915117f1c3d1a93ccc948c ---- subprojects/gssdp-1.6.wrap.orig 2022-10-11 21:00:49 UTC +--- subprojects/gssdp-1.6.wrap.orig 2023-08-02 11:16:11 UTC +++ subprojects/gssdp-1.6.wrap -@@ -3,6 +3,6 @@ depth = 1 - revision = master +@@ -4,5 +4,5 @@ revision = master depth = 1 --[provides] --dependency_name = gssdp-1.2 -+[provide] + [provide] +-dependency_names = gssdp-1.2 +dependency_names = gssdp-1.6 ---- subprojects/gupnp-1.6.wrap.orig 2022-10-11 21:00:49 UTC +--- subprojects/gupnp-1.6.wrap.orig 2023-08-02 11:16:11 UTC +++ subprojects/gupnp-1.6.wrap -@@ -3,6 +3,6 @@ depth = 1 - revision = master +@@ -4,5 +4,5 @@ revision = master depth = 1 --[provides] --dependency_name = gupnp-1.2 -+[provide] + [provide] +-dependency_names = gupnp-1.2 +dependency_names = gupnp-1.6 ---- subprojects/gupnp-av-1.0.wrap.orig 2022-10-11 21:00:49 UTC -+++ subprojects/gupnp-av-1.0.wrap -@@ -3,6 +3,6 @@ depth = 1 - revision = master - depth = 1 - --[provides] --dependency_name = gupnp-av-1.0 -+[provide] -+dependency_names = gupnp-av-1.0 - diff --git a/net/gupnp-tools/pkg-descr b/net/gupnp-tools/pkg-descr index 14425ac88d8..976fb952471 100644 --- a/net/gupnp-tools/pkg-descr +++ b/net/gupnp-tools/pkg-descr @@ -18,5 +18,3 @@ test and debug one's UPnP devices and control points: relies on external UPnP MediaRenderer devices for actual playback. - Upload: a simple commandline utility that uploads files to known MediaServers. Use Universal Control Point for discovering the MediaServers. - -See also: https://wiki.gnome.org/Projects/GUPnP diff --git a/net/gupnp-tools/pkg-plist b/net/gupnp-tools/pkg-plist index 5e810fa0fec..3cab8ab4405 100644 --- a/net/gupnp-tools/pkg-plist +++ b/net/gupnp-tools/pkg-plist @@ -36,6 +36,7 @@ share/locale/fur/LC_MESSAGES/gupnp-tools.mo share/locale/hu/LC_MESSAGES/gupnp-tools.mo share/locale/id/LC_MESSAGES/gupnp-tools.mo share/locale/ja/LC_MESSAGES/gupnp-tools.mo +share/locale/ka/LC_MESSAGES/gupnp-tools.mo share/locale/pl/LC_MESSAGES/gupnp-tools.mo share/locale/pt/LC_MESSAGES/gupnp-tools.mo share/locale/pt_BR/LC_MESSAGES/gupnp-tools.mo diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index 6dc13dac271..10d9f2d3d2b 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -1,5 +1,5 @@ PORTNAME= ocserv -DISTVERSION= 1.1.7 +DISTVERSION= 1.2.0 CATEGORIES= net net-vpn security MASTER_SITES= https://www.infradead.org/ocserv/download/ @@ -23,8 +23,8 @@ LIB_DEPENDS= libev.so:devel/libev \ libtalloc.so:devel/talloc \ libtasn1.so:security/libtasn1 -USES= autoreconf cpe gperf libtool localbase ncurses pathfix \ - pkgconfig readline tar:xz +USES= autoreconf cpe gettext-tools gperf libtool localbase ncurses \ + pathfix pkgconfig readline tar:xz CPE_VENDOR= infradead USE_RC_SUBR= ocserv diff --git a/net/ocserv/distinfo b/net/ocserv/distinfo index 30465e6a2b4..c10dada0e39 100644 --- a/net/ocserv/distinfo +++ b/net/ocserv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683875970 -SHA256 (ocserv-1.1.7.tar.xz) = f30f7515e1e569ca2e68a96fa5e3dd10d49a18a40c981ad95b484d10835e3aa6 -SIZE (ocserv-1.1.7.tar.xz) = 844140 +TIMESTAMP = 1692132524 +SHA256 (ocserv-1.2.0.tar.xz) = 47a66e504a6b04bb04856176d78ee392ad1385d22d1670d4ed48b7b95e9dffc5 +SIZE (ocserv-1.2.0.tar.xz) = 746968 diff --git a/net/ocserv/files/patch-configure.ac b/net/ocserv/files/patch-configure.ac index 27f60419b70..f06c82846f5 100644 --- a/net/ocserv/files/patch-configure.ac +++ b/net/ocserv/files/patch-configure.ac @@ -1,15 +1,15 @@ ---- configure.ac.orig 2020-10-09 11:32:59 UTC +--- configure.ac.orig 2023-07-11 12:47:23 UTC +++ configure.ac -@@ -15,7 +15,7 @@ AM_PROG_AR - AM_PROG_CC_C_O +@@ -16,7 +16,7 @@ AM_PROG_CC_C_O AC_PROG_SED + if test "$GCC" = "yes" && ! expr "$CC" : clang >/dev/null 2>&1;then - CFLAGS="$CFLAGS -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers -Wno-implicit-fallthrough -Wno-stringop-truncation" + CFLAGS="$CFLAGS -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers" fi AC_PATH_PROG(CTAGS, ctags, [:]) -@@ -222,7 +222,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind +@@ -223,7 +223,7 @@ if test "$test_for_geoip" = yes && test "$have_maxmind fi have_readline=no diff --git a/net/ocserv/files/patch-doc_sample.config b/net/ocserv/files/patch-doc_sample.config index f866507ac5a..b21233ad088 100644 --- a/net/ocserv/files/patch-doc_sample.config +++ b/net/ocserv/files/patch-doc_sample.config @@ -1,4 +1,4 @@ ---- doc/sample.config.orig 2022-12-02 18:59:51 UTC +--- doc/sample.config.orig 2023-07-11 12:54:03 UTC +++ doc/sample.config @@ -19,7 +19,7 @@ # This enabled PAM authentication of the user. The gid-min option is used @@ -91,9 +91,13 @@ # The number of sub-processes to use for the security module (authentication) # processes. Typically this should not be set as the number of processes -@@ -172,15 +169,9 @@ ca-cert = ../tests/certs/ca.pem +@@ -171,17 +168,10 @@ ca-cert = ../tests/certs/ca.pem + ### operation. If the server key changes on reload, there may be connection ### failures during the reloading time. ++# ocserv 1.1.1 on FreeBSD does not currently support process isolation, ++# because ocserv only supports Linux's seccomp system, but not capsicum(4). ++#isolate-workers = false -# Whether to enable seccomp/Linux namespaces worker isolation. That restricts the number of -# system calls allowed to a worker process, in order to reduce damage from a @@ -102,15 +106,13 @@ -# Note however, that process isolation is restricted to the specific libc versions -# the isolation was tested at. If you get random failures on worker processes, try -# disabling that option and report the failures you, along with system and debugging --# information at: https://gitlab.com/ocserv/ocserv/issues +-# information at: https://gitlab.com/openconnect/ocserv/issues -isolate-workers = true -+# ocserv 1.1.1 on FreeBSD does not currently support process isolation, -+# because ocserv only supports Linux's seccomp system, but not capsicum(4). -+#isolate-workers = false - +- # A banner to be displayed on clients after connection #banner = "Welcome" -@@ -262,7 +253,7 @@ try-mtu-discovery = false + +@@ -262,7 +252,7 @@ try-mtu-discovery = false # You can update this response periodically using: # ocsptool --ask --load-cert=your_cert --load-issuer=your_ca --outfile response # Make sure that you replace the following file in an atomic way. @@ -119,7 +121,7 @@ # The object identifier that will be used to read the user ID in the client # certificate. The object identifier should be part of the certificate's DN -@@ -281,7 +272,7 @@ cert-user-oid = 0.9.2342.19200300.100.1.1 +@@ -281,7 +271,7 @@ cert-user-oid = 0.9.2342.19200300.100.1.1 # See the manual to generate an empty CRL initially. The CRL will be reloaded # periodically when ocserv detects a change in the file. To force a reload use # SIGHUP. @@ -128,7 +130,7 @@ # Uncomment this to enable compression negotiation (LZS, LZ4). #compression = true -@@ -558,15 +549,15 @@ no-route = 192.168.5.0/255.255.255.0 +@@ -560,15 +550,15 @@ no-route = 192.168.5.0/255.255.255.0 # Note the that following two firewalling options currently are available # in Linux systems with iptables software. @@ -147,7 +149,7 @@ # access specific ports in the network. This option can be set globally # or in the per-user configuration. #restrict-user-to-ports = "tcp(443), tcp(80), udp(443), sctp(99), tcp(583), icmp(), icmpv6()" -@@ -614,13 +605,13 @@ no-route = 192.168.5.0/255.255.255.0 +@@ -616,13 +606,13 @@ no-route = 192.168.5.0/255.255.255.0 # hostname to override any proposed by the user. Note also, that, any # routes, no-routes, DNS or NBNS servers present will overwrite the global ones. @@ -165,7 +167,7 @@ # The system command to use to setup a route. %{R} will be replaced with the # route/mask, %{RI} with the route in CIDR format, and %{D} with the (tun) device. -@@ -642,7 +633,7 @@ no-route = 192.168.5.0/255.255.255.0 +@@ -644,7 +634,7 @@ no-route = 192.168.5.0/255.255.255.0 # In MIT kerberos you'll need to add in realms: # EXAMPLE.COM = { # kdc = https://ocserv.example.com/KdcProxy @@ -174,7 +176,7 @@ # } # In some distributions the krb5-k5tls plugin of kinit is required. # -@@ -722,13 +713,13 @@ client-bypass-protocol = false +@@ -747,13 +737,13 @@ camouflage_realm = "Restricted Content" [vhost:www.example.com] auth = "certificate" diff --git a/net/ocserv/files/patch-src_ip-util.h b/net/ocserv/files/patch-src_ip-util.h new file mode 100644 index 00000000000..ac62f740dc6 --- /dev/null +++ b/net/ocserv/files/patch-src_ip-util.h @@ -0,0 +1,10 @@ +--- src/ip-util.h.orig 2023-08-15 11:26:31.522070000 +0300 ++++ src/ip-util.h 2023-08-15 11:28:31.360118000 +0300 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + #define MAX_IP_STR 46 + // Lower MTU bound is the value defined in RFC 791 diff --git a/net/ocserv/files/patch-src_main.c b/net/ocserv/files/patch-src_main.c new file mode 100644 index 00000000000..f5c7037ce8e --- /dev/null +++ b/net/ocserv/files/patch-src_main.c @@ -0,0 +1,25 @@ +--- src/main.c.orig 2023-06-16 17:01:03 UTC ++++ src/main.c +@@ -215,9 +215,9 @@ int _listen_ports(void *pool, struct perm_cfg_st* conf + #endif + + y = 1; +- if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, ++ if (setsockopt(s, SOL_SOCKET, SO_REUSEPORT, + (const void *) &y, sizeof(y)) < 0) { +- perror("setsockopt(SO_REUSEADDR) failed"); ++ perror("setsockopt(SO_REUSEPORT) failed"); + } + + if (ptr->ai_socktype == SOCK_DGRAM) { +@@ -424,8 +424,8 @@ int y; + #endif + + y = 1; +- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const void *) &y, sizeof(y)) < 0) { +- perror("setsockopt(SO_REUSEADDR) failed"); ++ if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (const void *) &y, sizeof(y)) < 0) { ++ perror("setsockopt(SO_REUSEPORT) failed"); + } + + if (GETCONFIG(s)->try_mtu) { diff --git a/net/ocserv/files/patch-src_occtl_occtl.c b/net/ocserv/files/patch-src_occtl_occtl.c index de75a421e6f..b7c73f0d305 100644 --- a/net/ocserv/files/patch-src_occtl_occtl.c +++ b/net/ocserv/files/patch-src_occtl_occtl.c @@ -1,6 +1,6 @@ ---- src/occtl/occtl.c.orig 2020-08-06 18:51:31 UTC +--- src/occtl/occtl.c.orig 2023-06-16 17:01:03 UTC +++ src/occtl/occtl.c -@@ -264,7 +264,7 @@ static int handle_help_cmd(CONN_TYPE * conn, const cha +@@ -257,7 +257,7 @@ static int handle_help_cmd(CONN_TYPE * conn, const cha static int handle_reset_cmd(CONN_TYPE * conn, const char *arg, cmd_params_st *params) { rl_reset_terminal(NULL); diff --git a/net/ocserv/files/patch-src_occtl_time.c b/net/ocserv/files/patch-src_occtl_time.c index 85ef4c1819e..0feb85fdffd 100644 --- a/net/ocserv/files/patch-src_occtl_time.c +++ b/net/ocserv/files/patch-src_occtl_time.c @@ -1,16 +1,16 @@ ---- src/occtl/time.c.orig 2017-09-09 08:34:02 UTC +--- src/occtl/time.c.orig 2023-06-09 13:21:24 UTC +++ src/occtl/time.c @@ -36,7 +36,7 @@ void print_time_ival7(char output[MAX_TMPSTR_SIZE], ti { time_t t = t1 - t2; -- if ((long)t < (long)0) { +- if ((long)t < 0) { + if ((long long)t < (long long)0) { /* system clock changed? */ snprintf(output, MAX_TMPSTR_SIZE, " ? "); return; @@ -44,17 +44,17 @@ void print_time_ival7(char output[MAX_TMPSTR_SIZE], ti - + if (t >= 48 * 60 * 60) /* 2 days or more */ - snprintf(output, MAX_TMPSTR_SIZE, _("%2ludays"), (long)t / (24 * 60 * 60)); diff --git a/net/py-blobfile/Makefile b/net/py-blobfile/Makefile new file mode 100644 index 00000000000..9e030fbfdb3 --- /dev/null +++ b/net/py-blobfile/Makefile @@ -0,0 +1,29 @@ +PORTNAME= blobfile +PORTVERSION= 2.0.2 +DISTVERSIONPREFIX= v +CATEGORIES= net python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Read GCS, ABS and local paths with the same interface +WWW= https://github.com/blobfile/blobfile + +LICENSE= UNLICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astor>=0.8.0:devel/py-astor@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=42.0.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0.33.6:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=3.0<4:sysutils/py-filelock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=4.9<5:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.8<4:security/py-pycryptodomex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.3,1<3,1:net/py-urllib3@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent pep517 + +NO_ARCH= yes + +USE_GITHUB= yes + +.include diff --git a/net/py-blobfile/distinfo b/net/py-blobfile/distinfo new file mode 100644 index 00000000000..18cc15d09bd --- /dev/null +++ b/net/py-blobfile/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211617 +SHA256 (blobfile-blobfile-v2.0.2_GH0.tar.gz) = 685a36a7f90bde5c81b7d7f08a472c4dd63e24772b165be16a752213f8075cf5 +SIZE (blobfile-blobfile-v2.0.2_GH0.tar.gz) = 83871 diff --git a/net/py-blobfile/files/patch-pyproject.toml b/net/py-blobfile/files/patch-pyproject.toml new file mode 100644 index 00000000000..0f913e50f4b --- /dev/null +++ b/net/py-blobfile/files/patch-pyproject.toml @@ -0,0 +1,14 @@ +--- pyproject.toml.orig 2023-04-21 05:36:25 UTC ++++ pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] + requires = [ +- "setuptools == 42.0.0", +- "wheel == 0.33.6", +- "astor == 0.8.0", +-] +\ No newline at end of file ++ "setuptools >= 42.0.0", ++ "wheel >= 0.33.6", ++ "astor >= 0.8.0", ++] diff --git a/net/py-blobfile/pkg-descr b/net/py-blobfile/pkg-descr new file mode 100644 index 00000000000..28dea92d06b --- /dev/null +++ b/net/py-blobfile/pkg-descr @@ -0,0 +1,14 @@ +blobfile is a library that provides a Python-like interface for reading local +and remote files (only from blob storage), with an API similar to open() as well +as some of the os.path and shutil functions. blobfile supports local paths, +Google Cloud Storage paths (gs://), and Azure Blob Storage paths +(az:/// or +https://.blob.core.windows.net//). + +The main function is BlobFile, which lets you open local and remote files that +act more or less like local ones. There are also a few additional functions such +as basename, dirname, and join, which mostly do the same thing as their os.path +namesakes, only they also support GCS paths and ABS paths. + +This library is inspired by TensorFlow's gfile but does not have exactly the +same interface. diff --git a/net/py-magic-wormhole/Makefile b/net/py-magic-wormhole/Makefile index 32996809107..59d93f5a823 100644 --- a/net/py-magic-wormhole/Makefile +++ b/net/py-magic-wormhole/Makefile @@ -1,5 +1,5 @@ PORTNAME= magic-wormhole -PORTVERSION= 0.12.0 +PORTVERSION= 0.13.0 CATEGORIES= net MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -8,22 +8,22 @@ MAINTAINER= bofh@FreeBSD.org COMMENT= Get things from one computer to another, safely WWW= https://github.com/warner/magic-wormhole -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.3.0:devel/py-attrs@${PY_FLAVOR} \ +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}spake2>=0.8:security/py-spake2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=17.5.0:devel/py-twisted@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}txtorcon>=18.0.2:security/py-txtorcon@${PY_FLAVOR} -USES= python +USES= pycryptography:run python USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/net/py-magic-wormhole/distinfo b/net/py-magic-wormhole/distinfo index 29f8b0248f3..88667f5f55e 100644 --- a/net/py-magic-wormhole/distinfo +++ b/net/py-magic-wormhole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1594652396 -SHA256 (magic-wormhole-0.12.0.tar.gz) = 1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160 -SIZE (magic-wormhole-0.12.0.tar.gz) = 262269 +TIMESTAMP = 1692764214 +SHA256 (magic-wormhole-0.13.0.tar.gz) = ac3bd68286270e7f149c06149a8e409e5fa34d7feb0e88844a26d29eed2d1516 +SIZE (magic-wormhole-0.13.0.tar.gz) = 274564 diff --git a/net/rubygem-activestorage70/Makefile b/net/rubygem-activestorage70/Makefile index 50bdfd930a2..52966d3ff16 100644 --- a/net/rubygem-activestorage70/Makefile +++ b/net/rubygem-activestorage70/Makefile @@ -1,5 +1,5 @@ PORTNAME= activestorage -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= net rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/net/rubygem-activestorage70/distinfo b/net/rubygem-activestorage70/distinfo index 5989a7d2c1f..2e0b51422b6 100644 --- a/net/rubygem-activestorage70/distinfo +++ b/net/rubygem-activestorage70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167214 -SHA256 (rubygem/activestorage-7.0.6.gem) = 9270183f7fee6ab4677b079a85ec2abeb041b2a7207c49dd81b5965c46dad50c -SIZE (rubygem/activestorage-7.0.6.gem) = 65536 +TIMESTAMP = 1692212043 +SHA256 (rubygem/activestorage-7.0.7.gem) = 1b8b27cd1ed5ead195100c30c8eaac01884adcd5327115c3ccfdec4a38be5dbd +SIZE (rubygem/activestorage-7.0.7.gem) = 65536 diff --git a/net/rubygem-asset_sync/Makefile b/net/rubygem-asset_sync/Makefile index 443890b3b6f..b7aa701a771 100644 --- a/net/rubygem-asset_sync/Makefile +++ b/net/rubygem-asset_sync/Makefile @@ -1,5 +1,5 @@ PORTNAME= asset_sync -PORTVERSION= 2.18.1 +PORTVERSION= 2.19.1 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-asset_sync/distinfo b/net/rubygem-asset_sync/distinfo index 22dc6da6c2c..bbc86e18972 100644 --- a/net/rubygem-asset_sync/distinfo +++ b/net/rubygem-asset_sync/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070418 -SHA256 (rubygem/asset_sync-2.18.1.gem) = be4a93ad9fc42ec8953066b0253091b93a6989bee860eb50c7c3e16afab13848 -SIZE (rubygem/asset_sync-2.18.1.gem) = 45568 +TIMESTAMP = 1692640088 +SHA256 (rubygem/asset_sync-2.19.1.gem) = 14a59bfd5fd38580593f9f960ecf4ea3093f647e0a902a89f85693a1b616e655 +SIZE (rubygem/asset_sync-2.19.1.gem) = 46080 diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile index a1bec288062..10649898f05 100644 --- a/net/rubygem-fog-google/Makefile +++ b/net/rubygem-fog-google/Makefile @@ -1,5 +1,5 @@ PORTNAME= fog-google -PORTVERSION= 1.21.1 +PORTVERSION= 1.22.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-fog-google/distinfo b/net/rubygem-fog-google/distinfo index f8aa73237c3..59909e045d6 100644 --- a/net/rubygem-fog-google/distinfo +++ b/net/rubygem-fog-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167124 -SHA256 (rubygem/fog-google-1.21.1.gem) = c815526481591a23370c93b1f70360f9e131595f945c3ef8462b2296ec3efdd9 -SIZE (rubygem/fog-google-1.21.1.gem) = 152576 +TIMESTAMP = 1692211981 +SHA256 (rubygem/fog-google-1.22.0.gem) = 0719c4b243a8cdfb2790ac5fe7ca798bdb2e95b7f87d6601d4258c2004013123 +SIZE (rubygem/fog-google-1.22.0.gem) = 153088 diff --git a/net/rubygem-google-cloud-bigtable-admin-v2/Makefile b/net/rubygem-google-cloud-bigtable-admin-v2/Makefile index 326b84d6bd3..bcccec3349f 100644 --- a/net/rubygem-google-cloud-bigtable-admin-v2/Makefile +++ b/net/rubygem-google-cloud-bigtable-admin-v2/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-bigtable-admin-v2 -PORTVERSION= 0.16.2 +PORTVERSION= 0.17.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-google-cloud-bigtable-admin-v2/distinfo b/net/rubygem-google-cloud-bigtable-admin-v2/distinfo index 76c49b61855..12243c72975 100644 --- a/net/rubygem-google-cloud-bigtable-admin-v2/distinfo +++ b/net/rubygem-google-cloud-bigtable-admin-v2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399629 -SHA256 (rubygem/google-cloud-bigtable-admin-v2-0.16.2.gem) = df4023a39ba14441b8e2eb6738279605340f75b1239f3436a5cf03b689bd52ad -SIZE (rubygem/google-cloud-bigtable-admin-v2-0.16.2.gem) = 101376 +TIMESTAMP = 1692211983 +SHA256 (rubygem/google-cloud-bigtable-admin-v2-0.17.0.gem) = 03e3b1845eef888fa64027a2c7c039b9898bc7e55aff98945f0edd5bfa53e158 +SIZE (rubygem/google-cloud-bigtable-admin-v2-0.17.0.gem) = 102912 diff --git a/net/rubygem-google-cloud-bigtable/Makefile b/net/rubygem-google-cloud-bigtable/Makefile index 9843f421904..f5711e51354 100644 --- a/net/rubygem-google-cloud-bigtable/Makefile +++ b/net/rubygem-google-cloud-bigtable/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-bigtable -PORTVERSION= 2.7.1 +PORTVERSION= 2.8.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-google-cloud-bigtable/distinfo b/net/rubygem-google-cloud-bigtable/distinfo index 087141e2bf2..036a0807d58 100644 --- a/net/rubygem-google-cloud-bigtable/distinfo +++ b/net/rubygem-google-cloud-bigtable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167128 -SHA256 (rubygem/google-cloud-bigtable-2.7.1.gem) = 5f9e3737de8b1dc6b199126f7707810f31c858e9a2719f69d07f8b42ac830fc3 -SIZE (rubygem/google-cloud-bigtable-2.7.1.gem) = 91648 +TIMESTAMP = 1692640090 +SHA256 (rubygem/google-cloud-bigtable-2.8.0.gem) = c07534de388e71857b3c1e4b33d0a27142ad20b7e31e701168e8067e4ef88da0 +SIZE (rubygem/google-cloud-bigtable-2.8.0.gem) = 93184 diff --git a/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile b/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile index b39bc4ad6d3..9c039c3fe95 100644 --- a/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile +++ b/net/rubygem-google-cloud-spanner-admin-database-v1/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-spanner-admin-database-v1 -PORTVERSION= 0.14.1 +PORTVERSION= 0.14.2 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo b/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo index 22c420ab1fd..c933031cb23 100644 --- a/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo +++ b/net/rubygem-google-cloud-spanner-admin-database-v1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686496884 -SHA256 (rubygem/google-cloud-spanner-admin-database-v1-0.14.1.gem) = 328ab3d86ba5344ad2e8d30b574fa2790003432b482a8aaf9619ee14d295b6c8 -SIZE (rubygem/google-cloud-spanner-admin-database-v1-0.14.1.gem) = 96256 +TIMESTAMP = 1692211985 +SHA256 (rubygem/google-cloud-spanner-admin-database-v1-0.14.2.gem) = 15d3d1d1d92df4e391ef0da63758cb89da1f8d863777423710e890e64ecb4269 +SIZE (rubygem/google-cloud-spanner-admin-database-v1-0.14.2.gem) = 96256 diff --git a/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile b/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile index 739c5176e72..ac19ea3e5e2 100644 --- a/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile +++ b/net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-spanner-admin-instance-v1 -PORTVERSION= 0.10.1 +PORTVERSION= 0.10.2 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo b/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo index bf29fd2b574..7cf3df488fd 100644 --- a/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo +++ b/net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686496886 -SHA256 (rubygem/google-cloud-spanner-admin-instance-v1-0.10.1.gem) = 950af4c7ceab5a141d71cc16e113cf91b1922ccf4d594d314c2d5a85f14fceaf -SIZE (rubygem/google-cloud-spanner-admin-instance-v1-0.10.1.gem) = 83968 +TIMESTAMP = 1692211987 +SHA256 (rubygem/google-cloud-spanner-admin-instance-v1-0.10.2.gem) = e1247446d27ff06f284803aa225147d71917c606950e505b61e62bce0ccc1fef +SIZE (rubygem/google-cloud-spanner-admin-instance-v1-0.10.2.gem) = 83968 diff --git a/net/rubygem-grpc/Makefile b/net/rubygem-grpc/Makefile index 64cde847501..9a2add151ee 100644 --- a/net/rubygem-grpc/Makefile +++ b/net/rubygem-grpc/Makefile @@ -1,5 +1,5 @@ PORTNAME= grpc -PORTVERSION= 1.56.0 +PORTVERSION= 1.57.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-grpc/distinfo b/net/rubygem-grpc/distinfo index a2be1a78c47..b345c09c1db 100644 --- a/net/rubygem-grpc/distinfo +++ b/net/rubygem-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167134 -SHA256 (rubygem/grpc-1.56.0.gem) = e183a35d0772af44f801e272cef801324eb0b57cad8f459e7dd7a68aa953db2f -SIZE (rubygem/grpc-1.56.0.gem) = 6249984 +TIMESTAMP = 1692211989 +SHA256 (rubygem/grpc-1.57.0.gem) = ef4c93ae7da64094dd89cc06875d8b358d3908033733e2a6a05619a1064eefd8 +SIZE (rubygem/grpc-1.57.0.gem) = 6344192 diff --git a/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb b/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb index c325a069f18..c061d0c14e0 100644 --- a/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb +++ b/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb @@ -1,11 +1,11 @@ ---- src/ruby/ext/grpc/extconf.rb.orig 2023-02-26 18:56:37 UTC +--- src/ruby/ext/grpc/extconf.rb.orig 2023-08-19 01:12:29 UTC +++ src/ruby/ext/grpc/extconf.rb -@@ -69,11 +69,11 @@ if apple_toolchain && !cross_compiling +@@ -68,11 +68,11 @@ if apple_toolchain && !cross_compiling end # Don't embed on TruffleRuby (constant-time crypto is unsafe with Sulong, slow build times) -ENV['EMBED_OPENSSL'] = (RUBY_ENGINE != 'truffleruby').to_s -+ENV['EMBED_OPENSSL'] = 'false' ++ENV['EMBED_OPENSSL'] = 'false' # Don't embed on TruffleRuby (the system zlib is already linked for the zlib C extension, slow build times) -ENV['EMBED_ZLIB'] = (RUBY_ENGINE != 'truffleruby').to_s +ENV['EMBED_ZLIB'] = 'false' @@ -15,9 +15,9 @@ ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] if apple_toolchain && !cross_compiling -@@ -94,25 +94,6 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir - grpc_lib_dir = File.join(output_dir, 'libs', grpc_config) - ENV['BUILDDIR'] = output_dir +@@ -97,36 +97,6 @@ ENV['BUILDDIR'] = output_dir + strip_tool = RbConfig::CONFIG['STRIP'] + strip_tool += ' -x' if apple_toolchain -unless windows - puts 'Building internal gRPC into ' + grpc_lib_dir @@ -33,6 +33,17 @@ - puts "Building grpc native library: #{cmd}" - system(cmd) - exit 1 unless $? == 0 +- +- if grpc_config == 'opt' +- rm_obj_cmd = "rm -rf #{File.join(output_dir, 'objs')}" +- puts "Removing grpc object files: #{rm_obj_cmd}" +- system(rm_obj_cmd) +- exit 1 unless $? == 0 +- strip_cmd = "#{strip_tool} #{grpc_lib_dir}/*.a" +- puts "Stripping grpc native library: #{strip_cmd}" +- system(strip_cmd) +- exit 1 unless $? == 0 +- end -end - -$CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt @@ -41,12 +52,15 @@ def have_ruby_abi_version() return true if RUBY_ENGINE == 'truffleruby' # ruby_abi_version is only available in development versions: https://github.com/ruby/ruby/pull/6231 -@@ -141,10 +122,8 @@ def ext_export_filename() +@@ -155,13 +125,12 @@ def ext_export_filename() end ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', ext_export_filename()) -$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux --$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if apple_toolchain + if apple_toolchain + $LDFLAGS << ' -weak_framework CoreFoundation' if RUBY_PLATFORM =~ /arm64/ + $LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' + end -$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows +$LDFLAGS << ' -lgrpc' unless windows diff --git a/net/rubygem-packetgen/Makefile b/net/rubygem-packetgen/Makefile index 8707af0d104..b6cecc0f765 100644 --- a/net/rubygem-packetgen/Makefile +++ b/net/rubygem-packetgen/Makefile @@ -1,5 +1,5 @@ PORTNAME= packetgen -PORTVERSION= 3.2.2 +PORTVERSION= 3.3.0 CATEGORIES= net rubygems MASTER_SITES= RG @@ -11,8 +11,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-interfacez>=1.0<2:net/rubygem-interfacez \ - rubygem-pcaprub>=0.12.0:net/rubygem-pcaprub \ - rubygem-rasn1>=0.8.0<1:security/rubygem-rasn1 + rubygem-pcaprub>=0.13.0<0.14:net/rubygem-pcaprub \ + rubygem-rasn1>=0.12<1:security/rubygem-rasn1 USES= gem diff --git a/net/rubygem-packetgen/distinfo b/net/rubygem-packetgen/distinfo index fd9aba326aa..5e5875d4689 100644 --- a/net/rubygem-packetgen/distinfo +++ b/net/rubygem-packetgen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679498512 -SHA256 (rubygem/packetgen-3.2.2.gem) = 302b19b26ddf806956e4a3f0996140d4250f9f91f0526672553e3f591446e89f -SIZE (rubygem/packetgen-3.2.2.gem) = 109568 +TIMESTAMP = 1692211991 +SHA256 (rubygem/packetgen-3.3.0.gem) = 15ec70a1a5c426be5edf2ff3bcd5d3027dc6c6e341d72bba277f62d0a146e1af +SIZE (rubygem/packetgen-3.3.0.gem) = 110080 diff --git a/net/rubygem-packetgen/files/patch-gemspec b/net/rubygem-packetgen/files/patch-gemspec deleted file mode 100644 index 88375b284bb..00000000000 --- a/net/rubygem-packetgen/files/patch-gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- packetgen.gemspec.orig 2023-03-23 11:32:52 UTC -+++ packetgen.gemspec -@@ -24,7 +24,7 @@ Gem::Specification.new do |s| - s.specification_version = 4 - - s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) -- s.add_runtime_dependency(%q.freeze, ["~> 0.12.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 0.12.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.8", ">= 0.8.0"]) - s.add_development_dependency(%q.freeze, ["~> 13.0"]) - s.add_development_dependency(%q.freeze, ["~> 3.7"]) diff --git a/net/s5cmd/Makefile b/net/s5cmd/Makefile index b135ad825f2..9e31ea43ff2 100644 --- a/net/s5cmd/Makefile +++ b/net/s5cmd/Makefile @@ -1,7 +1,6 @@ PORTNAME= s5cmd DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 -PORTREVISION= 1 +DISTVERSION= 2.2.0 CATEGORIES= net MAINTAINER= ehaupt@FreeBSD.org diff --git a/net/s5cmd/distinfo b/net/s5cmd/distinfo index ed9958e4cb0..c90cd8a7ca5 100644 --- a/net/s5cmd/distinfo +++ b/net/s5cmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687180138 -SHA256 (peak-s5cmd-v2.1.0_GH0.tar.gz) = d67279cb6b69cfff32edfdb744238bd574a4a1e496cf3a59efa0646f94e40a17 -SIZE (peak-s5cmd-v2.1.0_GH0.tar.gz) = 2667759 +TIMESTAMP = 1692687426 +SHA256 (peak-s5cmd-v2.2.0_GH0.tar.gz) = 1884052843f45045a6f24cff03a32253991b5839e2f7ae5dcaaa1060f2e1756f +SIZE (peak-s5cmd-v2.2.0_GH0.tar.gz) = 3074382 diff --git a/net/xprobe/Makefile b/net/xprobe/Makefile index 8c4f775f0f1..dbc8e501580 100644 --- a/net/xprobe/Makefile +++ b/net/xprobe/Makefile @@ -14,15 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING CONFIGURE_ENV= INSTALL=${INSTALL} GNU_CONFIGURE= yes -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -CC= clang${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.endif - post-patch: @${REINPLACE_CMD} -e 's|-DBROKEN_BSD||' ${WRKSRC}/libs-external/USI++/src/configure diff --git a/net/xprobe/files/patch-src-target.cc b/net/xprobe/files/patch-src-target.cc new file mode 100644 index 00000000000..21f32bb807d --- /dev/null +++ b/net/xprobe/files/patch-src-target.cc @@ -0,0 +1,29 @@ +--- src/target.cc.orig 2005-07-27 08:38:17 UTC ++++ src/target.cc +@@ -28,6 +28,8 @@ + #include "os_matrix.h" + #include "xplib/xplib.h" + #include "log.h" ++#include ++#include + + extern Interface *ui; + extern Xprobe_Module_Hdlr *xmh; +@@ -363,6 +365,8 @@ void Port_Range::set_range(u_short a, u_short b) { + + int Port_Range::get_next(u_short *port) { + int k, sz=size(); ++ std::random_device rd; ++ std::mt19937 g(rd()); + + if (curr+low > high) + return 1; +@@ -370,7 +373,7 @@ int Port_Range::get_next(u_short *port) { + // initialize + for (k=0; k < sz; k++) + ports.push_back(low + k); +- random_shuffle(ports.begin(), ports.end()); ++ std::shuffle(ports.begin(), ports.end(), g); + *port = ports[curr++]; + } else + *port = ports[curr++]; diff --git a/news/py-sabctools/Makefile b/news/py-sabctools/Makefile index 7bb1f05f572..957c1ba827b 100644 --- a/news/py-sabctools/Makefile +++ b/news/py-sabctools/Makefile @@ -1,6 +1,5 @@ PORTNAME= sabctools -PORTVERSION= 7.1.0 -PORTREVISION= 1 +PORTVERSION= 7.1.1 CATEGORIES= news python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +11,7 @@ WWW= https://github.com/sabnzbd/sabctools LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} USES= python diff --git a/news/py-sabctools/distinfo b/news/py-sabctools/distinfo index e1bd0c87c31..895950cdf49 100644 --- a/news/py-sabctools/distinfo +++ b/news/py-sabctools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685792326 -SHA256 (sabctools-7.1.0.tar.gz) = 9f496b1acef3ccdd965da2a1bb2b98bf98a53f8ae7b0e849942cbfd1ab5c3a03 -SIZE (sabctools-7.1.0.tar.gz) = 234041 +TIMESTAMP = 1692211807 +SHA256 (sabctools-7.1.1.tar.gz) = 6ff39428bfe4586d1fe51a66348b414c90874e35b1effe78023c0ef40e483a01 +SIZE (sabctools-7.1.1.tar.gz) = 234106 diff --git a/news/sabnzbd/Makefile b/news/sabnzbd/Makefile index b33a4a1d292..d20168e911e 100644 --- a/news/sabnzbd/Makefile +++ b/news/sabnzbd/Makefile @@ -1,5 +1,6 @@ PORTNAME= sabnzbd DISTVERSION= 4.0.2 +PORTREVISION= 1 CATEGORIES= news MASTER_SITES= https://github.com/sabnzbd/sabnzbd/releases/download/${DISTVERSION}/ DISTNAME= SABnzbd-${DISTVERSION}-src @@ -19,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>=0:devel/py-cheetah3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.0:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portend>=0:net/py-portend@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sabctools>=7.1.0<7.1.0_99:news/py-sabctools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sabctools>=7.1.0<7.1.1_99:news/py-sabctools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}guessit>0:multimedia/py-guessit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}puremagic>0:sysutils/py-puremagic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \ diff --git a/news/sabnzbd/files/patch-sabctools b/news/sabnzbd/files/patch-sabctools index a9d0ee784c2..da0463501ac 100644 --- a/news/sabnzbd/files/patch-sabctools +++ b/news/sabnzbd/files/patch-sabctools @@ -1,4 +1,5 @@ Obtained from: https://github.com/sabnzbd/sabnzbd/commit/a179f2a895259e49f3679405ad59cac06e0bf2d9 + https://github.com/sabnzbd/sabnzbd/commit/a951361fa639235e9252cd32c5c7264ff0f1a70a --- requirements.txt.orig 2023-06-07 19:24:42 UTC +++ requirements.txt @@ -6,7 +7,7 @@ Obtained from: https://github.com/sabnzbd/sabnzbd/commit/a179f2a895259e49f367940 # Main requirements # Note that not all sub-dependencies are listed, but only ones we know could cause trouble -sabctools==7.0.2 -+sabctools==7.1.0 ++sabctools==7.1.1 cheetah3==3.2.6.post1 cffi==1.15.1 pycparser==2.21 diff --git a/print/py-pypdf/Makefile b/print/py-pypdf/Makefile index a96d260e24c..058b888043e 100644 --- a/print/py-pypdf/Makefile +++ b/print/py-pypdf/Makefile @@ -1,12 +1,15 @@ PORTNAME= pypdf -PORTVERSION= 3.15.1 +PORTVERSION= 3.15.2 CATEGORIES= print python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Pure-Python PDF toolkit -WWW= https://pybrary.net/pyPdf/ +WWW= https://github.com/py-pdf/pypdf + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>2:devel/py-flit-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} diff --git a/print/py-pypdf/distinfo b/print/py-pypdf/distinfo index a44a0743638..443172f86a6 100644 --- a/print/py-pypdf/distinfo +++ b/print/py-pypdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692276716 -SHA256 (pypdf-3.15.1.tar.gz) = d0dfaf4f10dfb06ac39e1d6a9cbffd63e77621d1e89c0ef08f346fd902df7b4b -SIZE (pypdf-3.15.1.tar.gz) = 268859 +TIMESTAMP = 1692685086 +SHA256 (pypdf-3.15.2.tar.gz) = cdf7d75ebb8901f3352cf9488c5f662c6de9c52e432c429d15cada67ba372fce +SIZE (pypdf-3.15.2.tar.gz) = 269076 diff --git a/science/cantera/Makefile b/science/cantera/Makefile index b85c41e74d4..c25ad53ef30 100644 --- a/science/cantera/Makefile +++ b/science/cantera/Makefile @@ -1,7 +1,6 @@ PORTNAME= cantera DISTVERSIONPREFIX= v -DISTVERSION= 2.6.0 -PORTREVISION= 3 +DISTVERSION= 3.0.0 CATEGORIES= science # chemistry physics MAINTAINER= yuri@FreeBSD.org @@ -12,11 +11,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/License.txt BUILD_DEPENDS= googletest>0:devel/googletest \ - ${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs + ${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs \ + highfive>0:science/highfive LIB_DEPENDS= libfmt.so:devel/libfmt \ + libhdf5.so:science/hdf5 \ + libopenblas.so:math/openblas \ libyaml-cpp.so:devel/yaml-cpp -USES= compiler:c++11-lang eigen:3 localbase scons +USES= compiler:c++17-lang eigen:3 localbase scons USE_LDCONFIG= yes USE_GITHUB= yes @@ -34,12 +36,13 @@ MAKE_ARGS= system_eigen='y' \ debug='no' \ cc_flags="${CXXFLAGS}" \ prefix="${PREFIX}" +MAKE_ENV= INSTALL_MANPAGES=y ALL_TARGET= build TEST_TARGET= test # some tests fail, see https://github.com/Cantera/cantera/issues/1095 OPTIONS_DEFINE= OCTAVE PYTHON -OPTIONS_DEFAULT= # PYTHON is broken; OCTAVE is off by default because Octave interface is not as frequently requested feature +OPTIONS_DEFAULT= # PYTHON is broken; OCTAVE is off by default because Octave interface is not a frequently requested feature OPTIONS_SUB= yes OCTAVE_DESC= Octave support @@ -48,6 +51,7 @@ OCTAVE_CXXFLAGS= -I${LOCALBASE}/include/octave-${OCTAVE_VERSION}/octave OCTAVE_LIB_DEPENDS= liboctave.so:math/octave OCTAVE_SUB_FILES= pkg-message-octave OCTAVE_USES= octave:env +OCTAVE_BROKEN= Octave support needs to be updated PYTHON_USES= python PYTHON_USE= PYTHON=cython @@ -60,15 +64,16 @@ PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} -PYTHON_BROKEN= https://github.com/Cantera/cantera/issues/1269 +PYTHON_BROKEN= https://github.com/Cantera/cantera/issues/1601 do-install: cd ${WRKSRC} && \ ${MAKE_CMD} install \ stage_dir="${STAGEDIR}" - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcantera_shared.so.2.6.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcantera_shared.so.${PORTVERSION} do-install-PYTHON-on: + # strip @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cantera/_cantera.cpython-${PYTHON_SUFFIX}.so post-patch-OCTAVE-on: # adjust Octave version in SConscript (python styled os.environ['OCTAVE_VERSION'] somehow doesn't work for this) diff --git a/science/cantera/distinfo b/science/cantera/distinfo index cee52c83d2f..4fa9a560756 100644 --- a/science/cantera/distinfo +++ b/science/cantera/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1651506700 -SHA256 (Cantera-cantera-v2.6.0_GH0.tar.gz) = 7273622ea76a53373cee820f939613b15eea3dd83db6e1b127c5ed043f77dc5b -SIZE (Cantera-cantera-v2.6.0_GH0.tar.gz) = 2586243 +TIMESTAMP = 1692765950 +SHA256 (Cantera-cantera-v3.0.0_GH0.tar.gz) = 6d17cdef21dae9deaf91351260b68ccf7e264c37c6030c9d4bf26a2cefb2b905 +SIZE (Cantera-cantera-v3.0.0_GH0.tar.gz) = 2451103 SHA256 (LLNL-sundials-887af43_GH0.tar.gz) = 147919c4887c93157c9975f195e8d45903285b61303d42f9dfdee251468abdb7 SIZE (LLNL-sundials-887af43_GH0.tar.gz) = 18888776 diff --git a/science/cantera/files/patch-SConstruct b/science/cantera/files/patch-SConstruct index cbccdcef24f..1220b2aedf5 100644 --- a/science/cantera/files/patch-SConstruct +++ b/science/cantera/files/patch-SConstruct @@ -1,17 +1,18 @@ - the first part is fixing the configure failure, see https://github.com/Cantera/cantera/issues/1536 ---- SConstruct.orig 2022-05-01 15:31:54 UTC +--- SConstruct.orig 2023-08-22 21:34:46 UTC +++ SConstruct -@@ -191,7 +191,7 @@ config_options = [ - { - "cl": "/EHsc", - "Cygwin": "-std=gnu++11", # See http://stackoverflow.com/questions/18784112 -- "default": "-std=c++11" -+ "default": "-std=c++14" - }), - Option( - "CC", -@@ -805,6 +805,9 @@ elif "icx" in env.subst("$CC"): +@@ -846,6 +846,9 @@ if os.name == "nt": + for key,val in env["ENV"].items(): + env["ENV"][key] = str(val) + ++elif "cc" in env.subst("$CC"): ++ config.select("clang") ++ + else: + env["INSTALL_MANPAGES"] = True + +@@ -880,6 +883,9 @@ elif "icx" in env.subst("$CC"): elif "clang" in env.subst("$CC"): config.select("clang") @@ -19,36 +20,38 @@ + config.select("clang") + else: - print(f"WARNING: Unrecognized C compiler '{env['CC']}'") - -@@ -869,10 +872,10 @@ if "sdist" in COMMAND_LINE_TARGETS: + logger.error(f"Unrecognized C compiler {env['CC']!r}") + sys.exit(1) +@@ -945,10 +951,10 @@ if "sdist" in COMMAND_LINE_TARGETS: logger.info("'sdist' target was specified. Setting 'use_pch' to False.") env["use_pch"] = False -for arg in ARGUMENTS: - if arg not in config: -- logger.error(f"Encountered unexpected command line option: '{arg}'") +- logger.error(f"Encountered unexpected command line option: {arg!r}") - sys.exit(1) +#for arg in ARGUMENTS: +# if arg not in config: -+# logger.error(f"Encountered unexpected command line option: '{arg}'") ++# logger.error(f"Encountered unexpected command line option: {arg!r}") +# sys.exit(1) - env["cantera_version"] = "2.6.0" + env["cantera_version"] = "3.0.0" # For use where pre-release tags are not permitted (MSI, sonames) -@@ -1673,11 +1676,11 @@ if env["matlab_toolbox"] == "y": +@@ -2002,12 +2008,12 @@ if env["matlab_toolbox"] == "y": "SUNDIALS libraries and skip building the Matlab toolbox.") sys.exit(1) -- if not (os.path.isdir(matlab_path) and -- os.path.isdir(pjoin(matlab_path, "extern"))): +- matlab_path = Path(matlab_path) +- env["matlab_path"] = matlab_path.as_posix() +- if not matlab_path.is_dir() and (matlab_path / "extern").is_dir(): - logger.error( -- f"Path set for 'matlab_path' is not correct. Path was '{matlab_path}'") +- f"Path set for 'matlab_path' is not correct. Path was {matlab_path!r}") - sys.exit(1) -+ #if not (os.path.isdir(matlab_path) and -+ # os.path.isdir(pjoin(matlab_path, "extern"))): ++ #matlab_path = Path(matlab_path) ++ #env["matlab_path"] = matlab_path.as_posix() ++ #if not matlab_path.is_dir() and (matlab_path / "extern").is_dir(): + # logger.error( -+ # f"Path set for 'matlab_path' is not correct. Path was '{matlab_path}'") ++ # f"Path set for 'matlab_path' is not correct. Path was {matlab_path!r}") + # sys.exit(1) diff --git a/science/cantera/files/patch-platform_posix_SConscript b/science/cantera/files/patch-platform_posix_SConscript new file mode 100644 index 00000000000..e3578795504 --- /dev/null +++ b/science/cantera/files/patch-platform_posix_SConscript @@ -0,0 +1,11 @@ +--- platform/posix/SConscript.orig 2023-08-23 04:54:38 UTC ++++ platform/posix/SConscript +@@ -6,7 +6,7 @@ Import('env', 'build', 'install') + localenv = env.Clone() + + # Copy man pages +-if env['INSTALL_MANPAGES']: ++if True or env['INSTALL_MANPAGES']: + install('$inst_mandir', multi_glob(localenv, '#platform/posix/man', '*')) + + ### Generate customized scripts ### diff --git a/science/cantera/files/patch-src_matlab_SConscript b/science/cantera/files/patch-src_matlab_SConscript index 300ee07c6df..c192ea9fb1b 100644 --- a/science/cantera/files/patch-src_matlab_SConscript +++ b/science/cantera/files/patch-src_matlab_SConscript @@ -1,6 +1,6 @@ ---- src/matlab/SConscript.orig 2022-05-01 15:31:54 UTC +--- src/matlab/SConscript.orig 2023-08-22 21:34:46 UTC +++ src/matlab/SConscript -@@ -42,7 +42,7 @@ elif localenv['OS'] == 'Darwin': +@@ -48,7 +48,7 @@ elif localenv['OS'] == 'Darwin': elif os.name == 'posix': linklibs = list(env['cantera_libs']) diff --git a/science/cantera/pkg-plist b/science/cantera/pkg-plist index a5aecda50a5..a48fdd35166 100644 --- a/science/cantera/pkg-plist +++ b/science/cantera/pkg-plist @@ -3,17 +3,19 @@ %%PYTHON%%bin/cti2yaml %%PYTHON%%bin/ctml2yaml %%PYTHON%%bin/ctml_writer -bin/setup_cantera -bin/setup_cantera.csh -include/cantera/Cantera.mak include/cantera/base/AnyMap.h include/cantera/base/AnyMap.inl.h include/cantera/base/Array.h include/cantera/base/Delegator.h +include/cantera/base/ExtensionManager.h +include/cantera/base/ExtensionManagerFactory.h +include/cantera/base/ExternalLogger.h include/cantera/base/FactoryBase.h include/cantera/base/Interface.h include/cantera/base/NoExitLogger.h include/cantera/base/Solution.h +include/cantera/base/SolutionArray.h +include/cantera/base/Storage.h include/cantera/base/Units.h include/cantera/base/ValueCache.h include/cantera/base/YamlWriter.h @@ -22,14 +24,11 @@ include/cantera/base/config.h include/cantera/base/config.h.in include/cantera/base/ct_defs.h include/cantera/base/ctexceptions.h -include/cantera/base/ctml.h include/cantera/base/fmt.h include/cantera/base/global.h include/cantera/base/logger.h -include/cantera/base/plots.h include/cantera/base/stringUtils.h include/cantera/base/utilities.h -include/cantera/base/xml.h include/cantera/base/yaml.h include/cantera/clib/clib_defs.h include/cantera/clib/ct.h @@ -40,8 +39,12 @@ include/cantera/clib/ctonedim.h include/cantera/clib/ctreactor.h include/cantera/clib/ctrpath.h include/cantera/clib/ctsurf.h -include/cantera/clib/ctxml.h +include/cantera/core.h include/cantera/cython/funcWrapper.h +include/cantera/cython/kinetics_utils.h +include/cantera/cython/thermo_utils.h +include/cantera/cython/transport_utils.h +include/cantera/cython/utils_utils.h include/cantera/cython/wrappers.h include/cantera/equil/ChemEquil.h include/cantera/equil/MultiPhase.h @@ -60,11 +63,11 @@ include/cantera/ext/cvodes/cvodes_diag.h include/cantera/ext/cvodes/cvodes_direct.h include/cantera/ext/cvodes/cvodes_ls.h include/cantera/ext/cvodes/cvodes_spils.h -include/cantera/ext/ida/ida.h -include/cantera/ext/ida/ida_bbdpre.h -include/cantera/ext/ida/ida_direct.h -include/cantera/ext/ida/ida_ls.h -include/cantera/ext/ida/ida_spils.h +include/cantera/ext/idas/idas.h +include/cantera/ext/idas/idas_bbdpre.h +include/cantera/ext/idas/idas_direct.h +include/cantera/ext/idas/idas_ls.h +include/cantera/ext/idas/idas_spils.h include/cantera/ext/nvector/nvector_cuda.h include/cantera/ext/nvector/nvector_manyvector.h include/cantera/ext/nvector/nvector_mpimanyvector.h @@ -116,6 +119,8 @@ include/cantera/ext/sunmatrix/sunmatrix_sparse.h include/cantera/ext/sunnonlinsol/sunnonlinsol_fixedpoint.h include/cantera/ext/sunnonlinsol/sunnonlinsol_newton.h include/cantera/ext/sunnonlinsol/sunnonlinsol_petscsnes.h +include/cantera/extensions/PythonExtensionManager.h +include/cantera/extensions/PythonHandle.h include/cantera/kinetics.h include/cantera/kinetics/Arrhenius.h include/cantera/kinetics/BlowersMaselRate.h @@ -124,8 +129,6 @@ include/cantera/kinetics/ChebyshevRate.h include/cantera/kinetics/Custom.h include/cantera/kinetics/EdgeKinetics.h include/cantera/kinetics/Falloff.h -include/cantera/kinetics/FalloffFactory.h -include/cantera/kinetics/FalloffMgr.h include/cantera/kinetics/GasKinetics.h include/cantera/kinetics/Group.h include/cantera/kinetics/ImplicitSurfChem.h @@ -136,28 +139,28 @@ include/cantera/kinetics/KineticsFactory.h include/cantera/kinetics/MultiRate.h include/cantera/kinetics/MultiRateBase.h include/cantera/kinetics/PlogRate.h -include/cantera/kinetics/RateCoeffMgr.h include/cantera/kinetics/Reaction.h include/cantera/kinetics/ReactionData.h include/cantera/kinetics/ReactionPath.h include/cantera/kinetics/ReactionRate.h +include/cantera/kinetics/ReactionRateDelegator.h include/cantera/kinetics/ReactionRateFactory.h -include/cantera/kinetics/RxnRates.h include/cantera/kinetics/StoichManager.h include/cantera/kinetics/ThirdBodyCalc.h include/cantera/kinetics/TwoTempPlasmaRate.h -include/cantera/kinetics/importKinetics.h -include/cantera/kinetics/reaction_defs.h include/cantera/kinetics/solveSP.h +include/cantera/numerics/AdaptivePreconditioner.h include/cantera/numerics/BandMatrix.h include/cantera/numerics/CVodesIntegrator.h -include/cantera/numerics/DAE_Solver.h include/cantera/numerics/DenseMatrix.h include/cantera/numerics/Func1.h +include/cantera/numerics/Func1Factory.h include/cantera/numerics/FuncEval.h include/cantera/numerics/GeneralMatrix.h -include/cantera/numerics/IDA_Solver.h +include/cantera/numerics/IdasIntegrator.h include/cantera/numerics/Integrator.h +include/cantera/numerics/PreconditionerBase.h +include/cantera/numerics/PreconditionerFactory.h include/cantera/numerics/ResidEval.h include/cantera/numerics/ResidJacEval.h include/cantera/numerics/SundialsContext.h @@ -166,9 +169,10 @@ include/cantera/numerics/eigen_dense.h include/cantera/numerics/eigen_sparse.h include/cantera/numerics/funcs.h include/cantera/numerics/polyfit.h +include/cantera/numerics/sundials_headers.h include/cantera/oneD/Boundary1D.h include/cantera/oneD/Domain1D.h -include/cantera/oneD/Inlet1D.h +include/cantera/oneD/DomainFactory.h include/cantera/oneD/IonFlow.h include/cantera/oneD/MultiJac.h include/cantera/oneD/MultiNewton.h @@ -182,6 +186,7 @@ include/cantera/test/gtest_utils.h include/cantera/thermo.h include/cantera/thermo/BinarySolutionTabulatedThermo.h include/cantera/thermo/ConstCpPoly.h +include/cantera/thermo/CoverageDependentSurfPhase.h include/cantera/thermo/DebyeHuckel.h include/cantera/thermo/EdgePhase.h include/cantera/thermo/Elements.h @@ -244,17 +249,22 @@ include/cantera/transport/HighPressureGasTransport.h include/cantera/transport/IonGasTransport.h include/cantera/transport/MixTransport.h include/cantera/transport/MultiTransport.h +include/cantera/transport/Transport.h include/cantera/transport/TransportBase.h include/cantera/transport/TransportData.h include/cantera/transport/TransportFactory.h include/cantera/transport/UnityLewisTransport.h include/cantera/transport/WaterTransport.h +include/cantera/zeroD/ConstPressureMoleReactor.h include/cantera/zeroD/ConstPressureReactor.h include/cantera/zeroD/FlowDevice.h include/cantera/zeroD/FlowDeviceFactory.h include/cantera/zeroD/FlowReactor.h +include/cantera/zeroD/IdealGasConstPressureMoleReactor.h include/cantera/zeroD/IdealGasConstPressureReactor.h +include/cantera/zeroD/IdealGasMoleReactor.h include/cantera/zeroD/IdealGasReactor.h +include/cantera/zeroD/MoleReactor.h include/cantera/zeroD/Reactor.h include/cantera/zeroD/ReactorBase.h include/cantera/zeroD/ReactorDelegator.h @@ -607,8 +617,8 @@ include/cantera/zerodim.h %%OCTAVE%%lib/cantera/matlab/toolbox/useLegacyRateConstants.m lib/libcantera.a lib/libcantera_shared.so -lib/libcantera_shared.so.2 -lib/libcantera_shared.so.2.6.0 +lib/libcantera_shared.so.3 +lib/libcantera_shared.so.3.0.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/Cantera-2.6.0a3-py%%PYTHON_VER%%.egg-info/PKG-INFO %%PYTHON%%%%PYTHON_SITELIBDIR%%/Cantera-2.6.0a3-py%%PYTHON_VER%%.egg-info/SOURCES.txt %%PYTHON%%%%PYTHON_SITELIBDIR%%/Cantera-2.6.0a3-py%%PYTHON_VER%%.egg-info/dependency_links.txt @@ -984,124 +994,69 @@ lib/libcantera_shared.so.2.6.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/cantera/test/utilities.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/cantera/utils.py libdata/pkgconfig/cantera.pc -%%DATADIR%%/data/KOH.cti -%%DATADIR%%/data/KOH.xml %%DATADIR%%/data/KOH.yaml -%%DATADIR%%/data/air.cti -%%DATADIR%%/data/air.xml +%%DATADIR%%/data/SiF4_NH3_mec.yaml +%%DATADIR%%/data/YZA.yaml %%DATADIR%%/data/air.yaml -%%DATADIR%%/data/airNASA9.cti -%%DATADIR%%/data/airNASA9.xml %%DATADIR%%/data/airNASA9.yaml -%%DATADIR%%/data/argon.cti -%%DATADIR%%/data/argon.xml +%%DATADIR%%/data/covdepsurf.yaml %%DATADIR%%/data/critical-properties.yaml -%%DATADIR%%/data/diamond.cti -%%DATADIR%%/data/diamond.xml %%DATADIR%%/data/diamond.yaml %%DATADIR%%/data/element-standard-entropies.yaml -%%DATADIR%%/data/elements.xml -%%DATADIR%%/data/graphite.cti -%%DATADIR%%/data/graphite.xml %%DATADIR%%/data/graphite.yaml -%%DATADIR%%/data/gri30.cti -%%DATADIR%%/data/gri30.xml %%DATADIR%%/data/gri30.yaml -%%DATADIR%%/data/gri30_highT.cti -%%DATADIR%%/data/gri30_highT.xml %%DATADIR%%/data/gri30_highT.yaml -%%DATADIR%%/data/gri30_ion.cti -%%DATADIR%%/data/gri30_ion.xml %%DATADIR%%/data/gri30_ion.yaml -%%DATADIR%%/data/h2o2.cti -%%DATADIR%%/data/h2o2.xml %%DATADIR%%/data/h2o2.yaml -%%DATADIR%%/data/liquidvapor.cti -%%DATADIR%%/data/liquidvapor.xml %%DATADIR%%/data/liquidvapor.yaml -%%DATADIR%%/data/lithium_ion_battery.cti -%%DATADIR%%/data/lithium_ion_battery.xml %%DATADIR%%/data/lithium_ion_battery.yaml -%%DATADIR%%/data/methane_pox_on_pt.cti -%%DATADIR%%/data/methane_pox_on_pt.xml %%DATADIR%%/data/methane_pox_on_pt.yaml -%%DATADIR%%/data/nDodecane_Reitz.cti -%%DATADIR%%/data/nDodecane_Reitz.xml %%DATADIR%%/data/nDodecane_Reitz.yaml -%%DATADIR%%/data/nasa.cti -%%DATADIR%%/data/nasa.xml -%%DATADIR%%/data/nasa_condensed.cti -%%DATADIR%%/data/nasa_condensed.xml %%DATADIR%%/data/nasa_condensed.yaml -%%DATADIR%%/data/nasa_gas.cti -%%DATADIR%%/data/nasa_gas.xml %%DATADIR%%/data/nasa_gas.yaml -%%DATADIR%%/data/ohn.cti -%%DATADIR%%/data/ohn.xml %%DATADIR%%/data/ohn.yaml -%%DATADIR%%/data/ptcombust.cti -%%DATADIR%%/data/ptcombust.xml %%DATADIR%%/data/ptcombust.yaml -%%DATADIR%%/data/silane.cti -%%DATADIR%%/data/silane.xml -%%DATADIR%%/data/silane.yaml -%%DATADIR%%/data/silicon.cti -%%DATADIR%%/data/silicon.xml %%DATADIR%%/data/silicon.yaml -%%DATADIR%%/data/silicon_carbide.cti -%%DATADIR%%/data/silicon_carbide.xml %%DATADIR%%/data/silicon_carbide.yaml -%%DATADIR%%/data/sofc.cti -%%DATADIR%%/data/sofc.xml %%DATADIR%%/data/sofc.yaml -%%DATADIR%%/data/water.cti -%%DATADIR%%/data/water.xml %%DATADIR%%/data/water.yaml %%DATADIR%%/doc/LICENSE.txt +%%DATADIR%%/samples/clib/CMakeLists.txt +%%DATADIR%%/samples/clib/SConstruct +%%DATADIR%%/samples/clib/demo.c %%DATADIR%%/samples/cxx/LiC6_electrode/CMakeLists.txt %%DATADIR%%/samples/cxx/LiC6_electrode/LiC6_electrode.cpp -%%DATADIR%%/samples/cxx/LiC6_electrode/Makefile %%DATADIR%%/samples/cxx/LiC6_electrode/SConstruct %%DATADIR%%/samples/cxx/bvp/BoundaryValueProblem.h %%DATADIR%%/samples/cxx/bvp/CMakeLists.txt -%%DATADIR%%/samples/cxx/bvp/Makefile %%DATADIR%%/samples/cxx/bvp/SConstruct %%DATADIR%%/samples/cxx/bvp/blasius.cpp %%DATADIR%%/samples/cxx/combustor/CMakeLists.txt -%%DATADIR%%/samples/cxx/combustor/Makefile %%DATADIR%%/samples/cxx/combustor/SConstruct %%DATADIR%%/samples/cxx/combustor/combustor.cpp %%DATADIR%%/samples/cxx/custom/CMakeLists.txt -%%DATADIR%%/samples/cxx/custom/Makefile %%DATADIR%%/samples/cxx/custom/SConstruct %%DATADIR%%/samples/cxx/custom/custom.cpp %%DATADIR%%/samples/cxx/demo/CMakeLists.txt -%%DATADIR%%/samples/cxx/demo/Makefile %%DATADIR%%/samples/cxx/demo/SConstruct %%DATADIR%%/samples/cxx/demo/demo.cpp %%DATADIR%%/samples/cxx/flamespeed/CMakeLists.txt -%%DATADIR%%/samples/cxx/flamespeed/Makefile %%DATADIR%%/samples/cxx/flamespeed/SConstruct %%DATADIR%%/samples/cxx/flamespeed/flamespeed.cpp %%DATADIR%%/samples/cxx/gas_transport/CMakeLists.txt -%%DATADIR%%/samples/cxx/gas_transport/Makefile %%DATADIR%%/samples/cxx/gas_transport/SConstruct %%DATADIR%%/samples/cxx/gas_transport/gas_transport.cpp %%DATADIR%%/samples/cxx/jacobian/CMakeLists.txt -%%DATADIR%%/samples/cxx/jacobian/Makefile %%DATADIR%%/samples/cxx/jacobian/SConstruct %%DATADIR%%/samples/cxx/jacobian/derivative_speed.cpp %%DATADIR%%/samples/cxx/kinetics1/CMakeLists.txt -%%DATADIR%%/samples/cxx/kinetics1/Makefile %%DATADIR%%/samples/cxx/kinetics1/SConstruct %%DATADIR%%/samples/cxx/kinetics1/example_utils.h %%DATADIR%%/samples/cxx/kinetics1/kinetics1.cpp %%DATADIR%%/samples/cxx/openmp_ignition/CMakeLists.txt -%%DATADIR%%/samples/cxx/openmp_ignition/Makefile %%DATADIR%%/samples/cxx/openmp_ignition/SConstruct %%DATADIR%%/samples/cxx/openmp_ignition/openmp_ignition.cpp %%DATADIR%%/samples/cxx/rankine/CMakeLists.txt -%%DATADIR%%/samples/cxx/rankine/Makefile %%DATADIR%%/samples/cxx/rankine/SConstruct %%DATADIR%%/samples/cxx/rankine/rankine.cpp %%OCTAVE%%%%DATADIR%%/samples/matlab/PFR_solver.m @@ -1135,8 +1090,7 @@ libdata/pkgconfig/cantera.pc %%OCTAVE%%%%DATADIR%%/samples/matlab/tut5.m %%OCTAVE%%%%DATADIR%%/samples/matlab/tut6.m %%OCTAVE%%%%DATADIR%%/samples/matlab/tut7.m -share/man/man1/ck2cti.1.gz share/man/man1/ck2yaml.1.gz share/man/man1/cti2yaml.1.gz share/man/man1/ctml2yaml.1.gz -share/man/man1/ctml_writer.1.gz +share/man/man1/yaml2ck.1.gz diff --git a/science/py-asdf/Makefile b/science/py-asdf/Makefile index e985d61575a..c79dd07d3f7 100644 --- a/science/py-asdf/Makefile +++ b/science/py-asdf/Makefile @@ -1,6 +1,5 @@ PORTNAME= asdf -PORTVERSION= 2.15.0 -PORTREVISION= 2 +PORTVERSION= 2.15.1 CATEGORIES= science python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,29 +17,26 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=60:devel/py-setuptools@${PY_FL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asdf-standard>=1.0.1:science/py-asdf-standard@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}asdf-transform-schemas>=0.3:science/py-asdf-transform-schemas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}asdf-unit-schemas>=0.1:science/py-asdf-unit-schemas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}attrs>=20.1.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.11.4:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jmespath>=0.6.2:devel/py-jmespath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema417>=4.0.1<4.18:devel/py-jsonschema417@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.20,1:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.8:devel/py-jsonschema@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.22,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8:devel/py-semantic-version@${PY_FLAVOR} -USES= python +USES= python:3.9+ shebangfix USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes +SHEBANG_FILES= asdf/_jsonschema/json/bin/jsonschema_suite + OPTIONS_DEFINE= ALL OPTIONS_DEFAULT=ALL ALL_DESC= Lz4 compression algorithm support ALL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.10:archivers/py-lz4@${PY_FLAVOR} -.include - -.if ${PYTHON_REL} < 30900 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=3:devel/py-importlib-resources@${PY_FLAVOR} -.endif - -.include +.include diff --git a/science/py-asdf/distinfo b/science/py-asdf/distinfo index f6d76e6672b..3d1121cc463 100644 --- a/science/py-asdf/distinfo +++ b/science/py-asdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681052958 -SHA256 (asdf-2.15.0.tar.gz) = 686f1c91ebf987d41f915cfb6aa70940d7ad17f87ede0be70463147ad2314587 -SIZE (asdf-2.15.0.tar.gz) = 505054 +TIMESTAMP = 1692211811 +SHA256 (asdf-2.15.1.tar.gz) = be09427d69d8c145b374915ad75b24c089a6e6d686f0865904ac487be3a803ff +SIZE (asdf-2.15.1.tar.gz) = 804690 diff --git a/science/shelxle/Makefile b/science/shelxle/Makefile index d61ce428e56..1612c43f0ce 100644 --- a/science/shelxle/Makefile +++ b/science/shelxle/Makefile @@ -1,5 +1,5 @@ PORTNAME= shelxle -DISTVERSION= 1.0.1552 +DISTVERSION= 1.0.1554 CATEGORIES= science # chemistry MASTER_SITES= SF/${PORTNAME}/code/ diff --git a/science/shelxle/distinfo b/science/shelxle/distinfo index 170e43f8100..c044b18b865 100644 --- a/science/shelxle/distinfo +++ b/science/shelxle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691457387 -SHA256 (shelxle-1.0.1552.tar.bz2) = 2f55b43d28511aa834818a6c0d984e21685d894eacec7f8db80f4e16cd8e22d1 -SIZE (shelxle-1.0.1552.tar.bz2) = 3930667 +TIMESTAMP = 1692731437 +SHA256 (shelxle-1.0.1554.tar.bz2) = 66cbf45caca994a7ba13d565cec2f54b35aecee6d14a8cc52088e3f34b7023a1 +SIZE (shelxle-1.0.1554.tar.bz2) = 3930410 diff --git a/security/Makefile b/security/Makefile index 5e215d686b2..cb182a1516e 100644 --- a/security/Makefile +++ b/security/Makefile @@ -948,7 +948,6 @@ SUBDIR += py-muacrypt SUBDIR += py-nassl SUBDIR += py-netbox-secrets - SUBDIR += py-netbox-secretstore SUBDIR += py-netmiko SUBDIR += py-noiseprotocol SUBDIR += py-notus-scanner @@ -1150,7 +1149,6 @@ SUBDIR += rubygem-openssl-ccm SUBDIR += rubygem-openssl-cmac SUBDIR += rubygem-openssl-signature_algorithm - SUBDIR += rubygem-openssl2 SUBDIR += rubygem-openvas-omp SUBDIR += rubygem-origami SUBDIR += rubygem-pbkdf2-ruby diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist index c5eb9f27096..bfc7b2f3bef 100644 --- a/security/gpgme-cpp/pkg-plist +++ b/security/gpgme-cpp/pkg-plist @@ -44,4 +44,4 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake lib/libgpgmepp.so lib/libgpgmepp.so.6 -lib/libgpgmepp.so.6.18.0 +lib/libgpgmepp.so.6.19.0 diff --git a/security/gpgme-qt/Makefile b/security/gpgme-qt/Makefile index 354fd2ccc31..961e7768dfb 100644 --- a/security/gpgme-qt/Makefile +++ b/security/gpgme-qt/Makefile @@ -1,12 +1,6 @@ -.if ${FLAVOR:U} == qt5 PORTREVISION= 0 -COMMENT= Gpgme Qt5 bindings -.else -PORTREVISION= 0 - -COMMENT= Gpgme Qt6 bindings -.endif +COMMENT= Gpgme ${QT_STR} bindings LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/security/gpgme-qt/pkg-plist b/security/gpgme-qt/pkg-plist index 4d404382a6c..b783f7213e8 100644 --- a/security/gpgme-qt/pkg-plist +++ b/security/gpgme-qt/pkg-plist @@ -2,4 +2,4 @@ lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%Config.cmake lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%ConfigVersion.cmake lib/libqgpgme%%qt_SUFFIX%%.so lib/libqgpgme%%qt_SUFFIX%%.so.15 -lib/libqgpgme%%qt_SUFFIX%%.so.15.3.0 +lib/libqgpgme%%qt_SUFFIX%%.so.15.4.0 diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile index d226f804761..2e8e03f9938 100644 --- a/security/p5-Authen-SASL/Makefile +++ b/security/p5-Authen-SASL/Makefile @@ -1,6 +1,6 @@ PORTNAME= Authen-SASL -PORTVERSION= 2.16 -PORTREVISION= 1 +PORTVERSION= 2.17 +DISTVERSIONSUFFIX= 00 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,17 +13,21 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Digest-HMAC>0:security/p5-Digest-HMAC +RUN_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC +TEST_DEPENDS= p5-Pod-Coverage-TrustPod>=0:devel/p5-Pod-Coverage-TrustPod \ + p5-Test-Pod>=0:devel/p5-Test-Pod \ + p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage + +USES= perl5 +USE_PERL5= configure + +CONFIGURE_ENV= AUTOMATED_TESTING=yes +NO_ARCH= yes OPTIONS_DEFINE= KERBEROS OPTIONS_DEFAULT=KERBEROS -NO_ARCH= yes -USES= perl5 -USE_PERL5= configure -CONFIGURE_ENV= AUTOMATED_TESTING=yes - -KERBEROS_BUILD_DEPENDS= p5-GSSAPI>0:security/p5-GSSAPI -KERBEROS_RUN_DEPENDS= p5-GSSAPI>0:security/p5-GSSAPI +KERBEROS_BUILD_DEPENDS= p5-GSSAPI>=0:security/p5-GSSAPI +KERBEROS_RUN_DEPENDS= p5-GSSAPI>=0:security/p5-GSSAPI .include diff --git a/security/p5-Authen-SASL/distinfo b/security/p5-Authen-SASL/distinfo index 20d139b49b8..dae97c71771 100644 --- a/security/p5-Authen-SASL/distinfo +++ b/security/p5-Authen-SASL/distinfo @@ -1,2 +1,3 @@ -SHA256 (Authen-SASL-2.16.tar.gz) = 6614fa7518f094f853741b63c73f3627168c5d3aca89b1d02b1016dc32854e09 -SIZE (Authen-SASL-2.16.tar.gz) = 45129 +TIMESTAMP = 1692212105 +SHA256 (Authen-SASL-2.1700.tar.gz) = b86d5a576b8d387aee24f39f47a54afd14bb66b09003db5065001f1de03a8ece +SIZE (Authen-SASL-2.1700.tar.gz) = 37488 diff --git a/security/p5-IO-Async-SSL/Makefile b/security/p5-IO-Async-SSL/Makefile index 73393283ae5..78e6c84823f 100644 --- a/security/p5-IO-Async-SSL/Makefile +++ b/security/p5-IO-Async-SSL/Makefile @@ -1,5 +1,5 @@ PORTNAME= IO-Async-SSL -PORTVERSION= 0.24 +PORTVERSION= 0.25 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/security/p5-IO-Async-SSL/distinfo b/security/p5-IO-Async-SSL/distinfo index 428cd0d7ee0..a15222a8267 100644 --- a/security/p5-IO-Async-SSL/distinfo +++ b/security/p5-IO-Async-SSL/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589682 -SHA256 (IO-Async-SSL-0.24.tar.gz) = 93c14fb27e282d4be7f0d274e4386a144b0373961b27b659353ea987906437cf -SIZE (IO-Async-SSL-0.24.tar.gz) = 29788 +TIMESTAMP = 1692640040 +SHA256 (IO-Async-SSL-0.25.tar.gz) = 4def485db1eff4e139b4b5912202c0fd61c3aed2cec35bd5ab8bf7bbd83f5a75 +SIZE (IO-Async-SSL-0.25.tar.gz) = 29937 diff --git a/security/py-libnacl/Makefile b/security/py-libnacl/Makefile index 218eae94f8e..6f19e9bee4e 100644 --- a/security/py-libnacl/Makefile +++ b/security/py-libnacl/Makefile @@ -1,5 +1,5 @@ PORTNAME= libnacl -PORTVERSION= 1.8.0 +PORTVERSION= 2.1.0 CATEGORIES= security python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,10 +12,11 @@ WWW= https://libnacl.readthedocs.io/en/latest/ \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=0:devel/py-poetry-core@${PY_FLAVOR} LIB_DEPENDS= libsodium.so:security/libsodium USES= python -USE_PYTHON= autoplist concurrent distutils unittest +USE_PYTHON= autoplist concurrent pep517 unittest NO_ARCH= yes TEST_ARGS= discover -s tests diff --git a/security/py-libnacl/distinfo b/security/py-libnacl/distinfo index c8b4b57530c..1ebe0180042 100644 --- a/security/py-libnacl/distinfo +++ b/security/py-libnacl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652471215 -SHA256 (libnacl-1.8.0.tar.gz) = f1037b85ca31fd8b02c43d66f78c2049bc58480e6a395dc9d27e6821b5fe185d -SIZE (libnacl-1.8.0.tar.gz) = 41331 +TIMESTAMP = 1692211813 +SHA256 (libnacl-2.1.0.tar.gz) = f3418da7df29e6d9b11fd7d990289d16397dc1020e4e35192e11aee826922860 +SIZE (libnacl-2.1.0.tar.gz) = 42189 diff --git a/security/py-netbox-secretstore/Makefile b/security/py-netbox-secretstore/Makefile deleted file mode 100644 index f0b68fe0ca3..00000000000 --- a/security/py-netbox-secretstore/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -PORTNAME= netbox-secretstore -DISTVERSION= 1.4.1 -PORTREVISION= 2 -CATEGORIES= security python -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= kai@FreeBSD.org -COMMENT= Secret store for NetBox -WWW= https://github.com/dansheps/netbox-secretstore - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -DEPRECATED= No longer maintained by upstream, not compatible with NetBox 3.5, please migrate to security/py-netbox-secrets -EXPIRATION_DATE= 2023-08-15 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} - -USES= python -USE_PYTHON= autoplist distutils - -NO_ARCH= yes - -SUB_FILES= pkg-message -SUB_LIST= PYTHON_VER=${PYTHON_VER} - -.include diff --git a/security/py-netbox-secretstore/distinfo b/security/py-netbox-secretstore/distinfo deleted file mode 100644 index f8cf5c30d52..00000000000 --- a/security/py-netbox-secretstore/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1676976590 -SHA256 (netbox-secretstore-1.4.1.tar.gz) = fb0a81cfddc38d1b3d9793ec7013fd97c7945d54c4b0989ac32f5a92920c4eaf -SIZE (netbox-secretstore-1.4.1.tar.gz) = 46819 diff --git a/security/py-netbox-secretstore/files/patch-netbox__secretstore_migrations_0006__alter__secret__custom__field__data__and__more.py b/security/py-netbox-secretstore/files/patch-netbox__secretstore_migrations_0006__alter__secret__custom__field__data__and__more.py deleted file mode 100644 index 4da31820f74..00000000000 --- a/security/py-netbox-secretstore/files/patch-netbox__secretstore_migrations_0006__alter__secret__custom__field__data__and__more.py +++ /dev/null @@ -1,60 +0,0 @@ -From: Daniel Sheppard -Date: Tue, 24 Jan 2023 13:51:57 -0600 -Subject: [PATCH] Update for missing migrations - -Obtained from: - -https://github.com/DanSheps/netbox-secretstore/commit/9c3f69e5af6f5e8d6af11f5c8ea41433ef51145c - -From: Abhimanyu Saharan -Date: Wed, 12 Apr 2023 21:01:43 +0530 -Subject: [PATCH] fix migrations - -Obtained from: - -https://github.com/Onemind-Services-LLC/netbox-secretstore/commit/248330409413f1858daf13902fd1b409053fd846.patch - ---- netbox_secretstore/migrations/0006_alter_secret_custom_field_data_and_more.py.orig 2023-05-08 17:51:21 UTC -+++ netbox_secretstore/migrations/0006_alter_secret_custom_field_data_and_more.py -@@ -0,0 +1,41 @@ -+# Generated by Django 4.1.7 on 2023-04-12 15:31 -+ -+from django.conf import settings -+from django.db import migrations, models -+import django.db.models.deletion -+import utilities.json -+ -+ -+class Migration(migrations.Migration): -+ -+ dependencies = [ -+ migrations.swappable_dependency(settings.AUTH_USER_MODEL), -+ ("netbox_secretstore", "0005_alter_secret_created_alter_secret_id_and_more"), -+ ] -+ -+ operations = [ -+ migrations.AlterField( -+ model_name="secret", -+ name="custom_field_data", -+ field=models.JSONField( -+ blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder -+ ), -+ ), -+ migrations.AlterField( -+ model_name="secretrole", -+ name="custom_field_data", -+ field=models.JSONField( -+ blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder -+ ), -+ ), -+ migrations.AlterField( -+ model_name="userkey", -+ name="user", -+ field=models.OneToOneField( -+ editable=False, -+ on_delete=django.db.models.deletion.CASCADE, -+ related_name="user_key_secretstore", -+ to=settings.AUTH_USER_MODEL, -+ ), -+ ), -+ ] diff --git a/security/py-netbox-secretstore/files/patch-netbox__secretstore_models_secrets.py b/security/py-netbox-secretstore/files/patch-netbox__secretstore_models_secrets.py deleted file mode 100644 index af682f8b802..00000000000 --- a/security/py-netbox-secretstore/files/patch-netbox__secretstore_models_secrets.py +++ /dev/null @@ -1,51 +0,0 @@ -From: Abhimanyu Saharan -Date: Wed, 12 Apr 2023 21:01:43 +0530 -Subject: [PATCH] fix migrations - -Obtained from: - -https://github.com/Onemind-Services-LLC/netbox-secretstore/commit/248330409413f1858daf13902fd1b409053fd846.patch - ---- netbox_secretstore/models/secrets.py.orig 2022-12-31 01:50:00 UTC -+++ netbox_secretstore/models/secrets.py -@@ -21,6 +21,7 @@ from netbox_secretstore.utils import encrypt_master_ke - from netbox_secretstore.hashers import SecretValidationHasher - from netbox_secretstore.querysets import UserKeyQuerySet - from netbox_secretstore.utils import encrypt_master_key, decrypt_master_key, generate_random_key -+from taggit.managers import TaggableManager - - - __all__ = ( -@@ -47,7 +48,7 @@ class UserKey(models.Model): - user = models.OneToOneField( - to=User, - on_delete=models.CASCADE, -- related_name='user_key', -+ related_name='user_key_secretstore', - editable=False - ) - public_key = models.TextField( -@@ -256,6 +257,11 @@ class SecretRole(OrganizationalModel): - blank=True, - ) - -+ tags = TaggableManager( -+ through='extras.TaggedItem', -+ related_name='netbox_secretstore_secretroles' -+ ) -+ - objects = RestrictedQuerySet.as_manager() - - csv_headers = ['name', 'slug', 'description'] -@@ -312,6 +318,11 @@ class Secret(NetBoxModel): - hash = models.CharField( - max_length=128, - editable=False -+ ) -+ -+ tags = TaggableManager( -+ through='extras.TaggedItem', -+ related_name='netbox_secretstore_secret' - ) - - objects = RestrictedQuerySet.as_manager() diff --git a/security/py-netbox-secretstore/files/patch-netbox__secretstore_views.py b/security/py-netbox-secretstore/files/patch-netbox__secretstore_views.py deleted file mode 100644 index b9f12b55e32..00000000000 --- a/security/py-netbox-secretstore/files/patch-netbox__secretstore_views.py +++ /dev/null @@ -1,33 +0,0 @@ -From: Daniel Sheppard -Date: Tue, 11 Apr 2023 08:34:04 -0500 -Subject: [PATCH] #12087 - Fix Bulk Edit update when M2M operations are present. - -Obtained from: - -https://github.com/DanSheps/netbox-secretstore/commit/7ad1ba639aa077c45bcac05dc025132c6bd9139e.patch - ---- netbox_secretstore/views.py.orig 2022-12-31 01:50:00 UTC -+++ netbox_secretstore/views.py -@@ -156,15 +156,15 @@ class SecretEditView(ObjectEditView): - secret.plaintext = str(form.cleaned_data['plaintext']) - secret.encrypt(master_key) - -- secret.save() -- form.save_m2m() -+ secret.save() -+ form.save_m2m() - -- msg = '{} secret'.format('Created' if not form.instance.pk else 'Modified') -- logger.info(f"{msg} {secret} (PK: {secret.pk})") -- msg = f'{msg} {escape(secret)}' -- messages.success(request, mark_safe(msg)) -+ msg = '{} secret'.format('Created' if not form.instance.pk else 'Modified') -+ logger.info(f"{msg} {secret} (PK: {secret.pk})") -+ msg = f'{msg} {escape(secret)}' -+ messages.success(request, mark_safe(msg)) - -- return redirect(self.get_return_url(request, secret)) -+ return redirect(self.get_return_url(request, secret)) - - else: - logger.debug("Form validation failed") diff --git a/security/py-netbox-secretstore/files/pkg-message.in b/security/py-netbox-secretstore/files/pkg-message.in deleted file mode 100644 index 5e2a87dc3ef..00000000000 --- a/security/py-netbox-secretstore/files/pkg-message.in +++ /dev/null @@ -1,110 +0,0 @@ -[ -{ type: install - message: < output.sql - - 6. Run the output of the previous command in the database, e.g.: - - # psql -d NETBOXDB < output.sql - - 7. You can now remove netbox-secretstore from the application by removing it - from the PLUGINS line in the netbox configuration: - - PLUGINS = ['netbox_secrets'] - - 8. Collect static files of the netbox-secrets plugin: - - # python%%PYTHON_VER%% manage.py collectstatic --no-input - - 9. Restart WSGI/httpd environment (supervisord/apache/nginx/etc.). - -10. You may have clean up your database of the old tables manually, e.g.: - - DROP TABLE netbox_secretstore_secret; - DROP TABLE netbox_secretstore_secretrole; - DROP TABLE netbox_secretstore_sessionkey; - DROP TABLE netbox_secretstore_userkey; - -11. Uninstall security/py-netbox-secretstore. -EOD -} -] diff --git a/security/py-netbox-secretstore/pkg-descr b/security/py-netbox-secretstore/pkg-descr deleted file mode 100644 index 5ce4d256273..00000000000 --- a/security/py-netbox-secretstore/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -With NetBox 3.0 the secrets are no longer managed by NetBox itself. This is -the continuation of the secrets app. diff --git a/security/rubygem-airbrussh/Makefile b/security/rubygem-airbrussh/Makefile index 6bac75f4279..dcd8fea3baa 100644 --- a/security/rubygem-airbrussh/Makefile +++ b/security/rubygem-airbrussh/Makefile @@ -1,5 +1,5 @@ PORTNAME= airbrussh -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 CATEGORIES= security rubygems MASTER_SITES= RG diff --git a/security/rubygem-airbrussh/distinfo b/security/rubygem-airbrussh/distinfo index 1c4af816c87..38e03ecbb3e 100644 --- a/security/rubygem-airbrussh/distinfo +++ b/security/rubygem-airbrussh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659161323 -SHA256 (rubygem/airbrussh-1.4.1.gem) = 1bcb405c6489254a9bcaa8a91c83f58731d73795396f6df93547b569fdf0a574 -SIZE (rubygem/airbrussh-1.4.1.gem) = 20992 +TIMESTAMP = 1692211993 +SHA256 (rubygem/airbrussh-1.4.2.gem) = e04f3a63a14f0bdf5dfb508522b52cc7ab646cd473623c91d70ac122e5b0f8be +SIZE (rubygem/airbrussh-1.4.2.gem) = 21504 diff --git a/security/rubygem-gpgme/Makefile b/security/rubygem-gpgme/Makefile index 167b1344aee..503487a6203 100644 --- a/security/rubygem-gpgme/Makefile +++ b/security/rubygem-gpgme/Makefile @@ -1,5 +1,5 @@ PORTNAME= gpgme -PORTVERSION= 2.0.22 +PORTVERSION= 2.0.23 CATEGORIES= security rubygems MASTER_SITES= RG @@ -17,14 +17,9 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgme.so:security/gpgme USES= gem pkgconfig shebangfix -SHEBANG_FILES= test/pinentry CONFIGURE_ARGS= --use-system-libraries -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" -.endif +SHEBANG_FILES= test/pinentry .include diff --git a/security/rubygem-gpgme/distinfo b/security/rubygem-gpgme/distinfo index 6248f37ea01..48a3bd5dfe9 100644 --- a/security/rubygem-gpgme/distinfo +++ b/security/rubygem-gpgme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590552 -SHA256 (rubygem/gpgme-2.0.22.gem) = 7c6904952afdd0bf2c7c3ed6de98a5143f86c6b7390dbcd9d7012bddfa3ec862 -SIZE (rubygem/gpgme-2.0.22.gem) = 3418112 +TIMESTAMP = 1692211995 +SHA256 (rubygem/gpgme-2.0.23.gem) = c87bbafdb8719da7c58ebcac08297aa1fb227022ac6cd2972829ba68adc91c04 +SIZE (rubygem/gpgme-2.0.23.gem) = 3496960 diff --git a/security/rubygem-openssl2/Makefile b/security/rubygem-openssl2/Makefile deleted file mode 100644 index bec19394874..00000000000 --- a/security/rubygem-openssl2/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -PORTNAME= openssl -PORTVERSION= 2.2.3 -CATEGORIES= security rubygems -MASTER_SITES= RG -PKGNAMESUFFIX= 2 - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Wrap the OpenSSL library -WWW= https://github.com/ruby/openssl - -LICENSE= BSD2CLAUSE RUBY -LICENSE_COMB= dual -LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL -LICENSE_FILE_RUBY= ${WRKSRC}/LICENSE.txt - -RUN_DEPENDS= rubygem-ipaddr>=0:net/rubygem-ipaddr - -USES= cpe gem ssl - -CPE_VENDOR= ruby-lang - -PORTSCOUT= limit:^2\. - -.include - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -IGNORE_SSL= base openssl30 openssl31 -IGNORE_SSL_REASON= Missing upstream support for OpenSSL 3.0.0 and later in this version -.endif - -.include diff --git a/security/rubygem-openssl2/distinfo b/security/rubygem-openssl2/distinfo deleted file mode 100644 index 42f725d6de7..00000000000 --- a/security/rubygem-openssl2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1674590556 -SHA256 (rubygem/openssl-2.2.3.gem) = ce59d8a78b8f55d7d0cc01fc3d0c27a70a93e5283b617ad96b04882bfeb7a966 -SIZE (rubygem/openssl-2.2.3.gem) = 192512 diff --git a/security/rubygem-openssl2/pkg-descr b/security/rubygem-openssl2/pkg-descr deleted file mode 100644 index 671d7bfbe99..00000000000 --- a/security/rubygem-openssl2/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -OpenSSL provides SSL, TLS and general purpose cryptography. This gem wraps the -OpenSSL library. diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile index b3269049e61..cca720607ec 100644 --- a/security/tailscale/Makefile +++ b/security/tailscale/Makefile @@ -1,5 +1,5 @@ PORTNAME= tailscale -PORTVERSION= 1.48.0 +PORTVERSION= 1.48.1 DISTVERSIONPREFIX= v CATEGORIES= security net-vpn diff --git a/security/tailscale/distinfo b/security/tailscale/distinfo index d0be2666f63..9f0e2df0875 100644 --- a/security/tailscale/distinfo +++ b/security/tailscale/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1692204208 -SHA256 (go/security_tailscale/tailscale-v1.48.0/v1.48.0.mod) = dd2e229e2fb0a210e19600f5ae627478e2dd08a4161f07f12f62019551183632 -SIZE (go/security_tailscale/tailscale-v1.48.0/v1.48.0.mod) = 18027 -SHA256 (go/security_tailscale/tailscale-v1.48.0/v1.48.0.zip) = 591331a5038b3353a6aed2f00b7b6c255a0104d42c187b3fe6f1b57b7034a7a4 -SIZE (go/security_tailscale/tailscale-v1.48.0/v1.48.0.zip) = 2477369 +TIMESTAMP = 1692651151 +SHA256 (go/security_tailscale/tailscale-v1.48.1/v1.48.1.mod) = dd2e229e2fb0a210e19600f5ae627478e2dd08a4161f07f12f62019551183632 +SIZE (go/security_tailscale/tailscale-v1.48.1/v1.48.1.mod) = 18027 +SHA256 (go/security_tailscale/tailscale-v1.48.1/v1.48.1.zip) = db1c5aff9c4050df64057bbb3941e1eac2990edc188b357f585463105397f63e +SIZE (go/security_tailscale/tailscale-v1.48.1/v1.48.1.zip) = 2480150 diff --git a/security/zeek/Makefile b/security/zeek/Makefile index b1226c204d2..650440d6e98 100644 --- a/security/zeek/Makefile +++ b/security/zeek/Makefile @@ -1,5 +1,5 @@ PORTNAME= zeek -DISTVERSION= 5.0.9 +DISTVERSION= 6.0.0 CATEGORIES= security MASTER_SITES= https://download.zeek.org/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -20,7 +20,7 @@ LIB_DEPENDS= libcares.so:dns/c-ares RUN_DEPENDS= c-ares>=1.18.1:dns/c-ares USES= bison cmake compiler:c++17-lang cpe gettext-runtime perl5 \ - python shebangfix ssl + python:3.7+ shebangfix ssl USE_LDCONFIG= yes @@ -39,6 +39,9 @@ CMAKE_ON= BROKER_DISABLE_DOC_EXAMPLES BROKER_DISABLE_TESTS \ BUILD_SHARED_LIBS BUILD_STATIC_BROKER INSTALL_AUX_TOOLS CMAKE_ARGS= -DCARES_ROOT_DIR:PATH=${PREFIX} \ -DCMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" \ + -DINSTALL_BTEST:BOOL=OFF \ + -DINSTALL_BTEST_PCAPS:BOOL=OFF \ + -DINSTALL_ZKG:BOOL=OFF \ -DPY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/zeekctl \ -DZEEK_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \ -DZEEK_MAN_INSTALL_PATH=${MANPREFIX}/man \ @@ -47,21 +50,19 @@ CMAKE_ARGS= -DCARES_ROOT_DIR:PATH=${PREFIX} \ ZEEKUSER?= zeek ZEEKGROUP?= zeek -PLIST_SUB+= ARCH=${UNAME_M} \ - LCASE_OPSYS=${OPSYS:tl} \ - ZEEKGROUP=${ZEEKGROUP} \ +PLIST_SUB+= ZEEKGROUP=${ZEEKGROUP} \ ZEEKUSER=${ZEEKUSER} USERS= ${ZEEKUSER} GROUPS= ${ZEEKGROUP} -OPTIONS_DEFINE= GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP PERFTOOLS SPICY ZEEKCTL \ +OPTIONS_DEFINE= GEOIP2 IPSUMDUMP LBL_CF LBL_HF PERFTOOLS SPICY ZEEKCTL \ ZKG OPTIONS_SINGLE= BUILD_TYPE OPTIONS_SINGLE_BUILD_TYPE= DEBUG MINSIZEREL RELEASE RELWITHDEBINFO -OPTIONS_DEFAULT= GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP RELEASE ZEEKCTL \ +OPTIONS_DEFAULT= GEOIP2 IPSUMDUMP LBL_CF LBL_HF RELEASE ZEEKCTL \ ZKG OPTIONS_DEFAULT_aarch64= SPICY OPTIONS_DEFAULT_amd64= SPICY @@ -76,7 +77,6 @@ IPSUMDUMP_DESC= Enables traffic summaries LBL_CF_DESC= Unix time to formated time/date filter support LBL_HF_DESC= Address to hostname filter support MINSIZEREL_DESC= Optimizations on, debug symbols/flags off -NETMAP_DESC= Native Netmap Packet IOSource for Zeek PERFTOOLS_DESC= Use Perftools to improve memory & CPU usage RELEASE_DESC= Optimizations on, debug symbols/flags off RELWITHDEBINFO_DESC= Optimizations/debug symbols on, debug flags off @@ -91,8 +91,6 @@ IPSUMDUMP_BUILD_DEPENDS= ipsumdump:net/ipsumdump IPSUMDUMP_RUN_DEPENDS= ipsumdump:net/ipsumdump LBL_CF_RUN_DEPENDS= ${LOCALBASE}/bin/cf:sysutils/lbl-cf LBL_HF_RUN_DEPENDS= ${LOCALBASE}/bin/hf:sysutils/lbl-hf -NETMAP_GH_TUPLE= zeek:zeek-netmap:v2.0.0:zeek_netmap -NETMAP_USE= GITHUB=nodefault PERFTOOLS_BUILD_DEPENDS= ${LOCALBASE}/bin/perftools-pprof:devel/google-perftools PERFTOOLS_CMAKE_BOOL= ENABLE_PERFTOOLS PERFTOOLS_RUN_DEPENDS= ${LOCALBASE}/bin/perftools-pprof:devel/google-perftools @@ -124,10 +122,6 @@ USE_RC_SUBR= zeek post-extract: @${RM} -rf ${WRKSRC}/auxil/c-ares -post-patch: - ${REINPLACE_CMD} -e '\|/usr/local/|s|$$| ${STAGEDIR}${PREFIX}/|' \ - ${WRKSRC_zeek_netmap}/cmake/FindNetmap.cmake - post-install-ZEEKCTL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/logs ${MKDIR} ${STAGEDIR}${PREFIX}/spool/tmp @@ -149,32 +143,8 @@ post-install: post-install-SPICY-on: @${RM} -rf ${STAGEDIR}${PREFIX}/include/hilti/rt/3rdparty/SafeInt/Archive @${RM} -rf ${STAGEDIR}${PREFIX}/include/hilti/rt/3rdparty/SafeInt/Test - @${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/bin - @${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/cmake - @${RM} -rf ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/include - @${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/spicy - @${RM} -rf ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/src - @${RM} -rf ${STAGEDIR}${PREFIX}/include/zeek/builtin-plugins/spicy-plugin/tests - @${RMDIR} ${STAGEDIR}${PREFIX}/include/zeek/script_opt/CPP/maint - @${RMDIR} ${STAGEDIR}${PREFIX}/lib/zeek-spicy/modules pre-install-ZEEKCTL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d -post-install-NETMAP-on: - ${MKDIR} ${WRKDIR}/zeek-bin - ${CP} ${STAGEDIR}${PREFIX}/bin/zeek-config ${WRKDIR}/zeek-bin - ${REINPLACE_CMD} -e 's|${PREFIX}|${STAGEDIR}${PREFIX}|g' \ - ${WRKDIR}/zeek-bin/zeek-config - cd ${WRKSRC_zeek_netmap} && ${SETENV} PATH=${WRKDIR}/zeek-bin:${PATH} \ - ./configure --with-netmap=/usr \ - --install-root=${STAGEDIR}${PREFIX}/lib/zeek/plugins - cd ${WRKSRC_zeek_netmap}/build && make && make install - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/zeek/plugins/Zeek_Netmap/lib/Zeek-Netmap.freebsd-${UNAME_M}.so - -.include - -# Would like to use ARCH (uname -p) but it's not always correct (e.g. arm64) -UNAME_M!= ${UNAME} -m - -.include +.include diff --git a/security/zeek/distinfo b/security/zeek/distinfo index 22ff3939cdf..8f96203cdbf 100644 --- a/security/zeek/distinfo +++ b/security/zeek/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1684516872 -SHA256 (zeek-5.0.9.tar.gz) = 2d6247c667c1838d0efd8d860744baadde4b2e8721734dea250e37147899cfcd -SIZE (zeek-5.0.9.tar.gz) = 42904019 -SHA256 (zeek-zeek-netmap-v2.0.0_GH0.tar.gz) = d37a69babfbb62a51a2413d6b83ae792ce1e7f1ccb1d51bd6b209a10fe5c4d75 -SIZE (zeek-zeek-netmap-v2.0.0_GH0.tar.gz) = 9100 +TIMESTAMP = 1692569614 +SHA256 (zeek-6.0.0.tar.gz) = cc37587389ec96a2437c48851a6ef8300b19a39d9e6a1c9066570c25b070d0e2 +SIZE (zeek-6.0.0.tar.gz) = 60086607 diff --git a/security/zeek/files/patch-auxil_spicy_CMakeLists.txt b/security/zeek/files/patch-auxil_spicy_CMakeLists.txt deleted file mode 100644 index 6aee2809e63..00000000000 --- a/security/zeek/files/patch-auxil_spicy_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- auxil/spicy/CMakeLists.txt.orig 2022-07-09 17:28:05 UTC -+++ auxil/spicy/CMakeLists.txt -@@ -36,3 +36,19 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-vla") - set(HILTI_DEV_PRECOMPILE_HEADERS OFF) - - add_subdirectory(spicy) -+ -+# Disable Spicy unit test targets. -+# -+# Spicy builds its unit tests as part of `ALL`. They are usually not only -+# uninteresting for us but might cause problems. Since any configuration -+# we do for our unit tests happens through global C++ compiler flags, they -+# would get inherited directly by Spicy which can cause issues, e.g., we set -+# `-DDOCTEST_CONFIG_DISABLE` if `ENABLE_ZEEK_UNIT_TESTS` is false, but Spicy -+# unit test do not anticipate this define being set. -+set_target_properties( -+ hilti-rt-tests -+ hilti-rt-configuration-tests -+ spicy-rt-tests -+ hilti-toolchain-tests -+ spicy-toolchain-tests -+ PROPERTIES EXCLUDE_FROM_ALL TRUE) diff --git a/security/zeek/files/patch-src_input_readers_raw_Raw.cc b/security/zeek/files/patch-src_input_readers_raw_Raw.cc deleted file mode 100644 index 7ed81f81640..00000000000 --- a/security/zeek/files/patch-src_input_readers_raw_Raw.cc +++ /dev/null @@ -1,146 +0,0 @@ ---- src/input/readers/raw/Raw.cc.orig 2022-07-05 19:35:27 UTC -+++ src/input/readers/raw/Raw.cc -@@ -2,15 +2,15 @@ - - #include "zeek/input/readers/raw/Raw.h" - --#include - #include --#include --#include --#include - #include - #include - #include - #include -+#include -+#include -+#include -+#include - - #include "zeek/input/readers/raw/Plugin.h" - #include "zeek/input/readers/raw/raw.bif.h" -@@ -36,6 +36,7 @@ Raw::Raw(ReaderFrontend* frontend) - firstrun = true; - mtime = 0; - ino = 0; -+ dev = 0; - forcekill = false; - offset = 0; - separator.assign((const char*)BifConst::InputRaw::record_separator->Bytes(), -@@ -282,10 +283,27 @@ bool Raw::OpenInput() - file = std::unique_ptr(fopen(fname.c_str(), "r"), fclose); - if ( ! file ) - { -+ if ( Info().mode == MODE_STREAM ) -+ // Wait for file to appear -+ return true; -+ - Error(Fmt("Init: cannot open %s", fname.c_str())); - return false; - } - -+ if ( Info().mode == MODE_STREAM ) -+ { -+ struct stat sb; -+ if ( fstat(fileno(file.get()), &sb) == -1 ) -+ { -+ // This is unlikely to fail -+ Error(Fmt("Could not get fstat for %s", fname.c_str())); -+ return false; -+ } -+ ino = sb.st_ino; -+ dev = sb.st_dev; -+ } -+ - if ( ! SetFDFlags(fileno(file.get()), F_SETFD, FD_CLOEXEC) ) - Warning(Fmt("Init: cannot set close-on-exec for %s", fname.c_str())); - } -@@ -346,6 +364,7 @@ bool Raw::DoInit(const ReaderInfo& info, int num_field - fname = info.source; - mtime = 0; - ino = 0; -+ dev = 0; - execute = false; - firstrun = true; - int want_fields = 1; -@@ -574,25 +593,61 @@ bool Raw::DoUpdate() - - mtime = sb.st_mtime; - ino = sb.st_ino; -+ dev = sb.st_dev; - // file changed. reread. - // - // fallthrough - } - - case MODE_MANUAL: -- case MODE_STREAM: -- if ( Info().mode == MODE_STREAM && file ) -- { -- clearerr(file.get()); // remove end of file evil bits -- break; -- } -- - CloseInput(); - if ( ! OpenInput() ) - return false; - - break; - -+ case MODE_STREAM: -+ // Clear possible EOF condition -+ if ( file ) -+ clearerr(file.get()); -+ -+ // Done if reading from a pipe -+ if ( execute ) -+ break; -+ -+ // Check if the file has changed -+ struct stat sb; -+ if ( stat(fname.c_str(), &sb) == -1 ) -+ // File was removed -+ break; -+ -+ // Is it the same file? -+ if ( file && sb.st_ino == ino && sb.st_dev == dev ) -+ break; -+ -+ // File was replaced -+ FILE* tfile; -+ tfile = fopen(fname.c_str(), "r"); -+ if ( ! tfile ) -+ break; -+ -+ // Stat newly opened file -+ if ( fstat(fileno(tfile), &sb) == -1 ) -+ { -+ // This is unlikely to fail -+ Error(Fmt("Could not fstat %s", fname.c_str())); -+ fclose(tfile); -+ return false; -+ } -+ if ( file ) -+ file.reset(nullptr); -+ file = std::unique_ptr(tfile, fclose); -+ ino = sb.st_ino; -+ dev = sb.st_dev; -+ offset = 0; -+ bufpos = 0; -+ break; -+ - default: - assert(false); - } -@@ -604,6 +659,10 @@ bool Raw::DoUpdate() - { - if ( stdin_towrite > 0 ) - WriteToStdin(); -+ -+ if ( ! file && Info().mode == MODE_STREAM ) -+ // Wait for file to appear -+ break; - - int64_t length = GetLine(file.get()); - // printf("Read %lld bytes\n", length); diff --git a/security/zeek/files/patch-src_input_readers_raw_Raw.h b/security/zeek/files/patch-src_input_readers_raw_Raw.h deleted file mode 100644 index a4fdd306443..00000000000 --- a/security/zeek/files/patch-src_input_readers_raw_Raw.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/input/readers/raw/Raw.h.orig 2022-07-05 21:28:35 UTC -+++ src/input/readers/raw/Raw.h -@@ -55,6 +55,7 @@ class Raw : public ReaderBackend (private) - bool firstrun; - time_t mtime; - ino_t ino; -+ dev_t dev; - - // options set from the script-level. - std::string separator; diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist index bfae01ab3d1..2077fe07d67 100644 --- a/security/zeek/pkg-plist +++ b/security/zeek/pkg-plist @@ -4,10 +4,6 @@ %%ZEEKCTL%%@postexec chown -R %%ZEEKUSER%%:%%ZEEKGROUP%% %D/spool/installed-scripts-do-not-touch bin/bifcl bin/binpac -bin/bro -bin/bro-config -bin/bro-cut -bin/broctl %%ZEEKCTL%%bin/capstats bin/gen-zam %%SPICY%%bin/hilti-config @@ -22,9 +18,10 @@ bin/paraglob-test %%SPICY%%bin/spicyz %%ZEEKCTL%%bin/trace-summary bin/zeek +bin/zeek-archiver +bin/zeek-client bin/zeek-config bin/zeek-cut -bin/zeek-wrapper %%ZEEKCTL%%bin/zeekctl %%ZEEKCTL%%@sample etc/networks.cfg.sample %%ZEEKCTL%%@sample etc/node.cfg.sample @@ -53,12 +50,10 @@ include/broker/detail/abstract_backend.hh include/broker/detail/algorithms.hh include/broker/detail/appliers.hh include/broker/detail/assert.hh -include/broker/detail/blob.hh include/broker/detail/comparable.hh include/broker/detail/die.hh include/broker/detail/filesystem.hh include/broker/detail/flare.hh -include/broker/detail/has_network_info.hh include/broker/detail/hash.hh include/broker/detail/inspect_enum.hh include/broker/detail/make_backend.hh @@ -77,7 +72,6 @@ include/broker/detail/sink_driver.hh include/broker/detail/source_driver.hh include/broker/detail/sqlite_backend.hh include/broker/detail/store_state.hh -include/broker/detail/subscription.hh include/broker/detail/type_traits.hh include/broker/domain_options.hh include/broker/endpoint.hh @@ -178,6 +172,7 @@ include/broker/zeek.hh %%SPICY%%include/hilti/ast/declarations/type.h %%SPICY%%include/hilti/ast/detail/operator-registry.h %%SPICY%%include/hilti/ast/detail/visitor.h +%%SPICY%%include/hilti/ast/doc-string.h %%SPICY%%include/hilti/ast/expression.h %%SPICY%%include/hilti/ast/expressions/all.h %%SPICY%%include/hilti/ast/expressions/assign.h @@ -370,6 +365,7 @@ include/broker/zeek.hh %%SPICY%%include/hilti/rt/doctest.h %%SPICY%%include/hilti/rt/exception.h %%SPICY%%include/hilti/rt/extension-points.h +%%SPICY%%include/hilti/rt/fiber-check-stack.h %%SPICY%%include/hilti/rt/fiber.h %%SPICY%%include/hilti/rt/filesystem.h %%SPICY%%include/hilti/rt/fmt.h @@ -385,8 +381,11 @@ include/broker/zeek.hh %%SPICY%%include/hilti/rt/library.h %%SPICY%%include/hilti/rt/linker.h %%SPICY%%include/hilti/rt/logging.h +%%SPICY%%include/hilti/rt/profiler-state.h +%%SPICY%%include/hilti/rt/profiler.h %%SPICY%%include/hilti/rt/result.h %%SPICY%%include/hilti/rt/safe-int.h +%%SPICY%%include/hilti/rt/safe-math.h %%SPICY%%include/hilti/rt/test/utils.h %%SPICY%%include/hilti/rt/threading.h %%SPICY%%include/hilti/rt/type-info.h @@ -479,6 +478,7 @@ include/paraglob/serializer.h %%SPICY%%include/spicy/compiler/detail/codegen/productions/look-ahead.h %%SPICY%%include/spicy/compiler/detail/codegen/productions/resolved.h %%SPICY%%include/spicy/compiler/detail/codegen/productions/sequence.h +%%SPICY%%include/spicy/compiler/detail/codegen/productions/skip.h %%SPICY%%include/spicy/compiler/detail/codegen/productions/switch.h %%SPICY%%include/spicy/compiler/detail/codegen/productions/type-literal.h %%SPICY%%include/spicy/compiler/detail/codegen/productions/unit.h @@ -494,6 +494,7 @@ include/paraglob/serializer.h %%SPICY%%include/spicy/global.h %%SPICY%%include/spicy/rt/autogen/config.h %%SPICY%%include/spicy/rt/base64.h +%%SPICY%%include/spicy/rt/configuration.h %%SPICY%%include/spicy/rt/debug.h %%SPICY%%include/spicy/rt/driver.h %%SPICY%%include/spicy/rt/filter.h @@ -517,8 +518,13 @@ include/zeek/3rdparty/ConvertUTF.h include/zeek/3rdparty/bro_inet_ntop.h include/zeek/3rdparty/bsd-getopt-long.h include/zeek/3rdparty/doctest.h +include/zeek/3rdparty/ghc/filesystem.hpp +include/zeek/3rdparty/ghc/fs_fwd.hpp +include/zeek/3rdparty/ghc/fs_impl.hpp +include/zeek/3rdparty/ghc/fs_std.hpp +include/zeek/3rdparty/ghc/fs_std_fwd.hpp +include/zeek/3rdparty/ghc/fs_std_impl.hpp include/zeek/3rdparty/modp_numtoa.h -include/zeek/3rdparty/nb_dns.h include/zeek/3rdparty/patricia.h include/zeek/3rdparty/rapidjson/include/rapidjson/allocators.h include/zeek/3rdparty/rapidjson/include/rapidjson/cursorstreamwrapper.h @@ -560,6 +566,7 @@ include/zeek/3rdparty/rapidjson/include/rapidjson/uri.h include/zeek/3rdparty/rapidjson/include/rapidjson/writer.h include/zeek/3rdparty/setsignal.h include/zeek/3rdparty/sqlite3.h +include/zeek/3rdparty/zeek_inet_ntop.h include/zeek/Anon.h include/zeek/Attr.h include/zeek/Base64.h @@ -612,7 +619,6 @@ include/zeek/Pipe.h include/zeek/PolicyFile.h include/zeek/PrefixTable.h include/zeek/PriorityQueue.h -include/zeek/Queue.h include/zeek/RE.h include/zeek/RandTest.h include/zeek/Reassem.h @@ -626,8 +632,8 @@ include/zeek/ScannedFile.h include/zeek/Scope.h include/zeek/ScriptCoverageManager.h include/zeek/ScriptProfile.h +include/zeek/ScriptValidation.h include/zeek/SerializationFormat.h -include/zeek/Sessions.h include/zeek/SmithWaterman.h include/zeek/Span.h include/zeek/Stats.h @@ -690,8 +696,7 @@ include/zeek/analyzer/protocol/dns/DNS.h include/zeek/analyzer/protocol/dns/events.bif.h include/zeek/analyzer/protocol/file/File.h include/zeek/analyzer/protocol/file/events.bif.h -include/zeek/analyzer/protocol/finger/Finger.h -include/zeek/analyzer/protocol/finger/events.bif.h +include/zeek/analyzer/protocol/finger/legacy/Finger.h include/zeek/analyzer/protocol/ftp/FTP.h include/zeek/analyzer/protocol/ftp/events.bif.h include/zeek/analyzer/protocol/ftp/functions.bif.h @@ -705,7 +710,6 @@ include/zeek/analyzer/protocol/gssapi/gssapi.pac include/zeek/analyzer/protocol/http/HTTP.h include/zeek/analyzer/protocol/http/events.bif.h include/zeek/analyzer/protocol/http/functions.bif.h -include/zeek/analyzer/protocol/icmp/ICMP.h include/zeek/analyzer/protocol/ident/Ident.h include/zeek/analyzer/protocol/ident/events.bif.h include/zeek/analyzer/protocol/imap/IMAP.h @@ -937,11 +941,10 @@ include/zeek/analyzer/protocol/ssl/tls-handshake-protocol.pac include/zeek/analyzer/protocol/ssl/tls-handshake-signed_certificate_timestamp.pac include/zeek/analyzer/protocol/ssl/tls-handshake.pac include/zeek/analyzer/protocol/ssl/types.bif.h -include/zeek/analyzer/protocol/syslog/Syslog.h -include/zeek/analyzer/protocol/syslog/events.bif.h -include/zeek/analyzer/protocol/syslog/syslog-analyzer.pac -include/zeek/analyzer/protocol/syslog/syslog-protocol.pac -include/zeek/analyzer/protocol/syslog/syslog.pac +include/zeek/analyzer/protocol/syslog/legacy/Syslog.h +include/zeek/analyzer/protocol/syslog/legacy/syslog-analyzer.pac +include/zeek/analyzer/protocol/syslog/legacy/syslog-protocol.pac +include/zeek/analyzer/protocol/syslog/legacy/syslog.pac include/zeek/analyzer/protocol/tcp/ContentLine.h include/zeek/analyzer/protocol/tcp/TCP.h include/zeek/analyzer/protocol/tcp/TCP_Endpoint.h @@ -950,7 +953,6 @@ include/zeek/analyzer/protocol/tcp/TCP_Reassembler.h include/zeek/analyzer/protocol/tcp/events.bif.h include/zeek/analyzer/protocol/tcp/functions.bif.h include/zeek/analyzer/protocol/tcp/types.bif.h -include/zeek/analyzer/protocol/udp/UDP.h include/zeek/analyzer/protocol/xmpp/XMPP.h include/zeek/analyzer/protocol/xmpp/events.bif.h include/zeek/analyzer/protocol/xmpp/xmpp-analyzer.pac @@ -968,10 +970,8 @@ include/zeek/broker/comm.bif.h include/zeek/broker/data.bif.h include/zeek/broker/messaging.bif.h include/zeek/broker/store.bif.h -%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/consts.bif.h -%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/events.bif.h -%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/functions.bif.h -%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/lib/zeek-spicy +include/zeek/communityid.bif.func_h +include/zeek/communityid.bif.netvar_h include/zeek/const.bif.func_h include/zeek/const.bif.netvar_h include/zeek/digest.h @@ -1000,12 +1000,6 @@ include/zeek/file_analysis/analyzer/pe/pe-file-idata.pac include/zeek/file_analysis/analyzer/pe/pe-file-types.pac include/zeek/file_analysis/analyzer/pe/pe-file.pac include/zeek/file_analysis/analyzer/pe/pe.pac -include/zeek/file_analysis/analyzer/unified2/Unified2.h -include/zeek/file_analysis/analyzer/unified2/events.bif.h -include/zeek/file_analysis/analyzer/unified2/types.bif.h -include/zeek/file_analysis/analyzer/unified2/unified2-analyzer.pac -include/zeek/file_analysis/analyzer/unified2/unified2-file.pac -include/zeek/file_analysis/analyzer/unified2/unified2.pac include/zeek/file_analysis/analyzer/x509/OCSP.h include/zeek/file_analysis/analyzer/x509/X509.h include/zeek/file_analysis/analyzer/x509/X509Common.h @@ -1093,13 +1087,18 @@ include/zeek/packet_analysis/protocol/ip/IPBasedAnalyzer.h include/zeek/packet_analysis/protocol/ip/SessionAdapter.h include/zeek/packet_analysis/protocol/iptunnel/IPTunnel.h include/zeek/packet_analysis/protocol/linux_sll/LinuxSLL.h +include/zeek/packet_analysis/protocol/linux_sll2/LinuxSLL2.h +include/zeek/packet_analysis/protocol/llc/LLC.h include/zeek/packet_analysis/protocol/mpls/MPLS.h include/zeek/packet_analysis/protocol/nflog/NFLog.h +include/zeek/packet_analysis/protocol/novell_802_3/Novell_802_3.h include/zeek/packet_analysis/protocol/null/Null.h +include/zeek/packet_analysis/protocol/pbb/PBB.h include/zeek/packet_analysis/protocol/ppp_serial/PPPSerial.h include/zeek/packet_analysis/protocol/pppoe/PPPoE.h include/zeek/packet_analysis/protocol/root/Root.h include/zeek/packet_analysis/protocol/skip/Skip.h +include/zeek/packet_analysis/protocol/snap/SNAP.h include/zeek/packet_analysis/protocol/tcp/Stats.h include/zeek/packet_analysis/protocol/tcp/TCP.h include/zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h @@ -1152,6 +1151,7 @@ include/zeek/script_opt/TempVar.h include/zeek/script_opt/UsageAnalyzer.h include/zeek/script_opt/UseDefs.h include/zeek/script_opt/ZAM/BuiltIn.h +include/zeek/script_opt/ZAM/BuiltInSupport.h include/zeek/script_opt/ZAM/Compile.h include/zeek/script_opt/ZAM/Inst-Gen.h include/zeek/script_opt/ZAM/IterInfo.h @@ -1162,6 +1162,17 @@ include/zeek/script_opt/ZAM/ZOp.h include/zeek/session/Key.h include/zeek/session/Manager.h include/zeek/session/Session.h +include/zeek/spicy/cookie.h +include/zeek/spicy/file-analyzer.h +include/zeek/spicy/manager.h +include/zeek/spicy/packet-analyzer.h +include/zeek/spicy/port-range.h +include/zeek/spicy/protocol-analyzer.h +include/zeek/spicy/runtime-support.h +include/zeek/spicy/spicy.bif.h +include/zeek/spicy/spicyz/config.h +include/zeek/spicy/spicyz/driver.h +include/zeek/spicy/spicyz/glue-compiler.h include/zeek/stats.bif.func_h include/zeek/stats.bif.netvar_h include/zeek/strings.bif.func_h @@ -1189,8 +1200,10 @@ include/zeek/types.bif.netvar_h include/zeek/util.h include/zeek/zeek-affinity.h include/zeek/zeek-bif.h +include/zeek/zeek-config-paths.h include/zeek/zeek-config.h include/zeek/zeek-setup.h +include/zeek/zeek-version.h include/zeek/zeek.bif.func_h include/zeek/zeek.bif.netvar_h include/zeek/zeek.pac @@ -1211,97 +1224,89 @@ lib/cmake/Broker/BrokerTargets-release.cmake lib/cmake/Broker/BrokerTargets.cmake lib/libbinpac.so lib/libbinpac.so.0 -lib/libbinpac.so.0.59 +lib/libbinpac.so.0.61 lib/libbroker.a %%SPICY%%lib/libhilti-rt-debug.a %%SPICY%%lib/libhilti-rt.a -%%SPICY%%lib/libhilti.a +%%SPICY%%lib/libhilti.so lib/libparaglob.a %%SPICY%%lib/libspicy-rt-debug.a %%SPICY%%lib/libspicy-rt.a -%%SPICY%%lib/libspicy.a -%%SPICY%%lib/zeek-spicy/cmake/FindSpicy.cmake -%%SPICY%%lib/zeek-spicy/cmake/FindZeek.cmake -%%SPICY%%lib/zeek-spicy/cmake/ZeekSpicyAnalyzerSupport.cmake -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/autogen/config.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/cookie.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/debug.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/driver.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/file-analyzer.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/packet-analyzer.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/plugin.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/protocol-analyzer.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/runtime-support.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/zeek-compat.h -%%SPICY%%lib/zeek-spicy/include/zeek-spicy/zeek-reporter.h -%%SPICY%%lib/zeek-spicy/spicy/zeek.spicy -%%SPICY%%lib/zeek-spicy/spicy/zeek_file.spicy -%%SPICY%%lib/zeek-spicy/spicy/zeek_rt.hlt -%%SPICY%%lib/zeek-spicy/tests/Scripts/canonify-zeek-log -%%SPICY%%lib/zeek-spicy/tests/Scripts/canonify-zeek-log-sorted -%%SPICY%%lib/zeek-spicy/tests/Scripts/diff-remove-abspath -%%SPICY%%lib/zeek-spicy/tests/Scripts/diff-remove-timestamps -%%SPICY%%lib/zeek-spicy/tests/Scripts/diff-sort -%%SPICY%%lib/zeek-spicy/tests/Scripts/spicy-version -%%SPICY%%lib/zeek-spicy/tests/Scripts/zeek-version -%%SPICY%%lib/zeek-spicy/tests/random.seed -%%NETMAP%%lib/zeek/plugins/Zeek_Netmap/COPYING -%%NETMAP%%lib/zeek/plugins/Zeek_Netmap/__bro_plugin__ -%%NETMAP%%lib/zeek/plugins/Zeek_Netmap/lib/Zeek-Netmap.%%LCASE_OPSYS%%-%%ARCH%%.so -%%NETMAP%%lib/zeek/plugins/Zeek_Netmap/scripts/__load__.zeek -%%NETMAP%%lib/zeek/plugins/Zeek_Netmap/scripts/init.zeek -%%NETMAP%%lib/zeek/plugins/Zeek_Netmap/zeekctl/netmap.py +%%SPICY%%lib/libspicy.so lib/zeek/python/SubnetTree.py lib/zeek/python/_SubnetTree.so lib/zeek/python/broker/__init__.py lib/zeek/python/broker/_broker.so lib/zeek/python/broker/zeek.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/BroControl/__init__.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/BroControl/cmdresult.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/BroControl/config.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/BroControl/plugin.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/__init__.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/cmdresult.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/config.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/control.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/cron.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/doc.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/events.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/exceptions.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/execute.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/install.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/lock.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/node.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/options.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/plugin.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/pluginreg.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/printdoc.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/ssh_runner.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/state.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/util.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/utilcurses.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/version.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/zeekcmd.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/ZeekControl/zeekctl.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/plugins/TestPlugin.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/plugins/lb_custom.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/plugins/lb_myricom.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/plugins/lb_pf_ring.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/plugins/ps.py -%%ZEEKCTL%%lib/zeek/python/zeekctl/plugins/zeek_port_warning.py +lib/zeek/python/zeekclient/__init__.py +lib/zeek/python/zeekclient/brokertypes.py +lib/zeek/python/zeekclient/cli.py +lib/zeek/python/zeekclient/config.py +lib/zeek/python/zeekclient/consts.py +lib/zeek/python/zeekclient/controller.py +lib/zeek/python/zeekclient/events.py +lib/zeek/python/zeekclient/logs.py +lib/zeek/python/zeekclient/ssl.py +lib/zeek/python/zeekclient/types.py +lib/zeek/python/zeekclient/utils.py +lib/zeek/python/zeekctl/BroControl/__init__.py +lib/zeek/python/zeekctl/BroControl/cmdresult.py +lib/zeek/python/zeekctl/BroControl/config.py +lib/zeek/python/zeekctl/BroControl/plugin.py +lib/zeek/python/zeekctl/ZeekControl/__init__.py +lib/zeek/python/zeekctl/ZeekControl/cmdresult.py +lib/zeek/python/zeekctl/ZeekControl/config.py +lib/zeek/python/zeekctl/ZeekControl/control.py +lib/zeek/python/zeekctl/ZeekControl/cron.py +lib/zeek/python/zeekctl/ZeekControl/doc.py +lib/zeek/python/zeekctl/ZeekControl/events.py +lib/zeek/python/zeekctl/ZeekControl/exceptions.py +lib/zeek/python/zeekctl/ZeekControl/execute.py +lib/zeek/python/zeekctl/ZeekControl/install.py +lib/zeek/python/zeekctl/ZeekControl/lock.py +lib/zeek/python/zeekctl/ZeekControl/node.py +lib/zeek/python/zeekctl/ZeekControl/options.py +lib/zeek/python/zeekctl/ZeekControl/plugin.py +lib/zeek/python/zeekctl/ZeekControl/pluginreg.py +lib/zeek/python/zeekctl/ZeekControl/printdoc.py +lib/zeek/python/zeekctl/ZeekControl/ssh_runner.py +lib/zeek/python/zeekctl/ZeekControl/state.py +lib/zeek/python/zeekctl/ZeekControl/util.py +lib/zeek/python/zeekctl/ZeekControl/utilcurses.py +lib/zeek/python/zeekctl/ZeekControl/version.py +lib/zeek/python/zeekctl/ZeekControl/zeekcmd.py +lib/zeek/python/zeekctl/ZeekControl/zeekctl.py +lib/zeek/python/zeekctl/plugins/TestPlugin.py +lib/zeek/python/zeekctl/plugins/lb_custom.py +lib/zeek/python/zeekctl/plugins/lb_myricom.py +lib/zeek/python/zeekctl/plugins/lb_pf_ring.py +lib/zeek/python/zeekctl/plugins/ps.py +lib/zeek/python/zeekctl/plugins/zeek_port_warning.py +lib/zeek/python/zeekctl/plugins/zzz_af_packet.py %%ZEEKCTL%%man/man1/trace-summary.1.gz man/man1/zeek-cut.1.gz man/man8/zeek.8.gz %%ZEEKCTL%%man/man8/zeekctl.8.gz +share/btest/data/Scripts/README +share/btest/data/Scripts/canonify-zeek-log +share/btest/data/Scripts/canonify-zeek-log-sorted +share/btest/data/Scripts/diff-remove-abspath +share/btest/data/Scripts/diff-remove-timestamps +share/btest/data/Scripts/diff-sort +share/btest/data/Scripts/run-zeek +share/btest/data/Scripts/spicy-version +share/btest/data/Scripts/zeek-version share/btest/data/random.seed share/btest/scripts/diff-canonifier share/btest/scripts/diff-canonifier-external +share/btest/scripts/diff-canonifier-spicy share/btest/scripts/diff-clean-doctest share/btest/scripts/diff-remove-abspath share/btest/scripts/diff-remove-fields share/btest/scripts/diff-remove-file-ids share/btest/scripts/diff-remove-fractions share/btest/scripts/diff-remove-openclose-timestamps +share/btest/scripts/diff-remove-spicy-abspath share/btest/scripts/diff-remove-timestamps share/btest/scripts/diff-remove-timestamps-and-sort share/btest/scripts/diff-remove-uids @@ -1311,6 +1316,9 @@ share/btest/scripts/diff-sort share/btest/scripts/diff-sort-and-remove-abspath share/btest/scripts/diff-sort-conn-service share/btest/scripts/diff-sort-set-elements +share/btest/scripts/spicy/diff-remove-abspath +share/btest/scripts/spicy/diff-remove-timestamps +share/btest/scripts/spicy/diff-sort %%SPICY%%share/hilti/hilti.hlt %%SPICY%%share/spicy/filter.spicy %%SPICY%%share/spicy/spicy-driver-host.cc @@ -1322,6 +1330,7 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/bif/bloom-filter.bif.zeek %%DATADIR%%/base/bif/cardinality-counter.bif.zeek %%DATADIR%%/base/bif/comm.bif.zeek +%%DATADIR%%/base/bif/communityid.bif.zeek %%DATADIR%%/base/bif/const.bif.zeek %%DATADIR%%/base/bif/data.bif.zeek %%DATADIR%%/base/bif/event.bif.zeek @@ -1355,7 +1364,6 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/bif/plugins/Zeek_FileExtract.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_FileExtract.functions.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_FileHash.events.bif.zeek -%%DATADIR%%/base/bif/plugins/Zeek_Finger.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_GSSAPI.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_GTPv1.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek @@ -1440,18 +1448,12 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/bif/plugins/Zeek_SSL.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_SSL.functions.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_SSL.types.bif.zeek -%%SPICY%%%%DATADIR%%/base/bif/plugins/Zeek_Spicy.consts.bif.zeek -%%SPICY%%%%DATADIR%%/base/bif/plugins/Zeek_Spicy.events.bif.zeek -%%SPICY%%%%DATADIR%%/base/bif/plugins/Zeek_Spicy.functions.bif.zeek -%%DATADIR%%/base/bif/plugins/Zeek_Syslog.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_TCP.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_TCP.functions.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_TCP.types.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_Teredo.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_Teredo.functions.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_UDP.events.bif.zeek -%%DATADIR%%/base/bif/plugins/Zeek_Unified2.events.bif.zeek -%%DATADIR%%/base/bif/plugins/Zeek_Unified2.types.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_VXLAN.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_X509.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_X509.functions.bif.zeek @@ -1460,6 +1462,7 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/bif/plugins/Zeek_XMPP.events.bif.zeek %%DATADIR%%/base/bif/plugins/__load__.zeek %%DATADIR%%/base/bif/reporter.bif.zeek +%%DATADIR%%/base/bif/spicy.bif.zeek %%DATADIR%%/base/bif/stats.bif.zeek %%DATADIR%%/base/bif/store.bif.zeek %%DATADIR%%/base/bif/strings.bif.zeek @@ -1481,6 +1484,8 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/files/x509/log-ocsp.zeek %%DATADIR%%/base/files/x509/main.zeek %%DATADIR%%/base/frameworks/analyzer/__load__.zeek +%%DATADIR%%/base/frameworks/analyzer/dpd.zeek +%%DATADIR%%/base/frameworks/analyzer/logging.zeek %%DATADIR%%/base/frameworks/analyzer/main.zeek %%DATADIR%%/base/frameworks/broker/__load__.zeek %%DATADIR%%/base/frameworks/broker/log.zeek @@ -1502,7 +1507,6 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/frameworks/control/__load__.zeek %%DATADIR%%/base/frameworks/control/main.zeek %%DATADIR%%/base/frameworks/dpd/__load__.zeek -%%DATADIR%%/base/frameworks/dpd/main.zeek %%DATADIR%%/base/frameworks/files/__load__.zeek %%DATADIR%%/base/frameworks/files/magic/__load__.zeek %%DATADIR%%/base/frameworks/files/magic/archive.sig @@ -1580,6 +1584,10 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/frameworks/signatures/main.zeek %%DATADIR%%/base/frameworks/software/__load__.zeek %%DATADIR%%/base/frameworks/software/main.zeek +%%DATADIR%%/base/frameworks/spicy/__load__.zeek +%%DATADIR%%/base/frameworks/spicy/init-bare.zeek +%%DATADIR%%/base/frameworks/spicy/init-framework.zeek +%%DATADIR%%/base/frameworks/spicy/main.zeek %%DATADIR%%/base/frameworks/sumstats/__load__.zeek %%DATADIR%%/base/frameworks/sumstats/cluster.zeek %%DATADIR%%/base/frameworks/sumstats/main.zeek @@ -1600,6 +1608,8 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/frameworks/supervisor/api.zeek %%DATADIR%%/base/frameworks/supervisor/control.zeek %%DATADIR%%/base/frameworks/supervisor/main.zeek +%%DATADIR%%/base/frameworks/telemetry/__load__.zeek +%%DATADIR%%/base/frameworks/telemetry/main.zeek %%DATADIR%%/base/frameworks/tunnels/__load__.zeek %%DATADIR%%/base/frameworks/tunnels/main.zeek %%DATADIR%%/base/init-bare.zeek @@ -1635,13 +1645,21 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/packet-protocols/iptunnel/main.zeek %%DATADIR%%/base/packet-protocols/linux_sll/__load__.zeek %%DATADIR%%/base/packet-protocols/linux_sll/main.zeek +%%DATADIR%%/base/packet-protocols/linux_sll2/__load__.zeek +%%DATADIR%%/base/packet-protocols/linux_sll2/main.zeek +%%DATADIR%%/base/packet-protocols/llc/__load__.zeek +%%DATADIR%%/base/packet-protocols/llc/main.zeek %%DATADIR%%/base/packet-protocols/main.zeek %%DATADIR%%/base/packet-protocols/mpls/__load__.zeek %%DATADIR%%/base/packet-protocols/mpls/main.zeek %%DATADIR%%/base/packet-protocols/nflog/__load__.zeek %%DATADIR%%/base/packet-protocols/nflog/main.zeek +%%DATADIR%%/base/packet-protocols/novell_802_3/__load__.zeek +%%DATADIR%%/base/packet-protocols/novell_802_3/main.zeek %%DATADIR%%/base/packet-protocols/null/__load__.zeek %%DATADIR%%/base/packet-protocols/null/main.zeek +%%DATADIR%%/base/packet-protocols/pbb/__load__.zeek +%%DATADIR%%/base/packet-protocols/pbb/main.zeek %%DATADIR%%/base/packet-protocols/ppp_serial/__load__.zeek %%DATADIR%%/base/packet-protocols/ppp_serial/main.zeek %%DATADIR%%/base/packet-protocols/pppoe/__load__.zeek @@ -1650,6 +1668,8 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/packet-protocols/root/main.zeek %%DATADIR%%/base/packet-protocols/skip/__load__.zeek %%DATADIR%%/base/packet-protocols/skip/main.zeek +%%DATADIR%%/base/packet-protocols/snap/__load__.zeek +%%DATADIR%%/base/packet-protocols/snap/main.zeek %%DATADIR%%/base/packet-protocols/tcp/__load__.zeek %%DATADIR%%/base/packet-protocols/tcp/main.zeek %%DATADIR%%/base/packet-protocols/teredo/__load__.zeek @@ -1684,6 +1704,9 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/protocols/dns/__load__.zeek %%DATADIR%%/base/protocols/dns/consts.zeek %%DATADIR%%/base/protocols/dns/main.zeek +%%DATADIR%%/base/protocols/finger/__load__.zeek +%%DATADIR%%/base/protocols/finger/main.zeek +%%DATADIR%%/base/protocols/finger/spicy-events.zeek %%DATADIR%%/base/protocols/ftp/__load__.zeek %%DATADIR%%/base/protocols/ftp/dpd.sig %%DATADIR%%/base/protocols/ftp/files.zeek @@ -1715,6 +1738,8 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/protocols/modbus/main.zeek %%DATADIR%%/base/protocols/mqtt/__load__.zeek %%DATADIR%%/base/protocols/mqtt/consts.zeek +%%DATADIR%%/base/protocols/mqtt/dpd.sig +%%DATADIR%%/base/protocols/mqtt/main.zeek %%DATADIR%%/base/protocols/mysql/__load__.zeek %%DATADIR%%/base/protocols/mysql/consts.zeek %%DATADIR%%/base/protocols/mysql/main.zeek @@ -1771,6 +1796,7 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/protocols/syslog/__load__.zeek %%DATADIR%%/base/protocols/syslog/consts.zeek %%DATADIR%%/base/protocols/syslog/main.zeek +%%DATADIR%%/base/protocols/syslog/spicy-events.zeek %%DATADIR%%/base/protocols/tunnels/__load__.zeek %%DATADIR%%/base/protocols/tunnels/dpd.sig %%DATADIR%%/base/protocols/xmpp/__load__.zeek @@ -1796,19 +1822,15 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/base/utils/thresholds.zeek %%DATADIR%%/base/utils/time.zeek %%DATADIR%%/base/utils/urls.zeek -%%ZEEKCTL%%%%SPICY%%%%DATADIR%%/builtin-plugins/Zeek_Spicy/Zeek/Spicy/__load__.zeek -%%ZEEKCTL%%%%SPICY%%%%DATADIR%%/builtin-plugins/Zeek_Spicy/Zeek/Spicy/bare.zeek -%%ZEEKCTL%%%%SPICY%%%%DATADIR%%/builtin-plugins/Zeek_Spicy/Zeek/Spicy/default.zeek -%%ZEEKCTL%%%%SPICY%%%%DATADIR%%/builtin-plugins/Zeek_Spicy/Zeek/Spicy/misc/record-spicy-batch.zeek -%%ZEEKCTL%%%%SPICY%%%%DATADIR%%/builtin-plugins/Zeek_Spicy/_Zeek -%%ZEEKCTL%%%%SPICY%%%%DATADIR%%/builtin-plugins/Zeek_Spicy/__load__.zeek -%%ZEEKCTL%%%%SPICY%%%%DATADIR%%/builtin-plugins/Zeek_Spicy/__preload__.zeek %%ZEEKCTL%%%%DATADIR%%/builtin-plugins/__load__.zeek %%ZEEKCTL%%%%DATADIR%%/builtin-plugins/__preload__.zeek +%%DATADIR%%/cmake/.cmake-format.json +%%DATADIR%%/cmake/.pre-commit-config.yaml %%DATADIR%%/cmake/AddUninstallTarget.cmake %%DATADIR%%/cmake/BifCl.cmake %%DATADIR%%/cmake/BinPAC.cmake %%DATADIR%%/cmake/BroPlugin.cmake +%%DATADIR%%/cmake/BuiltInSpicyAnalyzer.cmake %%DATADIR%%/cmake/COPYING %%DATADIR%%/cmake/ChangeMacInstallNames.cmake %%DATADIR%%/cmake/CheckCompilerArch.cmake @@ -1820,6 +1842,7 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/cmake/CheckTypes.cmake %%DATADIR%%/cmake/CommonCMakeConfig.cmake %%DATADIR%%/cmake/ConfigurePackaging.cmake +%%DATADIR%%/cmake/ConfigureSpicyBuild.cmake %%DATADIR%%/cmake/FindBIND.cmake %%DATADIR%%/cmake/FindBISON.cmake %%DATADIR%%/cmake/FindBinPAC.cmake @@ -1862,25 +1885,30 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/cmake/SetDefaultCompileFlags.cmake %%DATADIR%%/cmake/SetupRPATH.cmake %%DATADIR%%/cmake/UserChangedWarning.cmake +%%DATADIR%%/cmake/ZeekConfig.cmake +%%DATADIR%%/cmake/ZeekConfigVersion.cmake %%DATADIR%%/cmake/ZeekPlugin.cmake +%%DATADIR%%/cmake/ZeekPluginBootstrap.cmake %%DATADIR%%/cmake/ZeekPluginCommon.cmake %%DATADIR%%/cmake/ZeekPluginDynamic.cmake %%DATADIR%%/cmake/ZeekPluginStatic.cmake %%SPICY%%%%DATADIR%%/cmake/ZeekSpicyAnalyzerSupport.cmake %%DATADIR%%/cmake/ZeekSubdir.cmake +%%DATADIR%%/cmake/ZeekTargets.cmake %%DATADIR%%/cmake/cmake_uninstall.cmake.in +%%DATADIR%%/cmake/conan.cmake %%DATADIR%%/cmake/package_postupgrade.sh.in %%DATADIR%%/cmake/package_preinstall.sh.in %%DATADIR%%/cmake/zeek-plugin-create-package.sh %%DATADIR%%/cmake/zeek-plugin-install-package.sh -%%DATADIR%%/policy/files/unified2/__load__.zeek -%%DATADIR%%/policy/files/unified2/main.zeek %%DATADIR%%/policy/files/x509/disable-certificate-events-known-certs.zeek -%%DATADIR%%/policy/files/x509/log-ocsp.zeek +%%DATADIR%%/policy/frameworks/cluster/experimental.zeek +%%DATADIR%%/policy/frameworks/cluster/nodes-experimental/manager.zeek %%DATADIR%%/policy/frameworks/control/controllee.zeek %%DATADIR%%/policy/frameworks/control/controller.zeek %%DATADIR%%/policy/frameworks/dpd/detect-protocols.zeek %%DATADIR%%/policy/frameworks/dpd/packet-segment-logging.zeek +%%DATADIR%%/policy/frameworks/files/deprecated-txhosts-rxhosts-connuids.zeek %%DATADIR%%/policy/frameworks/files/detect-MHR.zeek %%DATADIR%%/policy/frameworks/files/entropy-test-all-files.zeek %%DATADIR%%/policy/frameworks/files/extract-all-files.zeek @@ -1931,15 +1959,17 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/policy/frameworks/netcontrol/catch-and-release.zeek %%DATADIR%%/policy/frameworks/notice/__load__.zeek %%DATADIR%%/policy/frameworks/notice/actions/drop.zeek +%%DATADIR%%/policy/frameworks/notice/community-id.zeek %%DATADIR%%/policy/frameworks/notice/extend-email/hostnames.zeek %%DATADIR%%/policy/frameworks/packet-filter/shunt.zeek %%DATADIR%%/policy/frameworks/signatures/detect-windows-shells.sig %%DATADIR%%/policy/frameworks/software/version-changes.zeek %%DATADIR%%/policy/frameworks/software/vulnerable.zeek %%DATADIR%%/policy/frameworks/software/windows-version-detection.zeek -%%DATADIR%%/policy/integration/barnyard2/__load__.zeek -%%DATADIR%%/policy/integration/barnyard2/main.zeek -%%DATADIR%%/policy/integration/barnyard2/types.zeek +%%DATADIR%%/policy/frameworks/spicy/record-spicy-batch.zeek +%%DATADIR%%/policy/frameworks/spicy/resource-usage.zeek +%%DATADIR%%/policy/frameworks/telemetry/log.zeek +%%DATADIR%%/policy/frameworks/telemetry/prometheus.zeek %%DATADIR%%/policy/integration/collective-intel/__load__.zeek %%DATADIR%%/policy/integration/collective-intel/main.zeek %%DATADIR%%/policy/misc/capture-loss.zeek @@ -1955,6 +1985,7 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/policy/misc/trim-trace-file.zeek %%DATADIR%%/policy/misc/unknown-protocols.zeek %%DATADIR%%/policy/misc/weird-stats.zeek +%%DATADIR%%/policy/protocols/conn/community-id-logging.zeek %%DATADIR%%/policy/protocols/conn/known-hosts.zeek %%DATADIR%%/policy/protocols/conn/known-services.zeek %%DATADIR%%/policy/protocols/conn/mac-logging.zeek @@ -1982,8 +2013,6 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/policy/protocols/modbus/known-masters-slaves.zeek %%DATADIR%%/policy/protocols/modbus/track-memmap.zeek %%DATADIR%%/policy/protocols/mqtt/__load__.zeek -%%DATADIR%%/policy/protocols/mqtt/dpd.sig -%%DATADIR%%/policy/protocols/mqtt/main.zeek %%DATADIR%%/policy/protocols/mysql/software.zeek %%DATADIR%%/policy/protocols/rdp/indicate_ssl.zeek %%DATADIR%%/policy/protocols/smb/log-cmds.zeek @@ -1995,15 +2024,14 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/policy/protocols/ssh/geo-data.zeek %%DATADIR%%/policy/protocols/ssh/interesting-hostnames.zeek %%DATADIR%%/policy/protocols/ssh/software.zeek +%%DATADIR%%/policy/protocols/ssl/certificate-request-info.zeek %%DATADIR%%/policy/protocols/ssl/decryption.zeek %%DATADIR%%/policy/protocols/ssl/dpd-v2.sig %%DATADIR%%/policy/protocols/ssl/expiring-certs.zeek -%%DATADIR%%/policy/protocols/ssl/extract-certs-pem.zeek %%DATADIR%%/policy/protocols/ssl/heartbleed.zeek %%DATADIR%%/policy/protocols/ssl/known-certs.zeek %%DATADIR%%/policy/protocols/ssl/log-certs-base64.zeek %%DATADIR%%/policy/protocols/ssl/log-hostcerts-only.zeek -%%DATADIR%%/policy/protocols/ssl/notary.zeek %%DATADIR%%/policy/protocols/ssl/ssl-log-ext.zeek %%DATADIR%%/policy/protocols/ssl/validate-certs.zeek %%DATADIR%%/policy/protocols/ssl/validate-ocsp.zeek @@ -2017,10 +2045,14 @@ share/btest/scripts/diff-sort-set-elements %%DATADIR%%/policy/tuning/json-logs.zeek %%DATADIR%%/policy/tuning/track-all-assets.zeek @sample %%DATADIR%%/site/local.zeek.sample +%%SPICY%%share/zeek/spicy/zeek.spicy +%%SPICY%%share/zeek/spicy/zeek_file.spicy +%%SPICY%%share/zeek/spicy/zeek_rt.hlt %%ZEEKCTL%%%%DATADIR%%/test-all-policy.zeek %%ZEEKCTL%%share/zeek/zeekctl/__load__.zeek %%ZEEKCTL%%share/zeek/zeekctl/auto.zeek %%ZEEKCTL%%share/zeek/zeekctl/check.zeek +%%ZEEKCTL%%share/zeek/zeekctl/logging.zeek %%ZEEKCTL%%share/zeek/zeekctl/main.zeek %%ZEEKCTL%%share/zeek/zeekctl/process-trace.zeek %%ZEEKCTL%%share/zeek/zeekctl/standalone.zeek diff --git a/shells/nushell/Makefile b/shells/nushell/Makefile index 50c96d911e5..1290fbeb4c2 100644 --- a/shells/nushell/Makefile +++ b/shells/nushell/Makefile @@ -1,5 +1,5 @@ PORTNAME= nushell -DISTVERSION= 0.83.1 +DISTVERSION= 0.84.0 CATEGORIES= shells MAINTAINER= yuri@FreeBSD.org @@ -16,7 +16,7 @@ USE_GITHUB= yes CARGO_CRATES= Inflector-0.11.4 \ addr2line-0.20.0 \ adler-1.0.2 \ - ahash-0.7.6 \ + adler32-1.2.0 \ ahash-0.8.3 \ aho-corasick-1.0.2 \ alloc-no-stdlib-2.0.4 \ @@ -43,6 +43,7 @@ CARGO_CRATES= Inflector-0.11.4 \ atoi-2.0.0 \ atomic-polyfill-0.1.11 \ autocfg-1.1.0 \ + avro-schema-0.3.0 \ backtrace-0.3.68 \ base64-0.21.2 \ bincode-1.3.3 \ @@ -52,7 +53,7 @@ CARGO_CRATES= Inflector-0.11.4 \ bitflags-1.3.2 \ bitflags-2.3.3 \ block-buffer-0.10.4 \ - bracoxide-0.1.1 \ + bracoxide-0.1.2 \ brotli-3.3.4 \ brotli-decompressor-2.3.4 \ brownstone-3.0.0 \ @@ -93,6 +94,8 @@ CARGO_CRATES= Inflector-0.11.4 \ core-foundation-0.9.3 \ core-foundation-sys-0.8.4 \ cpufeatures-0.2.9 \ + crc-2.1.0 \ + crc-catalog-1.1.1 \ crc32fast-1.3.2 \ criterion-0.5.1 \ criterion-plot-0.5.0 \ @@ -163,6 +166,7 @@ CARGO_CRATES= Inflector-0.11.4 \ futures-macro-0.3.28 \ futures-sink-0.3.28 \ futures-task-0.3.28 \ + futures-timer-3.0.2 \ futures-util-0.3.28 \ fuzzy-matcher-0.3.7 \ fxhash-0.2.1 \ @@ -230,6 +234,8 @@ CARGO_CRATES= Inflector-0.11.4 \ lexical-write-float-0.8.5 \ lexical-write-integer-0.8.5 \ libc-0.2.147 \ + libflate-1.4.0 \ + libflate_lz77-1.2.0 \ libgit2-sys-0.15.2+1.6.4 \ libloading-0.7.4 \ libm-0.2.7 \ @@ -306,7 +312,7 @@ CARGO_CRATES= Inflector-0.11.4 \ ordered-multimap-0.6.0 \ os_pipe-1.1.4 \ owo-colors-3.5.0 \ - papergrid-0.9.1 \ + papergrid-0.10.0 \ parking_lot-0.11.2 \ parking_lot-0.12.1 \ parking_lot_core-0.8.6 \ @@ -366,7 +372,7 @@ CARGO_CRATES= Inflector-0.11.4 \ pwd-1.4.0 \ quick-error-1.2.3 \ quick-xml-0.28.2 \ - quick-xml-0.29.0 \ + quick-xml-0.30.0 \ quickcheck-1.0.3 \ quickcheck_macros-1.0.0 \ quote-1.0.29 \ @@ -380,17 +386,19 @@ CARGO_CRATES= Inflector-0.11.4 \ redox_syscall-0.2.16 \ redox_syscall-0.3.5 \ redox_users-0.4.3 \ - reedline-0.22.0 \ + reedline-0.23.0 \ regex-1.9.0 \ regex-automata-0.1.10 \ regex-automata-0.3.0 \ regex-syntax-0.6.29 \ regex-syntax-0.7.3 \ + relative-path-1.8.0 \ + rle-decode-fast-1.0.3 \ rmp-0.8.11 \ rmp-serde-1.1.1 \ roxmltree-0.18.0 \ - rstest-0.17.0 \ - rstest_macros-0.17.0 \ + rstest-0.18.1 \ + rstest_macros-0.18.1 \ rusqlite-0.29.0 \ rust-embed-6.8.1 \ rust-embed-impl-6.8.1 \ @@ -450,7 +458,7 @@ CARGO_CRATES= Inflector-0.11.4 \ strength_reduce-0.2.4 \ string_cache-0.8.7 \ string_cache_codegen-0.5.2 \ - strip-ansi-escapes-0.1.1 \ + strip-ansi-escapes-0.2.0 \ strum-0.24.1 \ strum-0.25.0 \ strum_macros-0.24.3 \ @@ -464,7 +472,7 @@ CARGO_CRATES= Inflector-0.11.4 \ syn-2.0.23 \ sys-locale-0.3.0 \ sysinfo-0.29.4 \ - tabled-0.12.2 \ + tabled-0.14.0 \ target-features-0.1.4 \ tempfile-3.7.0 \ tendril-0.4.3 \ @@ -504,7 +512,7 @@ CARGO_CRATES= Inflector-0.11.4 \ unicase-2.6.0 \ unicode-bidi-0.3.13 \ unicode-ident-1.0.10 \ - unicode-linebreak-0.1.4 \ + unicode-linebreak-0.1.5 \ unicode-normalization-0.1.22 \ unicode-segmentation-1.10.1 \ unicode-width-0.1.10 \ @@ -520,6 +528,7 @@ CARGO_CRATES= Inflector-0.11.4 \ vcpkg-0.2.15 \ version_check-0.9.4 \ vte-0.10.1 \ + vte-0.11.1 \ vte_generate_state_changes-0.1.1 \ wait-timeout-0.2.0 \ walkdir-2.3.3 \ diff --git a/shells/nushell/distinfo b/shells/nushell/distinfo index 42abc8243da..e6a64e12bd1 100644 --- a/shells/nushell/distinfo +++ b/shells/nushell/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1690831616 +TIMESTAMP = 1692773399 SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3 SIZE (rust/crates/Inflector-0.11.4.crate) = 17438 SHA256 (rust/crates/addr2line-0.20.0.crate) = f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3 SIZE (rust/crates/addr2line-0.20.0.crate) = 39558 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe SIZE (rust/crates/adler-1.0.2.crate) = 12778 -SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 -SIZE (rust/crates/ahash-0.7.6.crate) = 38030 +SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234 +SIZE (rust/crates/adler32-1.2.0.crate) = 6411 SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f SIZE (rust/crates/ahash-0.8.3.crate) = 42416 SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41 @@ -59,6 +59,8 @@ SHA256 (rust/crates/atomic-polyfill-0.1.11.crate) = e3ff7eb3f316534d83a8a2c3d167 SIZE (rust/crates/atomic-polyfill-0.1.11.crate) = 11087 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 +SHA256 (rust/crates/avro-schema-0.3.0.crate) = b5281855b39aba9684d2f47bf96983fbfd8f1725f12fabb0513a8ab879647bbd +SIZE (rust/crates/avro-schema-0.3.0.crate) = 19318 SHA256 (rust/crates/backtrace-0.3.68.crate) = 4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12 SIZE (rust/crates/backtrace-0.3.68.crate) = 79891 SHA256 (rust/crates/base64-0.21.2.crate) = 604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d @@ -77,8 +79,8 @@ SHA256 (rust/crates/bitflags-2.3.3.crate) = 630be753d4e58660abd17930c71b647fe46c SIZE (rust/crates/bitflags-2.3.3.crate) = 34320 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538 -SHA256 (rust/crates/bracoxide-0.1.1.crate) = ae76c117551a0459f61c57b573271778214287482c346d14591d2ea250ecbea5 -SIZE (rust/crates/bracoxide-0.1.1.crate) = 14068 +SHA256 (rust/crates/bracoxide-0.1.2.crate) = d8654ced31d3071e01cee9112fb25f241798b17b08d083512f8da2afa3da076b +SIZE (rust/crates/bracoxide-0.1.2.crate) = 14162 SHA256 (rust/crates/brotli-3.3.4.crate) = a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68 SIZE (rust/crates/brotli-3.3.4.crate) = 1369026 SHA256 (rust/crates/brotli-decompressor-2.3.4.crate) = 4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744 @@ -159,6 +161,10 @@ SHA256 (rust/crates/core-foundation-sys-0.8.4.crate) = e496a50fda8aacccc86d7529e SIZE (rust/crates/core-foundation-sys-0.8.4.crate) = 17725 SHA256 (rust/crates/cpufeatures-0.2.9.crate) = a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1 SIZE (rust/crates/cpufeatures-0.2.9.crate) = 11895 +SHA256 (rust/crates/crc-2.1.0.crate) = 49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23 +SIZE (rust/crates/crc-2.1.0.crate) = 8683 +SHA256 (rust/crates/crc-catalog-1.1.1.crate) = ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403 +SIZE (rust/crates/crc-catalog-1.1.1.crate) = 8698 SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661 SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f @@ -299,6 +305,8 @@ SHA256 (rust/crates/futures-sink-0.3.28.crate) = f43be4fe21a13b9781a69afa4985b0f SIZE (rust/crates/futures-sink-0.3.28.crate) = 7852 SHA256 (rust/crates/futures-task-0.3.28.crate) = 76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65 SIZE (rust/crates/futures-task-0.3.28.crate) = 11848 +SHA256 (rust/crates/futures-timer-3.0.2.crate) = e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c +SIZE (rust/crates/futures-timer-3.0.2.crate) = 19879 SHA256 (rust/crates/futures-util-0.3.28.crate) = 26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533 SIZE (rust/crates/futures-util-0.3.28.crate) = 158510 SHA256 (rust/crates/fuzzy-matcher-0.3.7.crate) = 54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94 @@ -433,6 +441,10 @@ SHA256 (rust/crates/lexical-write-integer-0.8.5.crate) = e1b6f3d1f4422866b68192d SIZE (rust/crates/lexical-write-integer-0.8.5.crate) = 55427 SHA256 (rust/crates/libc-0.2.147.crate) = b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3 SIZE (rust/crates/libc-0.2.147.crate) = 686772 +SHA256 (rust/crates/libflate-1.4.0.crate) = 5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18 +SIZE (rust/crates/libflate-1.4.0.crate) = 42600 +SHA256 (rust/crates/libflate_lz77-1.2.0.crate) = a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf +SIZE (rust/crates/libflate_lz77-1.2.0.crate) = 5964 SHA256 (rust/crates/libgit2-sys-0.15.2+1.6.4.crate) = a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa SIZE (rust/crates/libgit2-sys-0.15.2+1.6.4.crate) = 1755413 SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f @@ -585,8 +597,8 @@ SHA256 (rust/crates/os_pipe-1.1.4.crate) = 0ae859aa07428ca9a929b936690f8b12dc5f1 SIZE (rust/crates/os_pipe-1.1.4.crate) = 11436 SHA256 (rust/crates/owo-colors-3.5.0.crate) = c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f SIZE (rust/crates/owo-colors-3.5.0.crate) = 30310 -SHA256 (rust/crates/papergrid-0.9.1.crate) = ae7891b22598926e4398790c8fe6447930c72a67d36d983a49d6ce682ce83290 -SIZE (rust/crates/papergrid-0.9.1.crate) = 51314 +SHA256 (rust/crates/papergrid-0.10.0.crate) = a2ccbe15f2b6db62f9a9871642746427e297b0ceb85f9a7f1ee5ff47d184d0c8 +SIZE (rust/crates/papergrid-0.10.0.crate) = 52097 SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99 SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f @@ -705,8 +717,8 @@ SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289d SIZE (rust/crates/quick-error-1.2.3.crate) = 15066 SHA256 (rust/crates/quick-xml-0.28.2.crate) = 0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1 SIZE (rust/crates/quick-xml-0.28.2.crate) = 156462 -SHA256 (rust/crates/quick-xml-0.29.0.crate) = 81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51 -SIZE (rust/crates/quick-xml-0.29.0.crate) = 160308 +SHA256 (rust/crates/quick-xml-0.30.0.crate) = eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956 +SIZE (rust/crates/quick-xml-0.30.0.crate) = 161923 SHA256 (rust/crates/quickcheck-1.0.3.crate) = 588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6 SIZE (rust/crates/quickcheck-1.0.3.crate) = 28069 SHA256 (rust/crates/quickcheck_macros-1.0.0.crate) = b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9 @@ -733,8 +745,8 @@ SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2e SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 -SHA256 (rust/crates/reedline-0.22.0.crate) = c2fde955d11817fdcb79d703932fb6b473192cb36b6a92ba21f7f4ac0513374e -SIZE (rust/crates/reedline-0.22.0.crate) = 112365 +SHA256 (rust/crates/reedline-0.23.0.crate) = 3defc4467a8909614bcb02cb304a3e8472c31f7a44e6c6c287eb9575b212bc4d +SIZE (rust/crates/reedline-0.23.0.crate) = 112287 SHA256 (rust/crates/regex-1.9.0.crate) = 89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484 SIZE (rust/crates/regex-1.9.0.crate) = 250963 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132 @@ -745,16 +757,20 @@ SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752 SHA256 (rust/crates/regex-syntax-0.7.3.crate) = 2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846 SIZE (rust/crates/regex-syntax-0.7.3.crate) = 343354 +SHA256 (rust/crates/relative-path-1.8.0.crate) = 4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698 +SIZE (rust/crates/relative-path-1.8.0.crate) = 24865 +SHA256 (rust/crates/rle-decode-fast-1.0.3.crate) = 3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422 +SIZE (rust/crates/rle-decode-fast-1.0.3.crate) = 62086 SHA256 (rust/crates/rmp-0.8.11.crate) = 44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f SIZE (rust/crates/rmp-0.8.11.crate) = 28829 SHA256 (rust/crates/rmp-serde-1.1.1.crate) = c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e SIZE (rust/crates/rmp-serde-1.1.1.crate) = 30360 SHA256 (rust/crates/roxmltree-0.18.0.crate) = d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8 SIZE (rust/crates/roxmltree-0.18.0.crate) = 42463 -SHA256 (rust/crates/rstest-0.17.0.crate) = de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962 -SIZE (rust/crates/rstest-0.17.0.crate) = 26737 -SHA256 (rust/crates/rstest_macros-0.17.0.crate) = 290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8 -SIZE (rust/crates/rstest_macros-0.17.0.crate) = 50678 +SHA256 (rust/crates/rstest-0.18.1.crate) = 2b96577ca10cb3eade7b337eb46520108a67ca2818a24d0b63f41fd62bc9651c +SIZE (rust/crates/rstest-0.18.1.crate) = 28670 +SHA256 (rust/crates/rstest_macros-0.18.1.crate) = 225e674cf31712b8bb15fdbca3ec0c1b9d825c5a24407ff2b7e005fb6a29ba03 +SIZE (rust/crates/rstest_macros-0.18.1.crate) = 56971 SHA256 (rust/crates/rusqlite-0.29.0.crate) = 549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2 SIZE (rust/crates/rusqlite-0.29.0.crate) = 137156 SHA256 (rust/crates/rust-embed-6.8.1.crate) = a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661 @@ -873,8 +889,8 @@ SHA256 (rust/crates/string_cache-0.8.7.crate) = f91138e76242f575eb1d3b38b4f1362f SIZE (rust/crates/string_cache-0.8.7.crate) = 16655 SHA256 (rust/crates/string_cache_codegen-0.5.2.crate) = 6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988 SIZE (rust/crates/string_cache_codegen-0.5.2.crate) = 8156 -SHA256 (rust/crates/strip-ansi-escapes-0.1.1.crate) = 011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8 -SIZE (rust/crates/strip-ansi-escapes-0.1.1.crate) = 8668 +SHA256 (rust/crates/strip-ansi-escapes-0.2.0.crate) = 55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa +SIZE (rust/crates/strip-ansi-escapes-0.2.0.crate) = 8625 SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f SIZE (rust/crates/strum-0.24.1.crate) = 5636 SHA256 (rust/crates/strum-0.25.0.crate) = 290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125 @@ -901,8 +917,8 @@ SHA256 (rust/crates/sys-locale-0.3.0.crate) = ea0b9eefabb91675082b41eb94c3ecd91a SIZE (rust/crates/sys-locale-0.3.0.crate) = 14548 SHA256 (rust/crates/sysinfo-0.29.4.crate) = 751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11 SIZE (rust/crates/sysinfo-0.29.4.crate) = 153776 -SHA256 (rust/crates/tabled-0.12.2.crate) = 0ce69a5028cd9576063ec1f48edb2c75339fd835e6094ef3e05b3a079bf594a6 -SIZE (rust/crates/tabled-0.12.2.crate) = 181257 +SHA256 (rust/crates/tabled-0.14.0.crate) = dfe9c3632da101aba5131ed63f9eed38665f8b3c68703a6bb18124835c1a5d22 +SIZE (rust/crates/tabled-0.14.0.crate) = 192117 SHA256 (rust/crates/target-features-0.1.4.crate) = 06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e SIZE (rust/crates/target-features-0.1.4.crate) = 18176 SHA256 (rust/crates/tempfile-3.7.0.crate) = 5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998 @@ -981,8 +997,8 @@ SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70c SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477 SHA256 (rust/crates/unicode-ident-1.0.10.crate) = 22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73 SIZE (rust/crates/unicode-ident-1.0.10.crate) = 42039 -SHA256 (rust/crates/unicode-linebreak-0.1.4.crate) = c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137 -SIZE (rust/crates/unicode-linebreak-0.1.4.crate) = 74962 +SHA256 (rust/crates/unicode-linebreak-0.1.5.crate) = 3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f +SIZE (rust/crates/unicode-linebreak-0.1.5.crate) = 15324 SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921 SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604 SHA256 (rust/crates/unicode-segmentation-1.10.1.crate) = 1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36 @@ -1013,6 +1029,8 @@ SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7 SIZE (rust/crates/version_check-0.9.4.crate) = 14895 SHA256 (rust/crates/vte-0.10.1.crate) = 6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983 SIZE (rust/crates/vte-0.10.1.crate) = 24947 +SHA256 (rust/crates/vte-0.11.1.crate) = f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197 +SIZE (rust/crates/vte-0.11.1.crate) = 40455 SHA256 (rust/crates/vte_generate_state_changes-0.1.1.crate) = d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff SIZE (rust/crates/vte_generate_state_changes-0.1.1.crate) = 2422 SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6 @@ -1113,5 +1131,5 @@ SHA256 (rust/crates/zstd-safe-6.0.5+zstd.1.5.4.crate) = d56d9e60b4b1758206c238a1 SIZE (rust/crates/zstd-safe-6.0.5+zstd.1.5.4.crate) = 20863 SHA256 (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c SIZE (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 736270 -SHA256 (nushell-nushell-0.83.1_GH0.tar.gz) = a08baef4e487cf200b14cd4a8555110106a947ac439ad8e2759f5ec52c8f9656 -SIZE (nushell-nushell-0.83.1_GH0.tar.gz) = 2648419 +SHA256 (nushell-nushell-0.84.0_GH0.tar.gz) = 483211c44bb40ca6199b52824ea0a935da19d6a40259c4e27c29ae1e3b3be2a7 +SIZE (nushell-nushell-0.84.0_GH0.tar.gz) = 2667049 diff --git a/sysutils/Makefile b/sysutils/Makefile index 237544057f9..8a23cd7e546 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -803,7 +803,6 @@ SUBDIR += munin-contrib SUBDIR += munin-master SUBDIR += munin-node - SUBDIR += muse SUBDIR += mxkill SUBDIR += mybashburn SUBDIR += myrescue @@ -1429,6 +1428,7 @@ SUBDIR += testdisk SUBDIR += tflint SUBDIR += thefish + SUBDIR += tiempo SUBDIR += timelimit SUBDIR += timemon SUBDIR += tiramisu @@ -1611,6 +1611,7 @@ SUBDIR += xbatt SUBDIR += xbattbar SUBDIR += xcdroast + SUBDIR += xcp SUBDIR += xcpustate SUBDIR += xdu SUBDIR += xe diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile index f97d4ab496b..48b0c88d368 100644 --- a/sysutils/appjail/Makefile +++ b/sysutils/appjail/Makefile @@ -1,6 +1,6 @@ PORTNAME= appjail DISTVERSIONPREFIX= v -DISTVERSION= 2.6.0 +DISTVERSION= 2.7.1 CATEGORIES= sysutils MAINTAINER= DtxdF@disroot.org diff --git a/sysutils/appjail/distinfo b/sysutils/appjail/distinfo index 90f470ed354..712df3a94be 100644 --- a/sysutils/appjail/distinfo +++ b/sysutils/appjail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688398408 -SHA256 (DtxdF-AppJail-v2.6.0_GH0.tar.gz) = 1850d87587f1522903f186c3fba56563dbeaf13f4841930d8aceb4c5b716982b -SIZE (DtxdF-AppJail-v2.6.0_GH0.tar.gz) = 249619 +TIMESTAMP = 1692615459 +SHA256 (DtxdF-AppJail-v2.7.1_GH0.tar.gz) = 44f8158c9220f35114ccb188524f035b4ea8b4ad4490c9582cc0114a3e735421 +SIZE (DtxdF-AppJail-v2.7.1_GH0.tar.gz) = 251323 diff --git a/sysutils/appjail/pkg-plist b/sysutils/appjail/pkg-plist index 7674e7b8912..44dc0a71520 100644 --- a/sysutils/appjail/pkg-plist +++ b/sysutils/appjail/pkg-plist @@ -137,3 +137,9 @@ libexec/appjail/appjail-config/tok %%DATADIR%%/makejail/cmd/build/FROM %%DATADIR%%/makejail/write/build/FROM %%DATADIR%%/scripts/kill_child.sh +etc/rc.d/appjail-dns +%%DATADIR%%/files/dnsmasq.conf +%%DATADIR%%/makejail/cmd/all/GLOBAL +%%DATADIR%%/makejail/write/all/GLOBAL +%%DATADIR%%/scripts/ajdns.sh +%%DATADIR%%/scripts/dnsmasq-hook.sh diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 80c5cd1f34c..5c7477f91d5 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= bacula PORTVERSION= 11.0.6 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -91,7 +92,7 @@ BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} -SUB_LIST= BACULA_USER=${BACULA_USER} \ +SUB_LIST+= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ @@ -114,10 +115,14 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql +MYSQL_SUB_LIST= REQ_MYSQL=mysql +MYSQL_SUB_LIST_OFF= REQ_MYSQL="" SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_USES= sqlite:3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql +PGSQL_SUB_LIST= REQ_PGSQL=postgresql +PGSQL_SUB_LIST_OFF= REQ_PGSQL="" MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index 7094f78eee9..4c35f797c0d 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= bacula DISTVERSION= 13.0.1 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -91,7 +92,7 @@ BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} -SUB_LIST= BACULA_USER=${BACULA_USER} \ +SUB_LIST+= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ @@ -114,10 +115,14 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql +MYSQL_SUB_LIST= REQ_MYSQL=mysql +MYSQL_SUB_LIST_OFF= REQ_MYSQL="" SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_USES= sqlite:3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql +PGSQL_SUB_LIST= REQ_PGSQL=postgresql +PGSQL_SUB_LIST_OFF= REQ_PGSQL="" MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index e18d8d17856..a76bf3a7633 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 9.6.7 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -92,7 +92,7 @@ BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} -SUB_LIST= BACULA_USER=${BACULA_USER} \ +SUB_LIST+= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ @@ -115,10 +115,14 @@ CONFFILES= sd dir MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql +MYSQL_SUB_LIST= REQ_MYSQL=mysql +MYSQL_SUB_LIST_OFF= REQ_MYSQL="" SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_USES= sqlite:3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql +PGSQL_SUB_LIST= REQ_PGSQL=postgresql +PGSQL_SUB_LIST_OFF= REQ_PGSQL="" MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx diff --git a/sysutils/cpu-microcode-amd/Makefile b/sysutils/cpu-microcode-amd/Makefile index 6c9cf47fb99..55fe3534c7b 100644 --- a/sysutils/cpu-microcode-amd/Makefile +++ b/sysutils/cpu-microcode-amd/Makefile @@ -1,5 +1,5 @@ PORTNAME= microcode -PORTVERSION= 20230724 +PORTVERSION= 20230808 CATEGORIES= sysutils MASTER_SITES= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/amd-ucode/ PKGNAMEPREFIX= cpu- @@ -33,7 +33,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes PLIST_FILES= ${DISTFILES:S/^/${DATADIR}\//g:C/\?.*//} -_REV= 0bc3126c9cfa0b8c761483215c25382f831a7c6f +_REV= f2eb058afc57348cde66852272d6bf11da1eef8f do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ diff --git a/sysutils/cpu-microcode-amd/distinfo b/sysutils/cpu-microcode-amd/distinfo index 63bc387788f..08fc2e4eacf 100644 --- a/sysutils/cpu-microcode-amd/distinfo +++ b/sysutils/cpu-microcode-amd/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1691693284 -SHA256 (cpu-microcode-amd/microcode_amd.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 8a9d9e8b788e31e61cddc03cb1eeab5db99e0f667128943ff0780e6437d2e43e -SIZE (cpu-microcode-amd/microcode_amd.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 12684 -SHA256 (cpu-microcode-amd/microcode_amd_fam15h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 9d4a668410e72a4bdb86dc23e4261eca04daa83456ada02504115223f356981a -SIZE (cpu-microcode-amd/microcode_amd_fam15h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 7876 -SHA256 (cpu-microcode-amd/microcode_amd_fam16h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = e02ad653b39c975d6c52674b50f23727bb6706bab7b4e5b391a4ce229e7ff121 -SIZE (cpu-microcode-amd/microcode_amd_fam16h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 3510 -SHA256 (cpu-microcode-amd/microcode_amd_fam17h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 1eeaf4c86fb72a0f0e9d4ff28d3213d264ecb47a8dce8bcbd85addd0cfd999bb -SIZE (cpu-microcode-amd/microcode_amd_fam17h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 12924 -SHA256 (cpu-microcode-amd/microcode_amd_fam19h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 2e503e1381154297e30f7fdc83a639d81b02196ff965f63427652709423fdcc4 -SIZE (cpu-microcode-amd/microcode_amd_fam19h.bin?id=0bc3126c9cfa0b8c761483215c25382f831a7c6f) = 16804 +TIMESTAMP = 1692618222 +SHA256 (cpu-microcode-amd/microcode_amd.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 8a9d9e8b788e31e61cddc03cb1eeab5db99e0f667128943ff0780e6437d2e43e +SIZE (cpu-microcode-amd/microcode_amd.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 12684 +SHA256 (cpu-microcode-amd/microcode_amd_fam15h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 9d4a668410e72a4bdb86dc23e4261eca04daa83456ada02504115223f356981a +SIZE (cpu-microcode-amd/microcode_amd_fam15h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 7876 +SHA256 (cpu-microcode-amd/microcode_amd_fam16h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = e02ad653b39c975d6c52674b50f23727bb6706bab7b4e5b391a4ce229e7ff121 +SIZE (cpu-microcode-amd/microcode_amd_fam16h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 3510 +SHA256 (cpu-microcode-amd/microcode_amd_fam17h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 1eeaf4c86fb72a0f0e9d4ff28d3213d264ecb47a8dce8bcbd85addd0cfd999bb +SIZE (cpu-microcode-amd/microcode_amd_fam17h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 12924 +SHA256 (cpu-microcode-amd/microcode_amd_fam19h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = cc026f66376a02a0833d399d05d90c0d9bd45c45982e2c9921a19be0c294ad67 +SIZE (cpu-microcode-amd/microcode_amd_fam19h.bin?id=f2eb058afc57348cde66852272d6bf11da1eef8f) = 39172 diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile index b57e2b93038..70a222fa3d2 100644 --- a/sysutils/debhelper/Makefile +++ b/sysutils/debhelper/Makefile @@ -1,5 +1,5 @@ PORTNAME= debhelper -PORTVERSION= 13.11.4 +PORTVERSION= 13.11.5 CATEGORIES= sysutils MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debhelper/distinfo b/sysutils/debhelper/distinfo index 02a05889115..ed56d6c4f41 100644 --- a/sysutils/debhelper/distinfo +++ b/sysutils/debhelper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589542 -SHA256 (debhelper_13.11.4.tar.xz) = 9ed846bb34f1a5501894d06c9f30e4831f9c18e0b03e1a177ceac7eb63212b42 -SIZE (debhelper_13.11.4.tar.xz) = 580484 +TIMESTAMP = 1692211649 +SHA256 (debhelper_13.11.5.tar.xz) = 776128b17108ef958cf1421b6bce56c139942c7a60b6492f93246d0d27cb8407 +SIZE (debhelper_13.11.5.tar.xz) = 584628 diff --git a/sysutils/doctl/Makefile b/sysutils/doctl/Makefile index 4d8f00eb63c..1626dc34ddf 100644 --- a/sysutils/doctl/Makefile +++ b/sysutils/doctl/Makefile @@ -1,6 +1,5 @@ PORTNAME= doctl -DISTVERSION= 1.90.0 -PORTREVISION= 6 +DISTVERSION= 1.98.0 CATEGORIES= sysutils MASTER_SITES= https://github.com/digitalocean/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source diff --git a/sysutils/doctl/distinfo b/sysutils/doctl/distinfo index df44e7de018..fbb45f6793a 100644 --- a/sysutils/doctl/distinfo +++ b/sysutils/doctl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670875289 -SHA256 (doctl-1.90.0-source.tar.gz) = 77ccb37da62468c1ce932539375e1aa7fd5d5ddfc7c87eb0e7b68d1c974a246e -SIZE (doctl-1.90.0-source.tar.gz) = 7449190 +TIMESTAMP = 1692658088 +SHA256 (doctl-1.98.0-source.tar.gz) = 950139767c6626ecc95149ab6dfef75caa67d82931ca7ca453f8469b470ef145 +SIZE (doctl-1.98.0-source.tar.gz) = 7567477 diff --git a/sysutils/inotify-tools/Makefile b/sysutils/inotify-tools/Makefile index 331457edcf0..1a1be48fa22 100644 --- a/sysutils/inotify-tools/Makefile +++ b/sysutils/inotify-tools/Makefile @@ -1,5 +1,5 @@ PORTNAME= inotify-tools -DISTVERSION= 3.22.6.0 +DISTVERSION= 4.23.8.0 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -10,11 +10,14 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libinotify.so:devel/libinotify +TEST_DEPENDS= bash:shells/bash -USES= autoreconf compiler:c11 gmake libtool localbase +USES= autoreconf compiler:c11 gmake libtool localbase shebangfix USE_GITHUB= yes USE_LDCONFIG= yes +SHEBANG_GLOB= *.t *.sh + GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen @@ -24,9 +27,9 @@ OPTIONS_DEFINE= STATIC OPTIONS_SUB= yes post-patch: - @${REINPLACE_CMD} -e 's|stat64|stat|' \ - ${WRKSRC}/src/common.c \ - ${WRKSRC}/libinotifytools/src/inotifytools.c + @${REINPLACE_CMD} \ + -e 's|SHELL_PATH ?= /bin/bash|SHELL_PATH ?= ${LOCALBASE}/bin/bash|' \ + ${WRKSRC}/t/Makefile post-build-STATIC-on: @cd ${WRKSRC}/src && \ diff --git a/sysutils/inotify-tools/distinfo b/sysutils/inotify-tools/distinfo index e1e6961506f..ceabaaecce2 100644 --- a/sysutils/inotify-tools/distinfo +++ b/sysutils/inotify-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655175207 -SHA256 (inotify-tools-inotify-tools-3.22.6.0_GH0.tar.gz) = c6b7e70f1df09e386217102a1fe041cfc15fa4f3d683d2970140b6814cf2ed12 -SIZE (inotify-tools-inotify-tools-3.22.6.0_GH0.tar.gz) = 92918 +TIMESTAMP = 1692682288 +SHA256 (inotify-tools-inotify-tools-4.23.8.0_GH0.tar.gz) = 8ad8b72a146af57688f3289b33b92a026915fc677997147071887b65b603d20a +SIZE (inotify-tools-inotify-tools-4.23.8.0_GH0.tar.gz) = 93265 diff --git a/sysutils/inotify-tools/files/patch-configure.ac b/sysutils/inotify-tools/files/patch-configure.ac index 851282839de..6ff698392ea 100644 --- a/sysutils/inotify-tools/files/patch-configure.ac +++ b/sysutils/inotify-tools/files/patch-configure.ac @@ -1,7 +1,7 @@ ---- configure.ac.orig 2021-09-28 08:39:16 UTC +--- configure.ac.orig 2023-08-21 19:51:56 UTC +++ configure.ac -@@ -45,6 +45,7 @@ AM_CONDITIONAL([STATIC_BINARY_ENABLE], test "$STATIC_B - +@@ -55,6 +55,7 @@ fi + AM_CONDITIONAL(IS_CLANG, test "$IS_CLANG" = "yes") # Checks for libraries. +AC_SEARCH_LIBS(inotify_init, inotify) diff --git a/sysutils/inotify-tools/files/patch-src_Makefile.am b/sysutils/inotify-tools/files/patch-src_Makefile.am index 5214cd1fdfb..96f6b8cd3c8 100644 --- a/sysutils/inotify-tools/files/patch-src_Makefile.am +++ b/sysutils/inotify-tools/files/patch-src_Makefile.am @@ -1,11 +1,15 @@ ---- src/Makefile.am.orig 2021-09-28 08:39:16 UTC +--- src/Makefile.am.orig 2023-08-21 19:51:56 UTC +++ src/Makefile.am -@@ -11,7 +11,7 @@ fsnotifywatch_SOURCES = inotifywatch.c common.c common - fsnotifywatch_CPPFLAGS = -DENABLE_FANOTIFY +@@ -12,10 +12,10 @@ fsnotifywatch_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_FANOT endif --AM_CFLAGS = -Wall -Wextra -Wshadow -Werror -std=c99 -I../libinotifytools/src -+AM_CFLAGS = -Wall -Wextra -Wshadow -Werror -std=c99 - AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src - LDADD = ../libinotifytools/src/libinotifytools.la + if IS_CLANG +-AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src ++AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument + AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src + else +-AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src ++AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror + AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src + endif diff --git a/sysutils/inotify-tools/files/patch-src_inotifywatch.c b/sysutils/inotify-tools/files/patch-src_inotifywatch.c deleted file mode 100644 index 3b16e9a71dc..00000000000 --- a/sysutils/inotify-tools/files/patch-src_inotifywatch.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/inotifywatch.c.orig 2021-09-28 08:39:16 UTC -+++ src/inotifywatch.c -@@ -11,6 +11,9 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif // __FreeBSD__ - #include - #include - #include -@@ -96,8 +99,24 @@ int main(int argc, char **argv) { - char *inc_iregex = NULL; - int rc; - -+#ifdef __FreeBSD__ -+ sigset_t set, oset; -+#endif // __FreeBSD__ -+ - signal(SIGINT, handle_impatient_user); - -+#ifdef __FreeBSD__ -+ // Block some signals in libinotify's worker thread, so that -+ // handle_signal runs in the context of the main thread and -+ // the 'done' flag is actually honored. -+ sigemptyset(&set); -+ sigaddset(&set, SIGINT); -+ sigaddset(&set, SIGHUP); -+ sigaddset(&set, SIGTERM); -+ sigaddset(&set, SIGALRM); -+ pthread_sigmask(SIG_BLOCK, &set, &oset); -+#endif // __FreeBSD__ -+ - // Parse commandline options, aborting if something goes wrong - if (!parse_opts(&argc, &argv, &events, &timeout, &verbose, &zero, &sort, - &recursive, &no_dereference, &fromfile, &exc_regex, -@@ -130,6 +149,10 @@ int main(int argc, char **argv) { - warn_inotify_init_error(fanotify); - return EXIT_FAILURE; - } -+ -+#ifdef __FreeBSD__ -+ pthread_sigmask(SIG_SETMASK, &oset, NULL); -+#endif // __FreeBSD__ - - // Attempt to watch file - // If events is still 0, make it all events. diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile index c98be6ca7d8..4710db1f61a 100644 --- a/sysutils/mcron/Makefile +++ b/sysutils/mcron/Makefile @@ -1,6 +1,5 @@ PORTNAME= mcron -PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTVERSION= 1.2.3 CATEGORIES= sysutils MASTER_SITES= GNU @@ -11,13 +10,13 @@ WWW= https://www.gnu.org/software/mcron/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= guile:2.2,3.0 gmake pkgconfig +USES= gmake guile:3.0 pkgconfig GNU_CONFIGURE= yes -CONFLICTS_INSTALL= interchange isc-cron # bin/crontab - TEST_TARGET= check +CONFLICTS_INSTALL= interchange isc-cron # bin/crontab + INFO= mcron .include diff --git a/sysutils/mcron/distinfo b/sysutils/mcron/distinfo index 9ee51013124..4cd7ac70ef0 100644 --- a/sysutils/mcron/distinfo +++ b/sysutils/mcron/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628441116 -SHA256 (mcron-1.2.1.tar.gz) = 20fe726c8c53e00261a3a8e191051228b07558292de5abe3714445f1ca10762e -SIZE (mcron-1.2.1.tar.gz) = 326292 +TIMESTAMP = 1692644716 +SHA256 (mcron-1.2.3.tar.gz) = 1bc8c0d362d3b1a30fa0071d7fab696bbfc1da1ed536c42e0480bb9ffd22154e +SIZE (mcron-1.2.3.tar.gz) = 377967 diff --git a/sysutils/mcron/pkg-plist b/sysutils/mcron/pkg-plist index 66078570b91..670a24404e3 100644 --- a/sysutils/mcron/pkg-plist +++ b/sysutils/mcron/pkg-plist @@ -1,30 +1,38 @@ bin/crontab bin/mcron -man/man1/crontab.1.gz -man/man1/mcron.1.gz -man/man8/cron.8.gz -sbin/cron -%%GUILE_SITE%%/mcron/base.scm -%%GUILE_SITE%%/mcron/config.scm -%%GUILE_SITE%%/mcron/core.scm -%%GUILE_SITE%%/mcron/environment.scm -%%GUILE_SITE%%/mcron/job-specifier.scm -%%GUILE_SITE%%/mcron/redirect.scm -%%GUILE_SITE%%/mcron/scripts/cron.scm -%%GUILE_SITE%%/mcron/scripts/crontab.scm -%%GUILE_SITE%%/mcron/scripts/mcron.scm -%%GUILE_SITE%%/mcron/utils.scm -%%GUILE_SITE%%/mcron/vixie-specification.scm -%%GUILE_SITE%%/mcron/vixie-time.scm %%GUILE_SITE_CCACHE%%/mcron/base.go +%%GUILE_SITE_CCACHE%%/mcron/command-line-processor.go %%GUILE_SITE_CCACHE%%/mcron/config.go %%GUILE_SITE_CCACHE%%/mcron/core.go %%GUILE_SITE_CCACHE%%/mcron/environment.go +%%GUILE_SITE_CCACHE%%/mcron/getopt-long.go %%GUILE_SITE_CCACHE%%/mcron/job-specifier.go %%GUILE_SITE_CCACHE%%/mcron/redirect.go %%GUILE_SITE_CCACHE%%/mcron/scripts/cron.go +%%GUILE_SITE_CCACHE%%/mcron/scripts/crontab-access.go %%GUILE_SITE_CCACHE%%/mcron/scripts/crontab.go %%GUILE_SITE_CCACHE%%/mcron/scripts/mcron.go %%GUILE_SITE_CCACHE%%/mcron/utils.go %%GUILE_SITE_CCACHE%%/mcron/vixie-specification.go %%GUILE_SITE_CCACHE%%/mcron/vixie-time.go +libexec/crontab-access-real +man/man1/crontab.1.gz +man/man1/mcron.1.gz +man/man8/cron.8.gz +sbin/cron +sbin/crontab-access +%%GUILE_SITE%%/mcron/base.scm +%%GUILE_SITE%%/mcron/command-line-processor.scm +%%GUILE_SITE%%/mcron/config.scm +%%GUILE_SITE%%/mcron/core.scm +%%GUILE_SITE%%/mcron/environment.scm +%%GUILE_SITE%%/mcron/getopt-long.scm +%%GUILE_SITE%%/mcron/job-specifier.scm +%%GUILE_SITE%%/mcron/redirect.scm +%%GUILE_SITE%%/mcron/scripts/cron.scm +%%GUILE_SITE%%/mcron/scripts/crontab-access.scm +%%GUILE_SITE%%/mcron/scripts/crontab.scm +%%GUILE_SITE%%/mcron/scripts/mcron.scm +%%GUILE_SITE%%/mcron/utils.scm +%%GUILE_SITE%%/mcron/vixie-specification.scm +%%GUILE_SITE%%/mcron/vixie-time.scm diff --git a/sysutils/muse/Makefile b/sysutils/muse/Makefile deleted file mode 100644 index a6e2fabc93e..00000000000 --- a/sysutils/muse/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -PORTNAME= muse -PORTVERSION= 0.2 -CATEGORIES= sysutils -MASTER_SITES= http://www.spatula.net/muse/ - -MAINTAINER= freebsd@spatula.net -COMMENT= Shows memory usage data -WWW= http://www.spatula.net/proc/muse/index.src - -DEPRECATED= Broken on all supported FreeBSD releases for more than an year -EXPIRATION_DATE= 2023-08-16 -BROKEN_FreeBSD_12= fails to compile: read_mem.c: invalid use of undefined type 'struct vmmeter' -BROKEN_FreeBSD_13= fails to compile: read_mem.c: invalid use of undefined type 'struct vmmeter' -BROKEN_FreeBSD_14= fails to compile: read_mem.c: invalid use of undefined type 'struct vmmeter' -BROKEN_mips= fails to compile: muse.c: storage size of 'vmstats' isn't known -BROKEN_mips64= fails to compile: muse.c: storage size of 'vmstats' isn't known - -USES= uidfix - -PLIST_FILES= bin/muse man/man1/muse.1.gz - -.include diff --git a/sysutils/muse/distinfo b/sysutils/muse/distinfo deleted file mode 100644 index 681643c947e..00000000000 --- a/sysutils/muse/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (muse-0.2.tar.gz) = 7a993f0170edfd126593e08fff563ad8eb19f03bf36e327e930d8c056dc3d802 -SIZE (muse-0.2.tar.gz) = 2589 diff --git a/sysutils/muse/pkg-descr b/sysutils/muse/pkg-descr deleted file mode 100644 index efdce2eb174..00000000000 --- a/sysutils/muse/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This is muse, which lists out memory usage categorized by Active, Inactive, -Wired, Reserved, Cache, Buffer, Total, and Free in a manner more friendly -and verbose than vmstat and without as much clutter as top(1). - -It is inspired in part by top(1), OS9's mfree, Linux's free, and DOS's -mem /c. diff --git a/sysutils/ncdu/Makefile b/sysutils/ncdu/Makefile index 58c1bbcbc22..df349e009cf 100644 --- a/sysutils/ncdu/Makefile +++ b/sysutils/ncdu/Makefile @@ -5,7 +5,8 @@ MASTER_SITES= https://dev.yorhel.nl/download/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= NCurses Disk Usage (LTS version written in C) -WWW= https://dev.yorhel.nl/ncdu +WWW= https://dev.yorhel.nl/ncdu \ + https://code.blicky.net/yorhel/ncdu LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING @@ -17,8 +18,6 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/ncdu \ man/man1/ncdu.1.gz -CONFLICTS_INSTALL= ncdu2 - # ncdu 1.* (LTS) is written in C. # ncdu 2.* (stable) is written in Zig which only works with specific version. PORTSCOUT= limit:^1\. diff --git a/sysutils/ncdu2/Makefile b/sysutils/ncdu2/Makefile index b2249715fc9..1838f9785d9 100644 --- a/sysutils/ncdu2/Makefile +++ b/sysutils/ncdu2/Makefile @@ -1,17 +1,19 @@ PORTNAME= ncdu PORTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://dev.yorhel.nl/download/ PKGNAMESUFFIX= 2 MAINTAINER= sunpoet@FreeBSD.org COMMENT= NCurses Disk Usage (stable version written in Zig) -WWW= https://dev.yorhel.nl/ncdu +WWW= https://dev.yorhel.nl/ncdu \ + https://code.blicky.net/yorhel/ncdu LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSES/MIT.txt -BUILD_DEPENDS= zig>=0.10.0<0.11:lang/zig +BUILD_DEPENDS= zig>=0.10.0<0.10.1_99:lang/zig RUN_DEPENDS= zig:lang/zig USES= ncurses @@ -19,16 +21,15 @@ USES= ncurses BUILD_ARGS= --prefix "${PREFIX}" --verbose MAKE_ENV= DESTDIR="${STAGEDIR}" -PLIST_FILES= bin/ncdu \ - share/man/man1/ncdu.1.gz - -CONFLICTS_INSTALL= ncdu +PLIST_FILES= bin/ncdu2 \ + share/man/man1/ncdu2.1.gz do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} zig build ${BUILD_ARGS} do-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ncdu - ${INSTALL_MAN} ${WRKSRC}/ncdu.1 ${STAGEDIR}${PREFIX}/share/man/man1/ncdu.1 + ${MV} ${STAGEDIR}${PREFIX}/bin/ncdu ${STAGEDIR}${PREFIX}/bin/ncdu2 + ${INSTALL_MAN} ${WRKSRC}/ncdu.1 ${STAGEDIR}${PREFIX}/share/man/man1/ncdu2.1 .include diff --git a/sysutils/p5-Rex/Makefile b/sysutils/p5-Rex/Makefile index b54999f3cf0..afcde3baa17 100644 --- a/sysutils/p5-Rex/Makefile +++ b/sysutils/p5-Rex/Makefile @@ -1,5 +1,5 @@ PORTNAME= Rex -PORTVERSION= 1.14.2 +PORTVERSION= 1.14.3 CATEGORIES= sysutils perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:FERKI diff --git a/sysutils/p5-Rex/distinfo b/sysutils/p5-Rex/distinfo index 3bcd8602769..27d7735bf47 100644 --- a/sysutils/p5-Rex/distinfo +++ b/sysutils/p5-Rex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683478894 -SHA256 (Rex-1.14.2.tar.gz) = 21daa951da747f0053afd7ad946fce2feb2c08ddb1cc2bfe00ee46601a8cab56 -SIZE (Rex-1.14.2.tar.gz) = 355848 +TIMESTAMP = 1692211685 +SHA256 (Rex-1.14.3.tar.gz) = 027d3042ef940b67590e5989e96f22ae1e67ba744895c5dd3db569c05137025c +SIZE (Rex-1.14.3.tar.gz) = 377627 diff --git a/sysutils/p5-Rex/pkg-plist b/sysutils/p5-Rex/pkg-plist index 54debde5a15..b0bce51cf3d 100644 --- a/sysutils/p5-Rex/pkg-plist +++ b/sysutils/p5-Rex/pkg-plist @@ -204,6 +204,7 @@ bin/rexify %%SITE_PERL%%/Rex/Pkg/SunOS.pm %%SITE_PERL%%/Rex/Pkg/SunOS/OpenCSW.pm %%SITE_PERL%%/Rex/Pkg/SunOS/pkg.pm +%%SITE_PERL%%/Rex/Pkg/Test.pm %%SITE_PERL%%/Rex/Pkg/Ubuntu.pm %%SITE_PERL%%/Rex/Pkg/VoidLinux.pm %%SITE_PERL%%/Rex/PkgConf.pm diff --git a/sysutils/rtx/Makefile b/sysutils/rtx/Makefile index ef786430f41..64102ee5762 100644 --- a/sysutils/rtx/Makefile +++ b/sysutils/rtx/Makefile @@ -1,6 +1,6 @@ PORTNAME= rtx DISTVERSIONPREFIX= v -DISTVERSION= 2023.8.1 +DISTVERSION= 2023.8.2 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -40,8 +40,8 @@ CARGO_CRATES= addr2line-0.20.0 \ cc-1.0.82 \ cfg-if-1.0.0 \ chrono-0.4.26 \ - clap-4.3.21 \ - clap_builder-4.3.21 \ + clap-4.3.22 \ + clap_builder-4.3.22 \ clap_complete-4.3.2 \ clap_derive-4.3.12 \ clap_lex-0.5.0 \ @@ -176,7 +176,7 @@ CARGO_CRATES= addr2line-0.20.0 \ pretty_assertions-1.4.0 \ proc-macro2-1.0.66 \ quick-xml-0.23.1 \ - quote-1.0.32 \ + quote-1.0.33 \ rayon-1.7.0 \ rayon-core-1.11.0 \ redox_syscall-0.2.16 \ @@ -225,14 +225,14 @@ CARGO_CRATES= addr2line-0.20.0 \ static_assertions-1.1.0 \ strsim-0.10.0 \ syn-1.0.109 \ - syn-2.0.28 \ + syn-2.0.29 \ tar-0.4.40 \ tempfile-3.7.1 \ tera-1.19.0 \ termcolor-1.1.3 \ terminal_size-0.2.6 \ - thiserror-1.0.46 \ - thiserror-impl-1.0.46 \ + thiserror-1.0.47 \ + thiserror-impl-1.0.47 \ thread_local-1.1.4 \ time-0.3.25 \ time-core-0.1.1 \ @@ -293,22 +293,22 @@ CARGO_CRATES= addr2line-0.20.0 \ windows-sys-0.45.0 \ windows-sys-0.48.0 \ windows-targets-0.42.2 \ - windows-targets-0.48.2 \ + windows-targets-0.48.4 \ windows_aarch64_gnullvm-0.42.2 \ - windows_aarch64_gnullvm-0.48.2 \ + windows_aarch64_gnullvm-0.48.4 \ windows_aarch64_msvc-0.42.2 \ - windows_aarch64_msvc-0.48.2 \ + windows_aarch64_msvc-0.48.4 \ windows_i686_gnu-0.42.2 \ - windows_i686_gnu-0.48.2 \ + windows_i686_gnu-0.48.4 \ windows_i686_msvc-0.42.2 \ - windows_i686_msvc-0.48.2 \ + windows_i686_msvc-0.48.4 \ windows_x86_64_gnu-0.42.2 \ - windows_x86_64_gnu-0.48.2 \ + windows_x86_64_gnu-0.48.4 \ windows_x86_64_gnullvm-0.42.2 \ - windows_x86_64_gnullvm-0.48.2 \ + windows_x86_64_gnullvm-0.48.4 \ windows_x86_64_msvc-0.42.2 \ - windows_x86_64_msvc-0.48.2 \ - winnow-0.5.12 \ + windows_x86_64_msvc-0.48.4 \ + winnow-0.5.14 \ winreg-0.10.1 \ xattr-1.0.1 \ yaml-rust-0.4.5 \ diff --git a/sysutils/rtx/distinfo b/sysutils/rtx/distinfo index 54ef55199df..5d4d1aaee49 100644 --- a/sysutils/rtx/distinfo +++ b/sysutils/rtx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1692245121 +TIMESTAMP = 1692731801 SHA256 (rust/crates/addr2line-0.20.0.crate) = f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3 SIZE (rust/crates/addr2line-0.20.0.crate) = 39558 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -49,10 +49,10 @@ SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582eb SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/chrono-0.4.26.crate) = ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5 SIZE (rust/crates/chrono-0.4.26.crate) = 191501 -SHA256 (rust/crates/clap-4.3.21.crate) = c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd -SIZE (rust/crates/clap-4.3.21.crate) = 55024 -SHA256 (rust/crates/clap_builder-4.3.21.crate) = 08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa -SIZE (rust/crates/clap_builder-4.3.21.crate) = 161410 +SHA256 (rust/crates/clap-4.3.22.crate) = b417ae4361bca3f5de378294fc7472d3c4ed86a5ef9f49e93ae722f432aae8d2 +SIZE (rust/crates/clap-4.3.22.crate) = 55025 +SHA256 (rust/crates/clap_builder-4.3.22.crate) = 9c90dc0f0e42c64bff177ca9d7be6fcc9ddb0f26a6e062174a61c84dd6c644d4 +SIZE (rust/crates/clap_builder-4.3.22.crate) = 162153 SHA256 (rust/crates/clap_complete-4.3.2.crate) = 5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce SIZE (rust/crates/clap_complete-4.3.2.crate) = 34104 SHA256 (rust/crates/clap_derive-4.3.12.crate) = 54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050 @@ -321,8 +321,8 @@ SHA256 (rust/crates/proc-macro2-1.0.66.crate) = 18fb31db3f9bddb2ea821cde30a9f701 SIZE (rust/crates/proc-macro2-1.0.66.crate) = 43575 SHA256 (rust/crates/quick-xml-0.23.1.crate) = 11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea SIZE (rust/crates/quick-xml-0.23.1.crate) = 161488 -SHA256 (rust/crates/quote-1.0.32.crate) = 50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965 -SIZE (rust/crates/quote-1.0.32.crate) = 28037 +SHA256 (rust/crates/quote-1.0.33.crate) = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae +SIZE (rust/crates/quote-1.0.33.crate) = 28090 SHA256 (rust/crates/rayon-1.7.0.crate) = 1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b SIZE (rust/crates/rayon-1.7.0.crate) = 169488 SHA256 (rust/crates/rayon-core-1.11.0.crate) = 4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d @@ -419,8 +419,8 @@ SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f0 SIZE (rust/crates/strsim-0.10.0.crate) = 11355 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 SIZE (rust/crates/syn-1.0.109.crate) = 237611 -SHA256 (rust/crates/syn-2.0.28.crate) = 04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567 -SIZE (rust/crates/syn-2.0.28.crate) = 241635 +SHA256 (rust/crates/syn-2.0.29.crate) = c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a +SIZE (rust/crates/syn-2.0.29.crate) = 241664 SHA256 (rust/crates/tar-0.4.40.crate) = b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb SIZE (rust/crates/tar-0.4.40.crate) = 51844 SHA256 (rust/crates/tempfile-3.7.1.crate) = dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651 @@ -431,10 +431,10 @@ SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0 SIZE (rust/crates/termcolor-1.1.3.crate) = 17242 SHA256 (rust/crates/terminal_size-0.2.6.crate) = 8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237 SIZE (rust/crates/terminal_size-0.2.6.crate) = 10585 -SHA256 (rust/crates/thiserror-1.0.46.crate) = d9207952ae1a003f42d3d5e892dac3c6ba42aa6ac0c79a6a91a2b5cb4253e75c -SIZE (rust/crates/thiserror-1.0.46.crate) = 18801 -SHA256 (rust/crates/thiserror-impl-1.0.46.crate) = f1728216d3244de4f14f14f8c15c79be1a7c67867d28d69b719690e2a19fb445 -SIZE (rust/crates/thiserror-impl-1.0.46.crate) = 15076 +SHA256 (rust/crates/thiserror-1.0.47.crate) = 97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f +SIZE (rust/crates/thiserror-1.0.47.crate) = 18811 +SHA256 (rust/crates/thiserror-impl-1.0.47.crate) = 6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b +SIZE (rust/crates/thiserror-impl-1.0.47.crate) = 15080 SHA256 (rust/crates/thread_local-1.1.4.crate) = 5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180 SIZE (rust/crates/thread_local-1.1.4.crate) = 13106 SHA256 (rust/crates/time-0.3.25.crate) = b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea @@ -555,38 +555,38 @@ SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1e SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884 SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071 SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492 -SHA256 (rust/crates/windows-targets-0.48.2.crate) = d1eeca1c172a285ee6c2c84c341ccea837e7c01b12fbb2d0fe3c9e550ce49ec8 -SIZE (rust/crates/windows-targets-0.48.2.crate) = 6902 +SHA256 (rust/crates/windows-targets-0.48.4.crate) = d92ecb8ae0317859f509f17b19adc74b0763b0fa3b085dea8ed01085c8dac222 +SIZE (rust/crates/windows-targets-0.48.4.crate) = 6911 SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8 SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071 -SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.2.crate) = b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f -SIZE (rust/crates/windows_aarch64_gnullvm-0.48.2.crate) = 418490 +SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.4.crate) = d14b0ee96970be7108701212f097ce67ca772fd84cb0ffbc86d26a94e77ba929 +SIZE (rust/crates/windows_aarch64_gnullvm-0.48.4.crate) = 418500 SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43 SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981 -SHA256 (rust/crates/windows_aarch64_msvc-0.48.2.crate) = 571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058 -SIZE (rust/crates/windows_aarch64_msvc-0.48.2.crate) = 798478 +SHA256 (rust/crates/windows_aarch64_msvc-0.48.4.crate) = 1332277d49f440c8fc6014941e320ee47ededfcce10cb272728470f56cc092c9 +SIZE (rust/crates/windows_aarch64_msvc-0.48.4.crate) = 798493 SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236 -SHA256 (rust/crates/windows_i686_gnu-0.48.2.crate) = 2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd -SIZE (rust/crates/windows_i686_gnu-0.48.2.crate) = 844890 +SHA256 (rust/crates/windows_i686_gnu-0.48.4.crate) = d992130ac399d56f02c20564e9975ac5ba08cb25cb832849bbc0d736a101abe5 +SIZE (rust/crates/windows_i686_gnu-0.48.4.crate) = 844900 SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060 SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951 -SHA256 (rust/crates/windows_i686_msvc-0.48.2.crate) = 600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287 -SIZE (rust/crates/windows_i686_msvc-0.48.2.crate) = 864299 +SHA256 (rust/crates/windows_i686_msvc-0.48.4.crate) = 962e96d0fa4b4773c63977977ea6564f463fb10e34a6e07360428b53ae7a3f71 +SIZE (rust/crates/windows_i686_msvc-0.48.4.crate) = 864305 SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36 SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373 -SHA256 (rust/crates/windows_x86_64_gnu-0.48.2.crate) = ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a -SIZE (rust/crates/windows_x86_64_gnu-0.48.2.crate) = 801615 +SHA256 (rust/crates/windows_x86_64_gnu-0.48.4.crate) = 30652a53018a48a9735fbc2986ff0446c37bc8bed0d3f98a0ed4d04cdb80027e +SIZE (rust/crates/windows_x86_64_gnu-0.48.4.crate) = 801626 SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3 SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068 -SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.2.crate) = 8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d -SIZE (rust/crates/windows_x86_64_gnullvm-0.48.2.crate) = 418482 +SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.4.crate) = b5bb3f0331abfe1a95af56067f1e64b3791b55b5373b03869560b6025de809bf +SIZE (rust/crates/windows_x86_64_gnullvm-0.48.4.crate) = 418495 SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0 SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936 -SHA256 (rust/crates/windows_x86_64_msvc-0.48.2.crate) = d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9 -SIZE (rust/crates/windows_x86_64_msvc-0.48.2.crate) = 798416 -SHA256 (rust/crates/winnow-0.5.12.crate) = 83817bbecf72c73bad717ee86820ebf286203d2e04c3951f3cd538869c897364 -SIZE (rust/crates/winnow-0.5.12.crate) = 144683 +SHA256 (rust/crates/windows_x86_64_msvc-0.48.4.crate) = bd1df36d9fd0bbe4849461de9b969f765170f4e0f90497d580a235d515722b10 +SIZE (rust/crates/windows_x86_64_msvc-0.48.4.crate) = 798431 +SHA256 (rust/crates/winnow-0.5.14.crate) = d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97 +SIZE (rust/crates/winnow-0.5.14.crate) = 144956 SHA256 (rust/crates/winreg-0.10.1.crate) = 80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d SIZE (rust/crates/winreg-0.10.1.crate) = 25725 SHA256 (rust/crates/xattr-1.0.1.crate) = f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985 @@ -597,5 +597,5 @@ SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce SIZE (rust/crates/yansi-0.5.1.crate) = 16525 SHA256 (rust/crates/zeroize-1.6.0.crate) = 2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9 SIZE (rust/crates/zeroize-1.6.0.crate) = 19049 -SHA256 (jdxcode-rtx-v2023.8.1_GH0.tar.gz) = 079c743770f2b97af6af5f57f0e24915fa6c09c679cac0128181c30c2a233e39 -SIZE (jdxcode-rtx-v2023.8.1_GH0.tar.gz) = 1835863 +SHA256 (jdxcode-rtx-v2023.8.2_GH0.tar.gz) = beb69e87506d411a7ff75880a16911a5830fc9a5af6896da81568a7164f6cd7e +SIZE (jdxcode-rtx-v2023.8.2_GH0.tar.gz) = 1836151 diff --git a/sysutils/rubygem-bundler/Makefile b/sysutils/rubygem-bundler/Makefile index 1c6babf17e1..aedf1590241 100644 --- a/sysutils/rubygem-bundler/Makefile +++ b/sysutils/rubygem-bundler/Makefile @@ -1,5 +1,5 @@ PORTNAME= bundler -PORTVERSION= 2.4.18 +PORTVERSION= 2.4.19 PORTEPOCH= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-bundler/distinfo b/sysutils/rubygem-bundler/distinfo index 18a1872b6e8..7f3cee7d642 100644 --- a/sysutils/rubygem-bundler/distinfo +++ b/sysutils/rubygem-bundler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070506 -SHA256 (rubygem/bundler-2.4.18.gem) = b6f7d27121d49874a69c9194d4f8ef556b2390cceec41635ccf4f3c58069f70e -SIZE (rubygem/bundler-2.4.18.gem) = 412672 +TIMESTAMP = 1692640094 +SHA256 (rubygem/bundler-2.4.19.gem) = 334dc796438384732fdf19bfa2f623753b7ed85160d08ce1f20009984cefb362 +SIZE (rubygem/bundler-2.4.19.gem) = 413184 diff --git a/sysutils/tiempo/Makefile b/sysutils/tiempo/Makefile new file mode 100644 index 00000000000..9ab380611ad --- /dev/null +++ b/sysutils/tiempo/Makefile @@ -0,0 +1,169 @@ +PORTNAME= tiempo +DISTVERSION= 1.9.0 +CATEGORIES= sysutils + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Command-line time tracker +WWW= https://tiempo.categulario.xyz/ + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cargo + +USE_GITLAB= yes +GL_ACCOUNT= categulario +GL_PROJECT= tiempo-rs +GL_TAGNAME= 87ae271a3f925ad24ced8729604d60b4547f6acb + +CARGO_CRATES= ahash-0.7.6 \ + ahash-0.8.3 \ + aho-corasick-1.0.2 \ + allocator-api2-0.2.15 \ + android-tzdata-0.1.1 \ + android_system_properties-0.1.5 \ + ansi_term-0.12.1 \ + anstream-0.3.2 \ + anstyle-1.0.1 \ + anstyle-parse-0.2.1 \ + anstyle-query-1.0.0 \ + anstyle-wincon-1.0.1 \ + atty-0.2.14 \ + autocfg-0.1.8 \ + autocfg-1.1.0 \ + bitflags-1.3.2 \ + bumpalo-3.13.0 \ + cc-1.0.79 \ + cfg-if-1.0.0 \ + chrono-0.4.26 \ + clap-4.3.5 \ + clap_builder-4.3.5 \ + clap_derive-4.3.2 \ + clap_lex-0.5.0 \ + cloudabi-0.0.3 \ + colorchoice-1.0.0 \ + core-foundation-sys-0.8.4 \ + csv-1.2.2 \ + csv-core-0.1.10 \ + ctor-0.1.26 \ + diff-0.1.13 \ + directories-3.0.2 \ + dirs-sys-0.3.7 \ + either-1.8.1 \ + errno-0.3.1 \ + errno-dragonfly-0.1.2 \ + fallible-iterator-0.2.0 \ + fallible-streaming-iterator-0.1.9 \ + fastrand-1.9.0 \ + fuchsia-cprng-0.1.1 \ + getrandom-0.2.10 \ + hashbrown-0.12.3 \ + hashbrown-0.14.0 \ + hashlink-0.8.3 \ + heck-0.4.1 \ + hermit-abi-0.1.19 \ + hermit-abi-0.3.1 \ + hostname-0.3.1 \ + iana-time-zone-0.1.57 \ + iana-time-zone-haiku-0.1.2 \ + indexmap-1.9.3 \ + instant-0.1.12 \ + io-lifetimes-1.0.11 \ + is-terminal-0.4.7 \ + is_executable-1.0.1 \ + isolang-1.0.0 \ + itertools-0.10.5 \ + itoa-1.0.6 \ + js-sys-0.3.64 \ + lazy_static-1.4.0 \ + libc-0.2.146 \ + libsqlite3-sys-0.25.2 \ + linux-raw-sys-0.3.8 \ + log-0.4.19 \ + match_cfg-0.1.0 \ + memchr-2.5.0 \ + num-traits-0.2.15 \ + once_cell-1.18.0 \ + output_vt100-0.1.3 \ + phf-0.7.24 \ + phf_codegen-0.7.24 \ + phf_generator-0.7.24 \ + phf_shared-0.7.24 \ + pkg-config-0.3.27 \ + pretty_assertions-1.3.0 \ + proc-macro2-1.0.60 \ + quote-1.0.28 \ + rand-0.6.5 \ + rand_chacha-0.1.1 \ + rand_core-0.3.1 \ + rand_core-0.4.2 \ + rand_hc-0.1.0 \ + rand_isaac-0.1.1 \ + rand_jitter-0.1.4 \ + rand_os-0.1.3 \ + rand_pcg-0.1.2 \ + rand_xorshift-0.1.1 \ + rdrand-0.4.0 \ + redox_syscall-0.2.16 \ + redox_syscall-0.3.5 \ + redox_users-0.4.3 \ + regex-1.8.4 \ + regex-syntax-0.7.2 \ + rusqlite-0.28.0 \ + rustix-0.37.20 \ + rustversion-1.0.12 \ + ryu-1.0.13 \ + serde-1.0.164 \ + serde_derive-1.0.164 \ + serde_json-1.0.97 \ + serde_yaml-0.9.21 \ + siphasher-0.2.3 \ + smallvec-1.10.0 \ + smawk-0.3.1 \ + strsim-0.10.0 \ + strum-0.24.1 \ + strum_macros-0.24.3 \ + syn-1.0.109 \ + syn-2.0.18 \ + tempfile-3.6.0 \ + textwrap-0.14.2 \ + thiserror-1.0.40 \ + thiserror-impl-1.0.40 \ + time-0.1.45 \ + timeago-0.3.1 \ + toml-0.5.11 \ + unicode-ident-1.0.9 \ + unicode-linebreak-0.1.4 \ + unicode-width-0.1.10 \ + unsafe-libyaml-0.2.8 \ + utf8parse-0.2.1 \ + vcpkg-0.2.15 \ + version_check-0.9.4 \ + wasi-0.10.0+wasi-snapshot-preview1 \ + wasi-0.11.0+wasi-snapshot-preview1 \ + wasm-bindgen-0.2.87 \ + wasm-bindgen-backend-0.2.87 \ + wasm-bindgen-macro-0.2.87 \ + wasm-bindgen-macro-support-0.2.87 \ + wasm-bindgen-shared-0.2.87 \ + winapi-0.3.9 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-x86_64-pc-windows-gnu-0.4.0 \ + windows-0.48.0 \ + windows-sys-0.48.0 \ + windows-targets-0.48.0 \ + windows_aarch64_gnullvm-0.48.0 \ + windows_aarch64_msvc-0.48.0 \ + windows_i686_gnu-0.48.0 \ + windows_i686_msvc-0.48.0 \ + windows_x86_64_gnu-0.48.0 \ + windows_x86_64_gnullvm-0.48.0 \ + windows_x86_64_msvc-0.48.0 \ + yansi-0.5.1 + +PLIST_FILES= bin/t + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/t + +.include diff --git a/sysutils/tiempo/distinfo b/sysutils/tiempo/distinfo new file mode 100644 index 00000000000..771586e151e --- /dev/null +++ b/sysutils/tiempo/distinfo @@ -0,0 +1,291 @@ +TIMESTAMP = 1692768610 +SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 +SIZE (rust/crates/ahash-0.7.6.crate) = 38030 +SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f +SIZE (rust/crates/ahash-0.8.3.crate) = 42416 +SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41 +SIZE (rust/crates/aho-corasick-1.0.2.crate) = 167694 +SHA256 (rust/crates/allocator-api2-0.2.15.crate) = 56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9 +SIZE (rust/crates/allocator-api2-0.2.15.crate) = 58998 +SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0 +SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674 +SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 +SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243 +SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2 +SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838 +SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163 +SIZE (rust/crates/anstream-0.3.2.crate) = 19504 +SHA256 (rust/crates/anstyle-1.0.1.crate) = 3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd +SIZE (rust/crates/anstyle-1.0.1.crate) = 13977 +SHA256 (rust/crates/anstyle-parse-0.2.1.crate) = 938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333 +SIZE (rust/crates/anstyle-parse-0.2.1.crate) = 24802 +SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b +SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620 +SHA256 (rust/crates/anstyle-wincon-1.0.1.crate) = 180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188 +SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718 +SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 +SIZE (rust/crates/atty-0.2.14.crate) = 5470 +SHA256 (rust/crates/autocfg-0.1.8.crate) = 0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78 +SIZE (rust/crates/autocfg-0.1.8.crate) = 6621 +SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa +SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 +SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a +SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 +SHA256 (rust/crates/bumpalo-3.13.0.crate) = a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1 +SIZE (rust/crates/bumpalo-3.13.0.crate) = 82114 +SHA256 (rust/crates/cc-1.0.79.crate) = 50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f +SIZE (rust/crates/cc-1.0.79.crate) = 62624 +SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd +SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 +SHA256 (rust/crates/chrono-0.4.26.crate) = ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5 +SIZE (rust/crates/chrono-0.4.26.crate) = 191501 +SHA256 (rust/crates/clap-4.3.5.crate) = 2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc +SIZE (rust/crates/clap-4.3.5.crate) = 54241 +SHA256 (rust/crates/clap_builder-4.3.5.crate) = 2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae +SIZE (rust/crates/clap_builder-4.3.5.crate) = 162212 +SHA256 (rust/crates/clap_derive-4.3.2.crate) = b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f +SIZE (rust/crates/clap_derive-4.3.2.crate) = 29053 +SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b +SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792 +SHA256 (rust/crates/cloudabi-0.0.3.crate) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f +SIZE (rust/crates/cloudabi-0.0.3.crate) = 22156 +SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7 +SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857 +SHA256 (rust/crates/core-foundation-sys-0.8.4.crate) = e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa +SIZE (rust/crates/core-foundation-sys-0.8.4.crate) = 17725 +SHA256 (rust/crates/csv-1.2.2.crate) = 626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086 +SIZE (rust/crates/csv-1.2.2.crate) = 887958 +SHA256 (rust/crates/csv-core-0.1.10.crate) = 2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90 +SIZE (rust/crates/csv-core-0.1.10.crate) = 25668 +SHA256 (rust/crates/ctor-0.1.26.crate) = 6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096 +SIZE (rust/crates/ctor-0.1.26.crate) = 10803 +SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8 +SIZE (rust/crates/diff-0.1.13.crate) = 46216 +SHA256 (rust/crates/directories-3.0.2.crate) = e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7 +SIZE (rust/crates/directories-3.0.2.crate) = 15593 +SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6 +SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597 +SHA256 (rust/crates/either-1.8.1.crate) = 7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91 +SIZE (rust/crates/either-1.8.1.crate) = 16027 +SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a +SIZE (rust/crates/errno-0.3.1.crate) = 10348 +SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf +SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810 +SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7 +SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509 +SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a +SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249 +SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be +SIZE (rust/crates/fastrand-1.9.0.crate) = 11910 +SHA256 (rust/crates/fuchsia-cprng-0.1.1.crate) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba +SIZE (rust/crates/fuchsia-cprng-0.1.1.crate) = 2950 +SHA256 (rust/crates/getrandom-0.2.10.crate) = be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427 +SIZE (rust/crates/getrandom-0.2.10.crate) = 34955 +SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888 +SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968 +SHA256 (rust/crates/hashbrown-0.14.0.crate) = 2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a +SIZE (rust/crates/hashbrown-0.14.0.crate) = 116103 +SHA256 (rust/crates/hashlink-0.8.3.crate) = 312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f +SIZE (rust/crates/hashlink-0.8.3.crate) = 26438 +SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8 +SIZE (rust/crates/heck-0.4.1.crate) = 11567 +SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 +SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979 +SHA256 (rust/crates/hermit-abi-0.3.1.crate) = fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286 +SIZE (rust/crates/hermit-abi-0.3.1.crate) = 13793 +SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867 +SIZE (rust/crates/hostname-0.3.1.crate) = 9272 +SHA256 (rust/crates/iana-time-zone-0.1.57.crate) = 2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613 +SIZE (rust/crates/iana-time-zone-0.1.57.crate) = 19785 +SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f +SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185 +SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99 +SIZE (rust/crates/indexmap-1.9.3.crate) = 54653 +SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c +SIZE (rust/crates/instant-0.1.12.crate) = 6128 +SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2 +SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346 +SHA256 (rust/crates/is-terminal-0.4.7.crate) = adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f +SIZE (rust/crates/is-terminal-0.4.7.crate) = 8356 +SHA256 (rust/crates/is_executable-1.0.1.crate) = fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8 +SIZE (rust/crates/is_executable-1.0.1.crate) = 9550 +SHA256 (rust/crates/isolang-1.0.0.crate) = 265ef164908329e47e753c769b14cbb27434abf0c41984dca201484022f09ce5 +SIZE (rust/crates/isolang-1.0.0.crate) = 72781 +SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473 +SIZE (rust/crates/itertools-0.10.5.crate) = 115354 +SHA256 (rust/crates/itoa-1.0.6.crate) = 453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6 +SIZE (rust/crates/itoa-1.0.6.crate) = 10410 +SHA256 (rust/crates/js-sys-0.3.64.crate) = c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a +SIZE (rust/crates/js-sys-0.3.64.crate) = 80313 +SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 +SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 +SHA256 (rust/crates/libc-0.2.146.crate) = f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b +SIZE (rust/crates/libc-0.2.146.crate) = 684707 +SHA256 (rust/crates/libsqlite3-sys-0.25.2.crate) = 29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa +SIZE (rust/crates/libsqlite3-sys-0.25.2.crate) = 4841525 +SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519 +SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776 +SHA256 (rust/crates/log-0.4.19.crate) = b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4 +SIZE (rust/crates/log-0.4.19.crate) = 38073 +SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4 +SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153 +SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d +SIZE (rust/crates/memchr-2.5.0.crate) = 65812 +SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd +SIZE (rust/crates/num-traits-0.2.15.crate) = 49262 +SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d +SIZE (rust/crates/once_cell-1.18.0.crate) = 32969 +SHA256 (rust/crates/output_vt100-0.1.3.crate) = 628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66 +SIZE (rust/crates/output_vt100-0.1.3.crate) = 4473 +SHA256 (rust/crates/phf-0.7.24.crate) = b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18 +SIZE (rust/crates/phf-0.7.24.crate) = 4318 +SHA256 (rust/crates/phf_codegen-0.7.24.crate) = b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e +SIZE (rust/crates/phf_codegen-0.7.24.crate) = 2946 +SHA256 (rust/crates/phf_generator-0.7.24.crate) = 09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662 +SIZE (rust/crates/phf_generator-0.7.24.crate) = 2261 +SHA256 (rust/crates/phf_shared-0.7.24.crate) = 234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0 +SIZE (rust/crates/phf_shared-0.7.24.crate) = 2170 +SHA256 (rust/crates/pkg-config-0.3.27.crate) = 26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964 +SIZE (rust/crates/pkg-config-0.3.27.crate) = 18838 +SHA256 (rust/crates/pretty_assertions-1.3.0.crate) = a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755 +SIZE (rust/crates/pretty_assertions-1.3.0.crate) = 79441 +SHA256 (rust/crates/proc-macro2-1.0.60.crate) = dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406 +SIZE (rust/crates/proc-macro2-1.0.60.crate) = 44160 +SHA256 (rust/crates/quote-1.0.28.crate) = 1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488 +SIZE (rust/crates/quote-1.0.28.crate) = 28382 +SHA256 (rust/crates/rand-0.6.5.crate) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca +SIZE (rust/crates/rand-0.6.5.crate) = 104814 +SHA256 (rust/crates/rand_chacha-0.1.1.crate) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef +SIZE (rust/crates/rand_chacha-0.1.1.crate) = 11703 +SHA256 (rust/crates/rand_core-0.3.1.crate) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b +SIZE (rust/crates/rand_core-0.3.1.crate) = 15483 +SHA256 (rust/crates/rand_core-0.4.2.crate) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc +SIZE (rust/crates/rand_core-0.4.2.crate) = 20243 +SHA256 (rust/crates/rand_hc-0.1.0.crate) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4 +SIZE (rust/crates/rand_hc-0.1.0.crate) = 11644 +SHA256 (rust/crates/rand_isaac-0.1.1.crate) = ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08 +SIZE (rust/crates/rand_isaac-0.1.1.crate) = 16020 +SHA256 (rust/crates/rand_jitter-0.1.4.crate) = 1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b +SIZE (rust/crates/rand_jitter-0.1.4.crate) = 18409 +SHA256 (rust/crates/rand_os-0.1.3.crate) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071 +SIZE (rust/crates/rand_os-0.1.3.crate) = 18965 +SHA256 (rust/crates/rand_pcg-0.1.2.crate) = abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44 +SIZE (rust/crates/rand_pcg-0.1.2.crate) = 10844 +SHA256 (rust/crates/rand_xorshift-0.1.1.crate) = cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c +SIZE (rust/crates/rand_xorshift-0.1.1.crate) = 8997 +SHA256 (rust/crates/rdrand-0.4.0.crate) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 +SIZE (rust/crates/rdrand-0.4.0.crate) = 6456 +SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a +SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 +SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29 +SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 +SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b +SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 +SHA256 (rust/crates/regex-1.8.4.crate) = d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f +SIZE (rust/crates/regex-1.8.4.crate) = 249562 +SHA256 (rust/crates/regex-syntax-0.7.2.crate) = 436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78 +SIZE (rust/crates/regex-syntax-0.7.2.crate) = 339778 +SHA256 (rust/crates/rusqlite-0.28.0.crate) = 01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a +SIZE (rust/crates/rusqlite-0.28.0.crate) = 137504 +SHA256 (rust/crates/rustix-0.37.20.crate) = b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0 +SIZE (rust/crates/rustix-0.37.20.crate) = 327665 +SHA256 (rust/crates/rustversion-1.0.12.crate) = 4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06 +SIZE (rust/crates/rustversion-1.0.12.crate) = 17278 +SHA256 (rust/crates/ryu-1.0.13.crate) = f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041 +SIZE (rust/crates/ryu-1.0.13.crate) = 46823 +SHA256 (rust/crates/serde-1.0.164.crate) = 9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d +SIZE (rust/crates/serde-1.0.164.crate) = 77057 +SHA256 (rust/crates/serde_derive-1.0.164.crate) = d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68 +SIZE (rust/crates/serde_derive-1.0.164.crate) = 54789 +SHA256 (rust/crates/serde_json-1.0.97.crate) = bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a +SIZE (rust/crates/serde_json-1.0.97.crate) = 145152 +SHA256 (rust/crates/serde_yaml-0.9.21.crate) = d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c +SIZE (rust/crates/serde_yaml-0.9.21.crate) = 64229 +SHA256 (rust/crates/siphasher-0.2.3.crate) = 0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac +SIZE (rust/crates/siphasher-0.2.3.crate) = 8717 +SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 +SIZE (rust/crates/smallvec-1.10.0.crate) = 31564 +SHA256 (rust/crates/smawk-0.3.1.crate) = f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043 +SIZE (rust/crates/smawk-0.3.1.crate) = 12840 +SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 +SIZE (rust/crates/strsim-0.10.0.crate) = 11355 +SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f +SIZE (rust/crates/strum-0.24.1.crate) = 5636 +SHA256 (rust/crates/strum_macros-0.24.3.crate) = 1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59 +SIZE (rust/crates/strum_macros-0.24.3.crate) = 20696 +SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 +SIZE (rust/crates/syn-1.0.109.crate) = 237611 +SHA256 (rust/crates/syn-2.0.18.crate) = 32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e +SIZE (rust/crates/syn-2.0.18.crate) = 240648 +SHA256 (rust/crates/tempfile-3.6.0.crate) = 31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6 +SIZE (rust/crates/tempfile-3.6.0.crate) = 31812 +SHA256 (rust/crates/textwrap-0.14.2.crate) = 0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80 +SIZE (rust/crates/textwrap-0.14.2.crate) = 52016 +SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac +SIZE (rust/crates/thiserror-1.0.40.crate) = 18709 +SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f +SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138 +SHA256 (rust/crates/time-0.1.45.crate) = 1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a +SIZE (rust/crates/time-0.1.45.crate) = 28911 +SHA256 (rust/crates/timeago-0.3.1.crate) = 6ec32dde57efb15c035ac074118d7f32820451395f28cb0524a01d4e94983b26 +SIZE (rust/crates/timeago-0.3.1.crate) = 16179 +SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234 +SIZE (rust/crates/toml-0.5.11.crate) = 54910 +SHA256 (rust/crates/unicode-ident-1.0.9.crate) = b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0 +SIZE (rust/crates/unicode-ident-1.0.9.crate) = 41978 +SHA256 (rust/crates/unicode-linebreak-0.1.4.crate) = c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137 +SIZE (rust/crates/unicode-linebreak-0.1.4.crate) = 74962 +SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b +SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968 +SHA256 (rust/crates/unsafe-libyaml-0.2.8.crate) = 1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6 +SIZE (rust/crates/unsafe-libyaml-0.2.8.crate) = 61459 +SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a +SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435 +SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426 +SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735 +SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f +SIZE (rust/crates/version_check-0.9.4.crate) = 14895 +SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f +SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964 +SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 +SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 +SHA256 (rust/crates/wasm-bindgen-0.2.87.crate) = 7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342 +SIZE (rust/crates/wasm-bindgen-0.2.87.crate) = 175052 +SHA256 (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd +SIZE (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 26821 +SHA256 (rust/crates/wasm-bindgen-macro-0.2.87.crate) = dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d +SIZE (rust/crates/wasm-bindgen-macro-0.2.87.crate) = 13897 +SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b +SIZE (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 20006 +SHA256 (rust/crates/wasm-bindgen-shared-0.2.87.crate) = ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1 +SIZE (rust/crates/wasm-bindgen-shared-0.2.87.crate) = 7248 +SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 +SIZE (rust/crates/winapi-0.3.9.crate) = 1200382 +SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 +SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815 +SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f +SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 +SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f +SIZE (rust/crates/windows-0.48.0.crate) = 11864177 +SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9 +SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884 +SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5 +SIZE (rust/crates/windows-targets-0.48.0.crate) = 7466 +SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc +SIZE (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 366543 +SHA256 (rust/crates/windows_aarch64_msvc-0.48.0.crate) = b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3 +SIZE (rust/crates/windows_aarch64_msvc-0.48.0.crate) = 671479 +SHA256 (rust/crates/windows_i686_gnu-0.48.0.crate) = 622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241 +SIZE (rust/crates/windows_i686_gnu-0.48.0.crate) = 741490 +SHA256 (rust/crates/windows_i686_msvc-0.48.0.crate) = 4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00 +SIZE (rust/crates/windows_i686_msvc-0.48.0.crate) = 730056 +SHA256 (rust/crates/windows_x86_64_gnu-0.48.0.crate) = ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1 +SIZE (rust/crates/windows_x86_64_gnu-0.48.0.crate) = 703595 +SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953 +SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536 +SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a +SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422 +SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec +SIZE (rust/crates/yansi-0.5.1.crate) = 16525 +SHA256 (categulario-tiempo-rs-87ae271a3f925ad24ced8729604d60b4547f6acb_GL0.tar.gz) = 16814f2fbfaea27e15a10f0d8797a7d92cb35b393bfefdca413e603ea12c12ad +SIZE (categulario-tiempo-rs-87ae271a3f925ad24ced8729604d60b4547f6acb_GL0.tar.gz) = 132163 diff --git a/sysutils/tiempo/pkg-descr b/sysutils/tiempo/pkg-descr new file mode 100644 index 00000000000..d1620005912 --- /dev/null +++ b/sysutils/tiempo/pkg-descr @@ -0,0 +1,3 @@ +Tiempo is a command-line time tracker. Register the start and end times of your +activities and get results by day, week, month or custom periods of time in +different formats, including custom ones. diff --git a/sysutils/ufetch/Makefile b/sysutils/ufetch/Makefile index 46e753a040c..11e6f840bd8 100644 --- a/sysutils/ufetch/Makefile +++ b/sysutils/ufetch/Makefile @@ -1,24 +1,22 @@ PORTNAME= ufetch DISTVERSIONPREFIX= v -DISTVERSION= 0.2 +DISTVERSION= 0.3 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org COMMENT= Tiny system info for Unix-like operating systems WWW= https://gitlab.com/jschx/ufetch/ -LICENSE= ISCL +LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITLAB= yes - GL_ACCOUNT= jschx -GL_TAGNAME= 9831ec29c6ec3b105a7a1c3573f58f4f7c414e09 NO_ARCH= yes NO_BUILD= yes -PLIST_FILES= bin/ufetch +PLIST_FILES= bin/${PORTNAME} post-patch: ${REINPLACE_CMD} -e 's|-freebsd||g' ${WRKSRC}/${PORTNAME}-freebsd diff --git a/sysutils/ufetch/distinfo b/sysutils/ufetch/distinfo index 2e6fb6c2306..a3ea15dbe73 100644 --- a/sysutils/ufetch/distinfo +++ b/sysutils/ufetch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617892479 -SHA256 (jschx-ufetch-9831ec29c6ec3b105a7a1c3573f58f4f7c414e09_GL0.tar.gz) = 97eef975f5c9cebce898467e5c704bc7f5e9f9fc8068b523490d5bb93f1b43f0 -SIZE (jschx-ufetch-9831ec29c6ec3b105a7a1c3573f58f4f7c414e09_GL0.tar.gz) = 44325 +TIMESTAMP = 1692649211 +SHA256 (ufetch-v0.3.tar.bz2) = 7ce4e63e2703caa47583a79045dd304f16807f671b04c4cdbf45d1ca5c1a4e1d +SIZE (ufetch-v0.3.tar.bz2) = 6608 diff --git a/sysutils/xcp/Makefile b/sysutils/xcp/Makefile new file mode 100644 index 00000000000..b4167a02097 --- /dev/null +++ b/sysutils/xcp/Makefile @@ -0,0 +1,121 @@ +PORTNAME= xcp +DISTVERSIONPREFIX= xcp- +DISTVERSION= 0.3.1 +CATEGORIES= sysutils + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Extended 'cp' command +WWW= https://github.com/tarka/xcp + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= cargo + +USE_GITHUB= yes +GH_ACCOUNT= tarka + +CARGO_CRATES= aho-corasick-0.6.9 \ + ansi_term-0.11.0 \ + atty-0.2.11 \ + autocfg-0.1.2 \ + backtrace-0.3.13 \ + backtrace-sys-0.1.28 \ + bitflags-1.0.4 \ + byteorder-1.3.1 \ + cc-1.0.29 \ + cfg-if-0.1.6 \ + chrono-0.4.6 \ + clap-2.32.0 \ + clicolors-control-1.0.0 \ + cloudabi-0.0.3 \ + console-0.7.5 \ + crossbeam-channel-0.3.8 \ + crossbeam-utils-0.6.5 \ + encode_unicode-0.3.5 \ + escargot-0.4.0 \ + failure-0.1.5 \ + failure_derive-0.1.5 \ + fnv-1.0.6 \ + fuchsia-cprng-0.1.1 \ + glob-0.2.11 \ + globset-0.4.2 \ + heck-0.3.1 \ + ignore-0.4.6 \ + indicatif-0.11.0 \ + itoa-0.4.3 \ + lazy_static-1.2.0 \ + libc-0.2.49 \ + lock_api-0.1.5 \ + log-0.4.6 \ + memchr-2.2.0 \ + num-integer-0.1.39 \ + num-traits-0.2.6 \ + number_prefix-0.2.8 \ + owning_ref-0.4.0 \ + parking_lot-0.7.1 \ + parking_lot_core-0.4.0 \ + proc-macro2-0.4.27 \ + quote-0.6.11 \ + rand-0.6.5 \ + rand_chacha-0.1.1 \ + rand_core-0.3.1 \ + rand_core-0.4.0 \ + rand_hc-0.1.0 \ + rand_isaac-0.1.1 \ + rand_jitter-0.1.3 \ + rand_os-0.1.2 \ + rand_pcg-0.1.1 \ + rand_xorshift-0.1.1 \ + rdrand-0.4.0 \ + redox_syscall-0.1.51 \ + redox_termios-0.1.1 \ + regex-1.1.0 \ + regex-syntax-0.6.5 \ + remove_dir_all-0.5.1 \ + rustc-demangle-0.1.13 \ + rustc_version-0.2.3 \ + ryu-0.2.7 \ + same-file-1.0.4 \ + scopeguard-0.3.3 \ + semver-0.9.0 \ + semver-parser-0.7.0 \ + serde-1.0.87 \ + serde_derive-1.0.87 \ + serde_json-1.0.38 \ + simplelog-0.5.3 \ + smallvec-0.6.8 \ + stable_deref_trait-1.1.1 \ + strsim-0.7.0 \ + structopt-0.2.14 \ + structopt-derive-0.2.14 \ + syn-0.15.26 \ + synstructure-0.10.1 \ + tempfile-3.0.6 \ + term-0.5.1 \ + termion-1.5.1 \ + termios-0.3.1 \ + textwrap-0.10.0 \ + thread_local-0.3.6 \ + time-0.1.42 \ + ucd-util-0.1.3 \ + unicode-segmentation-1.2.1 \ + unicode-width-0.1.5 \ + unicode-xid-0.1.0 \ + unreachable-1.0.0 \ + utf8-ranges-1.0.2 \ + uuid-0.7.2 \ + vec_map-0.8.1 \ + void-1.0.2 \ + walkdir-2.2.7 \ + winapi-0.3.6 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-util-0.1.2 \ + winapi-x86_64-pc-windows-gnu-0.4.0 + +PLIST_FILES= bin/${PORTNAME} + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +.include diff --git a/sysutils/xcp/distinfo b/sysutils/xcp/distinfo new file mode 100644 index 00000000000..29ac2f2232b --- /dev/null +++ b/sysutils/xcp/distinfo @@ -0,0 +1,197 @@ +TIMESTAMP = 1692771388 +SHA256 (rust/crates/aho-corasick-0.6.9.crate) = 1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e +SIZE (rust/crates/aho-corasick-0.6.9.crate) = 25979 +SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b +SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087 +SHA256 (rust/crates/atty-0.2.11.crate) = 9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652 +SIZE (rust/crates/atty-0.2.11.crate) = 5916 +SHA256 (rust/crates/autocfg-0.1.2.crate) = a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799 +SIZE (rust/crates/autocfg-0.1.2.crate) = 10444 +SHA256 (rust/crates/backtrace-0.3.13.crate) = b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5 +SIZE (rust/crates/backtrace-0.3.13.crate) = 34101 +SHA256 (rust/crates/backtrace-sys-0.1.28.crate) = 797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6 +SIZE (rust/crates/backtrace-sys-0.1.28.crate) = 522603 +SHA256 (rust/crates/bitflags-1.0.4.crate) = 228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12 +SIZE (rust/crates/bitflags-1.0.4.crate) = 15282 +SHA256 (rust/crates/byteorder-1.3.1.crate) = a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb +SIZE (rust/crates/byteorder-1.3.1.crate) = 20959 +SHA256 (rust/crates/cc-1.0.29.crate) = 4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e +SIZE (rust/crates/cc-1.0.29.crate) = 42386 +SHA256 (rust/crates/cfg-if-0.1.6.crate) = 082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4 +SIZE (rust/crates/cfg-if-0.1.6.crate) = 7411 +SHA256 (rust/crates/chrono-0.4.6.crate) = 45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878 +SIZE (rust/crates/chrono-0.4.6.crate) = 133108 +SHA256 (rust/crates/clap-2.32.0.crate) = b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e +SIZE (rust/crates/clap-2.32.0.crate) = 196073 +SHA256 (rust/crates/clicolors-control-1.0.0.crate) = 73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9 +SIZE (rust/crates/clicolors-control-1.0.0.crate) = 3916 +SHA256 (rust/crates/cloudabi-0.0.3.crate) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f +SIZE (rust/crates/cloudabi-0.0.3.crate) = 22156 +SHA256 (rust/crates/console-0.7.5.crate) = 2bf3720d3f3fc30b721ef1ae54e13af3264af4af39dc476a8de56a6ee1e2184b +SIZE (rust/crates/console-0.7.5.crate) = 15215 +SHA256 (rust/crates/crossbeam-channel-0.3.8.crate) = 0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b +SIZE (rust/crates/crossbeam-channel-0.3.8.crate) = 79923 +SHA256 (rust/crates/crossbeam-utils-0.6.5.crate) = f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c +SIZE (rust/crates/crossbeam-utils-0.6.5.crate) = 31735 +SHA256 (rust/crates/encode_unicode-0.3.5.crate) = 90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd +SIZE (rust/crates/encode_unicode-0.3.5.crate) = 42677 +SHA256 (rust/crates/escargot-0.4.0.crate) = ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597 +SIZE (rust/crates/escargot-0.4.0.crate) = 17410 +SHA256 (rust/crates/failure-0.1.5.crate) = 795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2 +SIZE (rust/crates/failure-0.1.5.crate) = 36749 +SHA256 (rust/crates/failure_derive-0.1.5.crate) = ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1 +SIZE (rust/crates/failure_derive-0.1.5.crate) = 4884 +SHA256 (rust/crates/fnv-1.0.6.crate) = 2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3 +SIZE (rust/crates/fnv-1.0.6.crate) = 11131 +SHA256 (rust/crates/fuchsia-cprng-0.1.1.crate) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba +SIZE (rust/crates/fuchsia-cprng-0.1.1.crate) = 2950 +SHA256 (rust/crates/glob-0.2.11.crate) = 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb +SIZE (rust/crates/glob-0.2.11.crate) = 18065 +SHA256 (rust/crates/globset-0.4.2.crate) = 4743617a7464bbda3c8aec8558ff2f9429047e025771037df561d383337ff865 +SIZE (rust/crates/globset-0.4.2.crate) = 22474 +SHA256 (rust/crates/heck-0.3.1.crate) = 20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205 +SIZE (rust/crates/heck-0.3.1.crate) = 54666 +SHA256 (rust/crates/ignore-0.4.6.crate) = ad03ca67dc12474ecd91fdb94d758cbd20cb4e7a78ebe831df26a9b7511e1162 +SIZE (rust/crates/ignore-0.4.6.crate) = 45507 +SHA256 (rust/crates/indicatif-0.11.0.crate) = 2c60da1c9abea75996b70a931bba6c750730399005b61ccd853cee50ef3d0d0c +SIZE (rust/crates/indicatif-0.11.0.crate) = 18558 +SHA256 (rust/crates/itoa-0.4.3.crate) = 1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b +SIZE (rust/crates/itoa-0.4.3.crate) = 11061 +SHA256 (rust/crates/lazy_static-1.2.0.crate) = a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1 +SIZE (rust/crates/lazy_static-1.2.0.crate) = 10840 +SHA256 (rust/crates/libc-0.2.49.crate) = 413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e +SIZE (rust/crates/libc-0.2.49.crate) = 375486 +SHA256 (rust/crates/lock_api-0.1.5.crate) = 62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c +SIZE (rust/crates/lock_api-0.1.5.crate) = 16967 +SHA256 (rust/crates/log-0.4.6.crate) = c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6 +SIZE (rust/crates/log-0.4.6.crate) = 22303 +SHA256 (rust/crates/memchr-2.2.0.crate) = 2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39 +SIZE (rust/crates/memchr-2.2.0.crate) = 20939 +SHA256 (rust/crates/num-integer-0.1.39.crate) = e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea +SIZE (rust/crates/num-integer-0.1.39.crate) = 17881 +SHA256 (rust/crates/num-traits-0.2.6.crate) = 0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1 +SIZE (rust/crates/num-traits-0.2.6.crate) = 39923 +SHA256 (rust/crates/number_prefix-0.2.8.crate) = dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee +SIZE (rust/crates/number_prefix-0.2.8.crate) = 5493 +SHA256 (rust/crates/owning_ref-0.4.0.crate) = 49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13 +SIZE (rust/crates/owning_ref-0.4.0.crate) = 12233 +SHA256 (rust/crates/parking_lot-0.7.1.crate) = ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337 +SIZE (rust/crates/parking_lot-0.7.1.crate) = 32670 +SHA256 (rust/crates/parking_lot_core-0.4.0.crate) = 94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9 +SIZE (rust/crates/parking_lot_core-0.4.0.crate) = 26817 +SHA256 (rust/crates/proc-macro2-0.4.27.crate) = 4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915 +SIZE (rust/crates/proc-macro2-0.4.27.crate) = 34098 +SHA256 (rust/crates/quote-0.6.11.crate) = cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1 +SIZE (rust/crates/quote-0.6.11.crate) = 17283 +SHA256 (rust/crates/rand-0.6.5.crate) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca +SIZE (rust/crates/rand-0.6.5.crate) = 104814 +SHA256 (rust/crates/rand_chacha-0.1.1.crate) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef +SIZE (rust/crates/rand_chacha-0.1.1.crate) = 11703 +SHA256 (rust/crates/rand_core-0.3.1.crate) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b +SIZE (rust/crates/rand_core-0.3.1.crate) = 15483 +SHA256 (rust/crates/rand_core-0.4.0.crate) = d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0 +SIZE (rust/crates/rand_core-0.4.0.crate) = 20326 +SHA256 (rust/crates/rand_hc-0.1.0.crate) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4 +SIZE (rust/crates/rand_hc-0.1.0.crate) = 11644 +SHA256 (rust/crates/rand_isaac-0.1.1.crate) = ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08 +SIZE (rust/crates/rand_isaac-0.1.1.crate) = 16020 +SHA256 (rust/crates/rand_jitter-0.1.3.crate) = 7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832 +SIZE (rust/crates/rand_jitter-0.1.3.crate) = 18341 +SHA256 (rust/crates/rand_os-0.1.2.crate) = b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d +SIZE (rust/crates/rand_os-0.1.2.crate) = 18359 +SHA256 (rust/crates/rand_pcg-0.1.1.crate) = 086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05 +SIZE (rust/crates/rand_pcg-0.1.1.crate) = 10881 +SHA256 (rust/crates/rand_xorshift-0.1.1.crate) = cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c +SIZE (rust/crates/rand_xorshift-0.1.1.crate) = 8997 +SHA256 (rust/crates/rdrand-0.4.0.crate) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 +SIZE (rust/crates/rdrand-0.4.0.crate) = 6456 +SHA256 (rust/crates/redox_syscall-0.1.51.crate) = 423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85 +SIZE (rust/crates/redox_syscall-0.1.51.crate) = 15646 +SHA256 (rust/crates/redox_termios-0.1.1.crate) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 +SIZE (rust/crates/redox_termios-0.1.1.crate) = 3227 +SHA256 (rust/crates/regex-1.1.0.crate) = 37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f +SIZE (rust/crates/regex-1.1.0.crate) = 241219 +SHA256 (rust/crates/regex-syntax-0.6.5.crate) = 8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861 +SIZE (rust/crates/regex-syntax-0.6.5.crate) = 272475 +SHA256 (rust/crates/remove_dir_all-0.5.1.crate) = 3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5 +SIZE (rust/crates/remove_dir_all-0.5.1.crate) = 8726 +SHA256 (rust/crates/rustc-demangle-0.1.13.crate) = adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619 +SIZE (rust/crates/rustc-demangle-0.1.13.crate) = 11726 +SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a +SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210 +SHA256 (rust/crates/ryu-0.2.7.crate) = eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7 +SIZE (rust/crates/ryu-0.2.7.crate) = 41382 +SHA256 (rust/crates/same-file-1.0.4.crate) = 8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267 +SIZE (rust/crates/same-file-1.0.4.crate) = 8678 +SHA256 (rust/crates/scopeguard-0.3.3.crate) = 94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27 +SIZE (rust/crates/scopeguard-0.3.3.crate) = 9605 +SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403 +SIZE (rust/crates/semver-0.9.0.crate) = 17344 +SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 +SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268 +SHA256 (rust/crates/serde-1.0.87.crate) = 2e20fde37801e83c891a2dc4ebd3b81f0da4d1fb67a9e0a2a3b921e2536a58ee +SIZE (rust/crates/serde-1.0.87.crate) = 71223 +SHA256 (rust/crates/serde_derive-1.0.87.crate) = 633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea +SIZE (rust/crates/serde_derive-1.0.87.crate) = 48593 +SHA256 (rust/crates/serde_json-1.0.38.crate) = 27dce848e7467aa0e2fcaf0a413641499c0b745452aaca1194d24dedde9e13c9 +SIZE (rust/crates/serde_json-1.0.38.crate) = 69619 +SHA256 (rust/crates/simplelog-0.5.3.crate) = 2e95345f185d5adeb8ec93459d2dc99654e294cc6ccf5b75414d8ea262de9a13 +SIZE (rust/crates/simplelog-0.5.3.crate) = 12816 +SHA256 (rust/crates/smallvec-0.6.8.crate) = 88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15 +SIZE (rust/crates/smallvec-0.6.8.crate) = 21448 +SHA256 (rust/crates/stable_deref_trait-1.1.1.crate) = dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8 +SIZE (rust/crates/stable_deref_trait-1.1.1.crate) = 8007 +SHA256 (rust/crates/strsim-0.7.0.crate) = bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550 +SIZE (rust/crates/strsim-0.7.0.crate) = 8435 +SHA256 (rust/crates/structopt-0.2.14.crate) = 670ad348dc73012fcf78c71f06f9d942232cdd4c859d4b6975e27836c3efc0c3 +SIZE (rust/crates/structopt-0.2.14.crate) = 25517 +SHA256 (rust/crates/structopt-derive-0.2.14.crate) = ef98172b1a00b0bec738508d3726540edcbd186d50dfd326f2b1febbb3559f04 +SIZE (rust/crates/structopt-derive-0.2.14.crate) = 12411 +SHA256 (rust/crates/syn-0.15.26.crate) = f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9 +SIZE (rust/crates/syn-0.15.26.crate) = 145493 +SHA256 (rust/crates/synstructure-0.10.1.crate) = 73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015 +SIZE (rust/crates/synstructure-0.10.1.crate) = 17836 +SHA256 (rust/crates/tempfile-3.0.6.crate) = 37daa55a7240c4931c84559f03b3cad7d19535840d1c4a0cc4e9b2fb0dcf70ff +SIZE (rust/crates/tempfile-3.0.6.crate) = 23337 +SHA256 (rust/crates/term-0.5.1.crate) = 5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561 +SIZE (rust/crates/term-0.5.1.crate) = 39105 +SHA256 (rust/crates/termion-1.5.1.crate) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 +SIZE (rust/crates/termion-1.5.1.crate) = 20659 +SHA256 (rust/crates/termios-0.3.1.crate) = 72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625 +SIZE (rust/crates/termios-0.3.1.crate) = 9541 +SHA256 (rust/crates/textwrap-0.10.0.crate) = 307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6 +SIZE (rust/crates/textwrap-0.10.0.crate) = 15986 +SHA256 (rust/crates/thread_local-0.3.6.crate) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b +SIZE (rust/crates/thread_local-0.3.6.crate) = 12388 +SHA256 (rust/crates/time-0.1.42.crate) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f +SIZE (rust/crates/time-0.1.42.crate) = 30005 +SHA256 (rust/crates/ucd-util-0.1.3.crate) = 535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86 +SIZE (rust/crates/ucd-util-0.1.3.crate) = 25897 +SHA256 (rust/crates/unicode-segmentation-1.2.1.crate) = aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1 +SIZE (rust/crates/unicode-segmentation-1.2.1.crate) = 68223 +SHA256 (rust/crates/unicode-width-0.1.5.crate) = 882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526 +SIZE (rust/crates/unicode-width-0.1.5.crate) = 15761 +SHA256 (rust/crates/unicode-xid-0.1.0.crate) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc +SIZE (rust/crates/unicode-xid-0.1.0.crate) = 16000 +SHA256 (rust/crates/unreachable-1.0.0.crate) = 382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56 +SIZE (rust/crates/unreachable-1.0.0.crate) = 6355 +SHA256 (rust/crates/utf8-ranges-1.0.2.crate) = 796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737 +SIZE (rust/crates/utf8-ranges-1.0.2.crate) = 8510 +SHA256 (rust/crates/uuid-0.7.2.crate) = 0238db0c5b605dd1cf51de0f21766f97fba2645897024461d6a00c036819a768 +SIZE (rust/crates/uuid-0.7.2.crate) = 35126 +SHA256 (rust/crates/vec_map-0.8.1.crate) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a +SIZE (rust/crates/vec_map-0.8.1.crate) = 14959 +SHA256 (rust/crates/void-1.0.2.crate) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d +SIZE (rust/crates/void-1.0.2.crate) = 2356 +SHA256 (rust/crates/walkdir-2.2.7.crate) = 9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1 +SIZE (rust/crates/walkdir-2.2.7.crate) = 23507 +SHA256 (rust/crates/winapi-0.3.6.crate) = 92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0 +SIZE (rust/crates/winapi-0.3.6.crate) = 1029391 +SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 +SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815 +SHA256 (rust/crates/winapi-util-0.1.2.crate) = 7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9 +SIZE (rust/crates/winapi-util-0.1.2.crate) = 7810 +SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f +SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 +SHA256 (tarka-xcp-xcp-0.3.1_GH0.tar.gz) = 8f271b476c1295edc087255e235f099dcf51f78aab986603d74306f1a97db94e +SIZE (tarka-xcp-xcp-0.3.1_GH0.tar.gz) = 34152 diff --git a/sysutils/xcp/pkg-descr b/sysutils/xcp/pkg-descr new file mode 100644 index 00000000000..8439fcaabc7 --- /dev/null +++ b/sysutils/xcp/pkg-descr @@ -0,0 +1,19 @@ +xcp is a (partial) clone of the Unix 'cp' command. It is not intended as a +full replacement, but as a companion utility with some more user-friendly +feedback and some optimisations that make sense under certain tasks (see +below). + +Features: +* Displays a progress-bar, both for directory and single file copies. This can + be disabled with `--no-progress`. +* On Linux it uses `copy_file_range` call to copy files. This is the most + efficient method of file-copying under Linux; in particular it is + filesystem-aware, and can massively speed-up copies on network mounts by + performing the copy operations server-side. However, unlike `copy_file_range` + sparse files are detected and handled appropriately. +* Non-Linux Unix-like OSs (OS X, *BSD) are supported via fall-back operation + (although sparse-files are not yet supported in this case). +* Optionally understands `.gitignore` files to limit the copied directories. +* Optimised for 'modern' systems (i.e. multiple cores, copious RAM, and + solid-state disks, especially ones connected into the main system bus, + e.g. M.2). diff --git a/textproc/Makefile b/textproc/Makefile index 126df16034c..41373a453e8 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1593,6 +1593,7 @@ SUBDIR += py-texttable SUBDIR += py-textual SUBDIR += py-three-merge + SUBDIR += py-tiktoken SUBDIR += py-tinycss SUBDIR += py-tinycss2 SUBDIR += py-toml @@ -1900,6 +1901,7 @@ SUBDIR += rubygem-ya2yaml SUBDIR += rubygem-yard SUBDIR += rubygem-yard-chef + SUBDIR += rubygem-yarp SUBDIR += rubygem-zmq SUBDIR += rw-aspell SUBDIR += rxp diff --git a/textproc/angle-grinder/Makefile b/textproc/angle-grinder/Makefile index 5fed25e670a..191e7cf763a 100644 --- a/textproc/angle-grinder/Makefile +++ b/textproc/angle-grinder/Makefile @@ -1,7 +1,7 @@ PORTNAME= angle-grinder DISTVERSIONPREFIX= v DISTVERSION= 0.19.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org @@ -11,9 +11,7 @@ WWW= https://github.com/rcoh/angle-grinder LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_14= fails to compile: failed to run custom build command for tikv-jemalloc-sys v0.5.3+5.3.0-patched - -USES= cargo ssl +USES= cargo gmake ssl USE_GITHUB= yes GH_ACCOUNT= rcoh diff --git a/textproc/difftastic/Makefile b/textproc/difftastic/Makefile index fbc14e15eef..39262486d5c 100644 --- a/textproc/difftastic/Makefile +++ b/textproc/difftastic/Makefile @@ -1,5 +1,5 @@ PORTNAME= difftastic -DISTVERSION= 0.49.0 +DISTVERSION= 0.50.0 CATEGORIES= textproc MAINTAINER= amdmi3@FreeBSD.org @@ -31,7 +31,7 @@ CARGO_CRATES= ahash-0.7.6 \ clap_lex-0.2.0 \ const_format-0.2.23 \ const_format_proc_macros-0.2.22 \ - crossbeam-channel-0.5.4 \ + crossbeam-channel-0.5.8 \ crossbeam-deque-0.8.1 \ crossbeam-epoch-0.9.8 \ crossbeam-utils-0.8.8 \ @@ -52,11 +52,13 @@ CARGO_CRATES= ahash-0.7.6 \ hashbrown-0.12.3 \ heck-0.4.1 \ hermit-abi-0.1.19 \ + humansize-2.1.3 \ humantime-1.3.0 \ indexmap-1.7.0 \ itertools-0.10.3 \ lazy_static-1.4.0 \ libc-0.2.139 \ + libm-0.2.7 \ libmimalloc-sys-0.1.24 \ lock_api-0.4.9 \ log-0.4.17 \ @@ -85,8 +87,8 @@ CARGO_CRATES= ahash-0.7.6 \ quick-error-1.2.3 \ quote-1.0.32 \ radix-heap-0.4.2 \ - rayon-1.6.1 \ - rayon-core-1.10.1 \ + rayon-1.7.0 \ + rayon-core-1.11.0 \ redox_syscall-0.2.16 \ regex-1.7.3 \ regex-automata-0.1.10 \ diff --git a/textproc/difftastic/distinfo b/textproc/difftastic/distinfo index 44f5ff05d90..8231e204b10 100644 --- a/textproc/difftastic/distinfo +++ b/textproc/difftastic/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1690467843 +TIMESTAMP = 1692556204 SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 SIZE (rust/crates/ahash-0.7.6.crate) = 38030 SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac @@ -29,8 +29,8 @@ SHA256 (rust/crates/const_format-0.2.23.crate) = 0936ffe6d0c8d6a51b3b0a73b2acbe9 SIZE (rust/crates/const_format-0.2.23.crate) = 72319 SHA256 (rust/crates/const_format_proc_macros-0.2.22.crate) = ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d SIZE (rust/crates/const_format_proc_macros-0.2.22.crate) = 24274 -SHA256 (rust/crates/crossbeam-channel-0.5.4.crate) = 5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53 -SIZE (rust/crates/crossbeam-channel-0.5.4.crate) = 88237 +SHA256 (rust/crates/crossbeam-channel-0.5.8.crate) = a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200 +SIZE (rust/crates/crossbeam-channel-0.5.8.crate) = 90455 SHA256 (rust/crates/crossbeam-deque-0.8.1.crate) = 6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e SIZE (rust/crates/crossbeam-deque-0.8.1.crate) = 20852 SHA256 (rust/crates/crossbeam-epoch-0.9.8.crate) = 1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c @@ -71,6 +71,8 @@ SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19 SIZE (rust/crates/heck-0.4.1.crate) = 11567 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979 +SHA256 (rust/crates/humansize-2.1.3.crate) = 6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7 +SIZE (rust/crates/humansize-2.1.3.crate) = 11953 SHA256 (rust/crates/humantime-1.3.0.crate) = df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f SIZE (rust/crates/humantime-1.3.0.crate) = 17020 SHA256 (rust/crates/indexmap-1.7.0.crate) = bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5 @@ -81,6 +83,8 @@ SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832a SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 SHA256 (rust/crates/libc-0.2.139.crate) = 201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79 SIZE (rust/crates/libc-0.2.139.crate) = 638983 +SHA256 (rust/crates/libm-0.2.7.crate) = f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4 +SIZE (rust/crates/libm-0.2.7.crate) = 115688 SHA256 (rust/crates/libmimalloc-sys-0.1.24.crate) = 7705fc40f6ed493f73584abbb324e74f96b358ff60dfe5659a0f8fc12c590a69 SIZE (rust/crates/libmimalloc-sys-0.1.24.crate) = 1119801 SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df @@ -137,10 +141,10 @@ SHA256 (rust/crates/quote-1.0.32.crate) = 50f3b39ccfb720540debaa0164757101c08ecb SIZE (rust/crates/quote-1.0.32.crate) = 28037 SHA256 (rust/crates/radix-heap-0.4.2.crate) = 59ffec9df464013295b499298811e6a3de31bf8128092135826517db12dee601 SIZE (rust/crates/radix-heap-0.4.2.crate) = 9323 -SHA256 (rust/crates/rayon-1.6.1.crate) = 6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7 -SIZE (rust/crates/rayon-1.6.1.crate) = 166330 -SHA256 (rust/crates/rayon-core-1.10.1.crate) = cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3 -SIZE (rust/crates/rayon-core-1.10.1.crate) = 70008 +SHA256 (rust/crates/rayon-1.7.0.crate) = 1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b +SIZE (rust/crates/rayon-1.7.0.crate) = 169488 +SHA256 (rust/crates/rayon-core-1.11.0.crate) = 4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d +SIZE (rust/crates/rayon-core-1.11.0.crate) = 73118 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 SHA256 (rust/crates/regex-1.7.3.crate) = 8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d @@ -231,5 +235,5 @@ SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce SIZE (rust/crates/yansi-0.5.1.crate) = 16525 SHA256 (Wilfred-tree_magic-13dd6dda15c7062bd8f7dd5bc9bb5b16ce9ee613_GH0.tar.gz) = 223745daf2d61920e2a8895b26cf2defcb173fcf0a95f88341a2f5b90a87b766 SIZE (Wilfred-tree_magic-13dd6dda15c7062bd8f7dd5bc9bb5b16ce9ee613_GH0.tar.gz) = 15665052 -SHA256 (Wilfred-difftastic-0.49.0_GH0.tar.gz) = 68a65c23ac0857b1a0bdd34d16605ac73fb53238504755d17fe6706c3e96af47 -SIZE (Wilfred-difftastic-0.49.0_GH0.tar.gz) = 56962613 +SHA256 (Wilfred-difftastic-0.50.0_GH0.tar.gz) = 20693882580d40a70173fb851aed5d92360040d9b06a821f4b4ffbbc2bf2326a +SIZE (Wilfred-difftastic-0.50.0_GH0.tar.gz) = 57193941 diff --git a/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile index 89c7399d7ea..f681730b62c 100644 --- a/textproc/ibus-m17n/Makefile +++ b/textproc/ibus-m17n/Makefile @@ -1,5 +1,5 @@ PORTNAME= ibus-m17n -DISTVERSION= 1.4.21 +DISTVERSION= 1.4.22 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org diff --git a/textproc/ibus-m17n/distinfo b/textproc/ibus-m17n/distinfo index 21268681ff2..57fe72d5195 100644 --- a/textproc/ibus-m17n/distinfo +++ b/textproc/ibus-m17n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691685491 -SHA256 (ibus-ibus-m17n-1.4.21_GH0.tar.gz) = 025adce529221da0e904552d546abe398d332f875234f3324800518254331498 -SIZE (ibus-ibus-m17n-1.4.21_GH0.tar.gz) = 648272 +TIMESTAMP = 1692684153 +SHA256 (ibus-ibus-m17n-1.4.22_GH0.tar.gz) = a22ccf9bc8879b7b07bbc21ed94783500e4f8f56fa087ed672d121d8ad50fc11 +SIZE (ibus-ibus-m17n-1.4.22_GH0.tar.gz) = 648741 diff --git a/textproc/ibus-m17n/pkg-plist b/textproc/ibus-m17n/pkg-plist index be0343293db..4b39d4b4a71 100644 --- a/textproc/ibus-m17n/pkg-plist +++ b/textproc/ibus-m17n/pkg-plist @@ -24,6 +24,7 @@ share/icons/hicolor/64x64/apps/ibus-m17n.png %%NLS%%share/locale/id/LC_MESSAGES/ibus-m17n.mo %%NLS%%share/locale/ja/LC_MESSAGES/ibus-m17n.mo %%NLS%%share/locale/ka/LC_MESSAGES/ibus-m17n.mo +%%NLS%%share/locale/lt/LC_MESSAGES/ibus-m17n.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/ibus-m17n.mo %%NLS%%share/locale/si/LC_MESSAGES/ibus-m17n.mo %%NLS%%share/locale/sv/LC_MESSAGES/ibus-m17n.mo diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile index 95e755035ce..dfa0adcbc8f 100644 --- a/textproc/ibus-table/Makefile +++ b/textproc/ibus-table/Makefile @@ -1,5 +1,5 @@ PORTNAME= ibus-table -DISTVERSION= 1.17.1 +DISTVERSION= 1.17.2 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org diff --git a/textproc/ibus-table/distinfo b/textproc/ibus-table/distinfo index b10b327f722..05062cf7e8c 100644 --- a/textproc/ibus-table/distinfo +++ b/textproc/ibus-table/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689176689 -SHA256 (kaio-ibus-table-1.17.1_GH0.tar.gz) = c8662a60578548d5c630ed77c6fbae8bfc213886fe7bc8344dc60e241a89b088 -SIZE (kaio-ibus-table-1.17.1_GH0.tar.gz) = 1402233 +TIMESTAMP = 1692685134 +SHA256 (kaio-ibus-table-1.17.2_GH0.tar.gz) = b9eb34ad92342eb769f0e3368ef513d1c6842c211ca30e1bd5f1ab34ca5db351 +SIZE (kaio-ibus-table-1.17.2_GH0.tar.gz) = 1402464 diff --git a/textproc/p5-Lingua-EN-Fathom/Makefile b/textproc/p5-Lingua-EN-Fathom/Makefile index 79ddfa8a5a7..87ee4719b1b 100644 --- a/textproc/p5-Lingua-EN-Fathom/Makefile +++ b/textproc/p5-Lingua-EN-Fathom/Makefile @@ -1,5 +1,5 @@ PORTNAME= Lingua-EN-Fathom -PORTVERSION= 1.24 +PORTVERSION= 1.27 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Lingua-EN-Fathom/distinfo b/textproc/p5-Lingua-EN-Fathom/distinfo index 1046e7c6523..ca74507f8bf 100644 --- a/textproc/p5-Lingua-EN-Fathom/distinfo +++ b/textproc/p5-Lingua-EN-Fathom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902975 -SHA256 (Lingua-EN-Fathom-1.24.tar.gz) = de47f658c8cc2c27c751cc01ff85d0f60603de086685b778123017cf901d5033 -SIZE (Lingua-EN-Fathom-1.24.tar.gz) = 10808 +TIMESTAMP = 1692212107 +SHA256 (Lingua-EN-Fathom-1.27.tar.gz) = db125587eb07542242d759ef02317ae76e82535c741d05e599c95fac275ccfe1 +SIZE (Lingua-EN-Fathom-1.27.tar.gz) = 11155 diff --git a/textproc/p5-Text-CSV/Makefile b/textproc/p5-Text-CSV/Makefile index ebfb90193d3..126be13919a 100644 --- a/textproc/p5-Text-CSV/Makefile +++ b/textproc/p5-Text-CSV/Makefile @@ -1,5 +1,5 @@ PORTNAME= Text-CSV -PORTVERSION= 2.02 +PORTVERSION= 2.03 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,14 +11,12 @@ WWW= https://metacpan.org/release/Text-CSV LICENSE= ART10 GPLv1+ LICENSE_COMB= dual +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= p5-Text-CSV_XS>=1.51:textproc/p5-Text-CSV_XS + USES= perl5 USE_PERL5= configure NO_ARCH= yes -OPTIONS_DEFINE= XS - -XS_BUILD_DEPENDS= p5-Text-CSV_XS>=1.48:textproc/p5-Text-CSV_XS -XS_RUN_DEPENDS= p5-Text-CSV_XS>=1.48:textproc/p5-Text-CSV_XS - .include diff --git a/textproc/p5-Text-CSV/distinfo b/textproc/p5-Text-CSV/distinfo index 5bdaebda705..b3391f7c773 100644 --- a/textproc/p5-Text-CSV/distinfo +++ b/textproc/p5-Text-CSV/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661599601 -SHA256 (Text-CSV-2.02.tar.gz) = 84120de3e10489ea8fbbb96411a340c32cafbe5cdff7dd9576b207081baa9d24 -SIZE (Text-CSV-2.02.tar.gz) = 136346 +TIMESTAMP = 1692212109 +SHA256 (Text-CSV-2.03.tar.gz) = 48bbce9f234935a88595618e04dd141628246d650f2a726024df1c137e0b65fb +SIZE (Text-CSV-2.03.tar.gz) = 140735 diff --git a/textproc/py-petl/Makefile b/textproc/py-petl/Makefile index 0cae2cc4547..976adf682d4 100644 --- a/textproc/py-petl/Makefile +++ b/textproc/py-petl/Makefile @@ -1,6 +1,5 @@ PORTNAME= petl -PORTVERSION= 1.7.12 -PORTREVISION= 1 +PORTVERSION= 1.7.13 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +11,7 @@ WWW= https://github.com/petl-developers/petl LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} @@ -39,7 +38,7 @@ XPATH_DESC= XPath support WHOOSH_DESC= Whoosh support AVRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastavro>=0.24.0:textproc/py-fastavro@${PY_FLAVOR} -DB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.6:databases/py-sqlalchemy14@${PY_FLAVOR} +DB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.6<2.0:databases/py-sqlalchemy14@${PY_FLAVOR} HDF5_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython>=0.29.13:lang/cython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numexpr>=2.6.9:math/py-numexpr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.4,1:math/py-numpy@${PY_FLAVOR} \ diff --git a/textproc/py-petl/distinfo b/textproc/py-petl/distinfo index 0e4152ab9fd..a807fa1ee20 100644 --- a/textproc/py-petl/distinfo +++ b/textproc/py-petl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590020 -SHA256 (petl-1.7.12.tar.gz) = d4a94e0d6f1274062fe92353b99a007ee12c7c84b4c31c0cb9713ed5dbda22e7 -SIZE (petl-1.7.12.tar.gz) = 409603 +TIMESTAMP = 1692211815 +SHA256 (petl-1.7.13.tar.gz) = 964136f10582a511807929fae9854af229a67a972f64cfc7c636a65efca157d7 +SIZE (petl-1.7.13.tar.gz) = 409877 diff --git a/textproc/py-pygccxml/Makefile b/textproc/py-pygccxml/Makefile index ac16440436e..c100d398087 100644 --- a/textproc/py-pygccxml/Makefile +++ b/textproc/py-pygccxml/Makefile @@ -1,6 +1,6 @@ PORTNAME= pygccxml DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0 +DISTVERSION= 2.4.0 CATEGORIES= textproc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,13 +11,16 @@ WWW= https://github.com/CastXML/pygccxml LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE.rst +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= castxml:textproc/castxml +py39_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.6:devel/py-importlib-metadata@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coveralls>0:devel/py-coveralls@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist pytest # tests fail due to missing dependencies, see https://github.com/CastXML/pygccxml/issues/160 +USE_PYTHON= pep517 autoplist pytest # tests fail due to missing dependencies, see https://github.com/CastXML/pygccxml/issues/160 USE_GITHUB= yes GH_ACCOUNT= CastXML diff --git a/textproc/py-pygccxml/distinfo b/textproc/py-pygccxml/distinfo index f41dfe26247..63ad4e59ca2 100644 --- a/textproc/py-pygccxml/distinfo +++ b/textproc/py-pygccxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691046764 -SHA256 (CastXML-pygccxml-v2.3.0_GH0.tar.gz) = bc20be367074af644e8ab4faca04dc905c6b93de0717bcbe92ef8e2a3934b91b -SIZE (CastXML-pygccxml-v2.3.0_GH0.tar.gz) = 3165248 +TIMESTAMP = 1692691673 +SHA256 (CastXML-pygccxml-v2.4.0_GH0.tar.gz) = d59867809f8008ec48a5567a7203bb4c130ff203a8ddd708c945690749723c70 +SIZE (CastXML-pygccxml-v2.4.0_GH0.tar.gz) = 3165189 diff --git a/textproc/py-tiktoken/Makefile b/textproc/py-tiktoken/Makefile new file mode 100644 index 00000000000..ec107bbec15 --- /dev/null +++ b/textproc/py-tiktoken/Makefile @@ -0,0 +1,35 @@ +PORTNAME= tiktoken +PORTVERSION= 0.4.0 +CATEGORIES= textproc python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Fast BPE tokeniser for use with OpenAI's models +WWW= https://github.com/openai/tiktoken + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=62.4:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.5.2:devel/py-setuptools-rust@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=2022.1.18:textproc/py-regex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAVOR} + +USES= cargo python +USE_PYTHON= autoplist concurrent pep517 + +CARGO_BUILD= no +CARGO_INSTALL= no + +OPTIONS_DEFINE= BLOBFILE +BLOBFILE_DESC= Blob file support + +BLOBFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blobfile>=2:net/py-blobfile@${PY_FLAVOR} + +post-install: + ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + + +.include diff --git a/textproc/py-tiktoken/Makefile.crates b/textproc/py-tiktoken/Makefile.crates new file mode 100644 index 00000000000..1eaa2bb56a7 --- /dev/null +++ b/textproc/py-tiktoken/Makefile.crates @@ -0,0 +1,43 @@ +CARGO_CRATES= aho-corasick-1.0.4 \ + autocfg-1.1.0 \ + bit-set-0.5.3 \ + bit-vec-0.6.3 \ + bitflags-1.3.2 \ + bstr-1.6.0 \ + cfg-if-1.0.0 \ + fancy-regex-0.10.0 \ + indoc-1.0.9 \ + libc-0.2.147 \ + lock_api-0.4.10 \ + memchr-2.5.0 \ + memoffset-0.6.5 \ + once_cell-1.18.0 \ + parking_lot-0.12.1 \ + parking_lot_core-0.9.8 \ + proc-macro2-1.0.66 \ + pyo3-0.17.3 \ + pyo3-build-config-0.17.3 \ + pyo3-ffi-0.17.3 \ + pyo3-macros-0.17.3 \ + pyo3-macros-backend-0.17.3 \ + quote-1.0.33 \ + redox_syscall-0.3.5 \ + regex-1.9.3 \ + regex-automata-0.3.6 \ + regex-syntax-0.7.4 \ + rustc-hash-1.1.0 \ + scopeguard-1.2.0 \ + serde-1.0.183 \ + smallvec-1.11.0 \ + syn-1.0.109 \ + target-lexicon-0.12.11 \ + unicode-ident-1.0.11 \ + unindent-0.1.11 \ + windows-targets-0.48.5 \ + windows_aarch64_gnullvm-0.48.5 \ + windows_aarch64_msvc-0.48.5 \ + windows_i686_gnu-0.48.5 \ + windows_i686_msvc-0.48.5 \ + windows_x86_64_gnu-0.48.5 \ + windows_x86_64_gnullvm-0.48.5 \ + windows_x86_64_msvc-0.48.5 diff --git a/textproc/py-tiktoken/distinfo b/textproc/py-tiktoken/distinfo new file mode 100644 index 00000000000..568934741e8 --- /dev/null +++ b/textproc/py-tiktoken/distinfo @@ -0,0 +1,89 @@ +TIMESTAMP = 1692211619 +SHA256 (tiktoken-0.4.0.tar.gz) = 59b20a819969735b48161ced9b92f05dc4519c17be4015cfb73b65270a243620 +SIZE (tiktoken-0.4.0.tar.gz) = 25504 +SHA256 (rust/crates/aho-corasick-1.0.4.crate) = 6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a +SIZE (rust/crates/aho-corasick-1.0.4.crate) = 171175 +SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa +SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 +SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1 +SIZE (rust/crates/bit-set-0.5.3.crate) = 14470 +SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb +SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927 +SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a +SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 +SHA256 (rust/crates/bstr-1.6.0.crate) = 6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05 +SIZE (rust/crates/bstr-1.6.0.crate) = 385877 +SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd +SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 +SHA256 (rust/crates/fancy-regex-0.10.0.crate) = 0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766 +SIZE (rust/crates/fancy-regex-0.10.0.crate) = 79951 +SHA256 (rust/crates/indoc-1.0.9.crate) = bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306 +SIZE (rust/crates/indoc-1.0.9.crate) = 13475 +SHA256 (rust/crates/libc-0.2.147.crate) = b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3 +SIZE (rust/crates/libc-0.2.147.crate) = 686772 +SHA256 (rust/crates/lock_api-0.4.10.crate) = c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16 +SIZE (rust/crates/lock_api-0.4.10.crate) = 26713 +SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d +SIZE (rust/crates/memchr-2.5.0.crate) = 65812 +SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce +SIZE (rust/crates/memoffset-0.6.5.crate) = 7686 +SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d +SIZE (rust/crates/once_cell-1.18.0.crate) = 32969 +SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f +SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 +SHA256 (rust/crates/parking_lot_core-0.9.8.crate) = 93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447 +SIZE (rust/crates/parking_lot_core-0.9.8.crate) = 32383 +SHA256 (rust/crates/proc-macro2-1.0.66.crate) = 18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9 +SIZE (rust/crates/proc-macro2-1.0.66.crate) = 43575 +SHA256 (rust/crates/pyo3-0.17.3.crate) = 268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543 +SIZE (rust/crates/pyo3-0.17.3.crate) = 408939 +SHA256 (rust/crates/pyo3-build-config-0.17.3.crate) = 28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8 +SIZE (rust/crates/pyo3-build-config-0.17.3.crate) = 29230 +SHA256 (rust/crates/pyo3-ffi-0.17.3.crate) = 0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc +SIZE (rust/crates/pyo3-ffi-0.17.3.crate) = 62854 +SHA256 (rust/crates/pyo3-macros-0.17.3.crate) = 94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28 +SIZE (rust/crates/pyo3-macros-0.17.3.crate) = 7257 +SHA256 (rust/crates/pyo3-macros-backend-0.17.3.crate) = c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f +SIZE (rust/crates/pyo3-macros-backend-0.17.3.crate) = 49992 +SHA256 (rust/crates/quote-1.0.33.crate) = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae +SIZE (rust/crates/quote-1.0.33.crate) = 28090 +SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29 +SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 +SHA256 (rust/crates/regex-1.9.3.crate) = 81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a +SIZE (rust/crates/regex-1.9.3.crate) = 252676 +SHA256 (rust/crates/regex-automata-0.3.6.crate) = fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69 +SIZE (rust/crates/regex-automata-0.3.6.crate) = 607174 +SHA256 (rust/crates/regex-syntax-0.7.4.crate) = e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2 +SIZE (rust/crates/regex-syntax-0.7.4.crate) = 343365 +SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2 +SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331 +SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49 +SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619 +SHA256 (rust/crates/serde-1.0.183.crate) = 32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c +SIZE (rust/crates/serde-1.0.183.crate) = 77210 +SHA256 (rust/crates/smallvec-1.11.0.crate) = 62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9 +SIZE (rust/crates/smallvec-1.11.0.crate) = 34680 +SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 +SIZE (rust/crates/syn-1.0.109.crate) = 237611 +SHA256 (rust/crates/target-lexicon-0.12.11.crate) = 9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a +SIZE (rust/crates/target-lexicon-0.12.11.crate) = 24594 +SHA256 (rust/crates/unicode-ident-1.0.11.crate) = 301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c +SIZE (rust/crates/unicode-ident-1.0.11.crate) = 42067 +SHA256 (rust/crates/unindent-0.1.11.crate) = e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c +SIZE (rust/crates/unindent-0.1.11.crate) = 7700 +SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c +SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904 +SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8 +SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492 +SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc +SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483 +SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e +SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891 +SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406 +SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300 +SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e +SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619 +SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc +SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486 +SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538 +SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412 diff --git a/textproc/py-tiktoken/pkg-descr b/textproc/py-tiktoken/pkg-descr new file mode 100644 index 00000000000..190f0b91352 --- /dev/null +++ b/textproc/py-tiktoken/pkg-descr @@ -0,0 +1 @@ +tiktoken is a fast BPE tokeniser for use with OpenAI's models. diff --git a/textproc/rubygem-actiontext70/Makefile b/textproc/rubygem-actiontext70/Makefile index 66c3e89f920..b52985e6b5e 100644 --- a/textproc/rubygem-actiontext70/Makefile +++ b/textproc/rubygem-actiontext70/Makefile @@ -1,5 +1,5 @@ PORTNAME= actiontext -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/textproc/rubygem-actiontext70/distinfo b/textproc/rubygem-actiontext70/distinfo index 6c7c7e0e69d..59671e05ddd 100644 --- a/textproc/rubygem-actiontext70/distinfo +++ b/textproc/rubygem-actiontext70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167216 -SHA256 (rubygem/actiontext-7.0.6.gem) = d459eff29352433f5963bd191ff2e22a74cb6b21c2edbed09aef57f01074fe2e -SIZE (rubygem/actiontext-7.0.6.gem) = 92160 +TIMESTAMP = 1692212045 +SHA256 (rubygem/actiontext-7.0.7.gem) = 355f6706925258d76eb5a232c9780c8ca7681c6d963711f7549ad678f56bcb54 +SIZE (rubygem/actiontext-7.0.7.gem) = 92160 diff --git a/textproc/rubygem-google-cloud-translate-v3/Makefile b/textproc/rubygem-google-cloud-translate-v3/Makefile index 66498a98d85..6a657d58a45 100644 --- a/textproc/rubygem-google-cloud-translate-v3/Makefile +++ b/textproc/rubygem-google-cloud-translate-v3/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-translate-v3 -PORTVERSION= 0.7.2 +PORTVERSION= 0.8.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-google-cloud-translate-v3/distinfo b/textproc/rubygem-google-cloud-translate-v3/distinfo index 16f54f52594..1543e3ebb02 100644 --- a/textproc/rubygem-google-cloud-translate-v3/distinfo +++ b/textproc/rubygem-google-cloud-translate-v3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070442 -SHA256 (rubygem/google-cloud-translate-v3-0.7.2.gem) = a9f4f33a7357d8389b622567df2789c43b3c71a420d748952d81f413caa904a0 -SIZE (rubygem/google-cloud-translate-v3-0.7.2.gem) = 72704 +TIMESTAMP = 1692211997 +SHA256 (rubygem/google-cloud-translate-v3-0.8.0.gem) = 60d27198db6ec386d2629707a271648b5300ebc04eb37d2210c19b5147859511 +SIZE (rubygem/google-cloud-translate-v3-0.8.0.gem) = 72704 diff --git a/textproc/rubygem-html-proofer/Makefile b/textproc/rubygem-html-proofer/Makefile index 24c649d7cf4..bc810203dbe 100644 --- a/textproc/rubygem-html-proofer/Makefile +++ b/textproc/rubygem-html-proofer/Makefile @@ -1,5 +1,5 @@ PORTNAME= html-proofer -PORTVERSION= 5.0.7 +PORTVERSION= 5.0.8 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-html-proofer/distinfo b/textproc/rubygem-html-proofer/distinfo index 62ed08a2331..7e133e90120 100644 --- a/textproc/rubygem-html-proofer/distinfo +++ b/textproc/rubygem-html-proofer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682354618 -SHA256 (rubygem/html-proofer-5.0.7.gem) = 0fd836efdeb9ff94e123665bb36bf13ceb3e902fe31c33e07ee0ee8b13178844 -SIZE (rubygem/html-proofer-5.0.7.gem) = 24064 +TIMESTAMP = 1692211999 +SHA256 (rubygem/html-proofer-5.0.8.gem) = 95f3a3445ac1b660efcfcda828cb139e36dee47340b501f568110b3a161df053 +SIZE (rubygem/html-proofer-5.0.8.gem) = 24576 diff --git a/textproc/rubygem-nokogiri/Makefile b/textproc/rubygem-nokogiri/Makefile index 04971efb773..a26201920a6 100644 --- a/textproc/rubygem-nokogiri/Makefile +++ b/textproc/rubygem-nokogiri/Makefile @@ -1,5 +1,5 @@ PORTNAME= nokogiri -PORTVERSION= 1.15.3 +PORTVERSION= 1.15.4 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-nokogiri/distinfo b/textproc/rubygem-nokogiri/distinfo index 2b17cf70b5c..39cb0f240c4 100644 --- a/textproc/rubygem-nokogiri/distinfo +++ b/textproc/rubygem-nokogiri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688903001 -SHA256 (rubygem/nokogiri-1.15.3.gem) = 876631295a85315dac37e7a71386d62d9eb452a891083cfe7505cca4805088cb -SIZE (rubygem/nokogiri-1.15.3.gem) = 4609024 +TIMESTAMP = 1692212135 +SHA256 (rubygem/nokogiri-1.15.4.gem) = e4a801e5ef643cc0036f0a7e93433d18818b31d48c9c287596b68e92c0173c4d +SIZE (rubygem/nokogiri-1.15.4.gem) = 4610560 diff --git a/textproc/rubygem-rails-dom-testing-rails5/Makefile b/textproc/rubygem-rails-dom-testing-rails5/Makefile index f103409ea4b..eb38370a1d0 100644 --- a/textproc/rubygem-rails-dom-testing-rails5/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails5/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-dom-testing -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 diff --git a/textproc/rubygem-rails-dom-testing-rails5/distinfo b/textproc/rubygem-rails-dom-testing-rails5/distinfo index 39aff424c08..884bcdcd49a 100644 --- a/textproc/rubygem-rails-dom-testing-rails5/distinfo +++ b/textproc/rubygem-rails-dom-testing-rails5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902931 -SHA256 (rubygem/rails-dom-testing-2.1.1.gem) = 4d3e37b102b890a5c4b2a7cea968951c0b160e44f02ab222f864a4838f2fe09d -SIZE (rubygem/rails-dom-testing-2.1.1.gem) = 14848 +TIMESTAMP = 1692212001 +SHA256 (rubygem/rails-dom-testing-2.2.0.gem) = e515712e48df1f687a1d7c380fd7b07b8558faa26464474da64183a7426fa93b +SIZE (rubygem/rails-dom-testing-2.2.0.gem) = 16896 diff --git a/textproc/rubygem-rails-dom-testing-rails50/Makefile b/textproc/rubygem-rails-dom-testing-rails50/Makefile index 941ea55387a..eb3690989ab 100644 --- a/textproc/rubygem-rails-dom-testing-rails50/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails50/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-dom-testing -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails50 diff --git a/textproc/rubygem-rails-dom-testing-rails50/distinfo b/textproc/rubygem-rails-dom-testing-rails50/distinfo index ab31d230021..04e0c6472c3 100644 --- a/textproc/rubygem-rails-dom-testing-rails50/distinfo +++ b/textproc/rubygem-rails-dom-testing-rails50/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902933 -SHA256 (rubygem/rails-dom-testing-2.1.1.gem) = 4d3e37b102b890a5c4b2a7cea968951c0b160e44f02ab222f864a4838f2fe09d -SIZE (rubygem/rails-dom-testing-2.1.1.gem) = 14848 +TIMESTAMP = 1692212003 +SHA256 (rubygem/rails-dom-testing-2.2.0.gem) = e515712e48df1f687a1d7c380fd7b07b8558faa26464474da64183a7426fa93b +SIZE (rubygem/rails-dom-testing-2.2.0.gem) = 16896 diff --git a/textproc/rubygem-rails-dom-testing-rails52/Makefile b/textproc/rubygem-rails-dom-testing-rails52/Makefile index e766a13e837..8389b7677fd 100644 --- a/textproc/rubygem-rails-dom-testing-rails52/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails52/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-dom-testing -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails52 diff --git a/textproc/rubygem-rails-dom-testing-rails52/distinfo b/textproc/rubygem-rails-dom-testing-rails52/distinfo index dc393676613..42e0e97da26 100644 --- a/textproc/rubygem-rails-dom-testing-rails52/distinfo +++ b/textproc/rubygem-rails-dom-testing-rails52/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902935 -SHA256 (rubygem/rails-dom-testing-2.1.1.gem) = 4d3e37b102b890a5c4b2a7cea968951c0b160e44f02ab222f864a4838f2fe09d -SIZE (rubygem/rails-dom-testing-2.1.1.gem) = 14848 +TIMESTAMP = 1692212005 +SHA256 (rubygem/rails-dom-testing-2.2.0.gem) = e515712e48df1f687a1d7c380fd7b07b8558faa26464474da64183a7426fa93b +SIZE (rubygem/rails-dom-testing-2.2.0.gem) = 16896 diff --git a/textproc/rubygem-rails-dom-testing-rails60/Makefile b/textproc/rubygem-rails-dom-testing-rails60/Makefile index 8ca80ec8a31..aa3867c6075 100644 --- a/textproc/rubygem-rails-dom-testing-rails60/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails60/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-dom-testing -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails60 diff --git a/textproc/rubygem-rails-dom-testing-rails60/distinfo b/textproc/rubygem-rails-dom-testing-rails60/distinfo index 6f5c21a44d0..56cf02a0bee 100644 --- a/textproc/rubygem-rails-dom-testing-rails60/distinfo +++ b/textproc/rubygem-rails-dom-testing-rails60/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902937 -SHA256 (rubygem/rails-dom-testing-2.1.1.gem) = 4d3e37b102b890a5c4b2a7cea968951c0b160e44f02ab222f864a4838f2fe09d -SIZE (rubygem/rails-dom-testing-2.1.1.gem) = 14848 +TIMESTAMP = 1692212007 +SHA256 (rubygem/rails-dom-testing-2.2.0.gem) = e515712e48df1f687a1d7c380fd7b07b8558faa26464474da64183a7426fa93b +SIZE (rubygem/rails-dom-testing-2.2.0.gem) = 16896 diff --git a/textproc/rubygem-rails-dom-testing-rails61/Makefile b/textproc/rubygem-rails-dom-testing-rails61/Makefile index 1f2b0ddee41..a9d73036295 100644 --- a/textproc/rubygem-rails-dom-testing-rails61/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails61/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-dom-testing -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails61 diff --git a/textproc/rubygem-rails-dom-testing-rails61/distinfo b/textproc/rubygem-rails-dom-testing-rails61/distinfo index c6833d00aeb..7a86bc49b9c 100644 --- a/textproc/rubygem-rails-dom-testing-rails61/distinfo +++ b/textproc/rubygem-rails-dom-testing-rails61/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902939 -SHA256 (rubygem/rails-dom-testing-2.1.1.gem) = 4d3e37b102b890a5c4b2a7cea968951c0b160e44f02ab222f864a4838f2fe09d -SIZE (rubygem/rails-dom-testing-2.1.1.gem) = 14848 +TIMESTAMP = 1692212009 +SHA256 (rubygem/rails-dom-testing-2.2.0.gem) = e515712e48df1f687a1d7c380fd7b07b8558faa26464474da64183a7426fa93b +SIZE (rubygem/rails-dom-testing-2.2.0.gem) = 16896 diff --git a/textproc/rubygem-rails-dom-testing-rails70/Makefile b/textproc/rubygem-rails-dom-testing-rails70/Makefile index 62bc2e753c5..2864dadd59d 100644 --- a/textproc/rubygem-rails-dom-testing-rails70/Makefile +++ b/textproc/rubygem-rails-dom-testing-rails70/Makefile @@ -1,5 +1,5 @@ PORTNAME= rails-dom-testing -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails70 diff --git a/textproc/rubygem-rails-dom-testing-rails70/distinfo b/textproc/rubygem-rails-dom-testing-rails70/distinfo index 99559b3e24e..8398b21cf4c 100644 --- a/textproc/rubygem-rails-dom-testing-rails70/distinfo +++ b/textproc/rubygem-rails-dom-testing-rails70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902941 -SHA256 (rubygem/rails-dom-testing-2.1.1.gem) = 4d3e37b102b890a5c4b2a7cea968951c0b160e44f02ab222f864a4838f2fe09d -SIZE (rubygem/rails-dom-testing-2.1.1.gem) = 14848 +TIMESTAMP = 1692212011 +SHA256 (rubygem/rails-dom-testing-2.2.0.gem) = e515712e48df1f687a1d7c380fd7b07b8558faa26464474da64183a7426fa93b +SIZE (rubygem/rails-dom-testing-2.2.0.gem) = 16896 diff --git a/textproc/rubygem-yarp/Makefile b/textproc/rubygem-yarp/Makefile new file mode 100644 index 00000000000..088b5eb9ab2 --- /dev/null +++ b/textproc/rubygem-yarp/Makefile @@ -0,0 +1,18 @@ +PORTNAME= yarp +PORTVERSION= 0.6.0 +CATEGORIES= textproc rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Yet Another Ruby Parser +WWW= https://ruby.github.io/yarp/ \ + https://github.com/ruby/yarp + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake + +USES= gem gmake + +.include diff --git a/textproc/rubygem-yarp/distinfo b/textproc/rubygem-yarp/distinfo new file mode 100644 index 00000000000..064b896c25b --- /dev/null +++ b/textproc/rubygem-yarp/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211631 +SHA256 (rubygem/yarp-0.6.0.gem) = a073d14542a7a45504044fa719de35708cd99e451741703b0b2bd6c781f615ac +SIZE (rubygem/yarp-0.6.0.gem) = 265216 diff --git a/textproc/rubygem-yarp/files/patch-ext-yarp-extconf.rb b/textproc/rubygem-yarp/files/patch-ext-yarp-extconf.rb new file mode 100644 index 00000000000..c29e7fac3be --- /dev/null +++ b/textproc/rubygem-yarp/files/patch-ext-yarp-extconf.rb @@ -0,0 +1,11 @@ +--- ext/yarp/extconf.rb.orig 2023-08-18 17:14:49 UTC ++++ ext/yarp/extconf.rb +@@ -70,7 +70,7 @@ module Yarp + Rake.sh("templates/template.rb") + end + Rake.sh("sh", "configure") # explicit "sh" for Windows where shebangs are not supported +- Rake.sh("make", target) ++ Rake.sh("gmake", target) + end + end + diff --git a/textproc/rubygem-yarp/pkg-descr b/textproc/rubygem-yarp/pkg-descr new file mode 100644 index 00000000000..3078f924903 --- /dev/null +++ b/textproc/rubygem-yarp/pkg-descr @@ -0,0 +1,4 @@ +Yet Another Ruby Parser is a parser for the Ruby programming language. It is +designed to be portable, error tolerant, and maintainable. It is written in C99 +and has no dependencies. It is currently being integrated into CRuby, JRuby, +TruffleRuby, Sorbet, and Syntax Tree. diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile index c6a0c9e0692..0e2b0469fdc 100644 --- a/textproc/sigil/Makefile +++ b/textproc/sigil/Makefile @@ -1,6 +1,5 @@ PORTNAME= sigil -PORTVERSION= 1.9.30 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= textproc MAINTAINER= jonc@chen.org.nz @@ -10,13 +9,14 @@ WWW= https://sigil-ebook.com/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -LIB_DEPENDS= libpcre.so:devel/pcre \ - libhunspell-1.7.so:textproc/hunspell +LIB_DEPENDS= libpcre2-16.so:devel/pcre2 \ + libhunspell-1.7.so:textproc/hunspell \ + libGLX.so:graphics/libglvnd RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/py-dulwich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} USES= cmake cpe desktop-file-utils \ - minizip pkgconfig python qt:5 shebangfix + minizip pkgconfig python qt:6 shebangfix CPE_VENDOR= ${PORTNAME}-ebook USE_GITHUB= yes @@ -25,15 +25,14 @@ GH_PROJECT= Sigil USE_LDCONFIG= ${PREFIX}/lib/sigil -USE_QT= concurrent core declarative gui location network printsupport \ - svg webchannel webengine widgets xml xmlpatterns \ - buildtools:build linguisttools:build qmake:build \ +USE_QT= base 5compat declarative location \ + svg tools:build positioning webchannel webengine \ imageformats:run SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \ src/Resource_Files/python3lib/*.py -CMAKE_ARGS= -DUSE_SYSTEM_LIBS:BOOL=1 +CMAKE_ARGS= -DUSE_SYSTEM_LIBS:BOOL=1 -DUSE_QT6=1 # Upstream uses pkg-config output to pass libhunspell-1.7.so and # libpcre16.so to the linker. pkg-config output does not include full diff --git a/textproc/sigil/distinfo b/textproc/sigil/distinfo index de616cd67ec..65ea81d42e2 100644 --- a/textproc/sigil/distinfo +++ b/textproc/sigil/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679313754 -SHA256 (Sigil-Ebook-Sigil-1.9.30_GH0.tar.gz) = 262c43ec0ce9ea9486fc19074dd0a687a39d9df1829732e9006d8c5fbb242458 -SIZE (Sigil-Ebook-Sigil-1.9.30_GH0.tar.gz) = 26602897 +TIMESTAMP = 1692695485 +SHA256 (Sigil-Ebook-Sigil-2.0.0_GH0.tar.gz) = 934f2eb8ca569499f79137d054ac0986e85e4453b5666a2a628a12a448caec4c +SIZE (Sigil-Ebook-Sigil-2.0.0_GH0.tar.gz) = 26777055 diff --git a/textproc/sigil/pkg-plist b/textproc/sigil/pkg-plist index 1bf139a4bb7..6ce788e9510 100644 --- a/textproc/sigil/pkg-plist +++ b/textproc/sigil/pkg-plist @@ -100,6 +100,7 @@ share/pixmaps/sigil.png %%DATADIR%%/translations/sigil_fi.qm %%DATADIR%%/translations/sigil_fr.qm %%DATADIR%%/translations/sigil_gl.qm +%%DATADIR%%/translations/sigil_hu_HU.qm %%DATADIR%%/translations/sigil_it.qm %%DATADIR%%/translations/sigil_ja.qm %%DATADIR%%/translations/sigil_ko.qm @@ -111,6 +112,6 @@ share/pixmaps/sigil.png %%DATADIR%%/translations/sigil_sv.qm %%DATADIR%%/translations/sigil_th.qm %%DATADIR%%/translations/sigil_tr.qm -%%DATADIR%%/translations/sigil_uk_UA.qm +%%DATADIR%%/translations/sigil_uk.qm %%DATADIR%%/translations/sigil_zh_CN.qm %%DATADIR%%/translations/sigil_zh_TW.qm diff --git a/textproc/tidyp/Makefile b/textproc/tidyp/Makefile index fe8c4433387..c4285a7a772 100644 --- a/textproc/tidyp/Makefile +++ b/textproc/tidyp/Makefile @@ -7,6 +7,11 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library and program to validate and fix HTML WWW= https://github.com/petdance/tidyp +LICENSE= HTML_TIDY +LICENSE_NAME= HTML Tidy License +LICENSE_FILE= ${WRKSRC}/htmldoc/license.html +LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell + USES= autoreconf libtool CONFIGURE_ARGS= --enable-asian --enable-utf16 diff --git a/textproc/ugrep/Makefile b/textproc/ugrep/Makefile index f905207b902..87b3b2d1b0a 100644 --- a/textproc/ugrep/Makefile +++ b/textproc/ugrep/Makefile @@ -1,6 +1,6 @@ PORTNAME= ugrep DISTVERSIONPREFIX= v -DISTVERSION= 4.0.1 +DISTVERSION= 4.0.2 CATEGORIES= textproc MAINTAINER= ashish@FreeBSD.org diff --git a/textproc/ugrep/distinfo b/textproc/ugrep/distinfo index d370aeb97be..b18e92aeaa8 100644 --- a/textproc/ugrep/distinfo +++ b/textproc/ugrep/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692554863 -SHA256 (Genivia-ugrep-v4.0.1_GH0.tar.gz) = 62b1c7fc9783cd73d4a6b7a2e3829683a65cdd44d53018ddc30253f404ecf54a -SIZE (Genivia-ugrep-v4.0.1_GH0.tar.gz) = 4513045 +TIMESTAMP = 1692778622 +SHA256 (Genivia-ugrep-v4.0.2_GH0.tar.gz) = 5230e472bb28ecbc0a7c3046559a5e9504de0135f58ac6faefeef75873772a46 +SIZE (Genivia-ugrep-v4.0.2_GH0.tar.gz) = 4512287 diff --git a/textproc/ugrep/files/patch-configure b/textproc/ugrep/files/patch-configure deleted file mode 100644 index 798e7162662..00000000000 --- a/textproc/ugrep/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2023-08-20 17:40:51 UTC -+++ configure -@@ -8418,7 +8418,7 @@ fi - # Check whether --enable-hidden was given. - if test ${enable_hidden+y} - then : -- enableval=$enable_hidden; with_hidden="yes" -+ enableval=$enable_hidden; with_hidden="$enable_hidden" - else $as_nop - with_hidden="no" - fi diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index 589da0b57f3..70ae57b1c74 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -1,6 +1,6 @@ PORTNAME= uim-el PORTVERSION= 1.9.0.b.${SNAPDATE} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/textproc/uim-el/files/patch-emacs_uim-var.el b/textproc/uim-el/files/patch-emacs_uim-var.el new file mode 100644 index 00000000000..b4b926167dd --- /dev/null +++ b/textproc/uim-el/files/patch-emacs_uim-var.el @@ -0,0 +1,20 @@ +--- emacs/uim-var.el.orig 2023-08-22 15:31:18 UTC ++++ emacs/uim-var.el +@@ -435,7 +435,7 @@ keeps the size of it when showing the candidates.") + (make-face 'uim-preedit-face) + + (copy-face 'uim-preedit-face 'uim-preedit-underline-face) +-(set-face-underline-p 'uim-preedit-underline-face t) ++(set-face-underline 'uim-preedit-underline-face t) + + ;; highlight + (make-face 'uim-preedit-highlight-face) +@@ -443,7 +443,7 @@ keeps the size of it when showing the candidates.") + (set-face-background 'uim-preedit-highlight-face "Blue3") + + (copy-face 'uim-preedit-highlight-face 'uim-preedit-highlight-underline-face) +-(set-face-underline-p 'uim-preedit-highlight-underline-face t) ++(set-face-underline 'uim-preedit-highlight-underline-face t) + + ;; separator + (make-face 'uim-separator-face) diff --git a/textproc/vacuum/Makefile b/textproc/vacuum/Makefile index 7068ae73b28..94d70848ccc 100644 --- a/textproc/vacuum/Makefile +++ b/textproc/vacuum/Makefile @@ -1,6 +1,6 @@ PORTNAME= vacuum DISTVERSIONPREFIX= v -DISTVERSION= 0.3.4 +DISTVERSION= 0.3.5 CATEGORIES= textproc PKGNAMESUFFIX= -lint-tool diff --git a/textproc/vacuum/distinfo b/textproc/vacuum/distinfo index d9809890ca6..d20b6b091fc 100644 --- a/textproc/vacuum/distinfo +++ b/textproc/vacuum/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1692246141 -SHA256 (go/textproc_vacuum/vacuum-v0.3.4/v0.3.4.mod) = 8f74f2ab1839ed2097de335c27279b43296bb461a165ecad8fc6c7300034325a -SIZE (go/textproc_vacuum/vacuum-v0.3.4/v0.3.4.mod) = 2247 -SHA256 (go/textproc_vacuum/vacuum-v0.3.4/v0.3.4.zip) = 454c142dd299d2e6b07dea87af056e921bb6c7df0b110bf959cf94426cff46ba -SIZE (go/textproc_vacuum/vacuum-v0.3.4/v0.3.4.zip) = 1913732 +TIMESTAMP = 1692688785 +SHA256 (go/textproc_vacuum/vacuum-v0.3.5/v0.3.5.mod) = b318d56926a53ec6ff3773228ca77d9076b95483217031d77d8d1b51c73c5dea +SIZE (go/textproc_vacuum/vacuum-v0.3.5/v0.3.5.mod) = 2690 +SHA256 (go/textproc_vacuum/vacuum-v0.3.5/v0.3.5.zip) = e77638919b230e951bd57ae180ed5d96d95bea0b41afc9e6f1ee1da59079cc2f +SIZE (go/textproc_vacuum/vacuum-v0.3.5/v0.3.5.zip) = 1928227 diff --git a/www/Makefile b/www/Makefile index 3a5281422b2..9daccf5d0b0 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2327,6 +2327,7 @@ SUBDIR += trafficserver SUBDIR += transmission-web SUBDIR += transproxy + SUBDIR += trunk SUBDIR += tt-rss SUBDIR += tuifeed SUBDIR += tusc diff --git a/www/chisel/Makefile b/www/chisel/Makefile index 62eed3a726c..29503ede7a9 100644 --- a/www/chisel/Makefile +++ b/www/chisel/Makefile @@ -1,6 +1,6 @@ PORTNAME= chisel DISTVERSIONPREFIX= v -DISTVERSION= 1.9.0 +DISTVERSION= 1.9.1 CATEGORIES= www MAINTAINER= lcook@FreeBSD.org diff --git a/www/chisel/distinfo b/www/chisel/distinfo index 9a837b99ec7..43e2d1afa63 100644 --- a/www/chisel/distinfo +++ b/www/chisel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1692470219 -SHA256 (go/www_chisel/chisel-v1.9.0/v1.9.0.mod) = b9aa871d61aa75d46b23e1c54326d72207fae1d88eabbabd8f622ff968a029fe -SIZE (go/www_chisel/chisel-v1.9.0/v1.9.0.mod) = 674 -SHA256 (go/www_chisel/chisel-v1.9.0/v1.9.0.zip) = 617a110ef0773854d37b29eccf87feb6d95b6ebb425628cd623e004dd07927c6 -SIZE (go/www_chisel/chisel-v1.9.0/v1.9.0.zip) = 70303 +TIMESTAMP = 1692651791 +SHA256 (go/www_chisel/chisel-v1.9.1/v1.9.1.mod) = b9aa871d61aa75d46b23e1c54326d72207fae1d88eabbabd8f622ff968a029fe +SIZE (go/www_chisel/chisel-v1.9.1/v1.9.1.mod) = 674 +SHA256 (go/www_chisel/chisel-v1.9.1/v1.9.1.zip) = 3a3108e01a89b1a439934bb51d31451dff5f05a7dec40c495afc423d0a8ae115 +SIZE (go/www_chisel/chisel-v1.9.1/v1.9.1.zip) = 70305 diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile index 08813245b5c..ee575099576 100644 --- a/www/cpp-httplib/Makefile +++ b/www/cpp-httplib/Makefile @@ -1,6 +1,6 @@ PORTNAME= cpp-httplib DISTVERSIONPREFIX= v -DISTVERSION= 0.13.3 +DISTVERSION= 0.14.0 CATEGORIES= www devel MAINTAINER= yuri@FreeBSD.org diff --git a/www/cpp-httplib/distinfo b/www/cpp-httplib/distinfo index 5eaca53aab6..c17399181c6 100644 --- a/www/cpp-httplib/distinfo +++ b/www/cpp-httplib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690877874 -SHA256 (yhirose-cpp-httplib-v0.13.3_GH0.tar.gz) = 2a4503f9f2015f6878baef54cd94b01849cc3ed19dfe95f2c9775655bea8b73f -SIZE (yhirose-cpp-httplib-v0.13.3_GH0.tar.gz) = 1147376 +TIMESTAMP = 1692766793 +SHA256 (yhirose-cpp-httplib-v0.14.0_GH0.tar.gz) = 3a92248ef8cf2c32ad07f910b8e3052ff2427022b2adb871cf326fb620d2438e +SIZE (yhirose-cpp-httplib-v0.14.0_GH0.tar.gz) = 1147334 diff --git a/www/deno/Makefile b/www/deno/Makefile index 5caff22d893..16e45ddcfe4 100644 --- a/www/deno/Makefile +++ b/www/deno/Makefile @@ -1,6 +1,6 @@ PORTNAME= deno DISTVERSIONPREFIX= v -DISTVERSION= 1.35.3 +DISTVERSION= 1.36.2 CATEGORIES= www MAINTAINER= mikael@FreeBSD.org @@ -23,7 +23,7 @@ GH_ACCOUNT= denoland USE_GNOME= glib20 -V8_VERS= 0.74.3 +V8_VERS= 0.75.0 CARGO_ENV+= CLANG_BASE_PATH=/usr \ GN=${PREFIX}/bin/gn \ @@ -40,30 +40,30 @@ CARGO_CRATES= Inflector-0.11.4 \ aes-0.8.2 \ aes-gcm-0.10.1 \ aes-kw-0.2.1 \ - ahash-0.7.6 \ ahash-0.8.3 \ aho-corasick-0.7.20 \ alloc-no-stdlib-2.0.4 \ alloc-stdlib-0.2.2 \ android-tzdata-0.1.1 \ + android_system_properties-0.1.5 \ anstream-0.3.2 \ anstyle-1.0.0 \ anstyle-parse-0.2.0 \ anstyle-query-1.0.0 \ anstyle-wincon-1.0.1 \ - anyhow-1.0.70 \ + anyhow-1.0.72 \ arrayvec-0.7.2 \ asn1-rs-0.5.2 \ asn1-rs-derive-0.4.0 \ asn1-rs-impl-0.1.0 \ - ast_node-0.9.4 \ - async-compression-0.3.15 \ - async-compression-0.4.0 \ + ast_node-0.9.5 \ + async-compression-0.4.1 \ async-stream-0.3.4 \ async-stream-impl-0.3.4 \ async-trait-0.1.68 \ atty-0.2.14 \ auto_impl-0.5.0 \ + auto_impl-1.1.0 \ autocfg-1.1.0 \ base16ct-0.1.1 \ base16ct-0.2.0 \ @@ -73,14 +73,13 @@ CARGO_CRATES= Inflector-0.11.4 \ base64-simd-0.8.0 \ base64ct-1.6.0 \ bencher-0.1.5 \ - better_scoped_tls-0.1.0 \ + better_scoped_tls-0.1.1 \ bincode-1.3.3 \ bit-set-0.5.3 \ bit-vec-0.6.3 \ bitflags-1.3.2 \ - bitflags-2.1.0 \ + bitflags-2.4.0 \ block-buffer-0.10.4 \ - block-modes-0.9.1 \ block-padding-0.3.2 \ brotli-3.3.4 \ brotli-decompressor-2.3.4 \ @@ -99,6 +98,7 @@ CARGO_CRATES= Inflector-0.11.4 \ clap_complete_fig-4.3.1 \ clap_lex-0.5.0 \ clipboard-win-4.5.0 \ + cmake-0.1.50 \ colorchoice-1.0.0 \ console_static_text-0.8.1 \ const-oid-0.9.2 \ @@ -123,18 +123,19 @@ CARGO_CRATES= Inflector-0.11.4 \ data-url-0.2.0 \ deno-proc-macro-rules-0.3.2 \ deno-proc-macro-rules-macros-0.3.2 \ - deno_ast-0.27.0 \ - deno_core-0.197.0 \ - deno_doc-0.63.1 \ - deno_emit-0.24.0 \ - deno_graph-0.49.0 \ - deno_lint-0.49.0 \ - deno_lockfile-0.14.1 \ - deno_media_type-0.1.0 \ - deno_npm-0.9.1 \ - deno_ops-0.75.0 \ - deno_semver-0.2.2 \ - deno_task_shell-0.13.1 \ + deno_ast-0.28.0 \ + deno_cache_dir-0.5.2 \ + deno_core-0.202.0 \ + deno_doc-0.65.0 \ + deno_emit-0.26.0 \ + deno_graph-0.52.0 \ + deno_lint-0.50.1 \ + deno_lockfile-0.15.0 \ + deno_media_type-0.1.1 \ + deno_npm-0.12.0 \ + deno_ops-0.80.0 \ + deno_semver-0.4.0 \ + deno_task_shell-0.13.2 \ der-0.6.1 \ der-0.7.3 \ der-parser-8.2.0 \ @@ -147,12 +148,11 @@ CARGO_CRATES= Inflector-0.11.4 \ dissimilar-1.0.4 \ dlopen-0.1.8 \ dlopen_derive-0.1.4 \ - dotenv-0.15.0 \ dprint-core-0.62.1 \ dprint-plugin-json-0.17.4 \ dprint-plugin-markdown-0.15.3 \ - dprint-plugin-typescript-0.85.0 \ - dprint-swc-ext-0.10.0 \ + dprint-plugin-typescript-0.86.2 \ + dprint-swc-ext-0.11.1 \ dsa-0.6.1 \ dyn-clone-1.0.11 \ dynasm-1.2.3 \ @@ -167,27 +167,28 @@ CARGO_CRATES= Inflector-0.11.4 \ endian-type-0.1.2 \ enum-as-inner-0.5.1 \ env_logger-0.9.0 \ + equivalent-1.0.0 \ errno-0.2.8 \ errno-dragonfly-0.1.2 \ error-code-2.3.1 \ escape8259-0.5.2 \ - eszip-0.45.0 \ + eszip-0.50.0 \ fallible-iterator-0.2.0 \ fallible-streaming-iterator-0.1.9 \ fancy-regex-0.10.0 \ fastrand-1.9.0 \ - fastwebsockets-0.3.1 \ + fastwebsockets-0.4.4 \ fd-lock-3.0.10 \ ff-0.12.1 \ ff-0.13.0 \ filetime-0.2.20 \ fixedbitset-0.4.2 \ flaky_test-0.1.0 \ - flate2-1.0.24 \ + flate2-1.0.26 \ fly-accept-encoding-0.2.0 \ fnv-1.0.7 \ - form_urlencoded-1.1.0 \ - from_variant-0.1.5 \ + form_urlencoded-1.2.0 \ + from_variant-0.1.6 \ fs3-0.5.0 \ fsevent-sys-4.1.0 \ fslock-0.1.8 \ @@ -213,6 +214,7 @@ CARGO_CRATES= Inflector-0.11.4 \ h2-0.3.17 \ hashbrown-0.12.3 \ hashbrown-0.13.2 \ + hashbrown-0.14.0 \ hashlink-0.8.2 \ heck-0.4.1 \ hermit-abi-0.1.19 \ @@ -229,13 +231,17 @@ CARGO_CRATES= Inflector-0.11.4 \ httpdate-1.0.2 \ humantime-2.1.0 \ hyper-0.14.26 \ - hyper-1.0.0-rc.3 \ + hyper-1.0.0-rc.4 \ hyper-rustls-0.24.0 \ + iana-time-zone-0.1.57 \ + iana-time-zone-haiku-0.1.2 \ idna-0.2.3 \ idna-0.3.0 \ + idna-0.4.0 \ if_chain-1.0.2 \ import_map-0.15.0 \ - indexmap-1.9.2 \ + indexmap-1.9.3 \ + indexmap-2.0.0 \ inotify-0.9.6 \ inotify-sys-0.1.5 \ inout-0.1.3 \ @@ -243,7 +249,7 @@ CARGO_CRATES= Inflector-0.11.4 \ io-lifetimes-1.0.7 \ ipconfig-0.3.1 \ ipnet-2.7.1 \ - is-macro-0.2.2 \ + is-macro-0.3.0 \ is-terminal-0.4.4 \ itertools-0.10.5 \ itoa-1.0.6 \ @@ -251,25 +257,18 @@ CARGO_CRATES= Inflector-0.11.4 \ js-sys-0.3.61 \ jsonc-parser-0.21.1 \ junction-0.2.0 \ - keccak-0.1.3 \ kqueue-1.0.7 \ kqueue-sys-1.0.3 \ lazy-regex-2.5.0 \ lazy-regex-proc_macros-2.4.1 \ lazy_static-1.4.0 \ - lexical-6.1.1 \ - lexical-core-0.8.5 \ - lexical-parse-float-0.8.5 \ - lexical-parse-integer-0.8.6 \ - lexical-util-0.8.5 \ - lexical-write-float-0.8.5 \ - lexical-write-integer-0.8.5 \ libc-0.2.147 \ libffi-3.2.0 \ libffi-sys-2.3.0 \ libloading-0.7.4 \ libm-0.2.6 \ libsqlite3-sys-0.26.0 \ + libz-ng-sys-1.1.12 \ libz-sys-1.1.8 \ linked-hash-map-0.5.6 \ linux-raw-sys-0.1.4 \ @@ -287,13 +286,14 @@ CARGO_CRATES= Inflector-0.11.4 \ memoffset-0.6.5 \ mime-0.3.16 \ minimal-lexical-0.2.1 \ - miniz_oxide-0.5.4 \ + miniz_oxide-0.7.1 \ mio-0.8.6 \ - monch-0.4.2 \ + monch-0.4.3 \ napi-build-1.2.1 \ napi-sys-2.2.3 \ netif-0.1.6 \ new_debug_unreachable-1.0.4 \ + nextest-workspace-hack-0.1.0 \ nibble_vec-0.1.0 \ nix-0.24.2 \ nom-7.1.3 \ @@ -306,7 +306,7 @@ CARGO_CRATES= Inflector-0.11.4 \ num-traits-0.2.15 \ num_cpus-1.15.0 \ oid-registry-0.6.1 \ - once_cell-1.17.1 \ + once_cell-1.18.0 \ opaque-debug-0.3.0 \ openssl-probe-0.1.5 \ ordered-float-2.10.0 \ @@ -343,7 +343,6 @@ CARGO_CRATES= Inflector-0.11.4 \ pkcs8-0.9.0 \ pkcs8-0.10.2 \ pkg-config-0.3.26 \ - pmutil-0.5.3 \ pmutil-0.6.1 \ polyval-0.6.0 \ ppv-lite86-0.2.17 \ @@ -357,11 +356,12 @@ CARGO_CRATES= Inflector-0.11.4 \ proc-macro2-0.4.30 \ proc-macro2-1.0.66 \ psm-0.1.21 \ - pty2-0.1.0 \ pulldown-cmark-0.9.3 \ quick-error-1.2.3 \ + quick-junit-0.3.3 \ + quick-xml-0.29.0 \ quote-0.6.13 \ - quote-1.0.28 \ + quote-1.0.32 \ radix_fmt-1.0.0 \ radix_trie-0.2.1 \ rand-0.8.5 \ @@ -409,18 +409,17 @@ CARGO_CRATES= Inflector-0.11.4 \ semver-0.9.0 \ semver-1.0.14 \ semver-parser-0.7.0 \ - serde-1.0.157 \ + serde-1.0.183 \ serde-value-0.7.0 \ serde_bytes-0.11.9 \ - serde_derive-1.0.157 \ - serde_json-1.0.94 \ + serde_derive-1.0.183 \ + serde_json-1.0.104 \ serde_repr-0.1.9 \ serde_urlencoded-0.7.1 \ - serde_v8-0.108.0 \ + serde_v8-0.113.0 \ sha-1-0.10.0 \ sha1-0.10.5 \ sha2-0.10.6 \ - sha3-0.10.6 \ shell-escape-0.1.5 \ signal-hook-registry-1.4.1 \ signature-1.6.4 \ @@ -441,40 +440,40 @@ CARGO_CRATES= Inflector-0.11.4 \ str-buf-1.0.6 \ string_cache-0.8.7 \ string_cache_codegen-0.5.2 \ - string_enum-0.4.0 \ + string_enum-0.4.1 \ strsim-0.10.0 \ strum-0.25.0 \ strum_macros-0.25.1 \ subtle-2.4.1 \ - swc_atoms-0.5.6 \ - swc_bundler-0.214.25 \ - swc_common-0.31.12 \ - swc_config-0.1.5 \ - swc_config_macro-0.1.1 \ - swc_ecma_ast-0.104.5 \ - swc_ecma_codegen-0.139.15 \ - swc_ecma_codegen_macros-0.7.2 \ - swc_ecma_dep_graph-0.106.12 \ - swc_ecma_loader-0.43.14 \ - swc_ecma_parser-0.134.12 \ - swc_ecma_transforms_base-0.127.16 \ - swc_ecma_transforms_classes-0.116.16 \ - swc_ecma_transforms_macros-0.5.1 \ - swc_ecma_transforms_optimization-0.187.21 \ - swc_ecma_transforms_proposal-0.161.20 \ - swc_ecma_transforms_react-0.173.18 \ - swc_ecma_transforms_typescript-0.177.20 \ - swc_ecma_utils-0.117.13 \ - swc_ecma_visit-0.90.5 \ - swc_eq_ignore_macros-0.1.1 \ - swc_fast_graph-0.19.12 \ - swc_graph_analyzer-0.20.13 \ - swc_macros_common-0.3.7 \ - swc_visit-0.5.6 \ - swc_visit_macros-0.5.7 \ + swc_atoms-0.5.8 \ + swc_bundler-0.217.49 \ + swc_common-0.31.21 \ + swc_config-0.1.7 \ + swc_config_macro-0.1.2 \ + swc_ecma_ast-0.107.7 \ + swc_ecma_codegen-0.142.17 \ + swc_ecma_codegen_macros-0.7.3 \ + swc_ecma_dep_graph-0.109.15 \ + swc_ecma_loader-0.43.23 \ + swc_ecma_parser-0.137.15 \ + swc_ecma_transforms_base-0.130.24 \ + swc_ecma_transforms_classes-0.119.24 \ + swc_ecma_transforms_macros-0.5.2 \ + swc_ecma_transforms_optimization-0.190.38 \ + swc_ecma_transforms_proposal-0.164.30 \ + swc_ecma_transforms_react-0.176.34 \ + swc_ecma_transforms_typescript-0.180.33 \ + swc_ecma_utils-0.120.19 \ + swc_ecma_visit-0.93.7 \ + swc_eq_ignore_macros-0.1.2 \ + swc_fast_graph-0.19.21 \ + swc_graph_analyzer-0.20.24 \ + swc_macros_common-0.3.8 \ + swc_visit-0.5.7 \ + swc_visit_macros-0.5.8 \ syn-0.15.44 \ syn-1.0.109 \ - syn-2.0.22 \ + syn-2.0.28 \ synstructure-0.12.6 \ sysinfo-0.27.8 \ tar-0.4.38 \ @@ -482,8 +481,9 @@ CARGO_CRATES= Inflector-0.11.4 \ termcolor-1.2.0 \ text-size-1.1.0 \ text_lines-0.6.0 \ - thiserror-1.0.40 \ - thiserror-impl-1.0.40 \ + thiserror-1.0.44 \ + thiserror-impl-1.0.44 \ + time-0.1.45 \ time-0.3.20 \ time-core-0.1.0 \ time-macros-0.2.8 \ @@ -532,12 +532,12 @@ CARGO_CRATES= Inflector-0.11.4 \ unicode-xid-0.2.4 \ universal-hash-0.5.0 \ untrusted-0.7.1 \ - url-2.3.1 \ + url-2.4.0 \ urlpattern-0.2.0 \ utf-8-0.7.6 \ utf8parse-0.2.1 \ uuid-1.4.1 \ - v8-0.74.3 \ + v8-0.75.0 \ vcpkg-0.2.15 \ version_check-0.9.4 \ vsimd-0.8.0 \ @@ -546,6 +546,7 @@ CARGO_CRATES= Inflector-0.11.4 \ walkdir-2.3.2 \ want-0.3.0 \ wasi-0.9.0+wasi-snapshot-preview1 \ + wasi-0.10.0+wasi-snapshot-preview1 \ wasi-0.11.0+wasi-snapshot-preview1 \ wasm-bindgen-0.2.84 \ wasm-bindgen-backend-0.2.84 \ @@ -558,11 +559,13 @@ CARGO_CRATES= Inflector-0.11.4 \ webpki-0.22.0 \ webpki-roots-0.22.6 \ which-4.4.0 \ + whoami-1.4.0 \ widestring-0.5.1 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.5 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ + windows-0.48.0 \ windows-sys-0.42.0 \ windows-sys-0.45.0 \ windows-sys-0.48.0 \ @@ -593,7 +596,7 @@ CARGO_CRATES= Inflector-0.11.4 \ zeroize_derive-1.3.3 \ zstd-0.11.2+zstd.1.5.2 \ zstd-safe-5.0.2+zstd.1.5.2 \ - zstd-sys-2.0.7+zstd.1.5.4 + zstd-sys-2.0.8+zstd.1.5.5 CARGO_INSTALL= no diff --git a/www/deno/distinfo b/www/deno/distinfo index 02bdad5eafd..6aab6fd961b 100644 --- a/www/deno/distinfo +++ b/www/deno/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1690439536 +TIMESTAMP = 1692704804 SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3 SIZE (rust/crates/Inflector-0.11.4.crate) = 17438 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -11,8 +11,6 @@ SHA256 (rust/crates/aes-gcm-0.10.1.crate) = 82e1366e0c69c9f927b1fa5ce2c7bf9eafc8 SIZE (rust/crates/aes-gcm-0.10.1.crate) = 148410 SHA256 (rust/crates/aes-kw-0.2.1.crate) = 69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c SIZE (rust/crates/aes-kw-0.2.1.crate) = 14088 -SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 -SIZE (rust/crates/ahash-0.7.6.crate) = 38030 SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f SIZE (rust/crates/ahash-0.8.3.crate) = 42416 SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac @@ -23,6 +21,8 @@ SHA256 (rust/crates/alloc-stdlib-0.2.2.crate) = 94fb8275041c72129eb51b7d0322c29b SIZE (rust/crates/alloc-stdlib-0.2.2.crate) = 6693 SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0 SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674 +SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 +SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243 SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163 SIZE (rust/crates/anstream-0.3.2.crate) = 19504 SHA256 (rust/crates/anstyle-1.0.0.crate) = 41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d @@ -33,8 +33,8 @@ SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4e SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620 SHA256 (rust/crates/anstyle-wincon-1.0.1.crate) = 180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188 SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718 -SHA256 (rust/crates/anyhow-1.0.70.crate) = 7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4 -SIZE (rust/crates/anyhow-1.0.70.crate) = 43803 +SHA256 (rust/crates/anyhow-1.0.72.crate) = 3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854 +SIZE (rust/crates/anyhow-1.0.72.crate) = 43837 SHA256 (rust/crates/arrayvec-0.7.2.crate) = 8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6 SIZE (rust/crates/arrayvec-0.7.2.crate) = 29341 SHA256 (rust/crates/asn1-rs-0.5.2.crate) = 7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0 @@ -43,12 +43,10 @@ SHA256 (rust/crates/asn1-rs-derive-0.4.0.crate) = 726535892e8eae7e70657b4c8ea93d SIZE (rust/crates/asn1-rs-derive-0.4.0.crate) = 5220 SHA256 (rust/crates/asn1-rs-impl-0.1.0.crate) = 2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed SIZE (rust/crates/asn1-rs-impl-0.1.0.crate) = 2256 -SHA256 (rust/crates/ast_node-0.9.4.crate) = c704e2f6ee1a98223f5a7629a6ef0f3decb3b552ed282889dc957edff98ce1e6 -SIZE (rust/crates/ast_node-0.9.4.crate) = 8225 -SHA256 (rust/crates/async-compression-0.3.15.crate) = 942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a -SIZE (rust/crates/async-compression-0.3.15.crate) = 58241 -SHA256 (rust/crates/async-compression-0.4.0.crate) = 5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11 -SIZE (rust/crates/async-compression-0.4.0.crate) = 41890 +SHA256 (rust/crates/ast_node-0.9.5.crate) = c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24 +SIZE (rust/crates/ast_node-0.9.5.crate) = 8281 +SHA256 (rust/crates/async-compression-0.4.1.crate) = 62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6 +SIZE (rust/crates/async-compression-0.4.1.crate) = 97688 SHA256 (rust/crates/async-stream-0.3.4.crate) = ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e SIZE (rust/crates/async-stream-0.3.4.crate) = 12419 SHA256 (rust/crates/async-stream-impl-0.3.4.crate) = e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965 @@ -59,6 +57,8 @@ SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93 SIZE (rust/crates/atty-0.2.14.crate) = 5470 SHA256 (rust/crates/auto_impl-0.5.0.crate) = 7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4 SIZE (rust/crates/auto_impl-0.5.0.crate) = 30504 +SHA256 (rust/crates/auto_impl-1.1.0.crate) = fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89 +SIZE (rust/crates/auto_impl-1.1.0.crate) = 31243 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 SHA256 (rust/crates/base16ct-0.1.1.crate) = 349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce @@ -77,8 +77,8 @@ SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241f SIZE (rust/crates/base64ct-1.6.0.crate) = 28870 SHA256 (rust/crates/bencher-0.1.5.crate) = 7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5 SIZE (rust/crates/bencher-0.1.5.crate) = 18827 -SHA256 (rust/crates/better_scoped_tls-0.1.0.crate) = b73e8ecdec39e98aa3b19e8cd0b8ed8f77ccb86a6b0b2dc7cd86d105438a2123 -SIZE (rust/crates/better_scoped_tls-0.1.0.crate) = 1886 +SHA256 (rust/crates/better_scoped_tls-0.1.1.crate) = 794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de +SIZE (rust/crates/better_scoped_tls-0.1.1.crate) = 1874 SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad SIZE (rust/crates/bincode-1.3.3.crate) = 28958 SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1 @@ -87,12 +87,10 @@ SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41a SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 -SHA256 (rust/crates/bitflags-2.1.0.crate) = c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3 -SIZE (rust/crates/bitflags-2.1.0.crate) = 33325 +SHA256 (rust/crates/bitflags-2.4.0.crate) = b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635 +SIZE (rust/crates/bitflags-2.4.0.crate) = 36954 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538 -SHA256 (rust/crates/block-modes-0.9.1.crate) = 9e2211b0817f061502a8dd9f11a37e879e79763e3c698d2418cf824d8cb2f21e -SIZE (rust/crates/block-modes-0.9.1.crate) = 758 SHA256 (rust/crates/block-padding-0.3.2.crate) = 0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78 SIZE (rust/crates/block-padding-0.3.2.crate) = 8452 SHA256 (rust/crates/brotli-3.3.4.crate) = a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68 @@ -129,6 +127,8 @@ SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c426 SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792 SHA256 (rust/crates/clipboard-win-4.5.0.crate) = 7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362 SIZE (rust/crates/clipboard-win-4.5.0.crate) = 13476 +SHA256 (rust/crates/cmake-0.1.50.crate) = a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130 +SIZE (rust/crates/cmake-0.1.50.crate) = 16748 SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7 SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857 SHA256 (rust/crates/console_static_text-0.8.1.crate) = f4be93df536dfbcbd39ff7c129635da089901116b88bfc29ec1acb9b56f8ff35 @@ -177,30 +177,32 @@ SHA256 (rust/crates/deno-proc-macro-rules-0.3.2.crate) = 3c65c2ffdafc15645652009 SIZE (rust/crates/deno-proc-macro-rules-0.3.2.crate) = 5221 SHA256 (rust/crates/deno-proc-macro-rules-macros-0.3.2.crate) = 3047b312b7451e3190865713a4dd6e1f821aed614ada219766ebc3024a690435 SIZE (rust/crates/deno-proc-macro-rules-macros-0.3.2.crate) = 6591 -SHA256 (rust/crates/deno_ast-0.27.0.crate) = db178e9f423fe41ff3580e32c43bc13726a5730360ef04e50b84de683a24f7d9 -SIZE (rust/crates/deno_ast-0.27.0.crate) = 37155 -SHA256 (rust/crates/deno_core-0.197.0.crate) = efdf066ffb540f889e481c4f1cdbb7bc202a7af937e7c435234586395e533976 -SIZE (rust/crates/deno_core-0.197.0.crate) = 4737083 -SHA256 (rust/crates/deno_doc-0.63.1.crate) = 499936300106c3c67caae87e29def3df5ea9385db6ed7428f154972f70ed39fa -SIZE (rust/crates/deno_doc-0.63.1.crate) = 118020 -SHA256 (rust/crates/deno_emit-0.24.0.crate) = 6bdc024d2c1e5ec56ef6f923be2c2fea4662d596b0a68074ccf89991b38a05e7 -SIZE (rust/crates/deno_emit-0.24.0.crate) = 6472 -SHA256 (rust/crates/deno_graph-0.49.0.crate) = a7e07fdff6c7dc1a9a7c03ce69435fda4b53641d2d6d3d3ed6d29cf67fefd3ea -SIZE (rust/crates/deno_graph-0.49.0.crate) = 54605 -SHA256 (rust/crates/deno_lint-0.49.0.crate) = e5900d62a2115735b3c59a3a6e201d62d8678c03a0a04b9fee2e69a3247afa90 -SIZE (rust/crates/deno_lint-0.49.0.crate) = 272944 -SHA256 (rust/crates/deno_lockfile-0.14.1.crate) = aa35b176a415501662244f99846b3d0dd1a7792b2135bf7f80007f8eca8b24ac -SIZE (rust/crates/deno_lockfile-0.14.1.crate) = 6854 -SHA256 (rust/crates/deno_media_type-0.1.0.crate) = 63772a60d740a41d97fbffb4788fc3779e6df47289e01892c12be38f4a5beded -SIZE (rust/crates/deno_media_type-0.1.0.crate) = 7818 -SHA256 (rust/crates/deno_npm-0.9.1.crate) = 371ef0398b5b5460d66b78a958d5015658e198ad3a29fb9ce329459272fd29aa -SIZE (rust/crates/deno_npm-0.9.1.crate) = 35319 -SHA256 (rust/crates/deno_ops-0.75.0.crate) = ba2d2ca95637f48ba885bfa78cf3b962aa6752e4bb0bacda438e024a4b6b3b69 -SIZE (rust/crates/deno_ops-0.75.0.crate) = 65782 -SHA256 (rust/crates/deno_semver-0.2.2.crate) = 242c8ad9f4ce614ec0fa2e6b3d834f2662ce024ca78e9ed4c58d812cbfc3e41d -SIZE (rust/crates/deno_semver-0.2.2.crate) = 17640 -SHA256 (rust/crates/deno_task_shell-0.13.1.crate) = ba1dc995d5731f4431520037b53ce6a8bb88ec5e7baaf0627eb273335769cbbf -SIZE (rust/crates/deno_task_shell-0.13.1.crate) = 37311 +SHA256 (rust/crates/deno_ast-0.28.0.crate) = 00c93119b1c487a85603406a988a0ca9a1d0e5315404cccc5c158fb484b1f5a2 +SIZE (rust/crates/deno_ast-0.28.0.crate) = 37782 +SHA256 (rust/crates/deno_cache_dir-0.5.2.crate) = 85e4ee308992ed5bd4977d251c0ce4bdfa4cc59efa4ee93d17ebe46eae1e4563 +SIZE (rust/crates/deno_cache_dir-0.5.2.crate) = 16490 +SHA256 (rust/crates/deno_core-0.202.0.crate) = e9d4f3ad9c2861e0bb8745e1f228aaee04782a9ab6a3c3bbb887e60d7faf087a +SIZE (rust/crates/deno_core-0.202.0.crate) = 4759665 +SHA256 (rust/crates/deno_doc-0.65.0.crate) = 10bb7c24a702ae82d8eaee95a325a9853b951dd0e01bb4950dd427e61e4fd0fe +SIZE (rust/crates/deno_doc-0.65.0.crate) = 117647 +SHA256 (rust/crates/deno_emit-0.26.0.crate) = 10663feb7be359aa447e7be4bc76a25a2d470fc9dfa8cd1b09a0a3916e0586e0 +SIZE (rust/crates/deno_emit-0.26.0.crate) = 6739 +SHA256 (rust/crates/deno_graph-0.52.0.crate) = 6acc743895f5e83c985d632998e58af1395c862b28acabd3d290540ef4d57354 +SIZE (rust/crates/deno_graph-0.52.0.crate) = 79318 +SHA256 (rust/crates/deno_lint-0.50.1.crate) = 790851a7216be0460da0ca5b4faeef568b031a4e856a3bd86a8e27cdc3333a9d +SIZE (rust/crates/deno_lint-0.50.1.crate) = 278004 +SHA256 (rust/crates/deno_lockfile-0.15.0.crate) = 3e1fcc91fa4e18c3e0574965d7133709e76eda665cb589de703219f0819dfaec +SIZE (rust/crates/deno_lockfile-0.15.0.crate) = 7012 +SHA256 (rust/crates/deno_media_type-0.1.1.crate) = 001d69b833ed4d244b608bab9c07069bfb570f631b763b58e73f82a020bf84ef +SIZE (rust/crates/deno_media_type-0.1.1.crate) = 7885 +SHA256 (rust/crates/deno_npm-0.12.0.crate) = c90198ae433bf22ac9b39fe5e18748d9d5b36db042ef1c24637f43d3b5e101e0 +SIZE (rust/crates/deno_npm-0.12.0.crate) = 37141 +SHA256 (rust/crates/deno_ops-0.80.0.crate) = abb6a1ceabfbab1c29b32872e68ec994d393b58ccdf12a835d150199555496f3 +SIZE (rust/crates/deno_ops-0.80.0.crate) = 68465 +SHA256 (rust/crates/deno_semver-0.4.0.crate) = 6f739a9d90c47e2af7e2fcbae0976360f3fb5292f7288a084d035ed44d12a288 +SIZE (rust/crates/deno_semver-0.4.0.crate) = 19347 +SHA256 (rust/crates/deno_task_shell-0.13.2.crate) = 4dbbad0a7ba06a961df3cd638ab117f5d67787607f627defa65629a4ef29d576 +SIZE (rust/crates/deno_task_shell-0.13.2.crate) = 37325 SHA256 (rust/crates/der-0.6.1.crate) = f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de SIZE (rust/crates/der-0.6.1.crate) = 74205 SHA256 (rust/crates/der-0.7.3.crate) = 82b10af9f9f9f2134a42d3f8aa74658660f2e0234b0eb81bd171df8aa32779ed @@ -225,18 +227,16 @@ SHA256 (rust/crates/dlopen-0.1.8.crate) = 71e80ad39f814a9abe68583cd50a2d45c8a675 SIZE (rust/crates/dlopen-0.1.8.crate) = 29753 SHA256 (rust/crates/dlopen_derive-0.1.4.crate) = f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581 SIZE (rust/crates/dlopen_derive-0.1.4.crate) = 3491 -SHA256 (rust/crates/dotenv-0.15.0.crate) = 77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f -SIZE (rust/crates/dotenv-0.15.0.crate) = 11668 SHA256 (rust/crates/dprint-core-0.62.1.crate) = e6563addfa2b6c6fa96acdda0341090beba2c5c4ff6ef91f3a232a6d4dd34156 SIZE (rust/crates/dprint-core-0.62.1.crate) = 52073 SHA256 (rust/crates/dprint-plugin-json-0.17.4.crate) = b63039b53a600a7dc078cf9d76d6b5aad9bdb665e5a107ecdb06aef7bcc2e345 SIZE (rust/crates/dprint-plugin-json-0.17.4.crate) = 18834 SHA256 (rust/crates/dprint-plugin-markdown-0.15.3.crate) = f20e5763efd89925412ac0f525a25bbba9066b2ba924eae87ab8a7120df0744c SIZE (rust/crates/dprint-plugin-markdown-0.15.3.crate) = 36006 -SHA256 (rust/crates/dprint-plugin-typescript-0.85.0.crate) = e49896ccb3ca2bfe03d96316b7acb0ce83dcfce69adc5b228f16fa6b30fb674b -SIZE (rust/crates/dprint-plugin-typescript-0.85.0.crate) = 1030506 -SHA256 (rust/crates/dprint-swc-ext-0.10.0.crate) = dd4dda8a1b920e8be367aeaad035753d21bb69b3c50515afb41ab1eefbb886b5 -SIZE (rust/crates/dprint-swc-ext-0.10.0.crate) = 71404 +SHA256 (rust/crates/dprint-plugin-typescript-0.86.2.crate) = 384b423bfa289e57a0fab8eadc5ced6a0890ccc3570258daf4a12b1d0412cfb9 +SIZE (rust/crates/dprint-plugin-typescript-0.86.2.crate) = 1032568 +SHA256 (rust/crates/dprint-swc-ext-0.11.1.crate) = 3f115ea5b6f5d0d02a25a9364f41b8c4f857452c299309dcfd29a694724d0566 +SIZE (rust/crates/dprint-swc-ext-0.11.1.crate) = 71395 SHA256 (rust/crates/dsa-0.6.1.crate) = b5638f6d17447bc0ffc46354949ee366847e83450e2a07895862942085cc9761 SIZE (rust/crates/dsa-0.6.1.crate) = 25739 SHA256 (rust/crates/dyn-clone-1.0.11.crate) = 68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30 @@ -265,6 +265,8 @@ SHA256 (rust/crates/enum-as-inner-0.5.1.crate) = c9720bba047d567ffc8a3cba48bf191 SIZE (rust/crates/enum-as-inner-0.5.1.crate) = 11707 SHA256 (rust/crates/env_logger-0.9.0.crate) = 0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3 SIZE (rust/crates/env_logger-0.9.0.crate) = 33573 +SHA256 (rust/crates/equivalent-1.0.0.crate) = 88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1 +SIZE (rust/crates/equivalent-1.0.0.crate) = 6621 SHA256 (rust/crates/errno-0.2.8.crate) = f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1 SIZE (rust/crates/errno-0.2.8.crate) = 9276 SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf @@ -273,8 +275,8 @@ SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a7 SIZE (rust/crates/error-code-2.3.1.crate) = 5324 SHA256 (rust/crates/escape8259-0.5.2.crate) = ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee SIZE (rust/crates/escape8259-0.5.2.crate) = 5462 -SHA256 (rust/crates/eszip-0.45.0.crate) = bbf5a0f47c2e73cb7631accc282ebda9bc9ed9b2034abfddec983dc9c8f78e7a -SIZE (rust/crates/eszip-0.45.0.crate) = 154750 +SHA256 (rust/crates/eszip-0.50.0.crate) = e254fcba0a6481f44fa41f41cb9027d811072e7e7fa94780ade4a7fa43b34c4b +SIZE (rust/crates/eszip-0.50.0.crate) = 157660 SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7 SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509 SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a @@ -283,8 +285,8 @@ SHA256 (rust/crates/fancy-regex-0.10.0.crate) = 0678ab2d46fa5195aaf59ad034c083d3 SIZE (rust/crates/fancy-regex-0.10.0.crate) = 79951 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be SIZE (rust/crates/fastrand-1.9.0.crate) = 11910 -SHA256 (rust/crates/fastwebsockets-0.3.1.crate) = 1925eb5ee48fffa504a9edce24b3b4d43e2809d1cc713a1df2b13a46e661b3c6 -SIZE (rust/crates/fastwebsockets-0.3.1.crate) = 37132 +SHA256 (rust/crates/fastwebsockets-0.4.4.crate) = 9e6185b6dc9dddc4db0dedd2e213047e93bcbf7a0fb092abc4c4e4f3195efdb4 +SIZE (rust/crates/fastwebsockets-0.4.4.crate) = 47487 SHA256 (rust/crates/fd-lock-3.0.10.crate) = 8ef1a30ae415c3a691a4f41afddc2dbcd6d70baf338368d85ebc1e8ed92cedb9 SIZE (rust/crates/fd-lock-3.0.10.crate) = 13691 SHA256 (rust/crates/ff-0.12.1.crate) = d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160 @@ -297,16 +299,16 @@ SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736e SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954 SHA256 (rust/crates/flaky_test-0.1.0.crate) = 479cde5eb168cf5a056dd98f311cbfab7494c216394e4fb9eba0336827a8db93 SIZE (rust/crates/flaky_test-0.1.0.crate) = 2401 -SHA256 (rust/crates/flate2-1.0.24.crate) = f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6 -SIZE (rust/crates/flate2-1.0.24.crate) = 70191 +SHA256 (rust/crates/flate2-1.0.26.crate) = 3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743 +SIZE (rust/crates/flate2-1.0.26.crate) = 70832 SHA256 (rust/crates/fly-accept-encoding-0.2.0.crate) = a3afa7516fdcfd8e5e93a938f8fec857785ced190a1f62d842d1fe1ffbe22ba8 SIZE (rust/crates/fly-accept-encoding-0.2.0.crate) = 3247 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1 SIZE (rust/crates/fnv-1.0.7.crate) = 11266 -SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8 -SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734 -SHA256 (rust/crates/from_variant-0.1.5.crate) = 1d449976075322384507443937df2f1d5577afbf4282f12a5a66ef29fa3e6307 -SIZE (rust/crates/from_variant-0.1.5.crate) = 1766 +SHA256 (rust/crates/form_urlencoded-1.2.0.crate) = a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652 +SIZE (rust/crates/form_urlencoded-1.2.0.crate) = 8923 +SHA256 (rust/crates/from_variant-0.1.6.crate) = 03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f +SIZE (rust/crates/from_variant-0.1.6.crate) = 1811 SHA256 (rust/crates/fs3-0.5.0.crate) = fb17cf6ed704f72485332f6ab65257460c4f9f3083934cf402bf9f5b3b600a90 SIZE (rust/crates/fs3-0.5.0.crate) = 13434 SHA256 (rust/crates/fsevent-sys-4.1.0.crate) = 76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2 @@ -357,6 +359,8 @@ SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa8526 SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968 SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265 +SHA256 (rust/crates/hashbrown-0.14.0.crate) = 2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a +SIZE (rust/crates/hashbrown-0.14.0.crate) = 116103 SHA256 (rust/crates/hashlink-0.8.2.crate) = 0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa SIZE (rust/crates/hashlink-0.8.2.crate) = 26428 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8 @@ -389,20 +393,28 @@ SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec8 SIZE (rust/crates/humantime-2.1.0.crate) = 16749 SHA256 (rust/crates/hyper-0.14.26.crate) = ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4 SIZE (rust/crates/hyper-0.14.26.crate) = 195570 -SHA256 (rust/crates/hyper-1.0.0-rc.3.crate) = 7b75264b2003a3913f118d35c586e535293b3e22e41f074930762929d071e092 -SIZE (rust/crates/hyper-1.0.0-rc.3.crate) = 129794 +SHA256 (rust/crates/hyper-1.0.0-rc.4.crate) = d280a71f348bcc670fc55b02b63c53a04ac0bf2daff2980795aeaf53edae10e6 +SIZE (rust/crates/hyper-1.0.0-rc.4.crate) = 136156 SHA256 (rust/crates/hyper-rustls-0.24.0.crate) = 0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7 SIZE (rust/crates/hyper-rustls-0.24.0.crate) = 29917 +SHA256 (rust/crates/iana-time-zone-0.1.57.crate) = 2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613 +SIZE (rust/crates/iana-time-zone-0.1.57.crate) = 19785 +SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f +SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185 SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8 SIZE (rust/crates/idna-0.2.3.crate) = 271023 SHA256 (rust/crates/idna-0.3.0.crate) = e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6 SIZE (rust/crates/idna-0.3.0.crate) = 271128 +SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c +SIZE (rust/crates/idna-0.4.0.crate) = 271429 SHA256 (rust/crates/if_chain-1.0.2.crate) = cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed SIZE (rust/crates/if_chain-1.0.2.crate) = 8062 SHA256 (rust/crates/import_map-0.15.0.crate) = 632089ec08bd62e807311104122fb26d5c911ab172e2b9864be154a575979e29 SIZE (rust/crates/import_map-0.15.0.crate) = 206398 -SHA256 (rust/crates/indexmap-1.9.2.crate) = 1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399 -SIZE (rust/crates/indexmap-1.9.2.crate) = 54627 +SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99 +SIZE (rust/crates/indexmap-1.9.3.crate) = 54653 +SHA256 (rust/crates/indexmap-2.0.0.crate) = d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d +SIZE (rust/crates/indexmap-2.0.0.crate) = 64038 SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff SIZE (rust/crates/inotify-0.9.6.crate) = 22971 SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb @@ -417,8 +429,8 @@ SHA256 (rust/crates/ipconfig-0.3.1.crate) = bd302af1b90f2463a98fa5ad469fc212c8e3 SIZE (rust/crates/ipconfig-0.3.1.crate) = 23904 SHA256 (rust/crates/ipnet-2.7.1.crate) = 30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146 SIZE (rust/crates/ipnet-2.7.1.crate) = 26989 -SHA256 (rust/crates/is-macro-0.2.2.crate) = 8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20 -SIZE (rust/crates/is-macro-0.2.2.crate) = 5247 +SHA256 (rust/crates/is-macro-0.3.0.crate) = f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e +SIZE (rust/crates/is-macro-0.3.0.crate) = 5252 SHA256 (rust/crates/is-terminal-0.4.4.crate) = 21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857 SIZE (rust/crates/is-terminal-0.4.4.crate) = 7744 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473 @@ -433,8 +445,6 @@ SHA256 (rust/crates/jsonc-parser-0.21.1.crate) = 7b56a20e76235284255a09fcd1f45cf SIZE (rust/crates/jsonc-parser-0.21.1.crate) = 42901 SHA256 (rust/crates/junction-0.2.0.crate) = be39922b087cecaba4e2d5592dedfc8bda5d4a5a1231f143337cca207950b61d SIZE (rust/crates/junction-0.2.0.crate) = 11006 -SHA256 (rust/crates/keccak-0.1.3.crate) = 3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768 -SIZE (rust/crates/keccak-0.1.3.crate) = 15143 SHA256 (rust/crates/kqueue-1.0.7.crate) = 2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98 SIZE (rust/crates/kqueue-1.0.7.crate) = 12554 SHA256 (rust/crates/kqueue-sys-1.0.3.crate) = 8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587 @@ -445,20 +455,6 @@ SHA256 (rust/crates/lazy-regex-proc_macros-2.4.1.crate) = 8edfc11b8f56ce85e207e6 SIZE (rust/crates/lazy-regex-proc_macros-2.4.1.crate) = 3967 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 -SHA256 (rust/crates/lexical-6.1.1.crate) = c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6 -SIZE (rust/crates/lexical-6.1.1.crate) = 24330 -SHA256 (rust/crates/lexical-core-0.8.5.crate) = 2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46 -SIZE (rust/crates/lexical-core-0.8.5.crate) = 26680 -SHA256 (rust/crates/lexical-parse-float-0.8.5.crate) = 683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f -SIZE (rust/crates/lexical-parse-float-0.8.5.crate) = 180161 -SHA256 (rust/crates/lexical-parse-integer-0.8.6.crate) = 6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9 -SIZE (rust/crates/lexical-parse-integer-0.8.6.crate) = 33647 -SHA256 (rust/crates/lexical-util-0.8.5.crate) = 5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc -SIZE (rust/crates/lexical-util-0.8.5.crate) = 85152 -SHA256 (rust/crates/lexical-write-float-0.8.5.crate) = accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862 -SIZE (rust/crates/lexical-write-float-0.8.5.crate) = 100281 -SHA256 (rust/crates/lexical-write-integer-0.8.5.crate) = e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446 -SIZE (rust/crates/lexical-write-integer-0.8.5.crate) = 55427 SHA256 (rust/crates/libc-0.2.147.crate) = b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3 SIZE (rust/crates/libc-0.2.147.crate) = 686772 SHA256 (rust/crates/libffi-3.2.0.crate) = ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2 @@ -471,6 +467,8 @@ SHA256 (rust/crates/libm-0.2.6.crate) = 348108ab3fba42ec82ff6e9564fc4ca0247bdccd SIZE (rust/crates/libm-0.2.6.crate) = 113690 SHA256 (rust/crates/libsqlite3-sys-0.26.0.crate) = afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326 SIZE (rust/crates/libsqlite3-sys-0.26.0.crate) = 4840390 +SHA256 (rust/crates/libz-ng-sys-1.1.12.crate) = 3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63 +SIZE (rust/crates/libz-ng-sys-1.1.12.crate) = 2381318 SHA256 (rust/crates/libz-sys-1.1.8.crate) = 9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf SIZE (rust/crates/libz-sys-1.1.8.crate) = 2481844 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f @@ -505,12 +503,12 @@ SHA256 (rust/crates/mime-0.3.16.crate) = 2a60c7ce501c71e03a9c9c0d35b861413ae925b SIZE (rust/crates/mime-0.3.16.crate) = 15206 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841 -SHA256 (rust/crates/miniz_oxide-0.5.4.crate) = 96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34 -SIZE (rust/crates/miniz_oxide-0.5.4.crate) = 53485 +SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7 +SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194 SHA256 (rust/crates/mio-0.8.6.crate) = 5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9 SIZE (rust/crates/mio-0.8.6.crate) = 93658 -SHA256 (rust/crates/monch-0.4.2.crate) = bb73e1dc7d232e1ab47ef27f45fa1d173a0979b370e763a9d0584556011150e0 -SIZE (rust/crates/monch-0.4.2.crate) = 305226 +SHA256 (rust/crates/monch-0.4.3.crate) = 4519a88847ba2d5ead3dc53f1060ec6a571de93f325d9c5c4968147382b1cbc3 +SIZE (rust/crates/monch-0.4.3.crate) = 305285 SHA256 (rust/crates/napi-build-1.2.1.crate) = ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b SIZE (rust/crates/napi-build-1.2.1.crate) = 5121349 SHA256 (rust/crates/napi-sys-2.2.3.crate) = 166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3 @@ -519,6 +517,8 @@ SHA256 (rust/crates/netif-0.1.6.crate) = d29a01b9f018d6b7b277fef6c79fdbd9bf17bb2 SIZE (rust/crates/netif-0.1.6.crate) = 5923 SHA256 (rust/crates/new_debug_unreachable-1.0.4.crate) = e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54 SIZE (rust/crates/new_debug_unreachable-1.0.4.crate) = 2561 +SHA256 (rust/crates/nextest-workspace-hack-0.1.0.crate) = d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3 +SIZE (rust/crates/nextest-workspace-hack-0.1.0.crate) = 1040 SHA256 (rust/crates/nibble_vec-0.1.0.crate) = 77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43 SIZE (rust/crates/nibble_vec-0.1.0.crate) = 11796 SHA256 (rust/crates/nix-0.24.2.crate) = 195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc @@ -543,8 +543,8 @@ SHA256 (rust/crates/num_cpus-1.15.0.crate) = 0fac9e2da13b5eb447a6ce3d392f23a29d8 SIZE (rust/crates/num_cpus-1.15.0.crate) = 15680 SHA256 (rust/crates/oid-registry-0.6.1.crate) = 9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff SIZE (rust/crates/oid-registry-0.6.1.crate) = 15068 -SHA256 (rust/crates/once_cell-1.17.1.crate) = b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3 -SIZE (rust/crates/once_cell-1.17.1.crate) = 32856 +SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d +SIZE (rust/crates/once_cell-1.18.0.crate) = 32969 SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5 SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767 SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf @@ -617,8 +617,6 @@ SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5 SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360 SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160 SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662 -SHA256 (rust/crates/pmutil-0.5.3.crate) = 3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004 -SIZE (rust/crates/pmutil-0.5.3.crate) = 11031 SHA256 (rust/crates/pmutil-0.6.1.crate) = 52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6 SIZE (rust/crates/pmutil-0.6.1.crate) = 10997 SHA256 (rust/crates/polyval-0.6.0.crate) = 7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6 @@ -645,16 +643,18 @@ SHA256 (rust/crates/proc-macro2-1.0.66.crate) = 18fb31db3f9bddb2ea821cde30a9f701 SIZE (rust/crates/proc-macro2-1.0.66.crate) = 43575 SHA256 (rust/crates/psm-0.1.21.crate) = 5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874 SIZE (rust/crates/psm-0.1.21.crate) = 23126 -SHA256 (rust/crates/pty2-0.1.0.crate) = 4461e7f96399674b9112e620e511089bc7c4c0d76545b3cc3e0b46bab72a15d5 -SIZE (rust/crates/pty2-0.1.0.crate) = 9829 SHA256 (rust/crates/pulldown-cmark-0.9.3.crate) = 77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998 SIZE (rust/crates/pulldown-cmark-0.9.3.crate) = 117339 SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 SIZE (rust/crates/quick-error-1.2.3.crate) = 15066 +SHA256 (rust/crates/quick-junit-0.3.3.crate) = 6bf780b59d590c25f8c59b44c124166a2a93587868b619fb8f5b47fb15e9ed6d +SIZE (rust/crates/quick-junit-0.3.3.crate) = 11242 +SHA256 (rust/crates/quick-xml-0.29.0.crate) = 81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51 +SIZE (rust/crates/quick-xml-0.29.0.crate) = 160308 SHA256 (rust/crates/quote-0.6.13.crate) = 6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1 SIZE (rust/crates/quote-0.6.13.crate) = 17475 -SHA256 (rust/crates/quote-1.0.28.crate) = 1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488 -SIZE (rust/crates/quote-1.0.28.crate) = 28382 +SHA256 (rust/crates/quote-1.0.32.crate) = 50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965 +SIZE (rust/crates/quote-1.0.32.crate) = 28037 SHA256 (rust/crates/radix_fmt-1.0.0.crate) = ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426 SIZE (rust/crates/radix_fmt-1.0.0.crate) = 8743 SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd @@ -749,30 +749,28 @@ SHA256 (rust/crates/semver-1.0.14.crate) = e25dfac463d778e353db5be2449d1cce89bd6 SIZE (rust/crates/semver-1.0.14.crate) = 29813 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268 -SHA256 (rust/crates/serde-1.0.157.crate) = 707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca -SIZE (rust/crates/serde-1.0.157.crate) = 77012 +SHA256 (rust/crates/serde-1.0.183.crate) = 32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c +SIZE (rust/crates/serde-1.0.183.crate) = 77210 SHA256 (rust/crates/serde-value-0.7.0.crate) = f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c SIZE (rust/crates/serde-value-0.7.0.crate) = 10249 SHA256 (rust/crates/serde_bytes-0.11.9.crate) = 416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294 SIZE (rust/crates/serde_bytes-0.11.9.crate) = 10833 -SHA256 (rust/crates/serde_derive-1.0.157.crate) = 78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5 -SIZE (rust/crates/serde_derive-1.0.157.crate) = 54958 -SHA256 (rust/crates/serde_json-1.0.94.crate) = 1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea -SIZE (rust/crates/serde_json-1.0.94.crate) = 144406 +SHA256 (rust/crates/serde_derive-1.0.183.crate) = aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816 +SIZE (rust/crates/serde_derive-1.0.183.crate) = 377265 +SHA256 (rust/crates/serde_json-1.0.104.crate) = 076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c +SIZE (rust/crates/serde_json-1.0.104.crate) = 146130 SHA256 (rust/crates/serde_repr-0.1.9.crate) = 1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca SIZE (rust/crates/serde_repr-0.1.9.crate) = 9695 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822 -SHA256 (rust/crates/serde_v8-0.108.0.crate) = 7a1a26c89d56d8607d220c639e971e3e3901138fcc5dd0f619cee0868e1cc89e -SIZE (rust/crates/serde_v8-0.108.0.crate) = 32474 +SHA256 (rust/crates/serde_v8-0.113.0.crate) = 3fa7b3ecd650d790ff8781402d0704d35a2f51c3bec87fe92d43eea6d371f05d +SIZE (rust/crates/serde_v8-0.113.0.crate) = 33238 SHA256 (rust/crates/sha-1-0.10.0.crate) = 028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f SIZE (rust/crates/sha-1-0.10.0.crate) = 12239 SHA256 (rust/crates/sha1-0.10.5.crate) = f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3 SIZE (rust/crates/sha1-0.10.5.crate) = 12146 SHA256 (rust/crates/sha2-0.10.6.crate) = 82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0 SIZE (rust/crates/sha2-0.10.6.crate) = 20558 -SHA256 (rust/crates/sha3-0.10.6.crate) = bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9 -SIZE (rust/crates/sha3-0.10.6.crate) = 854837 SHA256 (rust/crates/shell-escape-0.1.5.crate) = 45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f SIZE (rust/crates/shell-escape-0.1.5.crate) = 6847 SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1 @@ -813,8 +811,8 @@ SHA256 (rust/crates/string_cache-0.8.7.crate) = f91138e76242f575eb1d3b38b4f1362f SIZE (rust/crates/string_cache-0.8.7.crate) = 16655 SHA256 (rust/crates/string_cache_codegen-0.5.2.crate) = 6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988 SIZE (rust/crates/string_cache_codegen-0.5.2.crate) = 8156 -SHA256 (rust/crates/string_enum-0.4.0.crate) = 0090512bdfee4b56d82480d66c0fd8a6f53f0fe0f97e075e949b252acdd482e0 -SIZE (rust/crates/string_enum-0.4.0.crate) = 3796 +SHA256 (rust/crates/string_enum-0.4.1.crate) = 8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252 +SIZE (rust/crates/string_enum-0.4.1.crate) = 3982 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 SIZE (rust/crates/strsim-0.10.0.crate) = 11355 SHA256 (rust/crates/strum-0.25.0.crate) = 290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125 @@ -823,64 +821,64 @@ SHA256 (rust/crates/strum_macros-0.25.1.crate) = 6069ca09d878a33f883cc06aaa9718e SIZE (rust/crates/strum_macros-0.25.1.crate) = 21700 SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601 SIZE (rust/crates/subtle-2.4.1.crate) = 12630 -SHA256 (rust/crates/swc_atoms-0.5.6.crate) = 93d0307dc4bfd107d49c7528350c372758cfca94fb503629b9a056e6a1572860 -SIZE (rust/crates/swc_atoms-0.5.6.crate) = 15257 -SHA256 (rust/crates/swc_bundler-0.214.25.crate) = 503d03f4eb44ae6a57154e4459d9a7050c56e0aa9ec798a93d21ca07a8dd0409 -SIZE (rust/crates/swc_bundler-0.214.25.crate) = 72100 -SHA256 (rust/crates/swc_common-0.31.12.crate) = 19c774005489d2907fb67909cf42af926e72edee1366512777c605ba2ef19c94 -SIZE (rust/crates/swc_common-0.31.12.crate) = 92101 -SHA256 (rust/crates/swc_config-0.1.5.crate) = 89c8fc2c12bb1634c7c32fc3c9b6b963ad8f034cc62c4ecddcf215dc4f6f959d -SIZE (rust/crates/swc_config-0.1.5.crate) = 3253 -SHA256 (rust/crates/swc_config_macro-0.1.1.crate) = 7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004 -SIZE (rust/crates/swc_config_macro-0.1.1.crate) = 1748 -SHA256 (rust/crates/swc_ecma_ast-0.104.5.crate) = b5cf9dd351d0c285dcd36535267953a18995d4dda0cbe34ac9d1df61aa415b26 -SIZE (rust/crates/swc_ecma_ast-0.104.5.crate) = 30270 -SHA256 (rust/crates/swc_ecma_codegen-0.139.15.crate) = 11c6af8e6d6714ecd7ef5cfba322aa1b436f78d9a82b0c3ff16aeaf97b65cd6d -SIZE (rust/crates/swc_ecma_codegen-0.139.15.crate) = 48655 -SHA256 (rust/crates/swc_ecma_codegen_macros-0.7.2.crate) = bf4ee0caee1018808d94ecd09490cb7affd3d504b19aa11c49238f5fc4b54901 -SIZE (rust/crates/swc_ecma_codegen_macros-0.7.2.crate) = 3042 -SHA256 (rust/crates/swc_ecma_dep_graph-0.106.12.crate) = f3130754aba396ad8d849f3fd1a9949d71a33c0943dfd86b23ac595e81fabd0c -SIZE (rust/crates/swc_ecma_dep_graph-0.106.12.crate) = 5977 -SHA256 (rust/crates/swc_ecma_loader-0.43.14.crate) = fe45f1e5dcc1b005544ff78253b787dea5dfd5e2f712b133964cdc3545c954a4 -SIZE (rust/crates/swc_ecma_loader-0.43.14.crate) = 9723 -SHA256 (rust/crates/swc_ecma_parser-0.134.12.crate) = f0a3fcfe3d83dd445cbd9321882e47b467594433d9a21c4d6c37a27f534bb89e -SIZE (rust/crates/swc_ecma_parser-0.134.12.crate) = 146175 -SHA256 (rust/crates/swc_ecma_transforms_base-0.127.16.crate) = 6232e641bef05c462bc7da34a3771f9b3f1f3352349ae0cd72b8eee8b0f5d5e0 -SIZE (rust/crates/swc_ecma_transforms_base-0.127.16.crate) = 69554 -SHA256 (rust/crates/swc_ecma_transforms_classes-0.116.16.crate) = f086829a3e645382f5609c9c6dce1d29e5204b3c81f82fe8d65d3bf17bcca68b -SIZE (rust/crates/swc_ecma_transforms_classes-0.116.16.crate) = 4477 -SHA256 (rust/crates/swc_ecma_transforms_macros-0.5.1.crate) = 984d5ac69b681fc5438f9abf82b0fda34fe04e119bc75f8213b7e01128c7c9a2 -SIZE (rust/crates/swc_ecma_transforms_macros-0.5.1.crate) = 4485 -SHA256 (rust/crates/swc_ecma_transforms_optimization-0.187.21.crate) = 8d27c12926427f235d149e60f9a9e67a2181fe1eb418c12b53b8e0778c5052a2 -SIZE (rust/crates/swc_ecma_transforms_optimization-0.187.21.crate) = 60542 -SHA256 (rust/crates/swc_ecma_transforms_proposal-0.161.20.crate) = 416fbb84f84644ef0e81df80bf44fd575bbb297a78887e359e16a61f6dc5af86 -SIZE (rust/crates/swc_ecma_transforms_proposal-0.161.20.crate) = 19725 -SHA256 (rust/crates/swc_ecma_transforms_react-0.173.18.crate) = d39a0de45fa34ee797a1c80497c8b9dcb6cf6e56b455c163453399894c58a812 -SIZE (rust/crates/swc_ecma_transforms_react-0.173.18.crate) = 34313 -SHA256 (rust/crates/swc_ecma_transforms_typescript-0.177.20.crate) = 340cc027a6e87966715005b94e3a7ac95baf76c80b8aedad8afdd1c134740c80 -SIZE (rust/crates/swc_ecma_transforms_typescript-0.177.20.crate) = 36103 -SHA256 (rust/crates/swc_ecma_utils-0.117.13.crate) = ad791bbfdafcebd878584021e050964c8ab68aba7eeac9d0ee4afba4c284a629 -SIZE (rust/crates/swc_ecma_utils-0.117.13.crate) = 30774 -SHA256 (rust/crates/swc_ecma_visit-0.90.5.crate) = 6ce3ac941ae1d6c7e683aa375fc71fbf58df58b441f614d757fbb10554936ca2 -SIZE (rust/crates/swc_ecma_visit-0.90.5.crate) = 9925 -SHA256 (rust/crates/swc_eq_ignore_macros-0.1.1.crate) = 0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6 -SIZE (rust/crates/swc_eq_ignore_macros-0.1.1.crate) = 2921 -SHA256 (rust/crates/swc_fast_graph-0.19.12.crate) = 6291149aec4ba55076fd54a12ceb84cac1f703b2f571c3b2f19aa66ab9ec3009 -SIZE (rust/crates/swc_fast_graph-0.19.12.crate) = 7062 -SHA256 (rust/crates/swc_graph_analyzer-0.20.13.crate) = 6575adec8b200801d429ffa79166224a6e298292a1b307750f4763aec5aa16c3 -SIZE (rust/crates/swc_graph_analyzer-0.20.13.crate) = 1964 -SHA256 (rust/crates/swc_macros_common-0.3.7.crate) = 3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6 -SIZE (rust/crates/swc_macros_common-0.3.7.crate) = 6723 -SHA256 (rust/crates/swc_visit-0.5.6.crate) = 5f412dd4fbc58f509a04e64f5c8038333142fc139e8232f01b883db0094b3b51 -SIZE (rust/crates/swc_visit-0.5.6.crate) = 5762 -SHA256 (rust/crates/swc_visit_macros-0.5.7.crate) = 4cfc226380ba54a5feed2c12f3ccd33f1ae8e959160290e5d2d9b4e918b6472a -SIZE (rust/crates/swc_visit_macros-0.5.7.crate) = 14790 +SHA256 (rust/crates/swc_atoms-0.5.8.crate) = b8066e17abb484602da673e2d35138ab32ce53f26368d9c92113510e1659220b +SIZE (rust/crates/swc_atoms-0.5.8.crate) = 15250 +SHA256 (rust/crates/swc_bundler-0.217.49.crate) = ce78d316b33559330cb4348144bbd03181369aa62049f540d792c220ed389570 +SIZE (rust/crates/swc_bundler-0.217.49.crate) = 72560 +SHA256 (rust/crates/swc_common-0.31.21.crate) = de5823ef063f116ad281cde9700f5be6dfb182e543ce3f62c42cee1c03ffbc6b +SIZE (rust/crates/swc_common-0.31.21.crate) = 80374 +SHA256 (rust/crates/swc_config-0.1.7.crate) = 9ba1c7a40d38f9dd4e9a046975d3faf95af42937b34b2b963be4d8f01239584b +SIZE (rust/crates/swc_config-0.1.7.crate) = 3248 +SHA256 (rust/crates/swc_config_macro-0.1.2.crate) = e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829 +SIZE (rust/crates/swc_config_macro-0.1.2.crate) = 1753 +SHA256 (rust/crates/swc_ecma_ast-0.107.7.crate) = b7191c8c57af059b75a2aadc927a2608c3962d19e4d09ce8f9c3f03739ddf833 +SIZE (rust/crates/swc_ecma_ast-0.107.7.crate) = 31455 +SHA256 (rust/crates/swc_ecma_codegen-0.142.17.crate) = 1e4e3ee8a1f0bfaf630febbe0f6a03f2c28d66d373a9bbdb3f500f6bfb536b43 +SIZE (rust/crates/swc_ecma_codegen-0.142.17.crate) = 49484 +SHA256 (rust/crates/swc_ecma_codegen_macros-0.7.3.crate) = dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384 +SIZE (rust/crates/swc_ecma_codegen_macros-0.7.3.crate) = 3093 +SHA256 (rust/crates/swc_ecma_dep_graph-0.109.15.crate) = 1295557b5960eb97ec63fc2008be0a101d1ff7d2163a1031b3d31d3c898d5bb3 +SIZE (rust/crates/swc_ecma_dep_graph-0.109.15.crate) = 5968 +SHA256 (rust/crates/swc_ecma_loader-0.43.23.crate) = 82f47bb1ab686f603da93a8b6e559d69b42369ab47d5dee6bdda38ae5902dc2a +SIZE (rust/crates/swc_ecma_loader-0.43.23.crate) = 9742 +SHA256 (rust/crates/swc_ecma_parser-0.137.15.crate) = 29c0d554865a63bfa58cf1c433fa91d7d4adf40030fa8e4530e8065d0578166a +SIZE (rust/crates/swc_ecma_parser-0.137.15.crate) = 147070 +SHA256 (rust/crates/swc_ecma_transforms_base-0.130.24.crate) = d8d8ca5dd849cea79e6a9792d725f4082ad3ade7a9541fba960c42d55ae778f2 +SIZE (rust/crates/swc_ecma_transforms_base-0.130.24.crate) = 70594 +SHA256 (rust/crates/swc_ecma_transforms_classes-0.119.24.crate) = a09d0e350963d4fb14bf9dc31c85eb28e58a88614e779c75f49296710f9cb381 +SIZE (rust/crates/swc_ecma_transforms_classes-0.119.24.crate) = 4469 +SHA256 (rust/crates/swc_ecma_transforms_macros-0.5.2.crate) = f59c4b6ed5d78d3ad9fc7c6f8ab4f85bba99573d31d9a2c0a712077a6b45efd2 +SIZE (rust/crates/swc_ecma_transforms_macros-0.5.2.crate) = 4535 +SHA256 (rust/crates/swc_ecma_transforms_optimization-0.190.38.crate) = 93c2801884a19a5d35dd6ac6f7e7a3147502325337f3f7fd11cda7c7b4202007 +SIZE (rust/crates/swc_ecma_transforms_optimization-0.190.38.crate) = 60768 +SHA256 (rust/crates/swc_ecma_transforms_proposal-0.164.30.crate) = 62d3a04de35f6c79d8f343822138e7313934d3530cc4e4f891a079f7e2415c1a +SIZE (rust/crates/swc_ecma_transforms_proposal-0.164.30.crate) = 21495 +SHA256 (rust/crates/swc_ecma_transforms_react-0.176.34.crate) = 607017e6fbfe3229b69ffce7b47383eb9b62025ea93a50cd1cc1788d2a29a4ca +SIZE (rust/crates/swc_ecma_transforms_react-0.176.34.crate) = 34320 +SHA256 (rust/crates/swc_ecma_transforms_typescript-0.180.33.crate) = ea349e787a62af0dcf1b8b52d507045345871571c18cb78a2f892912f7d6b753 +SIZE (rust/crates/swc_ecma_transforms_typescript-0.180.33.crate) = 36168 +SHA256 (rust/crates/swc_ecma_utils-0.120.19.crate) = 2cb60e20e1eb9e9f7c88d99ac8659fd0561d70abd27853f550fbd907a448c878 +SIZE (rust/crates/swc_ecma_utils-0.120.19.crate) = 30974 +SHA256 (rust/crates/swc_ecma_visit-0.93.7.crate) = bb23a48abd9f5731b6275dbf4ea89f6e03dc60b7c8e3e1e383bb4a6c39fd7e25 +SIZE (rust/crates/swc_ecma_visit-0.93.7.crate) = 9903 +SHA256 (rust/crates/swc_eq_ignore_macros-0.1.2.crate) = 05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8 +SIZE (rust/crates/swc_eq_ignore_macros-0.1.2.crate) = 2975 +SHA256 (rust/crates/swc_fast_graph-0.19.21.crate) = b07b6c9a4d1659b7e6826fb384b3994b47c5ac35cb76a98a15ca483dd0a5d7b7 +SIZE (rust/crates/swc_fast_graph-0.19.21.crate) = 7054 +SHA256 (rust/crates/swc_graph_analyzer-0.20.24.crate) = 2126bce41c5c755f649bc5fc74fbd5e1ea01306acbf26b49f8aab2bd53f8025f +SIZE (rust/crates/swc_graph_analyzer-0.20.24.crate) = 1972 +SHA256 (rust/crates/swc_macros_common-0.3.8.crate) = 7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832 +SIZE (rust/crates/swc_macros_common-0.3.8.crate) = 6604 +SHA256 (rust/crates/swc_visit-0.5.7.crate) = e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3 +SIZE (rust/crates/swc_visit-0.5.7.crate) = 5762 +SHA256 (rust/crates/swc_visit_macros-0.5.8.crate) = 0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99 +SIZE (rust/crates/swc_visit_macros-0.5.8.crate) = 14818 SHA256 (rust/crates/syn-0.15.44.crate) = 9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5 SIZE (rust/crates/syn-0.15.44.crate) = 184212 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 SIZE (rust/crates/syn-1.0.109.crate) = 237611 -SHA256 (rust/crates/syn-2.0.22.crate) = 2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616 -SIZE (rust/crates/syn-2.0.22.crate) = 241001 +SHA256 (rust/crates/syn-2.0.28.crate) = 04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567 +SIZE (rust/crates/syn-2.0.28.crate) = 241635 SHA256 (rust/crates/synstructure-0.12.6.crate) = f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f SIZE (rust/crates/synstructure-0.12.6.crate) = 18429 SHA256 (rust/crates/sysinfo-0.27.8.crate) = a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33 @@ -895,10 +893,12 @@ SHA256 (rust/crates/text-size-1.1.0.crate) = 288cb548dbe72b652243ea797201f3d481a SIZE (rust/crates/text-size-1.1.0.crate) = 12380 SHA256 (rust/crates/text_lines-0.6.0.crate) = 7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf SIZE (rust/crates/text_lines-0.6.0.crate) = 5587 -SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac -SIZE (rust/crates/thiserror-1.0.40.crate) = 18709 -SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f -SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138 +SHA256 (rust/crates/thiserror-1.0.44.crate) = 611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90 +SIZE (rust/crates/thiserror-1.0.44.crate) = 18760 +SHA256 (rust/crates/thiserror-impl-1.0.44.crate) = 090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96 +SIZE (rust/crates/thiserror-impl-1.0.44.crate) = 15086 +SHA256 (rust/crates/time-0.1.45.crate) = 1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a +SIZE (rust/crates/time-0.1.45.crate) = 28911 SHA256 (rust/crates/time-0.3.20.crate) = cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890 SIZE (rust/crates/time-0.3.20.crate) = 111856 SHA256 (rust/crates/time-core-0.1.0.crate) = 2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd @@ -995,8 +995,8 @@ SHA256 (rust/crates/universal-hash-0.5.0.crate) = 7d3160b73c9a19f7e2939a2fdad446 SIZE (rust/crates/universal-hash-0.5.0.crate) = 9137 SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a SIZE (rust/crates/untrusted-0.7.1.crate) = 7924 -SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643 -SIZE (rust/crates/url-2.3.1.crate) = 72777 +SHA256 (rust/crates/url-2.4.0.crate) = 50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb +SIZE (rust/crates/url-2.4.0.crate) = 75670 SHA256 (rust/crates/urlpattern-0.2.0.crate) = f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609 SIZE (rust/crates/urlpattern-0.2.0.crate) = 26231 SHA256 (rust/crates/utf-8-0.7.6.crate) = 09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9 @@ -1005,8 +1005,8 @@ SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dc SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435 SHA256 (rust/crates/uuid-1.4.1.crate) = 79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d SIZE (rust/crates/uuid-1.4.1.crate) = 55291 -SHA256 (rust/crates/v8-0.74.3.crate) = 2eedac634b8dd39b889c5b62349cbc55913780226239166435c5cf66771792ea -SIZE (rust/crates/v8-0.74.3.crate) = 20392015 +SHA256 (rust/crates/v8-0.75.0.crate) = f9be435abe79a8427b0969f1ac0a3c0e91644235f68a3de5da4a27ec69666985 +SIZE (rust/crates/v8-0.75.0.crate) = 23571321 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426 SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f @@ -1023,6 +1023,8 @@ SHA256 (rust/crates/want-0.3.0.crate) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919 SIZE (rust/crates/want-0.3.0.crate) = 6550 SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519 SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521 +SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f +SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 SHA256 (rust/crates/wasm-bindgen-0.2.84.crate) = 31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b @@ -1047,6 +1049,8 @@ SHA256 (rust/crates/webpki-roots-0.22.6.crate) = b6c71e40d7d2c34a5106301fb632274 SIZE (rust/crates/webpki-roots-0.22.6.crate) = 242386 SHA256 (rust/crates/which-4.4.0.crate) = 2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269 SIZE (rust/crates/which-4.4.0.crate) = 10889 +SHA256 (rust/crates/whoami-1.4.0.crate) = 2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68 +SIZE (rust/crates/whoami-1.4.0.crate) = 15581 SHA256 (rust/crates/widestring-0.5.1.crate) = 17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983 SIZE (rust/crates/widestring-0.5.1.crate) = 41338 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 @@ -1057,6 +1061,8 @@ SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e9 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 +SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f +SIZE (rust/crates/windows-0.48.0.crate) = 11864177 SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7 SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0 @@ -1117,7 +1123,7 @@ SHA256 (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 20cc960326ece64f010d2d210753 SIZE (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 28987 SHA256 (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db SIZE (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 17273 -SHA256 (rust/crates/zstd-sys-2.0.7+zstd.1.5.4.crate) = 94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5 -SIZE (rust/crates/zstd-sys-2.0.7+zstd.1.5.4.crate) = 732100 -SHA256 (denoland-deno-v1.35.3_GH0.tar.gz) = a04128308a6deb434a37ed46d08b5359bb77e0053cf3ac990daffadeba2510a2 -SIZE (denoland-deno-v1.35.3_GH0.tar.gz) = 17677236 +SHA256 (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c +SIZE (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 736270 +SHA256 (denoland-deno-v1.36.2_GH0.tar.gz) = 9c0f6e95c3dc0f7ea953076fcdb67f6751f07e53366b479f5a2b9625ff94484f +SIZE (denoland-deno-v1.36.2_GH0.tar.gz) = 17607227 diff --git a/www/deno/files/patch-cargo-crates_v8_abseil-cpp_absl_base_internal_sysinfo.cc b/www/deno/files/patch-cargo-crates_v8_abseil-cpp_absl_base_internal_sysinfo.cc new file mode 100644 index 00000000000..b518e18c671 --- /dev/null +++ b/www/deno/files/patch-cargo-crates_v8_abseil-cpp_absl_base_internal_sysinfo.cc @@ -0,0 +1,13 @@ +https://github.com/abseil/abseil-cpp/issues/1518 + +--- cargo-crates/v8-0.75.0/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-08-22 14:21:20 UTC ++++ cargo-crates/v8-0.75.0/third_party/abseil-cpp/absl/base/internal/sysinfo.cc +@@ -447,7 +447,7 @@ pid_t GetTID() { + pid_t GetTID() { + // `pthread_t` need not be arithmetic per POSIX; platforms where it isn't + // should be handled above. +- return static_cast(pthread_self()); ++ return static_cast((intptr_t)pthread_self()); + } + + #endif diff --git a/www/deno/files/patch-cargo-crates_v8_build.rs b/www/deno/files/patch-cargo-crates_v8_build.rs index 7fe2eabfcf4..bd43140648e 100644 --- a/www/deno/files/patch-cargo-crates_v8_build.rs +++ b/www/deno/files/patch-cargo-crates_v8_build.rs @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build.rs.orig 2020-07-22 09:53:02 UTC -+++ cargo-crates/v8-0.74.3/build.rs +--- cargo-crates/v8-0.75.0/build.rs.orig 2020-07-22 09:53:02 UTC ++++ cargo-crates/v8-0.75.0/build.rs @@ -268,6 +268,8 @@ fn platform() -> String { "mac" } else if cfg!(target_os = "windows") { diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_build_config_BUILD.gn index b3ca7059cbc..5945049c37b 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_build_config_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/BUILD.gn.orig 2021-01-19 00:12:27 UTC -+++ cargo-crates/v8-0.74.3/build/config/BUILD.gn +--- cargo-crates/v8-0.75.0/build/config/BUILD.gn.orig 2021-01-19 00:12:27 UTC ++++ cargo-crates/v8-0.75.0/build/config/BUILD.gn @@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_BUILDCONFIG.gn b/www/deno/files/patch-cargo-crates_v8_build_config_BUILDCONFIG.gn index e6cffd86082..c2a2b01474b 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_BUILDCONFIG.gn +++ b/www/deno/files/patch-cargo-crates_v8_build_config_BUILDCONFIG.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/BUILDCONFIG.gn.orig 2021-01-19 00:12:27 UTC -+++ cargo-crates/v8-0.74.3/build/config/BUILDCONFIG.gn +--- cargo-crates/v8-0.75.0/build/config/BUILDCONFIG.gn.orig 2021-01-19 00:12:27 UTC ++++ cargo-crates/v8-0.75.0/build/config/BUILDCONFIG.gn @@ -131,7 +131,7 @@ declare_args() { is_official_build = false diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn index a9b455373ba..c1d1ba4ffc9 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_build_config_compiler_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/compiler/BUILD.gn.orig 1973-11-29 22:33:09 UTC -+++ cargo-crates/v8-0.74.3/build/config/compiler/BUILD.gn +--- cargo-crates/v8-0.75.0/build/config/compiler/BUILD.gn.orig 1973-11-29 22:33:09 UTC ++++ cargo-crates/v8-0.75.0/build/config/compiler/BUILD.gn @@ -135,7 +135,7 @@ declare_args() { # # TODO(crbug.com/1131993): This regresses binary size by ~1MB on Android and diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_features.gni b/www/deno/files/patch-cargo-crates_v8_build_config_features.gni index 651ba5a0107..ffc0fec1a3e 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_features.gni +++ b/www/deno/files/patch-cargo-crates_v8_build_config_features.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/features.gni.orig 2020-08-08 19:24:36 UTC -+++ cargo-crates/v8-0.74.3/build/config/features.gni +--- cargo-crates/v8-0.75.0/build/config/features.gni.orig 2020-08-08 19:24:36 UTC ++++ cargo-crates/v8-0.75.0/build/config/features.gni @@ -31,7 +31,7 @@ declare_args() { proprietary_codecs = is_chrome_branded || is_castos || is_cast_android diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_freetype_freetype.gni b/www/deno/files/patch-cargo-crates_v8_build_config_freetype_freetype.gni index 38e3d10702a..66ec948907e 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_freetype_freetype.gni +++ b/www/deno/files/patch-cargo-crates_v8_build_config_freetype_freetype.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/freetype/freetype.gni.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/config/freetype/freetype.gni +--- cargo-crates/v8-0.75.0/build/config/freetype/freetype.gni.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/config/freetype/freetype.gni @@ -10,5 +10,5 @@ declare_args() { # than version 2.7.1 and have color bitmap support compiled in. WARNING: # System FreeType configurations other than as described WILL INTRODUCE TEXT diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_linux_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_build_config_linux_BUILD.gn index eb003847596..a29e0a4268d 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_linux_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_build_config_linux_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/linux/BUILD.gn.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/config/linux/BUILD.gn +--- cargo-crates/v8-0.75.0/build/config/linux/BUILD.gn.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/config/linux/BUILD.gn @@ -41,7 +41,7 @@ config("runtime_library") { } diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_linux_pkg-config.py b/www/deno/files/patch-cargo-crates_v8_build_config_linux_pkg-config.py index 9bab4e7f5cd..82bb9e9cc1c 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_linux_pkg-config.py +++ b/www/deno/files/patch-cargo-crates_v8_build_config_linux_pkg-config.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/linux/pkg-config.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/config/linux/pkg-config.py +--- cargo-crates/v8-0.75.0/build/config/linux/pkg-config.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/config/linux/pkg-config.py @@ -59,8 +59,12 @@ def SetConfigPath(options): print("You must specify an architecture via -a if using a sysroot.") sys.exit(1) diff --git a/www/deno/files/patch-cargo-crates_v8_build_config_sysroot.gni b/www/deno/files/patch-cargo-crates_v8_build_config_sysroot.gni index 5995ca21165..40f4768347e 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_config_sysroot.gni +++ b/www/deno/files/patch-cargo-crates_v8_build_config_sysroot.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/config/sysroot.gni.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/config/sysroot.gni +--- cargo-crates/v8-0.75.0/build/config/sysroot.gni.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/config/sysroot.gni @@ -21,9 +21,9 @@ declare_args() { # Controls default is_linux sysroot. If set to true, and sysroot diff --git a/www/deno/files/patch-cargo-crates_v8_build_detect__host__arch.py b/www/deno/files/patch-cargo-crates_v8_build_detect__host__arch.py index 3a0ac408b01..471ef9b3b57 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_detect__host__arch.py +++ b/www/deno/files/patch-cargo-crates_v8_build_detect__host__arch.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/detect_host_arch.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/detect_host_arch.py +--- cargo-crates/v8-0.75.0/build/detect_host_arch.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/detect_host_arch.py @@ -21,6 +21,8 @@ def HostArch(): host_arch = 'ia32' elif host_arch in ['x86_64', 'amd64']: diff --git a/www/deno/files/patch-cargo-crates_v8_build_gn__run__binary.py b/www/deno/files/patch-cargo-crates_v8_build_gn__run__binary.py index ad84086388a..96a8f8d81aa 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_gn__run__binary.py +++ b/www/deno/files/patch-cargo-crates_v8_build_gn__run__binary.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/gn_run_binary.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/gn_run_binary.py +--- cargo-crates/v8-0.75.0/build/gn_run_binary.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/gn_run_binary.py @@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] diff --git a/www/deno/files/patch-cargo-crates_v8_build_linux_chrome.map b/www/deno/files/patch-cargo-crates_v8_build_linux_chrome.map index 1339aa9b796..21f49c92f45 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_linux_chrome.map +++ b/www/deno/files/patch-cargo-crates_v8_build_linux_chrome.map @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/linux/chrome.map.orig 2021-02-25 20:45:34 UTC -+++ cargo-crates/v8-0.74.3/build/linux/chrome.map +--- cargo-crates/v8-0.75.0/build/linux/chrome.map.orig 2021-02-25 20:45:34 UTC ++++ cargo-crates/v8-0.75.0/build/linux/chrome.map @@ -1,4 +1,7 @@ { +local: diff --git a/www/deno/files/patch-cargo-crates_v8_build_linux_libpci_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_build_linux_libpci_BUILD.gn index 2b1b45c77cd..e8090b99fee 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_linux_libpci_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_build_linux_libpci_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/linux/libpci/BUILD.gn.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/linux/libpci/BUILD.gn +--- cargo-crates/v8-0.75.0/build/linux/libpci/BUILD.gn.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/linux/libpci/BUILD.gn @@ -3,20 +3,36 @@ # found in the LICENSE file. diff --git a/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_libusb.gn b/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_libusb.gn index 552f2906cc7..fbb1045c0ac 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_libusb.gn +++ b/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_libusb.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/linux/unbundle/libusb.gn.orig 2020-07-22 09:52:14 UTC -+++ cargo-crates/v8-0.74.3/build/linux/unbundle/libusb.gn +--- cargo-crates/v8-0.75.0/build/linux/unbundle/libusb.gn.orig 2020-07-22 09:52:14 UTC ++++ cargo-crates/v8-0.75.0/build/linux/unbundle/libusb.gn @@ -0,0 +1,24 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be diff --git a/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_replace__gn__files.py b/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_replace__gn__files.py index 4c6b30ace50..a55cf331d2f 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_replace__gn__files.py +++ b/www/deno/files/patch-cargo-crates_v8_build_linux_unbundle_replace__gn__files.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/linux/unbundle/replace_gn_files.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/linux/unbundle/replace_gn_files.py +--- cargo-crates/v8-0.75.0/build/linux/unbundle/replace_gn_files.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/linux/unbundle/replace_gn_files.py @@ -27,6 +27,7 @@ REPLACEMENTS = { 'libevent': 'base/third_party/libevent/BUILD.gn', 'libjpeg': 'third_party/libjpeg.gni', diff --git a/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni b/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni index b19125798b9..8ccd61b416f 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni +++ b/www/deno/files/patch-cargo-crates_v8_build_toolchain_gcc__toolchain.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/toolchain/gcc_toolchain.gni.orig 1970-01-01 01:00:00 UTC -+++ cargo-crates/v8-0.74.3/build/toolchain/gcc_toolchain.gni +--- cargo-crates/v8-0.75.0/build/toolchain/gcc_toolchain.gni.orig 1970-01-01 01:00:00 UTC ++++ cargo-crates/v8-0.75.0/build/toolchain/gcc_toolchain.gni @@ -53,6 +53,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } diff --git a/www/deno/files/patch-cargo-crates_v8_build_toolchain_get__concurrent__links.py b/www/deno/files/patch-cargo-crates_v8_build_toolchain_get__concurrent__links.py index 39b194a12f5..0a2054b7fee 100644 --- a/www/deno/files/patch-cargo-crates_v8_build_toolchain_get__concurrent__links.py +++ b/www/deno/files/patch-cargo-crates_v8_build_toolchain_get__concurrent__links.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/build/toolchain/get_concurrent_links.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-0.74.3/build/toolchain/get_concurrent_links.py +--- cargo-crates/v8-0.75.0/build/toolchain/get_concurrent_links.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-0.75.0/build/toolchain/get_concurrent_links.py @@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: diff --git a/www/deno/files/patch-cargo-crates_v8_buildtools_third__party_libc++_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_buildtools_third__party_libc++_BUILD.gn index 44ee7dfac07..10a8c3b829f 100644 --- a/www/deno/files/patch-cargo-crates_v8_buildtools_third__party_libc++_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_buildtools_third__party_libc++_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/buildtools/third_party/libc++/BUILD.gn.orig 2020-07-22 17:57:09 UTC -+++ cargo-crates/v8-0.74.3/buildtools/third_party/libc++/BUILD.gn +--- cargo-crates/v8-0.75.0/buildtools/third_party/libc++/BUILD.gn.orig 2020-07-22 17:57:09 UTC ++++ cargo-crates/v8-0.75.0/buildtools/third_party/libc++/BUILD.gn @@ -23,7 +23,7 @@ config("config") { "-std:c++20", ] diff --git a/www/deno/files/patch-cargo-crates_v8_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/www/deno/files/patch-cargo-crates_v8_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc new file mode 100644 index 00000000000..208798a5268 --- /dev/null +++ b/www/deno/files/patch-cargo-crates_v8_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc @@ -0,0 +1,14 @@ +Why is it needed? +error: use of undeclared identifier 'FP_NAN' + +--- cargo-crates/v8-0.75.0/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2023-08-22 14:51:38 UTC ++++ cargo-crates/v8-0.75.0/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc +@@ -12,6 +12,8 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + ++#include ++ + #if !defined(HAS_STRPTIME) + #if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__VXWORKS__) + #define HAS_STRPTIME 1 // Assume everyone else has strptime(). diff --git a/www/deno/files/patch-cargo-crates_v8_third__party_zlib_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_third__party_zlib_BUILD.gn index e1676aa6045..3ad464ea63f 100644 --- a/www/deno/files/patch-cargo-crates_v8_third__party_zlib_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_third__party_zlib_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/third_party/zlib/BUILD.gn.orig 2022-11-20 11:42:33 UTC -+++ cargo-crates/v8-0.74.3/third_party/zlib/BUILD.gn +--- cargo-crates/v8-0.75.0/third_party/zlib/BUILD.gn.orig 2022-11-20 11:42:33 UTC ++++ cargo-crates/v8-0.75.0/third_party/zlib/BUILD.gn @@ -119,6 +119,8 @@ if (use_arm_neon_optimizations) { defines = [ "CRC32_ARMV8_CRC32" ] if (is_android) { diff --git a/www/deno/files/patch-cargo-crates_v8_third__party_zlib_cpu__features.c b/www/deno/files/patch-cargo-crates_v8_third__party_zlib_cpu__features.c index fb009335aab..9163403ee7e 100644 --- a/www/deno/files/patch-cargo-crates_v8_third__party_zlib_cpu__features.c +++ b/www/deno/files/patch-cargo-crates_v8_third__party_zlib_cpu__features.c @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/third_party/zlib/cpu_features.c.orig 2022-11-20 11:40:38 UTC -+++ cargo-crates/v8-0.74.3/third_party/zlib/cpu_features.c +--- cargo-crates/v8-0.75.0/third_party/zlib/cpu_features.c.orig 2022-11-20 11:40:38 UTC ++++ cargo-crates/v8-0.75.0/third_party/zlib/cpu_features.c @@ -31,11 +31,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; #ifndef CPU_NO_SIMD diff --git a/www/deno/files/patch-cargo-crates_v8_v8_BUILD.gn b/www/deno/files/patch-cargo-crates_v8_v8_BUILD.gn index ef414e1dcfb..8905ce2a0cf 100644 --- a/www/deno/files/patch-cargo-crates_v8_v8_BUILD.gn +++ b/www/deno/files/patch-cargo-crates_v8_v8_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/v8/BUILD.gn.orig 2021-01-19 00:12:40 UTC -+++ cargo-crates/v8-0.74.3/v8/BUILD.gn +--- cargo-crates/v8-0.75.0/v8/BUILD.gn.orig 2021-01-19 00:12:40 UTC ++++ cargo-crates/v8-0.75.0/v8/BUILD.gn @@ -5602,7 +5602,7 @@ v8_component("v8_libbase") { } } diff --git a/www/deno/files/patch-cargo-crates_v8_v8_include_v8config.h b/www/deno/files/patch-cargo-crates_v8_v8_include_v8config.h index dc425a79b88..c0a15f9b765 100644 --- a/www/deno/files/patch-cargo-crates_v8_v8_include_v8config.h +++ b/www/deno/files/patch-cargo-crates_v8_v8_include_v8config.h @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/v8/include/v8config.h.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-0.74.3/v8/include/v8config.h +--- cargo-crates/v8-0.75.0/v8/include/v8config.h.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-0.75.0/v8/include/v8config.h @@ -345,7 +345,18 @@ path. Add it with -I to the command line (V8_HAS_CPP_ATTRIBUTE(no_unique_address)) diff --git a/www/deno/files/patch-cargo-crates_v8_v8_src_api_api.cc b/www/deno/files/patch-cargo-crates_v8_v8_src_api_api.cc index ef1645e8ecc..d34e87a3b83 100644 --- a/www/deno/files/patch-cargo-crates_v8_v8_src_api_api.cc +++ b/www/deno/files/patch-cargo-crates_v8_v8_src_api_api.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/v8/src/api/api.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-0.74.3/v8/src/api/api.cc +--- cargo-crates/v8-0.75.0/v8/src/api/api.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-0.75.0/v8/src/api/api.cc @@ -6096,7 +6096,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/deno/files/patch-cargo-crates_v8_v8_src_base_cpu.cc b/www/deno/files/patch-cargo-crates_v8_v8_src_base_cpu.cc index 5fd9c0aadcf..3c43ddcd5b4 100644 --- a/www/deno/files/patch-cargo-crates_v8_v8_src_base_cpu.cc +++ b/www/deno/files/patch-cargo-crates_v8_v8_src_base_cpu.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/v8/src/base/cpu.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-0.74.3/v8/src/base/cpu.cc +--- cargo-crates/v8-0.75.0/v8/src/base/cpu.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-0.75.0/v8/src/base/cpu.cc @@ -475,6 +475,7 @@ CPU::CPU() #if V8_OS_LINUX diff --git a/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-freebsd.cc b/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-freebsd.cc index ccc7da71656..725d42a9886 100644 --- a/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-freebsd.cc +++ b/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-freebsd.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/v8/src/base/platform/platform-freebsd.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-0.74.3/v8/src/base/platform/platform-freebsd.cc +--- cargo-crates/v8-0.75.0/v8/src/base/platform/platform-freebsd.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-0.75.0/v8/src/base/platform/platform-freebsd.cc @@ -82,8 +82,8 @@ std::vector OS::GetSharedLib lib_name = std::string(path); } diff --git a/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-posix.cc b/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-posix.cc index 640e205ae6c..6996193b748 100644 --- a/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-posix.cc +++ b/www/deno/files/patch-cargo-crates_v8_v8_src_base_platform_platform-posix.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-0.74.3/v8/src/base/platform/platform-posix.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-0.74.3/v8/src/base/platform/platform-posix.cc +--- cargo-crates/v8-0.75.0/v8/src/base/platform/platform-posix.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-0.75.0/v8/src/base/platform/platform-posix.cc @@ -634,7 +634,7 @@ bool OS::HasLazyCommits() { // static diff --git a/www/deno/files/patch-ext_node_ops_os.rs b/www/deno/files/patch-ext_node_ops_os.rs new file mode 100644 index 00000000000..1c63e8236dc --- /dev/null +++ b/www/deno/files/patch-ext_node_ops_os.rs @@ -0,0 +1,30 @@ +--- ext/node/ops/os.rs.orig 2023-08-21 14:55:59 UTC ++++ ext/node/ops/os.rs +@@ -66,6 +66,9 @@ mod priority { + #[cfg(target_os = "linux")] + #[allow(non_camel_case_types)] + type priority_t = u32; ++ #[cfg(target_os = "freebsd")] ++ #[allow(non_camel_case_types)] ++ type priority_t = i32; + + const PRIORITY_HIGH: i32 = -14; + +@@ -74,7 +77,7 @@ mod priority { + set_errno(Errno(0)); + match ( + // SAFETY: libc::getpriority is unsafe +- unsafe { libc::getpriority(PRIO_PROCESS as priority_t, pid as id_t) }, ++ unsafe { libc::getpriority(PRIO_PROCESS as priority_t, (pid as id_t).try_into().unwrap()) }, + errno(), + ) { + (-1, Errno(0)) => Ok(PRIORITY_HIGH), +@@ -86,7 +89,7 @@ mod priority { + pub fn set_priority(pid: u32, priority: i32) -> Result<(), AnyError> { + // SAFETY: libc::setpriority is unsafe + match unsafe { +- libc::setpriority(PRIO_PROCESS as priority_t, pid as id_t, priority) ++ libc::setpriority(PRIO_PROCESS as priority_t, (pid as id_t).try_into().unwrap(), priority) + } { + -1 => Err(std::io::Error::last_os_error().into()), + _ => Ok(()), diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile index b7d6f06d3d0..c0ffb6b3842 100644 --- a/www/drupal7/Makefile +++ b/www/drupal7/Makefile @@ -1,5 +1,5 @@ PORTNAME= drupal7 -DISTVERSION= 7.95 +DISTVERSION= 7.98 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} diff --git a/www/drupal7/distinfo b/www/drupal7/distinfo index 4d1a12a1eb8..d7eaa6c5d4c 100644 --- a/www/drupal7/distinfo +++ b/www/drupal7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680848229 -SHA256 (drupal/drupal-7.95.tar.gz) = 1c14bc6538a79d02861ccb15e433c6f4c28514e96c5b477d4cc429d4ceea8754 -SIZE (drupal/drupal-7.95.tar.gz) = 3380331 +TIMESTAMP = 1692216177 +SHA256 (drupal/drupal-7.98.tar.gz) = f3698740ffabd96ce161c8d0fd561dadbaf16f78482aeae89aefd68aa881b9b6 +SIZE (drupal/drupal-7.98.tar.gz) = 3387441 diff --git a/www/drupal7/pkg-plist b/www/drupal7/pkg-plist index 0cb6a058df5..730ce23c85b 100644 --- a/www/drupal7/pkg-plist +++ b/www/drupal7/pkg-plist @@ -113,6 +113,7 @@ %%DRUPAL_BASE%%/misc/feed.png %%DRUPAL_BASE%%/misc/form.js %%DRUPAL_BASE%%/misc/forum-icons.png +%%DRUPAL_BASE%%/misc/form-single-submit.js %%DRUPAL_BASE%%/misc/grippie.png %%DRUPAL_BASE%%/misc/help.png %%DRUPAL_BASE%%/misc/jquery-extend-3.4.0.js diff --git a/www/drupal8/Makefile b/www/drupal8/Makefile index 07137f70e8d..7e005f95d25 100644 --- a/www/drupal8/Makefile +++ b/www/drupal8/Makefile @@ -11,6 +11,9 @@ WWW= https://www.drupal.org/ LICENSE= GPLv2+ +DEPRECATED= Upstream EOL reached on 2021-11-17 +EXPIRATION_DATE= 2023-09-30 + USES= php:web shebangfix USE_PHP= dom filter gd mbstring opcache pdo session \ simplexml tokenizer xml diff --git a/www/drupal9/Makefile b/www/drupal9/Makefile index 2e0acc98cf8..38e9c2b8b83 100644 --- a/www/drupal9/Makefile +++ b/www/drupal9/Makefile @@ -11,6 +11,9 @@ WWW= https://www.drupal.org/ LICENSE= GPLv2+ +DEPRECATED= Upstream EOL reaches on 2023-11-01 +EXPIRATION_DATE= 2023-12-31 + USES= php:web shebangfix USE_PHP= dom filter gd mbstring opcache pdo session \ simplexml tokenizer xml diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 68adb7e7ba6..635c2842ae8 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,10 +1,10 @@ PORTNAME= firefox -DISTVERSION= 102.14.0 +DISTVERSION= 102.15.0 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index c41eec7a990..1c6f40e8026 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690220452 -SHA256 (firefox-102.14.0esr.source.tar.xz) = 1ab85081c08a472cfd869873dba0e76ae6d9e83c1b8f23741e4c9d5471a5efee -SIZE (firefox-102.14.0esr.source.tar.xz) = 479449456 +TIMESTAMP = 1692724080 +SHA256 (firefox-102.15.0esr.source.tar.xz) = 81fa590408f5a3af8f004d839ac47fb4121e05fe717334445cec9ca55d8746af +SIZE (firefox-102.15.0esr.source.tar.xz) = 486592324 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 8ed7f3bc506..4de237ef04d 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,10 +1,9 @@ PORTNAME= firefox -DISTVERSION= 116.0.3 -PORTREVISION= 1 +DISTVERSION= 117.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org @@ -12,10 +11,10 @@ COMMENT= Web browser based on the browser portion of Mozilla WWW= https://www.mozilla.com/firefox BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.91:security/nss \ + nss>=3.92:security/nss \ icu>=73.1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=7.3.0:print/harfbuzz \ + harfbuzz>=8.0.1:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.39:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index d1bc9dc53d6..1672d14d103 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692135825 -SHA256 (firefox-116.0.3.source.tar.xz) = 575a0d11b487a03527cc90c5e6d556c09669201cbb584b73442b202ee1d3e2e6 -SIZE (firefox-116.0.3.source.tar.xz) = 520884220 +TIMESTAMP = 1692633856 +SHA256 (firefox-117.0.source.tar.xz) = fd1f968731d190167f319a6b1fe2db73f6c79e0d651075332b0f561a6c4659bd +SIZE (firefox-117.0.source.tar.xz) = 511181236 diff --git a/www/firefox/files/patch-js_public_Utility.h b/www/firefox/files/patch-js_public_Utility.h new file mode 100644 index 00000000000..4c2e16bc932 --- /dev/null +++ b/www/firefox/files/patch-js_public_Utility.h @@ -0,0 +1,35 @@ +commit 57b30241311091b5a6a5a0bb1c19a8e073860fc3 +Author: Christoph Moench-Tegeder + + do not assert on alignment when not having the bits + + the underlying issue seemed to be win-only anyways? + +diff --git js/public/Utility.h js/public/Utility.h +index 0d745e9df785..f0ca7ea37162 100644 +--- js/public/Utility.h ++++ js/public/Utility.h +@@ -480,6 +480,7 @@ static inline void js_free(void* p) { + * Note: Do not add a ; at the end of a use of JS_DECLARE_NEW_METHODS, + * or the build will break. + */ ++#if !defined(__i386__) + #define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ + template \ + QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ +@@ -490,6 +491,15 @@ static inline void js_free(void* p) { + return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ + : nullptr; \ + } ++#else ++#define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ ++ template \ ++ QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ ++ void* memory = ALLOCATOR(sizeof(T)); \ ++ return MOZ_LIKELY(memory) ? new (memory) T(std::forward(args)...) \ ++ : nullptr; \ ++ } ++#endif + + /* + * Given a class which should provide a 'new' method that takes an arena as diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 5f4d18be3d8..8bb12672c84 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,20 +1,20 @@ -commit 22b0397dd637396ffdc5a0fe913cdcc1b7ba7b9b +commit 0aac9b2c295097dbef4d85302845196eaf9c9d60 Author: Christoph Moench-Tegeder +Date: Sat Aug 19 19:46:49 2023 +0000 - regenerate FreeBSD libwebrtc patch for Firefox 116 + regenerate FreeBSD libwebrtc patch for Firefox 117 diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build -index c3f52293bf1b..46d0a26b3591 100644 +index aa958f70420c..e6a2d969a1fd 100644 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -29,7 +29,7 @@ index c3f52293bf1b..46d0a26b3591 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41,7 +41,6 @@ index c3f52293bf1b..46d0a26b3591 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -54,7 +53,6 @@ index c3f52293bf1b..46d0a26b3591 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -83,7 +81,6 @@ index c3f52293bf1b..46d0a26b3591 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -99,7 +96,6 @@ index c3f52293bf1b..46d0a26b3591 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -133,6 +129,24 @@ index c3f52293bf1b..46d0a26b3591 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -167,54 +181,51 @@ index c3f52293bf1b..46d0a26b3591 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("resource_adaptation_api_gn") diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build -index 042ba7513206..3e728ca6633b 100644 +index e453cb8585d0..552c7e77985a 100644 --- third_party/libwebrtc/api/array_view_gn/moz.build +++ third_party/libwebrtc/api/array_view_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -229,7 +240,7 @@ index 042ba7513206..3e728ca6633b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -241,7 +252,6 @@ index 042ba7513206..3e728ca6633b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -254,7 +264,6 @@ index 042ba7513206..3e728ca6633b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -283,7 +292,6 @@ index 042ba7513206..3e728ca6633b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -299,7 +307,6 @@ index 042ba7513206..3e728ca6633b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -330,6 +337,22 @@ index 042ba7513206..3e728ca6633b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -370,37 +393,32 @@ index 042ba7513206..3e728ca6633b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("array_view_gn") diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -index 6fc3d10926a4..252fa06b1535 100644 +index c2d256488d9b..1b3eb3a6acb6 100644 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -415,7 +433,7 @@ index 6fc3d10926a4..252fa06b1535 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -427,7 +445,6 @@ index 6fc3d10926a4..252fa06b1535 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -440,7 +457,6 @@ index 6fc3d10926a4..252fa06b1535 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -469,7 +485,6 @@ index 6fc3d10926a4..252fa06b1535 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -485,7 +500,6 @@ index 6fc3d10926a4..252fa06b1535 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -519,6 +533,24 @@ index 6fc3d10926a4..252fa06b1535 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -553,47 +585,45 @@ index 6fc3d10926a4..252fa06b1535 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("aec3_config_gn") diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build -index 58e55583224d..8bac3177733c 100644 +index ecd28a700696..4e5509d7162d 100644 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -601,7 +631,6 @@ index 58e55583224d..8bac3177733c 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -616,7 +645,7 @@ index 58e55583224d..8bac3177733c 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -628,7 +657,6 @@ index 58e55583224d..8bac3177733c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -641,7 +669,6 @@ index 58e55583224d..8bac3177733c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -674,7 +701,6 @@ index 58e55583224d..8bac3177733c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -690,7 +716,6 @@ index 58e55583224d..8bac3177733c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -731,6 +756,24 @@ index 58e55583224d..8bac3177733c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -765,54 +808,51 @@ index 58e55583224d..8bac3177733c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("aec3_factory_gn") diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build -index b18ab1742317..0b947d545951 100644 +index 6fac266c7368..ce2f85ba66dc 100644 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -827,7 +867,7 @@ index b18ab1742317..0b947d545951 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -839,7 +879,6 @@ index b18ab1742317..0b947d545951 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -852,7 +891,6 @@ index b18ab1742317..0b947d545951 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -881,7 +919,6 @@ index b18ab1742317..0b947d545951 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -897,7 +934,6 @@ index b18ab1742317..0b947d545951 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -935,6 +971,24 @@ index b18ab1742317..0b947d545951 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -969,54 +1023,51 @@ index b18ab1742317..0b947d545951 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_frame_api_gn") diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build -index 762d6a326ac6..817832d1cad6 100644 +index 1732aa7d0c9a..a6098a248028 100644 --- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build +++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -1031,7 +1082,7 @@ index 762d6a326ac6..817832d1cad6 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1043,7 +1094,6 @@ index 762d6a326ac6..817832d1cad6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -1052,7 +1102,6 @@ index 762d6a326ac6..817832d1cad6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -1081,7 +1130,6 @@ index 762d6a326ac6..817832d1cad6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -1097,7 +1145,6 @@ index 762d6a326ac6..817832d1cad6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -1128,6 +1175,22 @@ index 762d6a326ac6..817832d1cad6 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -1168,37 +1231,32 @@ index 762d6a326ac6..817832d1cad6 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_frame_processor_gn") diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build -index 6588e466fb4a..124632ba2c0c 100644 +index 4eac2aa4b4f4..2df8ddd20ca2 100644 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -1213,7 +1271,7 @@ index 6588e466fb4a..124632ba2c0c 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1225,7 +1283,6 @@ index 6588e466fb4a..124632ba2c0c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -1238,7 +1295,6 @@ index 6588e466fb4a..124632ba2c0c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -1267,7 +1323,6 @@ index 6588e466fb4a..124632ba2c0c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -1283,7 +1338,6 @@ index 6588e466fb4a..124632ba2c0c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -1318,6 +1372,22 @@ index 6588e466fb4a..124632ba2c0c 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -1358,37 +1428,32 @@ index 6588e466fb4a..124632ba2c0c 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_mixer_api_gn") diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build -index 3ad317dc5332..e483c9fd7863 100644 +index 2e128f80386d..6e4054510c88 100644 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -1403,7 +1468,7 @@ index 3ad317dc5332..e483c9fd7863 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1415,7 +1480,6 @@ index 3ad317dc5332..e483c9fd7863 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -1428,7 +1492,6 @@ index 3ad317dc5332..e483c9fd7863 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -1457,7 +1520,6 @@ index 3ad317dc5332..e483c9fd7863 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -1473,7 +1535,6 @@ index 3ad317dc5332..e483c9fd7863 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -1504,6 +1565,22 @@ index 3ad317dc5332..e483c9fd7863 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -1544,37 +1621,32 @@ index 3ad317dc5332..e483c9fd7863 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("echo_control_gn") diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build -index ae3e9dc306df..9c21c61611bf 100644 +index 87335c298d63..9f1caaa8645d 100644 --- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -1589,7 +1661,7 @@ index ae3e9dc306df..9c21c61611bf 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1601,7 +1673,6 @@ index ae3e9dc306df..9c21c61611bf 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -1614,7 +1685,6 @@ index ae3e9dc306df..9c21c61611bf 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -1643,7 +1713,6 @@ index ae3e9dc306df..9c21c61611bf 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -1659,7 +1728,6 @@ index ae3e9dc306df..9c21c61611bf 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -1697,6 +1765,24 @@ index ae3e9dc306df..9c21c61611bf 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -1731,54 +1817,51 @@ index ae3e9dc306df..9c21c61611bf 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_decoder_L16_gn") diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build -index ac5fff31eb11..d7d24678af7d 100644 +index 49e0d546f1ce..57de72563f2e 100644 --- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -1793,7 +1876,7 @@ index ac5fff31eb11..d7d24678af7d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1805,7 +1888,6 @@ index ac5fff31eb11..d7d24678af7d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -1818,7 +1900,6 @@ index ac5fff31eb11..d7d24678af7d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -1847,7 +1928,6 @@ index ac5fff31eb11..d7d24678af7d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -1863,7 +1943,6 @@ index ac5fff31eb11..d7d24678af7d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -1901,6 +1980,24 @@ index ac5fff31eb11..d7d24678af7d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -1935,54 +2032,51 @@ index ac5fff31eb11..d7d24678af7d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_L16_gn") diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build -index 3981b81f8a31..7061eeab5dce 100644 +index 846946073ee1..0a34d8fdda8a 100644 --- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -1997,7 +2091,7 @@ index 3981b81f8a31..7061eeab5dce 100644 FINAL_LIBRARY = "webrtc" -@@ -46,173 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2009,7 +2103,6 @@ index 3981b81f8a31..7061eeab5dce 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -2022,7 +2115,6 @@ index 3981b81f8a31..7061eeab5dce 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -2051,7 +2143,6 @@ index 3981b81f8a31..7061eeab5dce 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2067,7 +2158,6 @@ index 3981b81f8a31..7061eeab5dce 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2105,6 +2195,24 @@ index 3981b81f8a31..7061eeab5dce 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2139,54 +2247,51 @@ index 3981b81f8a31..7061eeab5dce 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_codecs_api_gn") diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build -index 742c17dbd15b..535c9a64c10f 100644 +index 366307ea13d7..7ea300e23f2a 100644 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build -@@ -12,13 +12,23 @@ AllowCompilerWarnings() +@@ -12,13 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -2203,7 +2308,7 @@ index 742c17dbd15b..535c9a64c10f 100644 FINAL_LIBRARY = "webrtc" -@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2215,7 +2320,6 @@ index 742c17dbd15b..535c9a64c10f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -2228,7 +2332,6 @@ index 742c17dbd15b..535c9a64c10f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -2261,7 +2364,6 @@ index 742c17dbd15b..535c9a64c10f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2277,7 +2379,6 @@ index 742c17dbd15b..535c9a64c10f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2318,6 +2419,24 @@ index 742c17dbd15b..535c9a64c10f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2352,54 +2471,51 @@ index 742c17dbd15b..535c9a64c10f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("builtin_audio_decoder_factory_gn") diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build -index dc8555f2f55e..e0acb5f4a4c5 100644 +index db0e3fbe00d5..0818f76d7b90 100644 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build -@@ -12,13 +12,23 @@ AllowCompilerWarnings() +@@ -12,13 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -2416,7 +2532,7 @@ index dc8555f2f55e..e0acb5f4a4c5 100644 FINAL_LIBRARY = "webrtc" -@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2428,7 +2544,6 @@ index dc8555f2f55e..e0acb5f4a4c5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -2441,7 +2556,6 @@ index dc8555f2f55e..e0acb5f4a4c5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -2474,7 +2588,6 @@ index dc8555f2f55e..e0acb5f4a4c5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2490,7 +2603,6 @@ index dc8555f2f55e..e0acb5f4a4c5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2531,6 +2643,24 @@ index dc8555f2f55e..e0acb5f4a4c5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2565,54 +2695,51 @@ index dc8555f2f55e..e0acb5f4a4c5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("builtin_audio_encoder_factory_gn") diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -index 5d92885b476f..9fc3485fe34d 100644 +index 4782d01dd10f..588ec3b5b33b 100644 --- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -2627,7 +2754,7 @@ index 5d92885b476f..9fc3485fe34d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2639,7 +2766,6 @@ index 5d92885b476f..9fc3485fe34d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -2652,7 +2778,6 @@ index 5d92885b476f..9fc3485fe34d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -2681,7 +2806,6 @@ index 5d92885b476f..9fc3485fe34d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2697,7 +2821,6 @@ index 5d92885b476f..9fc3485fe34d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2735,6 +2858,24 @@ index 5d92885b476f..9fc3485fe34d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2769,54 +2910,51 @@ index 5d92885b476f..9fc3485fe34d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_decoder_g711_gn") diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build -index 0fb19214d8be..5985b293f06a 100644 +index c972978c13ef..20d76c5496fa 100644 --- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -2831,7 +2969,7 @@ index 0fb19214d8be..5985b293f06a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2843,7 +2981,6 @@ index 0fb19214d8be..5985b293f06a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -2856,7 +2993,6 @@ index 0fb19214d8be..5985b293f06a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -2885,7 +3021,6 @@ index 0fb19214d8be..5985b293f06a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2901,7 +3036,6 @@ index 0fb19214d8be..5985b293f06a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2939,6 +3073,24 @@ index 0fb19214d8be..5985b293f06a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2973,54 +3125,51 @@ index 0fb19214d8be..5985b293f06a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_g711_gn") diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build -index 676fff1cf94d..25e3731ea347 100644 +index 77003c77a9dd..f738a9569a45 100644 --- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -3035,7 +3184,7 @@ index 676fff1cf94d..25e3731ea347 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3047,7 +3196,6 @@ index 676fff1cf94d..25e3731ea347 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -3060,7 +3208,6 @@ index 676fff1cf94d..25e3731ea347 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -3089,7 +3236,6 @@ index 676fff1cf94d..25e3731ea347 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -3105,7 +3251,6 @@ index 676fff1cf94d..25e3731ea347 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -3143,6 +3288,24 @@ index 676fff1cf94d..25e3731ea347 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -3177,54 +3340,51 @@ index 676fff1cf94d..25e3731ea347 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_decoder_g722_gn") diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build -index 8d3f39ab6f2d..ae3673d7d83f 100644 +index 41e1e248c525..2cc917d90aab 100644 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -3239,7 +3399,7 @@ index 8d3f39ab6f2d..ae3673d7d83f 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3251,7 +3411,6 @@ index 8d3f39ab6f2d..ae3673d7d83f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -3264,7 +3423,6 @@ index 8d3f39ab6f2d..ae3673d7d83f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -3293,7 +3451,6 @@ index 8d3f39ab6f2d..ae3673d7d83f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -3309,7 +3466,6 @@ index 8d3f39ab6f2d..ae3673d7d83f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -3344,6 +3500,22 @@ index 8d3f39ab6f2d..ae3673d7d83f 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -3384,37 +3556,32 @@ index 8d3f39ab6f2d..ae3673d7d83f 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_encoder_g722_config_gn") diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build -index 708747b4cb59..2a6a1468d617 100644 +index c3beba6cdb78..8f13941e25c3 100644 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -3429,7 +3596,7 @@ index 708747b4cb59..2a6a1468d617 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3441,7 +3608,6 @@ index 708747b4cb59..2a6a1468d617 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -3454,7 +3620,6 @@ index 708747b4cb59..2a6a1468d617 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -3483,7 +3648,6 @@ index 708747b4cb59..2a6a1468d617 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -3499,7 +3663,6 @@ index 708747b4cb59..2a6a1468d617 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -3537,6 +3700,24 @@ index 708747b4cb59..2a6a1468d617 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -3571,54 +3752,51 @@ index 708747b4cb59..2a6a1468d617 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_g722_gn") diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build -index 0508df8c128c..bf80183f964e 100644 +index 53e9d1a4a7ef..ada577bf55ee 100644 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -3633,7 +3811,7 @@ index 0508df8c128c..bf80183f964e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3645,7 +3823,6 @@ index 0508df8c128c..bf80183f964e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -3658,7 +3835,6 @@ index 0508df8c128c..bf80183f964e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -3691,7 +3867,6 @@ index 0508df8c128c..bf80183f964e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -3707,7 +3882,6 @@ index 0508df8c128c..bf80183f964e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -3748,6 +3922,24 @@ index 0508df8c128c..bf80183f964e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -3782,54 +3974,51 @@ index 0508df8c128c..bf80183f964e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_decoder_ilbc_gn") diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build -index 1b867299ad3f..d4ec1250c7b9 100644 +index 75737b8f19b0..008599051c34 100644 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -3844,7 +4033,7 @@ index 1b867299ad3f..d4ec1250c7b9 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3856,7 +4045,6 @@ index 1b867299ad3f..d4ec1250c7b9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -3865,7 +4053,6 @@ index 1b867299ad3f..d4ec1250c7b9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -3894,7 +4081,6 @@ index 1b867299ad3f..d4ec1250c7b9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -3910,7 +4096,6 @@ index 1b867299ad3f..d4ec1250c7b9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -3941,6 +4126,22 @@ index 1b867299ad3f..d4ec1250c7b9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -3981,37 +4182,32 @@ index 1b867299ad3f..d4ec1250c7b9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_encoder_ilbc_config_gn") diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build -index 86916311191d..e21fd153a761 100644 +index bddfe4219301..5d2f4376ee92 100644 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -4026,7 +4222,7 @@ index 86916311191d..e21fd153a761 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4038,7 +4234,6 @@ index 86916311191d..e21fd153a761 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -4051,7 +4246,6 @@ index 86916311191d..e21fd153a761 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -4084,7 +4278,6 @@ index 86916311191d..e21fd153a761 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -4100,7 +4293,6 @@ index 86916311191d..e21fd153a761 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4141,6 +4333,24 @@ index 86916311191d..e21fd153a761 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4175,54 +4385,51 @@ index 86916311191d..e21fd153a761 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_ilbc_gn") diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build -index 28c8a12f99b6..a594e676a6b6 100644 +index 2b2bc6d9a7b7..fce4fdca7298 100644 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -4237,7 +4444,7 @@ index 28c8a12f99b6..a594e676a6b6 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4249,7 +4456,6 @@ index 28c8a12f99b6..a594e676a6b6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -4262,7 +4468,6 @@ index 28c8a12f99b6..a594e676a6b6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -4291,7 +4496,6 @@ index 28c8a12f99b6..a594e676a6b6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -4307,7 +4511,6 @@ index 28c8a12f99b6..a594e676a6b6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4345,6 +4548,24 @@ index 28c8a12f99b6..a594e676a6b6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4379,54 +4600,51 @@ index 28c8a12f99b6..a594e676a6b6 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_decoder_multiopus_gn") diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build -index 996d829e29b4..508ce91d431b 100644 +index e2c470d5ee58..0c7b461dd94a 100644 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -4441,7 +4659,7 @@ index 996d829e29b4..508ce91d431b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4453,7 +4671,6 @@ index 996d829e29b4..508ce91d431b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -4466,7 +4683,6 @@ index 996d829e29b4..508ce91d431b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -4495,7 +4711,6 @@ index 996d829e29b4..508ce91d431b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -4511,7 +4726,6 @@ index 996d829e29b4..508ce91d431b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4546,6 +4760,22 @@ index 996d829e29b4..508ce91d431b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -4586,37 +4816,32 @@ index 996d829e29b4..508ce91d431b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_decoder_opus_config_gn") diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build -index c6bf3b3966c5..34d6a5a32c25 100644 +index 58e6355a5568..c40633ff9ee4 100644 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -4631,7 +4856,7 @@ index c6bf3b3966c5..34d6a5a32c25 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4643,7 +4868,6 @@ index c6bf3b3966c5..34d6a5a32c25 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -4656,7 +4880,6 @@ index c6bf3b3966c5..34d6a5a32c25 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -4689,7 +4912,6 @@ index c6bf3b3966c5..34d6a5a32c25 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -4705,7 +4927,6 @@ index c6bf3b3966c5..34d6a5a32c25 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4746,6 +4967,24 @@ index c6bf3b3966c5..34d6a5a32c25 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4780,54 +5019,51 @@ index c6bf3b3966c5..34d6a5a32c25 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_decoder_opus_gn") diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build -index 7b574fb08d6d..cb6ef27502ca 100644 +index 91afd0a4e40a..27167f6f4829 100644 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -4842,7 +5078,7 @@ index 7b574fb08d6d..cb6ef27502ca 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4854,7 +5090,6 @@ index 7b574fb08d6d..cb6ef27502ca 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -4867,7 +5102,6 @@ index 7b574fb08d6d..cb6ef27502ca 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -4896,7 +5130,6 @@ index 7b574fb08d6d..cb6ef27502ca 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -4912,7 +5145,6 @@ index 7b574fb08d6d..cb6ef27502ca 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4950,6 +5182,24 @@ index 7b574fb08d6d..cb6ef27502ca 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4984,54 +5234,51 @@ index 7b574fb08d6d..cb6ef27502ca 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_multiopus_gn") diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build -index 40b530b34c5f..c4d4369de701 100644 +index 06732b48f469..0ccb94d1f9fb 100644 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -5047,7 +5294,7 @@ index 40b530b34c5f..c4d4369de701 100644 FINAL_LIBRARY = "webrtc" -@@ -48,165 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,175 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5059,7 +5306,6 @@ index 40b530b34c5f..c4d4369de701 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -5068,7 +5314,6 @@ index 40b530b34c5f..c4d4369de701 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -5097,7 +5342,6 @@ index 40b530b34c5f..c4d4369de701 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -5113,7 +5357,6 @@ index 40b530b34c5f..c4d4369de701 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -5147,6 +5390,24 @@ index 40b530b34c5f..c4d4369de701 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -5180,8 +5441,7 @@ index 40b530b34c5f..c4d4369de701 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -5192,43 +5452,41 @@ index 40b530b34c5f..c4d4369de701 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_opus_config_gn") diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build -index 98136a3c9706..3a95578526c4 100644 +index ab84d3f7559f..e4bcd225837a 100644 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -5243,7 +5501,7 @@ index 98136a3c9706..3a95578526c4 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5255,7 +5513,6 @@ index 98136a3c9706..3a95578526c4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -5268,7 +5525,6 @@ index 98136a3c9706..3a95578526c4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -5301,7 +5557,6 @@ index 98136a3c9706..3a95578526c4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -5317,7 +5572,6 @@ index 98136a3c9706..3a95578526c4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -5358,6 +5612,24 @@ index 98136a3c9706..3a95578526c4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -5392,54 +5664,51 @@ index 98136a3c9706..3a95578526c4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_opus_gn") diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build -index e5d485802a35..b865a3c049ab 100644 +index 1b19c42e986c..8d416085b79b 100644 --- third_party/libwebrtc/api/audio_options_api_gn/moz.build +++ third_party/libwebrtc/api/audio_options_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -5454,7 +5723,7 @@ index e5d485802a35..b865a3c049ab 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5466,7 +5735,6 @@ index e5d485802a35..b865a3c049ab 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -5479,7 +5747,6 @@ index e5d485802a35..b865a3c049ab 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -5508,7 +5775,6 @@ index e5d485802a35..b865a3c049ab 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -5524,7 +5790,6 @@ index e5d485802a35..b865a3c049ab 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -5558,6 +5823,24 @@ index e5d485802a35..b865a3c049ab 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -5592,54 +5875,51 @@ index e5d485802a35..b865a3c049ab 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_options_api_gn") diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build -index 9b996f4f4b17..d429680c409e 100644 +index a694eff03b3f..953d60cc35a0 100644 --- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build +++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -5654,7 +5934,7 @@ index 9b996f4f4b17..d429680c409e 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5666,7 +5946,6 @@ index 9b996f4f4b17..d429680c409e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -5679,7 +5958,6 @@ index 9b996f4f4b17..d429680c409e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -5708,7 +5986,6 @@ index 9b996f4f4b17..d429680c409e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -5724,7 +6001,6 @@ index 9b996f4f4b17..d429680c409e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -5755,6 +6031,22 @@ index 9b996f4f4b17..d429680c409e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -5795,37 +6087,32 @@ index 9b996f4f4b17..d429680c409e 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("bitrate_allocation_gn") diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build -index fb54663aa230..88d540626600 100644 +index e446d8228025..8b21859a8adb 100644 --- third_party/libwebrtc/api/call_api_gn/moz.build +++ third_party/libwebrtc/api/call_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -5840,7 +6127,7 @@ index fb54663aa230..88d540626600 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5852,7 +6139,6 @@ index fb54663aa230..88d540626600 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -5861,7 +6147,6 @@ index fb54663aa230..88d540626600 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -5890,7 +6175,6 @@ index fb54663aa230..88d540626600 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -5906,7 +6190,6 @@ index fb54663aa230..88d540626600 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -5937,6 +6220,22 @@ index fb54663aa230..88d540626600 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -5977,37 +6276,32 @@ index fb54663aa230..88d540626600 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("call_api_gn") diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build -index ff1e226a47bb..af94caebd288 100644 +index b0f2bbbf3545..e51b0bd98f1a 100644 --- third_party/libwebrtc/api/callfactory_api_gn/moz.build +++ third_party/libwebrtc/api/callfactory_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -6022,7 +6316,7 @@ index ff1e226a47bb..af94caebd288 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6034,7 +6328,6 @@ index ff1e226a47bb..af94caebd288 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -6047,7 +6340,6 @@ index ff1e226a47bb..af94caebd288 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -6080,7 +6372,6 @@ index ff1e226a47bb..af94caebd288 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -6096,7 +6387,6 @@ index ff1e226a47bb..af94caebd288 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -6134,6 +6424,22 @@ index ff1e226a47bb..af94caebd288 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -6174,37 +6480,32 @@ index ff1e226a47bb..af94caebd288 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("callfactory_api_gn") diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -index 05fa88f51543..e78eca9f214f 100644 +index 1ce4cdd00a59..16ee32317d2a 100644 --- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build +++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -6219,7 +6520,7 @@ index 05fa88f51543..e78eca9f214f 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6231,7 +6532,6 @@ index 05fa88f51543..e78eca9f214f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -6244,7 +6544,6 @@ index 05fa88f51543..e78eca9f214f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -6273,7 +6572,6 @@ index 05fa88f51543..e78eca9f214f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -6289,7 +6587,6 @@ index 05fa88f51543..e78eca9f214f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -6320,6 +6617,22 @@ index 05fa88f51543..e78eca9f214f 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -6360,37 +6673,32 @@ index 05fa88f51543..e78eca9f214f 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("frame_decryptor_interface_gn") diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -index b4b02bc0fd68..bb7875318eb2 100644 +index b8385d1daacd..0ee97ec6c218 100644 --- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build +++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -6405,7 +6713,7 @@ index b4b02bc0fd68..bb7875318eb2 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6417,7 +6725,6 @@ index b4b02bc0fd68..bb7875318eb2 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -6430,7 +6737,6 @@ index b4b02bc0fd68..bb7875318eb2 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -6459,7 +6765,6 @@ index b4b02bc0fd68..bb7875318eb2 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -6475,7 +6780,6 @@ index b4b02bc0fd68..bb7875318eb2 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -6506,6 +6810,22 @@ index b4b02bc0fd68..bb7875318eb2 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -6546,37 +6866,32 @@ index b4b02bc0fd68..bb7875318eb2 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("frame_encryptor_interface_gn") diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build -index e4b496ffcab2..8847d0f5eae0 100644 +index aee1983c3e76..c6ad466bcf88 100644 --- third_party/libwebrtc/api/crypto/options_gn/moz.build +++ third_party/libwebrtc/api/crypto/options_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -6591,7 +6906,7 @@ index e4b496ffcab2..8847d0f5eae0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6603,7 +6918,6 @@ index e4b496ffcab2..8847d0f5eae0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -6612,7 +6926,6 @@ index e4b496ffcab2..8847d0f5eae0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -6641,7 +6954,6 @@ index e4b496ffcab2..8847d0f5eae0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -6657,7 +6969,6 @@ index e4b496ffcab2..8847d0f5eae0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -6691,6 +7002,24 @@ index e4b496ffcab2..8847d0f5eae0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -6724,8 +7053,7 @@ index e4b496ffcab2..8847d0f5eae0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -6736,43 +7064,41 @@ index e4b496ffcab2..8847d0f5eae0 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("options_gn") diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build -index 99b1645f6dac..60d1ef57b49a 100644 +index 014e7fe571aa..0e340edaa9b8 100644 --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build +++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -6787,7 +7113,7 @@ index 99b1645f6dac..60d1ef57b49a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6799,7 +7125,6 @@ index 99b1645f6dac..60d1ef57b49a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -6808,7 +7133,6 @@ index 99b1645f6dac..60d1ef57b49a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -6837,7 +7161,6 @@ index 99b1645f6dac..60d1ef57b49a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -6853,7 +7176,6 @@ index 99b1645f6dac..60d1ef57b49a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -6884,6 +7206,22 @@ index 99b1645f6dac..60d1ef57b49a 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -6924,37 +7262,32 @@ index 99b1645f6dac..60d1ef57b49a 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("fec_controller_api_gn") diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build -index ba5cc8d4555d..445124a6465d 100644 +index f8884b4cd26a..bb3da46c855c 100644 --- third_party/libwebrtc/api/field_trials_registry_gn/moz.build +++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -6969,7 +7302,7 @@ index ba5cc8d4555d..445124a6465d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6981,7 +7314,6 @@ index ba5cc8d4555d..445124a6465d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -6994,7 +7326,6 @@ index ba5cc8d4555d..445124a6465d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -7023,7 +7354,6 @@ index ba5cc8d4555d..445124a6465d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -7039,7 +7369,6 @@ index ba5cc8d4555d..445124a6465d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -7057,6 +7386,10 @@ index ba5cc8d4555d..445124a6465d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -7073,6 +7406,24 @@ index ba5cc8d4555d..445124a6465d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -7107,54 +7458,51 @@ index ba5cc8d4555d..445124a6465d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("field_trials_registry_gn") diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build -index 2546c5d6c76d..ddb7e9e6a62d 100644 +index 2c7f147d4afb..3078bdae753b 100644 --- third_party/libwebrtc/api/field_trials_view_gn/moz.build +++ third_party/libwebrtc/api/field_trials_view_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -7169,7 +7517,7 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7181,7 +7529,6 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -7190,7 +7537,6 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -7219,7 +7565,6 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -7235,7 +7580,6 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -7266,6 +7610,22 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7306,37 +7666,32 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("field_trials_view_gn") diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -index 7aa531c02248..2f54084a65d9 100644 +index 885c8437ae88..43b4eeb1d4f0 100644 --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -7351,7 +7706,7 @@ index 7aa531c02248..2f54084a65d9 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7363,7 +7718,6 @@ index 7aa531c02248..2f54084a65d9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -7376,7 +7730,6 @@ index 7aa531c02248..2f54084a65d9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -7409,7 +7762,6 @@ index 7aa531c02248..2f54084a65d9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -7425,7 +7777,6 @@ index 7aa531c02248..2f54084a65d9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -7463,6 +7814,22 @@ index 7aa531c02248..2f54084a65d9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7503,37 +7870,32 @@ index 7aa531c02248..2f54084a65d9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("frame_transformer_interface_gn") diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build -index f52383501aae..776b121f69ca 100644 +index 59ebc4ae7ad2..53144eed7f3b 100644 --- third_party/libwebrtc/api/function_view_gn/moz.build +++ third_party/libwebrtc/api/function_view_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -7548,7 +7910,7 @@ index f52383501aae..776b121f69ca 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7560,7 +7922,6 @@ index f52383501aae..776b121f69ca 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -7573,7 +7934,6 @@ index f52383501aae..776b121f69ca 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -7602,7 +7962,6 @@ index f52383501aae..776b121f69ca 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -7618,7 +7977,6 @@ index f52383501aae..776b121f69ca 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -7649,6 +8007,22 @@ index f52383501aae..776b121f69ca 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7689,37 +8063,32 @@ index f52383501aae..776b121f69ca 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("function_view_gn") diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build -index 1fcc4121d7c5..85f9899e8e45 100644 +index 5e41eca1b72c..a918a1104b37 100644 --- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build +++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -7734,7 +8103,7 @@ index 1fcc4121d7c5..85f9899e8e45 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7746,7 +8115,6 @@ index 1fcc4121d7c5..85f9899e8e45 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -7755,7 +8123,6 @@ index 1fcc4121d7c5..85f9899e8e45 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -7784,7 +8151,6 @@ index 1fcc4121d7c5..85f9899e8e45 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -7800,7 +8166,6 @@ index 1fcc4121d7c5..85f9899e8e45 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -7831,6 +8196,22 @@ index 1fcc4121d7c5..85f9899e8e45 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -7871,37 +8252,32 @@ index 1fcc4121d7c5..85f9899e8e45 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("jingle_logging_api_gn") diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build -index 02d86385a66c..1fd5948195b5 100644 +index 579b7f164b6a..bdbc0d078b7f 100644 --- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build +++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -7916,7 +8292,7 @@ index 02d86385a66c..1fd5948195b5 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7928,7 +8304,6 @@ index 02d86385a66c..1fd5948195b5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -7937,7 +8312,6 @@ index 02d86385a66c..1fd5948195b5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -7966,7 +8340,6 @@ index 02d86385a66c..1fd5948195b5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -7982,7 +8355,6 @@ index 02d86385a66c..1fd5948195b5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -8013,6 +8385,22 @@ index 02d86385a66c..1fd5948195b5 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -8053,37 +8441,32 @@ index 02d86385a66c..1fd5948195b5 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("jingle_peerconnection_api_gn") -diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build -index ed49ab3d2463..6b894d79d364 100644 ---- third_party/libwebrtc/api/make_ref_counted_gn/moz.build -+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build +index 434406691e4c..0251460ee9f6 100644 +--- third_party/libwebrtc/api/location_gn/moz.build ++++ third_party/libwebrtc/api/location_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -8098,7 +8481,7 @@ index ed49ab3d2463..6b894d79d364 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8110,7 +8493,6 @@ index ed49ab3d2463..6b894d79d364 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -8119,7 +8501,6 @@ index ed49ab3d2463..6b894d79d364 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -8148,7 +8529,6 @@ index ed49ab3d2463..6b894d79d364 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -8164,7 +8544,6 @@ index ed49ab3d2463..6b894d79d364 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -8195,6 +8574,211 @@ index ed49ab3d2463..6b894d79d364 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("location_gn") +diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build +index 8b3a500acb00..2565408ce87a 100644 +--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build ++++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -8235,37 +8819,32 @@ index ed49ab3d2463..6b894d79d364 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("make_ref_counted_gn") diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build -index 0624f737ac90..7dd6fe3636e4 100644 +index b80f10168f55..7aea55ea197a 100644 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build +++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -8280,7 +8859,7 @@ index 0624f737ac90..7dd6fe3636e4 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8292,7 +8871,6 @@ index 0624f737ac90..7dd6fe3636e4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -8305,7 +8883,6 @@ index 0624f737ac90..7dd6fe3636e4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -8334,7 +8911,6 @@ index 0624f737ac90..7dd6fe3636e4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -8350,7 +8926,6 @@ index 0624f737ac90..7dd6fe3636e4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -8388,6 +8963,24 @@ index 0624f737ac90..7dd6fe3636e4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -8422,54 +9015,51 @@ index 0624f737ac90..7dd6fe3636e4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("media_stream_interface_gn") diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build -index f7049361ee72..056a492f1038 100644 +index dce0ca43192e..9559599c7097 100644 --- third_party/libwebrtc/api/metronome/metronome_gn/moz.build +++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -8484,7 +9074,7 @@ index f7049361ee72..056a492f1038 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8496,7 +9086,6 @@ index f7049361ee72..056a492f1038 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -8509,7 +9098,6 @@ index f7049361ee72..056a492f1038 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -8538,7 +9126,6 @@ index f7049361ee72..056a492f1038 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -8554,7 +9141,6 @@ index f7049361ee72..056a492f1038 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -8585,6 +9171,22 @@ index f7049361ee72..056a492f1038 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -8625,37 +9227,32 @@ index f7049361ee72..056a492f1038 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("metronome_gn") diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build -index 5820d3bf121b..7b204ff681fe 100644 +index 273be80f73aa..3def73b6e920 100644 --- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build +++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -8670,7 +9267,7 @@ index 5820d3bf121b..7b204ff681fe 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8682,7 +9279,6 @@ index 5820d3bf121b..7b204ff681fe 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -8695,7 +9291,6 @@ index 5820d3bf121b..7b204ff681fe 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -8728,7 +9323,6 @@ index 5820d3bf121b..7b204ff681fe 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -8744,7 +9338,6 @@ index 5820d3bf121b..7b204ff681fe 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -8785,6 +9378,24 @@ index 5820d3bf121b..7b204ff681fe 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -8819,54 +9430,51 @@ index 5820d3bf121b..7b204ff681fe 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("default_neteq_controller_factory_gn") diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build -index b26a78cf1c46..b690402bf859 100644 +index f06937f581eb..909633162ae6 100644 --- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build +++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -8881,7 +9489,7 @@ index b26a78cf1c46..b690402bf859 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8893,7 +9501,6 @@ index b26a78cf1c46..b690402bf859 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -8906,7 +9513,6 @@ index b26a78cf1c46..b690402bf859 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -8939,7 +9545,6 @@ index b26a78cf1c46..b690402bf859 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -8955,7 +9560,6 @@ index b26a78cf1c46..b690402bf859 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -8996,6 +9600,24 @@ index b26a78cf1c46..b690402bf859 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -9030,54 +9652,51 @@ index b26a78cf1c46..b690402bf859 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("neteq_api_gn") diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build -index f746f88687c8..b661e6f325c9 100644 +index d09b5aed5335..b63d342a355c 100644 --- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build +++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -9092,7 +9711,7 @@ index f746f88687c8..b661e6f325c9 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9104,7 +9723,6 @@ index f746f88687c8..b661e6f325c9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -9117,7 +9735,6 @@ index f746f88687c8..b661e6f325c9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -9150,7 +9767,6 @@ index f746f88687c8..b661e6f325c9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -9166,7 +9782,6 @@ index f746f88687c8..b661e6f325c9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -9204,6 +9819,22 @@ index f746f88687c8..b661e6f325c9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -9244,37 +9875,32 @@ index f746f88687c8..b661e6f325c9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("neteq_controller_api_gn") diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build -index fd4f9bf717a7..49ee65092164 100644 +index 012522550973..10f3a99bcbcd 100644 --- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build +++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -9289,7 +9915,7 @@ index fd4f9bf717a7..49ee65092164 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9301,7 +9927,6 @@ index fd4f9bf717a7..49ee65092164 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -9314,7 +9939,6 @@ index fd4f9bf717a7..49ee65092164 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -9343,7 +9967,6 @@ index fd4f9bf717a7..49ee65092164 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -9359,7 +9982,6 @@ index fd4f9bf717a7..49ee65092164 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -9393,6 +10015,24 @@ index fd4f9bf717a7..49ee65092164 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -9427,54 +10067,51 @@ index fd4f9bf717a7..49ee65092164 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("tick_timer_gn") diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build -index a7da1f7e3bb0..422517f8411b 100644 +index 2a95233bda53..7f30532ddb95 100644 --- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build +++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -9489,7 +10126,7 @@ index a7da1f7e3bb0..422517f8411b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9501,7 +10138,6 @@ index a7da1f7e3bb0..422517f8411b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -9510,7 +10146,6 @@ index a7da1f7e3bb0..422517f8411b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -9539,7 +10174,6 @@ index a7da1f7e3bb0..422517f8411b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -9555,7 +10189,6 @@ index a7da1f7e3bb0..422517f8411b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -9586,6 +10219,22 @@ index a7da1f7e3bb0..422517f8411b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -9626,37 +10275,32 @@ index a7da1f7e3bb0..422517f8411b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("network_state_predictor_api_gn") diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build -index 191c836d8508..44ae2b5bf6ea 100644 +index 08cb5bf2d567..461d52f93d0e 100644 --- third_party/libwebrtc/api/priority_gn/moz.build +++ third_party/libwebrtc/api/priority_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -9671,7 +10315,7 @@ index 191c836d8508..44ae2b5bf6ea 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9683,7 +10327,6 @@ index 191c836d8508..44ae2b5bf6ea 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -9692,7 +10335,6 @@ index 191c836d8508..44ae2b5bf6ea 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -9721,7 +10363,6 @@ index 191c836d8508..44ae2b5bf6ea 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -9737,7 +10378,6 @@ index 191c836d8508..44ae2b5bf6ea 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -9768,6 +10408,22 @@ index 191c836d8508..44ae2b5bf6ea 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -9808,37 +10464,32 @@ index 191c836d8508..44ae2b5bf6ea 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("priority_gn") diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build -index 50d1dc895081..e6ea3a8d349d 100644 +index f2a22be84640..b048864ad448 100644 --- third_party/libwebrtc/api/refcountedbase_gn/moz.build +++ third_party/libwebrtc/api/refcountedbase_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -9853,7 +10504,7 @@ index 50d1dc895081..e6ea3a8d349d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9865,7 +10516,6 @@ index 50d1dc895081..e6ea3a8d349d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -9874,7 +10524,6 @@ index 50d1dc895081..e6ea3a8d349d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -9903,7 +10552,6 @@ index 50d1dc895081..e6ea3a8d349d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -9919,7 +10567,6 @@ index 50d1dc895081..e6ea3a8d349d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -9950,6 +10597,22 @@ index 50d1dc895081..e6ea3a8d349d 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -9990,37 +10653,32 @@ index 50d1dc895081..e6ea3a8d349d 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("refcountedbase_gn") diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build -index 5beae090b99a..9147a790d33e 100644 +index 07efa1cf5563..fcf285f401fc 100644 --- third_party/libwebrtc/api/rtc_error_gn/moz.build +++ third_party/libwebrtc/api/rtc_error_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -10035,7 +10693,7 @@ index 5beae090b99a..9147a790d33e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10047,7 +10705,6 @@ index 5beae090b99a..9147a790d33e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -10060,7 +10717,6 @@ index 5beae090b99a..9147a790d33e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -10089,7 +10745,6 @@ index 5beae090b99a..9147a790d33e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -10105,7 +10760,6 @@ index 5beae090b99a..9147a790d33e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -10143,6 +10797,24 @@ index 5beae090b99a..9147a790d33e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10177,54 +10849,51 @@ index 5beae090b99a..9147a790d33e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_error_gn") diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build -index bda287e729a7..ba95c9db6fa9 100644 +index a96be6791fdc..68470ecf6df4 100644 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -10239,7 +10908,7 @@ index bda287e729a7..ba95c9db6fa9 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10251,7 +10920,6 @@ index bda287e729a7..ba95c9db6fa9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -10264,7 +10932,6 @@ index bda287e729a7..ba95c9db6fa9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -10293,7 +10960,6 @@ index bda287e729a7..ba95c9db6fa9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -10309,7 +10975,6 @@ index bda287e729a7..ba95c9db6fa9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -10347,6 +11012,24 @@ index bda287e729a7..ba95c9db6fa9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10381,54 +11064,51 @@ index bda287e729a7..ba95c9db6fa9 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_log_gn") diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build -index ee29948e6455..c7fdc41cbd06 100644 +index d26fa6a026f9..b5647f419f7c 100644 --- third_party/libwebrtc/api/rtp_headers_gn/moz.build +++ third_party/libwebrtc/api/rtp_headers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -10443,7 +11123,7 @@ index ee29948e6455..c7fdc41cbd06 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10455,7 +11135,6 @@ index ee29948e6455..c7fdc41cbd06 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -10468,7 +11147,6 @@ index ee29948e6455..c7fdc41cbd06 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -10497,7 +11175,6 @@ index ee29948e6455..c7fdc41cbd06 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -10513,7 +11190,6 @@ index ee29948e6455..c7fdc41cbd06 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -10551,6 +11227,24 @@ index ee29948e6455..c7fdc41cbd06 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10585,54 +11279,51 @@ index ee29948e6455..c7fdc41cbd06 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_headers_gn") diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -index b2eb8ef5a7ff..40dceac38a1f 100644 +index 99c25cbbaead..df1cf58c7083 100644 --- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build +++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -10647,7 +11338,7 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10659,7 +11350,6 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -10672,7 +11362,6 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -10701,7 +11390,6 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -10717,7 +11405,6 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -10755,6 +11442,24 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10789,54 +11494,51 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_packet_info_gn") diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build -index 3c367bed3bb9..dd7145a56759 100644 +index 4dc6e4a74378..ddc2e7f5536f 100644 --- third_party/libwebrtc/api/rtp_parameters_gn/moz.build +++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -10851,7 +11553,7 @@ index 3c367bed3bb9..dd7145a56759 100644 FINAL_LIBRARY = "webrtc" -@@ -44,169 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10863,7 +11565,6 @@ index 3c367bed3bb9..dd7145a56759 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -10876,7 +11577,6 @@ index 3c367bed3bb9..dd7145a56759 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -10905,7 +11605,6 @@ index 3c367bed3bb9..dd7145a56759 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -10921,7 +11620,6 @@ index 3c367bed3bb9..dd7145a56759 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -10955,6 +11653,24 @@ index 3c367bed3bb9..dd7145a56759 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -10989,54 +11705,51 @@ index 3c367bed3bb9..dd7145a56759 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_parameters_gn") diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build -index 54c091ac7bed..43683534aba1 100644 +index 9712e13ddd16..5f6e81fb3f4e 100644 --- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build +++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -11051,7 +11764,7 @@ index 54c091ac7bed..43683534aba1 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11063,7 +11776,6 @@ index 54c091ac7bed..43683534aba1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -11072,7 +11784,6 @@ index 54c091ac7bed..43683534aba1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -11101,7 +11812,6 @@ index 54c091ac7bed..43683534aba1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -11117,7 +11827,6 @@ index 54c091ac7bed..43683534aba1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -11148,6 +11857,22 @@ index 54c091ac7bed..43683534aba1 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -11188,37 +11913,32 @@ index 54c091ac7bed..43683534aba1 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rtp_sender_interface_gn") diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build -index 2c59bcc25159..6e18f5b8ccfa 100644 +index 5cc94b1d99f7..f274d0055498 100644 --- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build +++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -11233,7 +11953,7 @@ index 2c59bcc25159..6e18f5b8ccfa 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11245,7 +11965,6 @@ index 2c59bcc25159..6e18f5b8ccfa 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -11258,7 +11977,6 @@ index 2c59bcc25159..6e18f5b8ccfa 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -11287,7 +12005,6 @@ index 2c59bcc25159..6e18f5b8ccfa 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -11303,7 +12020,6 @@ index 2c59bcc25159..6e18f5b8ccfa 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -11341,6 +12057,24 @@ index 2c59bcc25159..6e18f5b8ccfa 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -11375,54 +12109,51 @@ index 2c59bcc25159..6e18f5b8ccfa 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_sender_setparameters_callback_gn") diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -index 203600105c8d..9d999828d1df 100644 +index 1ca9b4be66c4..a4bf4591450e 100644 --- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build +++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -11437,7 +12168,7 @@ index 203600105c8d..9d999828d1df 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11449,7 +12180,6 @@ index 203600105c8d..9d999828d1df 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -11458,7 +12188,6 @@ index 203600105c8d..9d999828d1df 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -11487,7 +12216,6 @@ index 203600105c8d..9d999828d1df 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -11503,7 +12231,6 @@ index 203600105c8d..9d999828d1df 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -11534,6 +12261,22 @@ index 203600105c8d..9d999828d1df 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -11574,37 +12317,32 @@ index 203600105c8d..9d999828d1df 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rtp_transceiver_direction_gn") diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build -index 8805f8ec4ce1..164076c941d1 100644 +index d4dbda2c18f8..951e821afca9 100644 --- third_party/libwebrtc/api/scoped_refptr_gn/moz.build +++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -11619,7 +12357,7 @@ index 8805f8ec4ce1..164076c941d1 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11631,7 +12369,6 @@ index 8805f8ec4ce1..164076c941d1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -11640,7 +12377,6 @@ index 8805f8ec4ce1..164076c941d1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -11669,7 +12405,6 @@ index 8805f8ec4ce1..164076c941d1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -11685,7 +12420,6 @@ index 8805f8ec4ce1..164076c941d1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -11716,6 +12450,22 @@ index 8805f8ec4ce1..164076c941d1 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -11756,37 +12506,32 @@ index 8805f8ec4ce1..164076c941d1 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("scoped_refptr_gn") diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build -index a040d96e814e..01068ebc09ba 100644 +index d3dd3980f86a..81e314ac9523 100644 --- third_party/libwebrtc/api/sequence_checker_gn/moz.build +++ third_party/libwebrtc/api/sequence_checker_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -11801,7 +12546,7 @@ index a040d96e814e..01068ebc09ba 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11813,7 +12558,6 @@ index a040d96e814e..01068ebc09ba 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -11826,7 +12570,6 @@ index a040d96e814e..01068ebc09ba 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -11855,7 +12598,6 @@ index a040d96e814e..01068ebc09ba 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -11871,7 +12613,6 @@ index a040d96e814e..01068ebc09ba 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -11902,6 +12643,22 @@ index a040d96e814e..01068ebc09ba 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -11942,37 +12699,32 @@ index a040d96e814e..01068ebc09ba 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("sequence_checker_gn") diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build -index 508948c5ed5b..abb4c1fd1905 100644 +index 0867200479f4..04a99f0b12ea 100644 --- third_party/libwebrtc/api/simulated_network_api_gn/moz.build +++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -11987,7 +12739,7 @@ index 508948c5ed5b..abb4c1fd1905 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11999,7 +12751,6 @@ index 508948c5ed5b..abb4c1fd1905 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -12012,7 +12763,6 @@ index 508948c5ed5b..abb4c1fd1905 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -12041,7 +12791,6 @@ index 508948c5ed5b..abb4c1fd1905 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -12057,7 +12806,6 @@ index 508948c5ed5b..abb4c1fd1905 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -12088,6 +12836,22 @@ index 508948c5ed5b..abb4c1fd1905 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -12128,37 +12892,32 @@ index 508948c5ed5b..abb4c1fd1905 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("simulated_network_api_gn") diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build -index 301fb2492eb1..447e92bc84b1 100644 +index d7e6a087fa00..ba1a6b109e0e 100644 --- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build +++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -12173,7 +12932,7 @@ index 301fb2492eb1..447e92bc84b1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12185,7 +12944,6 @@ index 301fb2492eb1..447e92bc84b1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -12198,7 +12956,6 @@ index 301fb2492eb1..447e92bc84b1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -12227,7 +12984,6 @@ index 301fb2492eb1..447e92bc84b1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -12243,7 +12999,6 @@ index 301fb2492eb1..447e92bc84b1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -12277,6 +13032,24 @@ index 301fb2492eb1..447e92bc84b1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -12311,54 +13084,51 @@ index 301fb2492eb1..447e92bc84b1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("pending_task_safety_flag_gn") diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build -index e065dff9f9b5..f055a9f95453 100644 +index c4d9c9d67d0a..7ff2201844db 100644 --- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build +++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -12373,7 +13143,7 @@ index e065dff9f9b5..f055a9f95453 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12385,7 +13155,6 @@ index e065dff9f9b5..f055a9f95453 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -12398,7 +13167,6 @@ index e065dff9f9b5..f055a9f95453 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -12427,7 +13195,6 @@ index e065dff9f9b5..f055a9f95453 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -12443,7 +13210,6 @@ index e065dff9f9b5..f055a9f95453 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -12477,6 +13243,24 @@ index e065dff9f9b5..f055a9f95453 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -12511,54 +13295,51 @@ index e065dff9f9b5..f055a9f95453 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("task_queue_gn") diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -index 797fc49eddd0..cc4f22948f9c 100644 +index fba5b45a5df7..39a9ebc0842e 100644 --- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build +++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -12573,7 +13354,7 @@ index 797fc49eddd0..cc4f22948f9c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12585,7 +13366,6 @@ index 797fc49eddd0..cc4f22948f9c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -12594,7 +13374,6 @@ index 797fc49eddd0..cc4f22948f9c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -12623,7 +13402,6 @@ index 797fc49eddd0..cc4f22948f9c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -12639,7 +13417,6 @@ index 797fc49eddd0..cc4f22948f9c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -12673,6 +13450,24 @@ index 797fc49eddd0..cc4f22948f9c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -12706,8 +13501,7 @@ index 797fc49eddd0..cc4f22948f9c 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -12718,43 +13512,41 @@ index 797fc49eddd0..cc4f22948f9c 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bitrate_settings_gn") diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build -index 53b561e9f450..e3f2db2d5f13 100644 +index ac59bcbcde75..cbeb41795c2d 100644 --- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build +++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -12769,7 +13561,7 @@ index 53b561e9f450..e3f2db2d5f13 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12781,7 +13573,6 @@ index 53b561e9f450..e3f2db2d5f13 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -12794,7 +13585,6 @@ index 53b561e9f450..e3f2db2d5f13 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -12823,7 +13613,6 @@ index 53b561e9f450..e3f2db2d5f13 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -12839,7 +13628,6 @@ index 53b561e9f450..e3f2db2d5f13 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -12874,6 +13662,22 @@ index 53b561e9f450..e3f2db2d5f13 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -12914,37 +13718,32 @@ index 53b561e9f450..e3f2db2d5f13 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("datagram_transport_interface_gn") diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build -index 1908dc466677..888e6cd29d2b 100644 +index 1ef79b4d200b..e4486979adcc 100644 --- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build +++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -12959,7 +13758,7 @@ index 1908dc466677..888e6cd29d2b 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12971,7 +13770,6 @@ index 1908dc466677..888e6cd29d2b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -12984,7 +13782,6 @@ index 1908dc466677..888e6cd29d2b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -13013,7 +13810,6 @@ index 1908dc466677..888e6cd29d2b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -13029,7 +13825,6 @@ index 1908dc466677..888e6cd29d2b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -13067,6 +13862,24 @@ index 1908dc466677..888e6cd29d2b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13101,54 +13914,51 @@ index 1908dc466677..888e6cd29d2b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("field_trial_based_config_gn") diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -index 6125806b93a0..b4bf72798b33 100644 +index 69fd4ce27866..dee377f35156 100644 --- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build +++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -13163,7 +13973,7 @@ index 6125806b93a0..b4bf72798b33 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13175,7 +13985,6 @@ index 6125806b93a0..b4bf72798b33 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -13189,7 +13998,6 @@ index 6125806b93a0..b4bf72798b33 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -13222,7 +14030,6 @@ index 6125806b93a0..b4bf72798b33 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -13238,7 +14045,6 @@ index 6125806b93a0..b4bf72798b33 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -13279,6 +14085,24 @@ index 6125806b93a0..b4bf72798b33 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13313,54 +14137,51 @@ index 6125806b93a0..b4bf72798b33 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("goog_cc_gn") diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build -index f814acbc89ed..6ee3f82674d0 100644 +index 181843597f7a..f03b20773145 100644 --- third_party/libwebrtc/api/transport/network_control_gn/moz.build +++ third_party/libwebrtc/api/transport/network_control_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -13375,7 +14196,7 @@ index f814acbc89ed..6ee3f82674d0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13387,7 +14208,6 @@ index f814acbc89ed..6ee3f82674d0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -13400,7 +14220,6 @@ index f814acbc89ed..6ee3f82674d0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -13429,7 +14248,6 @@ index f814acbc89ed..6ee3f82674d0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -13445,7 +14263,6 @@ index f814acbc89ed..6ee3f82674d0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -13483,6 +14300,24 @@ index f814acbc89ed..6ee3f82674d0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13517,54 +14352,51 @@ index f814acbc89ed..6ee3f82674d0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("network_control_gn") diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build -index 2262aa35fc13..ed386cf37b57 100644 +index 0ee9e1fa1b7e..8c55ec075d15 100644 --- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build +++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -13579,7 +14411,7 @@ index 2262aa35fc13..ed386cf37b57 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13591,7 +14423,6 @@ index 2262aa35fc13..ed386cf37b57 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -13604,7 +14435,6 @@ index 2262aa35fc13..ed386cf37b57 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -13633,7 +14463,6 @@ index 2262aa35fc13..ed386cf37b57 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -13649,7 +14478,6 @@ index 2262aa35fc13..ed386cf37b57 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -13683,6 +14511,24 @@ index 2262aa35fc13..ed386cf37b57 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -13717,54 +14563,51 @@ index 2262aa35fc13..ed386cf37b57 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("dependency_descriptor_gn") diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build -index 4f6c623cfd44..51bcb4742875 100644 +index b43f4a77ec51..7862f9ee7c3d 100644 --- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build +++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -13779,7 +14622,7 @@ index 4f6c623cfd44..51bcb4742875 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13791,7 +14634,6 @@ index 4f6c623cfd44..51bcb4742875 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -13804,7 +14646,6 @@ index 4f6c623cfd44..51bcb4742875 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -13833,7 +14674,6 @@ index 4f6c623cfd44..51bcb4742875 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -13849,7 +14689,6 @@ index 4f6c623cfd44..51bcb4742875 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -13884,6 +14723,22 @@ index 4f6c623cfd44..51bcb4742875 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -13924,37 +14779,32 @@ index 4f6c623cfd44..51bcb4742875 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rtp_source_gn") diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build -index d7ae5c968385..5d085fac596a 100644 +index dd75da361bf7..39d0ef9756e1 100644 --- third_party/libwebrtc/api/transport/stun_types_gn/moz.build +++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -13969,7 +14819,7 @@ index d7ae5c968385..5d085fac596a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13981,7 +14831,6 @@ index d7ae5c968385..5d085fac596a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -13990,7 +14839,6 @@ index d7ae5c968385..5d085fac596a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -14019,7 +14867,6 @@ index d7ae5c968385..5d085fac596a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -14035,7 +14882,6 @@ index d7ae5c968385..5d085fac596a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -14066,6 +14912,22 @@ index d7ae5c968385..5d085fac596a 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -14106,37 +14968,32 @@ index d7ae5c968385..5d085fac596a 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("stun_types_gn") diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build -index 764d7249e251..3b70b5f8a435 100644 +index 5335c2c5196b..98964899137c 100644 --- third_party/libwebrtc/api/transport_api_gn/moz.build +++ third_party/libwebrtc/api/transport_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -14151,7 +15008,7 @@ index 764d7249e251..3b70b5f8a435 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14163,7 +15020,6 @@ index 764d7249e251..3b70b5f8a435 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -14172,7 +15028,6 @@ index 764d7249e251..3b70b5f8a435 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -14201,7 +15056,6 @@ index 764d7249e251..3b70b5f8a435 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -14217,7 +15071,6 @@ index 764d7249e251..3b70b5f8a435 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -14251,6 +15104,24 @@ index 764d7249e251..3b70b5f8a435 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14284,8 +15155,7 @@ index 764d7249e251..3b70b5f8a435 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -14296,43 +15166,41 @@ index 764d7249e251..3b70b5f8a435 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("transport_api_gn") diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build -index c09e5b4062ec..4e40e6e1565b 100644 +index de76b8e11c82..710093b8259e 100644 --- third_party/libwebrtc/api/units/data_rate_gn/moz.build +++ third_party/libwebrtc/api/units/data_rate_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -14347,7 +15215,7 @@ index c09e5b4062ec..4e40e6e1565b 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14359,7 +15227,6 @@ index c09e5b4062ec..4e40e6e1565b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -14372,7 +15239,6 @@ index c09e5b4062ec..4e40e6e1565b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -14401,7 +15267,6 @@ index c09e5b4062ec..4e40e6e1565b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -14417,7 +15282,6 @@ index c09e5b4062ec..4e40e6e1565b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -14451,6 +15315,24 @@ index c09e5b4062ec..4e40e6e1565b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14485,54 +15367,51 @@ index c09e5b4062ec..4e40e6e1565b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("data_rate_gn") diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build -index 56f909efe2b0..058574ab6619 100644 +index dc54ce4f156e..ef4aba55e68f 100644 --- third_party/libwebrtc/api/units/data_size_gn/moz.build +++ third_party/libwebrtc/api/units/data_size_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -14547,7 +15426,7 @@ index 56f909efe2b0..058574ab6619 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14559,7 +15438,6 @@ index 56f909efe2b0..058574ab6619 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -14572,7 +15450,6 @@ index 56f909efe2b0..058574ab6619 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -14601,7 +15478,6 @@ index 56f909efe2b0..058574ab6619 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -14617,7 +15493,6 @@ index 56f909efe2b0..058574ab6619 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -14651,6 +15526,24 @@ index 56f909efe2b0..058574ab6619 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14685,54 +15578,51 @@ index 56f909efe2b0..058574ab6619 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("data_size_gn") diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build -index e34936176d43..cc7118828da8 100644 +index 3c84c283b8ec..07ce5ab7d03d 100644 --- third_party/libwebrtc/api/units/frequency_gn/moz.build +++ third_party/libwebrtc/api/units/frequency_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -14747,7 +15637,7 @@ index e34936176d43..cc7118828da8 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14759,7 +15649,6 @@ index e34936176d43..cc7118828da8 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -14772,7 +15661,6 @@ index e34936176d43..cc7118828da8 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -14801,7 +15689,6 @@ index e34936176d43..cc7118828da8 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -14817,7 +15704,6 @@ index e34936176d43..cc7118828da8 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -14851,6 +15737,24 @@ index e34936176d43..cc7118828da8 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -14885,54 +15789,51 @@ index e34936176d43..cc7118828da8 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frequency_gn") diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build -index 5efac66d133a..ef07a2df5e13 100644 +index 3fe57620d83d..99beb9e82767 100644 --- third_party/libwebrtc/api/units/time_delta_gn/moz.build +++ third_party/libwebrtc/api/units/time_delta_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -14947,7 +15848,7 @@ index 5efac66d133a..ef07a2df5e13 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14959,7 +15860,6 @@ index 5efac66d133a..ef07a2df5e13 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -14972,7 +15872,6 @@ index 5efac66d133a..ef07a2df5e13 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -15001,7 +15900,6 @@ index 5efac66d133a..ef07a2df5e13 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -15017,7 +15915,6 @@ index 5efac66d133a..ef07a2df5e13 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -15051,6 +15948,24 @@ index 5efac66d133a..ef07a2df5e13 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15085,54 +16000,51 @@ index 5efac66d133a..ef07a2df5e13 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("time_delta_gn") diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build -index d1ce652a1d21..09d5c53c0e8c 100644 +index a869cbcd713e..41f7f84b1527 100644 --- third_party/libwebrtc/api/units/timestamp_gn/moz.build +++ third_party/libwebrtc/api/units/timestamp_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -15147,7 +16059,7 @@ index d1ce652a1d21..09d5c53c0e8c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15159,7 +16071,6 @@ index d1ce652a1d21..09d5c53c0e8c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -15172,7 +16083,6 @@ index d1ce652a1d21..09d5c53c0e8c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -15201,7 +16111,6 @@ index d1ce652a1d21..09d5c53c0e8c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -15217,7 +16126,6 @@ index d1ce652a1d21..09d5c53c0e8c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -15251,6 +16159,24 @@ index d1ce652a1d21..09d5c53c0e8c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15285,54 +16211,51 @@ index d1ce652a1d21..09d5c53c0e8c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("timestamp_gn") diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build -index ae89a504490d..7ad1ec737b60 100644 +index 40823f23553c..020bfc89b65a 100644 --- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build +++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -15347,7 +16270,7 @@ index ae89a504490d..7ad1ec737b60 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15359,7 +16282,6 @@ index ae89a504490d..7ad1ec737b60 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -15373,7 +16295,6 @@ index ae89a504490d..7ad1ec737b60 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -15406,7 +16327,6 @@ index ae89a504490d..7ad1ec737b60 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -15422,7 +16342,6 @@ index ae89a504490d..7ad1ec737b60 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -15463,6 +16382,24 @@ index ae89a504490d..7ad1ec737b60 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15497,54 +16434,51 @@ index ae89a504490d..7ad1ec737b60 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("builtin_video_bitrate_allocator_factory_gn") diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -index 5c92663f5d1b..27a72c527aae 100644 +index f5aee8c8e896..d43142211cf9 100644 --- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build +++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -15559,7 +16493,7 @@ index 5c92663f5d1b..27a72c527aae 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15571,7 +16505,6 @@ index 5c92663f5d1b..27a72c527aae 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -15584,7 +16517,6 @@ index 5c92663f5d1b..27a72c527aae 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -15617,7 +16549,6 @@ index 5c92663f5d1b..27a72c527aae 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -15633,7 +16564,6 @@ index 5c92663f5d1b..27a72c527aae 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -15674,6 +16604,24 @@ index 5c92663f5d1b..27a72c527aae 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15708,54 +16656,51 @@ index 5c92663f5d1b..27a72c527aae 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("encoded_frame_gn") diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build -index decf74cfbedb..4c16ea3d2ae3 100644 +index aebcf21b3767..4c046aa480ac 100644 --- third_party/libwebrtc/api/video/encoded_image_gn/moz.build +++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -15770,7 +16715,7 @@ index decf74cfbedb..4c16ea3d2ae3 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15782,7 +16727,6 @@ index decf74cfbedb..4c16ea3d2ae3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -15795,7 +16739,6 @@ index decf74cfbedb..4c16ea3d2ae3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -15824,7 +16767,6 @@ index decf74cfbedb..4c16ea3d2ae3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -15840,7 +16782,6 @@ index decf74cfbedb..4c16ea3d2ae3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -15878,6 +16819,24 @@ index decf74cfbedb..4c16ea3d2ae3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -15912,54 +16871,51 @@ index decf74cfbedb..4c16ea3d2ae3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("encoded_image_gn") diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build -index 7576f10c5c3b..01a2a71c9623 100644 +index 67d7583074d3..ea11fb826b9e 100644 --- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build +++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -15974,7 +16930,7 @@ index 7576f10c5c3b..01a2a71c9623 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15986,7 +16942,6 @@ index 7576f10c5c3b..01a2a71c9623 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -16000,7 +16955,6 @@ index 7576f10c5c3b..01a2a71c9623 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -16033,7 +16987,6 @@ index 7576f10c5c3b..01a2a71c9623 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -16049,7 +17002,6 @@ index 7576f10c5c3b..01a2a71c9623 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -16090,6 +17042,24 @@ index 7576f10c5c3b..01a2a71c9623 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -16124,54 +17094,51 @@ index 7576f10c5c3b..01a2a71c9623 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frame_buffer_gn") diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -index 8aac72c0620e..f01444177d57 100644 +index af294ef3ca63..63707a6269b2 100644 --- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build +++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -16186,7 +17153,7 @@ index 8aac72c0620e..f01444177d57 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16198,7 +17165,6 @@ index 8aac72c0620e..f01444177d57 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -16211,7 +17177,6 @@ index 8aac72c0620e..f01444177d57 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -16240,7 +17205,6 @@ index 8aac72c0620e..f01444177d57 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -16256,7 +17220,6 @@ index 8aac72c0620e..f01444177d57 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -16291,6 +17254,22 @@ index 8aac72c0620e..f01444177d57 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -16331,37 +17310,32 @@ index 8aac72c0620e..f01444177d57 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("recordable_encoded_frame_gn") diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build -index b6ed64bfd8eb..f77a78835a8d 100644 +index 5f97a983f82e..abe0dea08303 100644 --- third_party/libwebrtc/api/video/render_resolution_gn/moz.build +++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -16376,7 +17350,7 @@ index b6ed64bfd8eb..f77a78835a8d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16388,7 +17362,6 @@ index b6ed64bfd8eb..f77a78835a8d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -16397,7 +17370,6 @@ index b6ed64bfd8eb..f77a78835a8d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -16426,7 +17398,6 @@ index b6ed64bfd8eb..f77a78835a8d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -16442,7 +17413,6 @@ index b6ed64bfd8eb..f77a78835a8d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -16473,6 +17443,22 @@ index b6ed64bfd8eb..f77a78835a8d 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -16513,37 +17499,32 @@ index b6ed64bfd8eb..f77a78835a8d 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("render_resolution_gn") diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build -index 0933fb5dcd6b..acb92ee78edc 100644 +index deafa478ddb9..10bf77256f20 100644 --- third_party/libwebrtc/api/video/resolution_gn/moz.build +++ third_party/libwebrtc/api/video/resolution_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -16558,7 +17539,7 @@ index 0933fb5dcd6b..acb92ee78edc 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16570,7 +17551,6 @@ index 0933fb5dcd6b..acb92ee78edc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -16579,7 +17559,6 @@ index 0933fb5dcd6b..acb92ee78edc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -16608,7 +17587,6 @@ index 0933fb5dcd6b..acb92ee78edc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -16624,7 +17602,6 @@ index 0933fb5dcd6b..acb92ee78edc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -16655,6 +17632,22 @@ index 0933fb5dcd6b..acb92ee78edc 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -16695,37 +17688,32 @@ index 0933fb5dcd6b..acb92ee78edc 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("resolution_gn") diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build -index 0ce9d82860e3..3cebaf7e5fe4 100644 +index 3b4495f26c0c..cd0d8268f411 100644 --- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build +++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -16740,7 +17728,7 @@ index 0ce9d82860e3..3cebaf7e5fe4 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16752,7 +17740,6 @@ index 0ce9d82860e3..3cebaf7e5fe4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -16765,7 +17752,6 @@ index 0ce9d82860e3..3cebaf7e5fe4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -16794,7 +17780,6 @@ index 0ce9d82860e3..3cebaf7e5fe4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -16810,7 +17795,6 @@ index 0ce9d82860e3..3cebaf7e5fe4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -16844,6 +17828,24 @@ index 0ce9d82860e3..3cebaf7e5fe4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -16878,54 +17880,51 @@ index 0ce9d82860e3..3cebaf7e5fe4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_adaptation_gn") diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build -index 153d62a1e3fc..efeec2eceeff 100644 +index 2c7b1f39e7c2..b2366c6af2a0 100644 --- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build +++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -16940,7 +17939,7 @@ index 153d62a1e3fc..efeec2eceeff 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16952,7 +17951,6 @@ index 153d62a1e3fc..efeec2eceeff 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -16965,7 +17963,6 @@ index 153d62a1e3fc..efeec2eceeff 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -16994,7 +17991,6 @@ index 153d62a1e3fc..efeec2eceeff 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -17010,7 +18006,6 @@ index 153d62a1e3fc..efeec2eceeff 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -17044,6 +18039,24 @@ index 153d62a1e3fc..efeec2eceeff 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -17078,54 +18091,51 @@ index 153d62a1e3fc..efeec2eceeff 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_bitrate_allocation_gn") diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build -index f7f8e10471f2..5e59171d6c04 100644 +index a6e2e2c6f5a9..8eb8884fe45b 100644 --- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build +++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -17140,7 +18150,7 @@ index f7f8e10471f2..5e59171d6c04 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17152,7 +18162,6 @@ index f7f8e10471f2..5e59171d6c04 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -17165,7 +18174,6 @@ index f7f8e10471f2..5e59171d6c04 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -17194,7 +18202,6 @@ index f7f8e10471f2..5e59171d6c04 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -17210,7 +18217,6 @@ index f7f8e10471f2..5e59171d6c04 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -17245,6 +18251,22 @@ index f7f8e10471f2..5e59171d6c04 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -17285,37 +18307,32 @@ index f7f8e10471f2..5e59171d6c04 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("video_bitrate_allocator_factory_gn") diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build -index 7cb6d113c212..7e1cd085764c 100644 +index f09476aacb87..7f6b2b8a30ac 100644 --- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build +++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -17330,7 +18347,7 @@ index 7cb6d113c212..7e1cd085764c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17342,7 +18359,6 @@ index 7cb6d113c212..7e1cd085764c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -17355,7 +18371,6 @@ index 7cb6d113c212..7e1cd085764c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -17384,7 +18399,6 @@ index 7cb6d113c212..7e1cd085764c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -17400,7 +18414,6 @@ index 7cb6d113c212..7e1cd085764c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -17434,6 +18447,24 @@ index 7cb6d113c212..7e1cd085764c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -17468,54 +18499,51 @@ index 7cb6d113c212..7e1cd085764c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_bitrate_allocator_gn") diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build -index 0ed60e1ab281..4702b48888cf 100644 +index 2ac72c5b5429..b7f4cc420178 100644 --- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build +++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -17530,7 +18558,7 @@ index 0ed60e1ab281..4702b48888cf 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17542,7 +18570,6 @@ index 0ed60e1ab281..4702b48888cf 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -17551,7 +18578,6 @@ index 0ed60e1ab281..4702b48888cf 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -17580,7 +18606,6 @@ index 0ed60e1ab281..4702b48888cf 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -17596,7 +18621,6 @@ index 0ed60e1ab281..4702b48888cf 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -17627,6 +18651,22 @@ index 0ed60e1ab281..4702b48888cf 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -17667,37 +18707,32 @@ index 0ed60e1ab281..4702b48888cf 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("video_codec_constants_gn") diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build -index 6e742c8d81d8..443eb4d84288 100644 +index 7a4e9fdc2c33..c7700a5bcd92 100644 --- third_party/libwebrtc/api/video/video_frame_gn/moz.build +++ third_party/libwebrtc/api/video/video_frame_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -17712,7 +18747,7 @@ index 6e742c8d81d8..443eb4d84288 100644 FINAL_LIBRARY = "webrtc" -@@ -54,173 +64,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -54,183 +63,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17724,7 +18759,6 @@ index 6e742c8d81d8..443eb4d84288 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -17737,7 +18771,6 @@ index 6e742c8d81d8..443eb4d84288 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -17766,7 +18799,6 @@ index 6e742c8d81d8..443eb4d84288 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -17782,7 +18814,6 @@ index 6e742c8d81d8..443eb4d84288 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -17820,6 +18851,24 @@ index 6e742c8d81d8..443eb4d84288 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -17854,54 +18903,51 @@ index 6e742c8d81d8..443eb4d84288 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_frame_gn") diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build -index 3fa0830088fc..0eec78099ce6 100644 +index e56d43a29930..735fd52d03b8 100644 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -17916,7 +18962,7 @@ index 3fa0830088fc..0eec78099ce6 100644 FINAL_LIBRARY = "webrtc" -@@ -50,173 +60,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17928,7 +18974,6 @@ index 3fa0830088fc..0eec78099ce6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -17941,7 +18986,6 @@ index 3fa0830088fc..0eec78099ce6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -17970,7 +19014,6 @@ index 3fa0830088fc..0eec78099ce6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -17986,7 +19029,6 @@ index 3fa0830088fc..0eec78099ce6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -18024,6 +19066,24 @@ index 3fa0830088fc..0eec78099ce6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -18058,54 +19118,51 @@ index 3fa0830088fc..0eec78099ce6 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_frame_i010_gn") diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build -index 6aabfa81899f..7848e8688276 100644 +index 2d2221dbb57d..eb03efadbe9a 100644 --- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build +++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -18120,7 +19177,7 @@ index 6aabfa81899f..7848e8688276 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18132,7 +19189,6 @@ index 6aabfa81899f..7848e8688276 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -18145,7 +19201,6 @@ index 6aabfa81899f..7848e8688276 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -18174,7 +19229,6 @@ index 6aabfa81899f..7848e8688276 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -18190,7 +19244,6 @@ index 6aabfa81899f..7848e8688276 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -18228,6 +19281,24 @@ index 6aabfa81899f..7848e8688276 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -18262,54 +19333,51 @@ index 6aabfa81899f..7848e8688276 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_frame_metadata_gn") diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build -index 12aa3330e200..ca8538598c91 100644 +index bc4c46bfbdc5..7b04b10d4157 100644 --- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build +++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -18324,7 +19392,7 @@ index 12aa3330e200..ca8538598c91 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18336,7 +19404,6 @@ index 12aa3330e200..ca8538598c91 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -18345,7 +19412,6 @@ index 12aa3330e200..ca8538598c91 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -18374,7 +19440,6 @@ index 12aa3330e200..ca8538598c91 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -18390,7 +19455,6 @@ index 12aa3330e200..ca8538598c91 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -18421,6 +19485,22 @@ index 12aa3330e200..ca8538598c91 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -18461,37 +19541,32 @@ index 12aa3330e200..ca8538598c91 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("video_frame_type_gn") diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build -index 997629ff3596..8e7aa606ac81 100644 +index ded4d37ab6b7..0129e1ce4ed0 100644 --- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build +++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -18506,7 +19581,7 @@ index 997629ff3596..8e7aa606ac81 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18518,7 +19593,6 @@ index 997629ff3596..8e7aa606ac81 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -18531,7 +19605,6 @@ index 997629ff3596..8e7aa606ac81 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -18560,7 +19633,6 @@ index 997629ff3596..8e7aa606ac81 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -18576,7 +19648,6 @@ index 997629ff3596..8e7aa606ac81 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -18607,6 +19678,22 @@ index 997629ff3596..8e7aa606ac81 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -18647,37 +19734,32 @@ index 997629ff3596..8e7aa606ac81 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("video_layers_allocation_gn") diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build -index 3ceaa9ceef82..0be1c5667094 100644 +index fffe252ebd5c..1bdba7c6dffa 100644 --- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build +++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -18692,7 +19774,7 @@ index 3ceaa9ceef82..0be1c5667094 100644 FINAL_LIBRARY = "webrtc" -@@ -46,173 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18704,7 +19786,6 @@ index 3ceaa9ceef82..0be1c5667094 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -18717,7 +19798,6 @@ index 3ceaa9ceef82..0be1c5667094 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -18746,7 +19826,6 @@ index 3ceaa9ceef82..0be1c5667094 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -18762,7 +19841,6 @@ index 3ceaa9ceef82..0be1c5667094 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -18800,6 +19878,24 @@ index 3ceaa9ceef82..0be1c5667094 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -18834,54 +19930,51 @@ index 3ceaa9ceef82..0be1c5667094 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_rtp_headers_gn") diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -index 27da55623c8f..a05b7b2e3e3c 100644 +index e36bc0df9828..cb189ba6fbb8 100644 --- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build +++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -18896,7 +19989,7 @@ index 27da55623c8f..a05b7b2e3e3c 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18908,7 +20001,6 @@ index 27da55623c8f..a05b7b2e3e3c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -18921,7 +20013,6 @@ index 27da55623c8f..a05b7b2e3e3c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -18950,7 +20041,6 @@ index 27da55623c8f..a05b7b2e3e3c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -18966,7 +20056,6 @@ index 27da55623c8f..a05b7b2e3e3c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -19001,6 +20090,22 @@ index 27da55623c8f..a05b7b2e3e3c 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -19041,37 +20146,32 @@ index 27da55623c8f..a05b7b2e3e3c 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("video_stream_encoder_gn") diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build -index 7fd6366deb59..96302de324a1 100644 +index dcf5d2273c8d..86180d10a821 100644 --- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build +++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -19086,7 +20186,7 @@ index 7fd6366deb59..96302de324a1 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19098,7 +20198,6 @@ index 7fd6366deb59..96302de324a1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -19111,7 +20210,6 @@ index 7fd6366deb59..96302de324a1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -19140,7 +20238,6 @@ index 7fd6366deb59..96302de324a1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -19156,7 +20253,6 @@ index 7fd6366deb59..96302de324a1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -19187,6 +20283,22 @@ index 7fd6366deb59..96302de324a1 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -19227,37 +20339,32 @@ index 7fd6366deb59..96302de324a1 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("bitstream_parser_api_gn") diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -index b1062ee23e27..ec8c9b5bb69f 100644 +index 987a01bd2f1a..dfcfda00467b 100644 --- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build +++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -19272,7 +20379,7 @@ index b1062ee23e27..ec8c9b5bb69f 100644 FINAL_LIBRARY = "webrtc" -@@ -44,181 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19284,7 +20391,6 @@ index b1062ee23e27..ec8c9b5bb69f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -19298,7 +20404,6 @@ index b1062ee23e27..ec8c9b5bb69f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -19331,7 +20436,6 @@ index b1062ee23e27..ec8c9b5bb69f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -19347,7 +20451,6 @@ index b1062ee23e27..ec8c9b5bb69f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -19388,6 +20491,24 @@ index b1062ee23e27..ec8c9b5bb69f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -19422,54 +20543,51 @@ index b1062ee23e27..ec8c9b5bb69f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_software_fallback_wrappers_gn") diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build -index 1470b96f07e4..65a6811f845c 100644 +index a308bfc58fd9..50cd221a39d7 100644 --- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build +++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -19484,7 +20602,7 @@ index 1470b96f07e4..65a6811f845c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19496,7 +20614,6 @@ index 1470b96f07e4..65a6811f845c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -19509,7 +20626,6 @@ index 1470b96f07e4..65a6811f845c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -19538,7 +20654,6 @@ index 1470b96f07e4..65a6811f845c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -19554,7 +20669,6 @@ index 1470b96f07e4..65a6811f845c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -19588,6 +20702,24 @@ index 1470b96f07e4..65a6811f845c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -19622,54 +20754,51 @@ index 1470b96f07e4..65a6811f845c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("scalability_mode_gn") diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build -index 6e6ab8ff7de5..28b53698939f 100644 +index eccdc6cfc778..748f6fb1b597 100644 --- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build +++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -19684,7 +20813,7 @@ index 6e6ab8ff7de5..28b53698939f 100644 FINAL_LIBRARY = "webrtc" -@@ -53,173 +63,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -53,183 +62,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19696,7 +20825,6 @@ index 6e6ab8ff7de5..28b53698939f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -19709,7 +20837,6 @@ index 6e6ab8ff7de5..28b53698939f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -19738,7 +20865,6 @@ index 6e6ab8ff7de5..28b53698939f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -19754,7 +20880,6 @@ index 6e6ab8ff7de5..28b53698939f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -19792,6 +20917,24 @@ index 6e6ab8ff7de5..28b53698939f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -19826,54 +20969,51 @@ index 6e6ab8ff7de5..28b53698939f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_codecs_api_gn") diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build -index 361543a104dd..1be3d8d2cff3 100644 +index 41d547569586..2b71c8370242 100644 --- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build +++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -19888,7 +21028,7 @@ index 361543a104dd..1be3d8d2cff3 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -19900,7 +21040,6 @@ index 361543a104dd..1be3d8d2cff3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -19914,7 +21053,6 @@ index 361543a104dd..1be3d8d2cff3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -19947,7 +21085,6 @@ index 361543a104dd..1be3d8d2cff3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -19963,7 +21100,6 @@ index 361543a104dd..1be3d8d2cff3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -20004,6 +21140,24 @@ index 361543a104dd..1be3d8d2cff3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20038,54 +21192,51 @@ index 361543a104dd..1be3d8d2cff3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("vp8_temporal_layers_factory_gn") diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build -index 6dbab87917fd..f61bf9ad2f5b 100644 +index 77f7ba4d70db..524de95cf6e8 100644 --- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build +++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -20100,7 +21251,7 @@ index 6dbab87917fd..f61bf9ad2f5b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20112,7 +21263,6 @@ index 6dbab87917fd..f61bf9ad2f5b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -20121,7 +21271,6 @@ index 6dbab87917fd..f61bf9ad2f5b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -20150,7 +21299,6 @@ index 6dbab87917fd..f61bf9ad2f5b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -20166,7 +21314,6 @@ index 6dbab87917fd..f61bf9ad2f5b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -20197,6 +21344,22 @@ index 6dbab87917fd..f61bf9ad2f5b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -20237,37 +21400,32 @@ index 6dbab87917fd..f61bf9ad2f5b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("video_track_source_constraints_gn") diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build -index 002061416e71..56fac825d60b 100644 +index 8a35de2e88b4..beb8a0df1b72 100644 --- third_party/libwebrtc/audio/audio_gn/moz.build +++ third_party/libwebrtc/audio/audio_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -20282,7 +21440,7 @@ index 002061416e71..56fac825d60b 100644 FINAL_LIBRARY = "webrtc" -@@ -55,181 +65,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -55,191 +64,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20294,7 +21452,6 @@ index 002061416e71..56fac825d60b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -20308,7 +21465,6 @@ index 002061416e71..56fac825d60b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -20341,7 +21497,6 @@ index 002061416e71..56fac825d60b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -20357,7 +21512,6 @@ index 002061416e71..56fac825d60b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -20398,6 +21552,24 @@ index 002061416e71..56fac825d60b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20432,54 +21604,51 @@ index 002061416e71..56fac825d60b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_gn") diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build -index ee505ec8852a..e7a97d4d85e3 100644 +index 81aea2d62785..1e0bdc5fc767 100644 --- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build +++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -20494,7 +21663,7 @@ index ee505ec8852a..e7a97d4d85e3 100644 FINAL_LIBRARY = "webrtc" -@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20506,7 +21675,6 @@ index ee505ec8852a..e7a97d4d85e3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -20519,7 +21687,6 @@ index ee505ec8852a..e7a97d4d85e3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -20552,7 +21719,6 @@ index ee505ec8852a..e7a97d4d85e3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -20568,7 +21734,6 @@ index ee505ec8852a..e7a97d4d85e3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -20609,6 +21774,24 @@ index ee505ec8852a..e7a97d4d85e3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20643,54 +21826,51 @@ index ee505ec8852a..e7a97d4d85e3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_frame_operations_gn") diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build -index 4307f8342cf0..148769984dcc 100644 +index b67981ba5850..5bb0f70142e3 100644 --- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build +++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -20705,7 +21885,7 @@ index 4307f8342cf0..148769984dcc 100644 FINAL_LIBRARY = "webrtc" -@@ -52,181 +62,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20717,7 +21897,6 @@ index 4307f8342cf0..148769984dcc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -20731,7 +21910,6 @@ index 4307f8342cf0..148769984dcc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -20764,7 +21942,6 @@ index 4307f8342cf0..148769984dcc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -20780,7 +21957,6 @@ index 4307f8342cf0..148769984dcc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -20821,6 +21997,24 @@ index 4307f8342cf0..148769984dcc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -20855,54 +22049,51 @@ index 4307f8342cf0..148769984dcc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("resource_adaptation_gn") diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -index 3235d95933ab..2389977fef71 100644 +index 6779dfa7cc01..75c30bf9abf4 100644 --- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build +++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -20917,7 +22108,7 @@ index 3235d95933ab..2389977fef71 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -20929,7 +22120,6 @@ index 3235d95933ab..2389977fef71 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -20942,7 +22132,6 @@ index 3235d95933ab..2389977fef71 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -20971,7 +22160,6 @@ index 3235d95933ab..2389977fef71 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -20987,7 +22175,6 @@ index 3235d95933ab..2389977fef71 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -21022,6 +22209,22 @@ index 3235d95933ab..2389977fef71 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -21062,37 +22265,32 @@ index 3235d95933ab..2389977fef71 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_sender_interface_gn") diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build -index 5554b058f188..c51ea8539ecc 100644 +index ef48a850a44f..7e63d38a987e 100644 --- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build +++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -21107,7 +22305,7 @@ index 5554b058f188..c51ea8539ecc 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21119,7 +22317,6 @@ index 5554b058f188..c51ea8539ecc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -21132,7 +22329,6 @@ index 5554b058f188..c51ea8539ecc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -21165,7 +22361,6 @@ index 5554b058f188..c51ea8539ecc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -21181,7 +22376,6 @@ index 5554b058f188..c51ea8539ecc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -21222,6 +22416,24 @@ index 5554b058f188..c51ea8539ecc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -21256,54 +22468,51 @@ index 5554b058f188..c51ea8539ecc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bitrate_allocator_gn") diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build -index 16240292e32c..de916669d8a7 100644 +index b70008b5486c..f62f036ab699 100644 --- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build +++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -21318,7 +22527,7 @@ index 16240292e32c..de916669d8a7 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21330,7 +22539,6 @@ index 16240292e32c..de916669d8a7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -21343,7 +22551,6 @@ index 16240292e32c..de916669d8a7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -21376,7 +22583,6 @@ index 16240292e32c..de916669d8a7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -21392,7 +22598,6 @@ index 16240292e32c..de916669d8a7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -21433,6 +22638,24 @@ index 16240292e32c..de916669d8a7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -21467,54 +22690,51 @@ index 16240292e32c..de916669d8a7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bitrate_configurator_gn") diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build -index caa099a6f298..638cce6bd141 100644 +index 1f5190649461..21474e0e8eb1 100644 --- third_party/libwebrtc/call/call_gn/moz.build +++ third_party/libwebrtc/call/call_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -21529,7 +22749,7 @@ index caa099a6f298..638cce6bd141 100644 FINAL_LIBRARY = "webrtc" -@@ -45,181 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21541,7 +22761,6 @@ index caa099a6f298..638cce6bd141 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -21555,7 +22774,6 @@ index caa099a6f298..638cce6bd141 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -21588,7 +22806,6 @@ index caa099a6f298..638cce6bd141 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -21604,7 +22821,6 @@ index caa099a6f298..638cce6bd141 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -21645,6 +22861,24 @@ index caa099a6f298..638cce6bd141 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -21679,54 +22913,51 @@ index caa099a6f298..638cce6bd141 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("call_gn") diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build -index bd3cda2a7ba3..7f6530082e0d 100644 +index 9782bf65f418..d02126352f57 100644 --- third_party/libwebrtc/call/call_interfaces_gn/moz.build +++ third_party/libwebrtc/call/call_interfaces_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -21741,7 +22972,7 @@ index bd3cda2a7ba3..7f6530082e0d 100644 FINAL_LIBRARY = "webrtc" -@@ -49,180 +59,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21753,7 +22984,6 @@ index bd3cda2a7ba3..7f6530082e0d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -21766,7 +22996,6 @@ index bd3cda2a7ba3..7f6530082e0d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -21799,7 +23028,6 @@ index bd3cda2a7ba3..7f6530082e0d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -21815,7 +23043,6 @@ index bd3cda2a7ba3..7f6530082e0d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -21856,6 +23083,24 @@ index bd3cda2a7ba3..7f6530082e0d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -21890,54 +23135,51 @@ index bd3cda2a7ba3..7f6530082e0d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("call_interfaces_gn") diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build -index 3fcacdf93f51..bb2bed8fee74 100644 +index 7be3350326f2..2d90f7bf5333 100644 --- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build +++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -21952,7 +23194,7 @@ index 3fcacdf93f51..bb2bed8fee74 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -21964,7 +23206,6 @@ index 3fcacdf93f51..bb2bed8fee74 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -21977,7 +23218,6 @@ index 3fcacdf93f51..bb2bed8fee74 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22010,7 +23250,6 @@ index 3fcacdf93f51..bb2bed8fee74 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -22026,7 +23265,6 @@ index 3fcacdf93f51..bb2bed8fee74 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -22064,6 +23302,22 @@ index 3fcacdf93f51..bb2bed8fee74 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -22104,37 +23358,32 @@ index 3fcacdf93f51..bb2bed8fee74 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("receive_stream_interface_gn") diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build -index 101cc096c354..db8671bd8a10 100644 +index 8e64b723410f..f0698d5291ce 100644 --- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build +++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -22149,7 +23398,7 @@ index 101cc096c354..db8671bd8a10 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22161,7 +23410,6 @@ index 101cc096c354..db8671bd8a10 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -22174,7 +23422,6 @@ index 101cc096c354..db8671bd8a10 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22207,7 +23454,6 @@ index 101cc096c354..db8671bd8a10 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -22223,7 +23469,6 @@ index 101cc096c354..db8671bd8a10 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -22264,6 +23509,24 @@ index 101cc096c354..db8671bd8a10 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -22298,54 +23561,51 @@ index 101cc096c354..db8671bd8a10 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_interfaces_gn") diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build -index f480482035e1..06947d77d001 100644 +index c3f5b80c8581..4b5e64a7b0a9 100644 --- third_party/libwebrtc/call/rtp_receiver_gn/moz.build +++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -22360,7 +23620,7 @@ index f480482035e1..06947d77d001 100644 FINAL_LIBRARY = "webrtc" -@@ -45,181 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22372,7 +23632,6 @@ index f480482035e1..06947d77d001 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -22386,7 +23645,6 @@ index f480482035e1..06947d77d001 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22419,7 +23677,6 @@ index f480482035e1..06947d77d001 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -22435,7 +23692,6 @@ index f480482035e1..06947d77d001 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -22476,6 +23732,24 @@ index f480482035e1..06947d77d001 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -22510,54 +23784,51 @@ index f480482035e1..06947d77d001 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_receiver_gn") diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build -index 52c4be0298ec..c29148b84f8d 100644 +index 1ed4fe8bb42c..2959f53394c1 100644 --- third_party/libwebrtc/call/rtp_sender_gn/moz.build +++ third_party/libwebrtc/call/rtp_sender_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -22572,7 +23843,7 @@ index 52c4be0298ec..c29148b84f8d 100644 FINAL_LIBRARY = "webrtc" -@@ -45,181 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22584,7 +23855,6 @@ index 52c4be0298ec..c29148b84f8d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -22598,7 +23868,6 @@ index 52c4be0298ec..c29148b84f8d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22631,7 +23900,6 @@ index 52c4be0298ec..c29148b84f8d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -22647,7 +23915,6 @@ index 52c4be0298ec..c29148b84f8d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -22688,6 +23955,24 @@ index 52c4be0298ec..c29148b84f8d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -22722,54 +24007,51 @@ index 52c4be0298ec..c29148b84f8d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_sender_gn") diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build -index 16e6085599bb..0799e640e201 100644 +index d6382035216b..b2052c8cd0fb 100644 --- third_party/libwebrtc/call/version_gn/moz.build +++ third_party/libwebrtc/call/version_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -22784,7 +24066,7 @@ index 16e6085599bb..0799e640e201 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22796,7 +24078,6 @@ index 16e6085599bb..0799e640e201 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -22805,7 +24086,6 @@ index 16e6085599bb..0799e640e201 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -22834,7 +24114,6 @@ index 16e6085599bb..0799e640e201 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -22850,7 +24129,6 @@ index 16e6085599bb..0799e640e201 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -22884,6 +24162,24 @@ index 16e6085599bb..0799e640e201 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -22917,8 +24213,7 @@ index 16e6085599bb..0799e640e201 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -22929,43 +24224,41 @@ index 16e6085599bb..0799e640e201 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("version_gn") diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build -index 9b78f6b935c2..b034dc02a528 100644 +index c441da830946..7eea7977d9df 100644 --- third_party/libwebrtc/call/video_stream_api_gn/moz.build +++ third_party/libwebrtc/call/video_stream_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -22980,7 +24273,7 @@ index 9b78f6b935c2..b034dc02a528 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -22992,7 +24285,6 @@ index 9b78f6b935c2..b034dc02a528 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -23005,7 +24297,6 @@ index 9b78f6b935c2..b034dc02a528 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -23038,7 +24329,6 @@ index 9b78f6b935c2..b034dc02a528 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -23054,7 +24344,6 @@ index 9b78f6b935c2..b034dc02a528 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -23095,6 +24384,24 @@ index 9b78f6b935c2..b034dc02a528 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -23129,38 +24436,36 @@ index 9b78f6b935c2..b034dc02a528 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" @@ -23333,17 +24638,16 @@ index 5526be7b8bed..30d931689b62 100644 Library("common_audio_avx2_gn") diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build -index 04d8ea56823e..2420d6b05b3a 100644 +index 9381d65ceafe..30c5b7a739fc 100644 --- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build +++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -23358,7 +24662,7 @@ index 04d8ea56823e..2420d6b05b3a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,158 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23370,7 +24674,6 @@ index 04d8ea56823e..2420d6b05b3a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -23379,7 +24682,6 @@ index 04d8ea56823e..2420d6b05b3a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -23408,7 +24710,6 @@ index 04d8ea56823e..2420d6b05b3a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -23424,7 +24725,6 @@ index 04d8ea56823e..2420d6b05b3a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -23460,6 +24760,22 @@ index 04d8ea56823e..2420d6b05b3a 100644 - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S" - ] - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -23500,37 +24816,32 @@ index 04d8ea56823e..2420d6b05b3a 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("common_audio_c_arm_asm_gn") diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build -index bb32b976d963..bafd0444d592 100644 +index c9d2d986330f..cbb28b276a83 100644 --- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build +++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -23545,27 +24856,12 @@ index bb32b976d963..bafd0444d592 100644 FINAL_LIBRARY = "webrtc" -@@ -39,6 +49,7 @@ UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/ring_buffer.c", - "/third_party/libwebrtc/common_audio/signal_processing/auto_corr_to_refl_coef.c", - "/third_party/libwebrtc/common_audio/signal_processing/auto_correlation.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", - "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", - "/third_party/libwebrtc/common_audio/signal_processing/copy_set_operations.c", - "/third_party/libwebrtc/common_audio/signal_processing/cross_correlation.c", -@@ -46,6 +57,7 @@ UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/downsample_fast.c", - "/third_party/libwebrtc/common_audio/signal_processing/energy.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar.c", -+ "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ma_fast_q12.c", - "/third_party/libwebrtc/common_audio/signal_processing/get_hanning_window.c", - "/third_party/libwebrtc/common_audio/signal_processing/get_scaling_square.c", -@@ -81,243 +93,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -80,113 +89,12 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- ++ DEFINES["_DEBUG"] = True + -if CONFIG["OS_TARGET"] == "Android": - - DEFINES["ANDROID"] = True @@ -23573,7 +24869,6 @@ index bb32b976d963..bafd0444d592 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -23584,9 +24879,12 @@ index bb32b976d963..bafd0444d592 100644 - "log" - ] - +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -23596,6 +24894,7 @@ index bb32b976d963..bafd0444d592 100644 - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] - @@ -23624,7 +24923,6 @@ index bb32b976d963..bafd0444d592 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -23634,9 +24932,11 @@ index bb32b976d963..bafd0444d592 100644 - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] -- ++if CONFIG["CPU_ARCH"] == "aarch64": + -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -23645,7 +24945,6 @@ index bb32b976d963..bafd0444d592 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -23670,18 +24969,20 @@ index bb32b976d963..bafd0444d592 100644 - "secur32", - "winmm" - ] ++ DEFINES["WEBRTC_ARCH_ARM64"] = True ++ DEFINES["WEBRTC_HAS_NEON"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -194,26 +102,10 @@ if CONFIG["OS_TARGET"] == "WINNT": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - -if CONFIG["CPU_ARCH"] == "arm": - - CFLAGS += [ @@ -23692,19 +24993,42 @@ index bb32b976d963..bafd0444d592 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "ppc64": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True + + SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c" +@@ -230,8 +122,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + + if CONFIG["CPU_ARCH"] == "mips64": + +- DEFINES["_GNU_SOURCE"] = True - + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", + "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", +@@ -246,85 +136,13 @@ if CONFIG["CPU_ARCH"] == "ppc64": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + -if CONFIG["CPU_ARCH"] == "riscv64": - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] +- + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -23745,8 +25069,7 @@ index bb32b976d963..bafd0444d592 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -23761,8 +25084,7 @@ index bb32b976d963..bafd0444d592 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" @@ -23770,57 +25092,63 @@ index bb32b976d963..bafd0444d592 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -332,21 +150,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- - DEFINES["_GNU_SOURCE"] = True - - UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c" - ] - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True -- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", -- "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" -- ] -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +@@ -354,14 +160,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" + ] + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c", +- "/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c", - "/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c" - ] + DEFINES["USE_X11"] = "1" Library("common_audio_c_gn") diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build -index a59fd66a6457..aab456e36133 100644 +index 90260ba8646c..54512f5b3543 100644 --- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build +++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -23835,7 +25163,7 @@ index a59fd66a6457..aab456e36133 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23847,7 +25175,6 @@ index a59fd66a6457..aab456e36133 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -23860,7 +25187,6 @@ index a59fd66a6457..aab456e36133 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -23893,7 +25219,6 @@ index a59fd66a6457..aab456e36133 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -23909,7 +25234,6 @@ index a59fd66a6457..aab456e36133 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -23950,6 +25274,24 @@ index a59fd66a6457..aab456e36133 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -23984,54 +25326,51 @@ index a59fd66a6457..aab456e36133 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("common_audio_cc_gn") diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build -index 5861713a4190..359abe387f7e 100644 +index c7b74d2e510c..1048f961f8f0 100644 --- third_party/libwebrtc/common_audio/common_audio_gn/moz.build +++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -24046,7 +25385,7 @@ index 5861713a4190..359abe387f7e 100644 FINAL_LIBRARY = "webrtc" -@@ -56,180 +66,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24058,7 +25397,6 @@ index 5861713a4190..359abe387f7e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -24071,7 +25409,6 @@ index 5861713a4190..359abe387f7e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -24104,7 +25441,6 @@ index 5861713a4190..359abe387f7e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -24120,7 +25456,6 @@ index 5861713a4190..359abe387f7e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -24161,6 +25496,24 @@ index 5861713a4190..359abe387f7e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -24195,47 +25548,45 @@ index 5861713a4190..359abe387f7e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("common_audio_gn") diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build -index f43ab4d16c60..cd2660ef1d90 100644 +index d51e7f4e3541..7d3d05a3e0af 100644 --- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build +++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build -@@ -12,13 +12,23 @@ AllowCompilerWarnings() +@@ -12,12 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -24243,7 +25594,6 @@ index f43ab4d16c60..cd2660ef1d90 100644 +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_ARCH_ARM64"] = True +DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["WEBRTC_LIBRARY_IMPL"] = True @@ -24259,7 +25609,7 @@ index f43ab4d16c60..cd2660ef1d90 100644 FINAL_LIBRARY = "webrtc" -@@ -47,148 +57,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,148 +56,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24410,10 +25760,10 @@ index f43ab4d16c60..cd2660ef1d90 100644 - Library("common_audio_neon_c_gn") diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -index 879f42419d37..b74c5a01877d 100644 +index 8df7017bff19..8ad021bcb676 100644 --- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build +++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build -@@ -12,13 +12,23 @@ AllowCompilerWarnings() +@@ -12,12 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -24421,7 +25771,6 @@ index 879f42419d37..b74c5a01877d 100644 +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_ARCH_ARM64"] = True +DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["WEBRTC_LIBRARY_IMPL"] = True @@ -24437,7 +25786,7 @@ index 879f42419d37..b74c5a01877d 100644 FINAL_LIBRARY = "webrtc" -@@ -46,148 +56,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,148 +55,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24778,17 +26127,16 @@ index 022ff2845548..81c11ad52373 100644 Library("common_audio_sse2_gn") diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build -index aed9a86bc767..2c669d283e7a 100644 +index 52e5226e09a0..f34663641568 100644 --- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build +++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -24803,7 +26151,7 @@ index aed9a86bc767..2c669d283e7a 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24815,7 +26163,6 @@ index aed9a86bc767..2c669d283e7a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -24828,7 +26175,6 @@ index aed9a86bc767..2c669d283e7a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -24861,7 +26207,6 @@ index aed9a86bc767..2c669d283e7a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -24877,7 +26222,6 @@ index aed9a86bc767..2c669d283e7a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -24918,6 +26262,24 @@ index aed9a86bc767..2c669d283e7a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -24952,54 +26314,51 @@ index aed9a86bc767..2c669d283e7a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("fir_filter_factory_gn") diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build -index e5721142ba9e..72b8c572db6e 100644 +index f931502550d0..3ccb102e85a9 100644 --- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build +++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -25014,7 +26373,7 @@ index e5721142ba9e..72b8c572db6e 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25026,7 +26385,6 @@ index e5721142ba9e..72b8c572db6e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -25035,7 +26393,6 @@ index e5721142ba9e..72b8c572db6e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -25064,7 +26421,6 @@ index e5721142ba9e..72b8c572db6e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -25080,7 +26436,6 @@ index e5721142ba9e..72b8c572db6e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -25111,6 +26466,22 @@ index e5721142ba9e..72b8c572db6e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -25151,37 +26522,32 @@ index e5721142ba9e..72b8c572db6e 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("fir_filter_gn") diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build -index b2ee6a36c707..e654a3d265e5 100644 +index 57e889cebd1b..8dc865c12715 100644 --- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build +++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -25196,7 +26562,7 @@ index b2ee6a36c707..e654a3d265e5 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25208,7 +26574,6 @@ index b2ee6a36c707..e654a3d265e5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -25221,7 +26586,6 @@ index b2ee6a36c707..e654a3d265e5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -25254,7 +26618,6 @@ index b2ee6a36c707..e654a3d265e5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -25270,7 +26633,6 @@ index b2ee6a36c707..e654a3d265e5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -25308,6 +26670,22 @@ index b2ee6a36c707..e654a3d265e5 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -25348,37 +26726,32 @@ index b2ee6a36c707..e654a3d265e5 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("sinc_resampler_gn") diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build -index e74d974d66d2..7d28d5168bc4 100644 +index 2f5623b61072..284df3697995 100644 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -25393,7 +26766,7 @@ index e74d974d66d2..7d28d5168bc4 100644 FINAL_LIBRARY = "webrtc" -@@ -43,101 +53,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,97 +52,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25405,7 +26778,6 @@ index e74d974d66d2..7d28d5168bc4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -25418,7 +26790,6 @@ index e74d974d66d2..7d28d5168bc4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -25451,7 +26822,6 @@ index e74d974d66d2..7d28d5168bc4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -25467,7 +26837,6 @@ index e74d974d66d2..7d28d5168bc4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -25496,7 +26865,7 @@ index e74d974d66d2..7d28d5168bc4 100644 if CONFIG["CPU_ARCH"] == "aarch64": -@@ -148,119 +64,29 @@ if CONFIG["CPU_ARCH"] == "aarch64": +@@ -144,133 +63,42 @@ if CONFIG["CPU_ARCH"] == "aarch64": "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" ] @@ -25513,15 +26882,33 @@ index e74d974d66d2..7d28d5168bc4 100644 - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc" - ] +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc" + ] + +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - if CONFIG["CPU_ARCH"] == "x86": +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" - ] - -if CONFIG["CPU_ARCH"] == "x86_64": - +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" - ] @@ -25575,7 +26962,8 @@ index e74d974d66d2..7d28d5168bc4 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" + UNIFIED_SOURCES += [ @@ -25584,12 +26972,10 @@ index e74d974d66d2..7d28d5168bc4 100644 -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": @@ -25600,18 +26986,17 @@ index e74d974d66d2..7d28d5168bc4 100644 "-msse2" ] -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc" ] -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": @@ -25624,17 +27009,16 @@ index e74d974d66d2..7d28d5168bc4 100644 Library("fft_size_128_gn") diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build -index 13785e1c90b5..1f876a0c4821 100644 +index 8639a7ae2e0e..3105fcab9d6b 100644 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -25649,7 +27033,7 @@ index 13785e1c90b5..1f876a0c4821 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25661,7 +27045,6 @@ index 13785e1c90b5..1f876a0c4821 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -25670,7 +27053,6 @@ index 13785e1c90b5..1f876a0c4821 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -25699,7 +27081,6 @@ index 13785e1c90b5..1f876a0c4821 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -25715,7 +27096,6 @@ index 13785e1c90b5..1f876a0c4821 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -25749,6 +27129,24 @@ index 13785e1c90b5..1f876a0c4821 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -25782,8 +27180,7 @@ index 13785e1c90b5..1f876a0c4821 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -25794,43 +27191,41 @@ index 13785e1c90b5..1f876a0c4821 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("fft_size_256_gn") diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build -index 16bb5784fdc4..7fd37387bf8c 100644 +index 4bae7df22774..5d194b7d816a 100644 --- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build +++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -25845,18 +27240,7 @@ index 16bb5784fdc4..7fd37387bf8c 100644 FINAL_LIBRARY = "webrtc" -@@ -30,6 +40,10 @@ LOCAL_INCLUDES += [ - "/tools/profiler/public" - ] - -+UNIFIED_SOURCES += [ -+ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -+] -+ - if not CONFIG["MOZ_DEBUG"]: - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -@@ -39,217 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25868,7 +27252,6 @@ index 16bb5784fdc4..7fd37387bf8c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -25877,7 +27260,6 @@ index 16bb5784fdc4..7fd37387bf8c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -25910,7 +27292,6 @@ index 16bb5784fdc4..7fd37387bf8c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -25930,7 +27311,6 @@ index 16bb5784fdc4..7fd37387bf8c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -25967,19 +27347,44 @@ index 16bb5784fdc4..7fd37387bf8c 100644 - - SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S" -- ] -- --if CONFIG["CPU_ARCH"] == "ppc64": -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] ++ UNIFIED_SOURCES += [ ++ "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c" +@@ -155,8 +70,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + + if CONFIG["CPU_ARCH"] == "mips64": + +- DEFINES["_GNU_SOURCE"] = True - + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] +@@ -167,107 +80,28 @@ if CONFIG["CPU_ARCH"] == "ppc64": + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + -if CONFIG["CPU_ARCH"] == "riscv64": - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] +- + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -26020,10 +27425,10 @@ index 16bb5784fdc4..7fd37387bf8c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -26040,38 +27445,36 @@ index 16bb5784fdc4..7fd37387bf8c 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" + ] + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": +- +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": - CFLAGS += [ - "-msse2" +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + UNIFIED_SOURCES += [ + "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" ] -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" -- ] -- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": +- DEFINES["_GNU_SOURCE"] = True +- - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c" - ] @@ -26079,17 +27482,16 @@ index 16bb5784fdc4..7fd37387bf8c 100644 Library("spl_sqrt_floor_gn") diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build -index baa9bb4286d4..39b206e220bc 100644 +index 869db500add1..9e5cdb7e6cce 100644 --- third_party/libwebrtc/common_video/common_video_gn/moz.build +++ third_party/libwebrtc/common_video/common_video_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -26104,7 +27506,7 @@ index baa9bb4286d4..39b206e220bc 100644 FINAL_LIBRARY = "webrtc" -@@ -55,173 +65,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -55,183 +64,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26116,7 +27518,6 @@ index baa9bb4286d4..39b206e220bc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -26129,7 +27530,6 @@ index baa9bb4286d4..39b206e220bc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -26158,7 +27558,6 @@ index baa9bb4286d4..39b206e220bc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -26174,7 +27573,6 @@ index baa9bb4286d4..39b206e220bc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -26212,6 +27610,24 @@ index baa9bb4286d4..39b206e220bc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -26246,54 +27662,51 @@ index baa9bb4286d4..39b206e220bc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("common_video_gn") diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build -index d4d9186a54f1..9b813d8a9936 100644 +index 6029016a0e4b..0bd2ab0ab211 100644 --- third_party/libwebrtc/common_video/frame_counts_gn/moz.build +++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -26308,7 +27721,7 @@ index d4d9186a54f1..9b813d8a9936 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26320,7 +27733,6 @@ index d4d9186a54f1..9b813d8a9936 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -26329,7 +27741,6 @@ index d4d9186a54f1..9b813d8a9936 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -26358,7 +27769,6 @@ index d4d9186a54f1..9b813d8a9936 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -26374,7 +27784,6 @@ index d4d9186a54f1..9b813d8a9936 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -26405,6 +27814,22 @@ index d4d9186a54f1..9b813d8a9936 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -26445,37 +27870,32 @@ index d4d9186a54f1..9b813d8a9936 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("frame_counts_gn") diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build -index 3f449754a910..d234443774e7 100644 +index b09e027176e1..0ab69dd829cb 100644 --- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build +++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -26490,7 +27910,7 @@ index 3f449754a910..d234443774e7 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26502,7 +27922,6 @@ index 3f449754a910..d234443774e7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -26515,7 +27934,6 @@ index 3f449754a910..d234443774e7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -26544,7 +27962,6 @@ index 3f449754a910..d234443774e7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -26560,7 +27977,6 @@ index 3f449754a910..d234443774e7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -26594,6 +28010,24 @@ index 3f449754a910..d234443774e7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -26628,54 +28062,51 @@ index 3f449754a910..d234443774e7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("generic_frame_descriptor_gn") diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build -index 7de3f4d4fa45..9a6ddc048f29 100644 +index 2ae645ea741d..82f547782ab4 100644 --- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build +++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -26690,7 +28121,7 @@ index 7de3f4d4fa45..9a6ddc048f29 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26702,7 +28133,6 @@ index 7de3f4d4fa45..9a6ddc048f29 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -26711,7 +28141,6 @@ index 7de3f4d4fa45..9a6ddc048f29 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -26740,7 +28169,6 @@ index 7de3f4d4fa45..9a6ddc048f29 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -26756,7 +28184,6 @@ index 7de3f4d4fa45..9a6ddc048f29 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -26787,6 +28214,22 @@ index 7de3f4d4fa45..9a6ddc048f29 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -26827,22 +28270,18 @@ index 7de3f4d4fa45..9a6ddc048f29 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("registered_field_trials_gn") @@ -26861,17 +28300,16 @@ index 2f9f14acb430..f8143d2798f0 100644 - Library("registered_field_trials_header_gn") diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -index 26a9e32bcfca..0542e02ca918 100644 +index ddc4a9cc8bdb..76b97cad597b 100644 --- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build +++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -26886,7 +28324,7 @@ index 26a9e32bcfca..0542e02ca918 100644 FINAL_LIBRARY = "webrtc" -@@ -47,173 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -26898,7 +28336,6 @@ index 26a9e32bcfca..0542e02ca918 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -26911,7 +28348,6 @@ index 26a9e32bcfca..0542e02ca918 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -26940,7 +28376,6 @@ index 26a9e32bcfca..0542e02ca918 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -26956,7 +28391,6 @@ index 26a9e32bcfca..0542e02ca918 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -26994,6 +28428,24 @@ index 26a9e32bcfca..0542e02ca918 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27028,54 +28480,51 @@ index 26a9e32bcfca..0542e02ca918 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_audio_gn") diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build -index 45a3e63aec78..ac2ed30a281a 100644 +index 270182b2be45..48e47598a034 100644 --- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build +++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -27090,7 +28539,7 @@ index 45a3e63aec78..ac2ed30a281a 100644 FINAL_LIBRARY = "webrtc" -@@ -48,173 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27102,7 +28551,6 @@ index 45a3e63aec78..ac2ed30a281a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -27115,7 +28563,6 @@ index 45a3e63aec78..ac2ed30a281a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -27144,7 +28591,6 @@ index 45a3e63aec78..ac2ed30a281a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -27160,7 +28606,6 @@ index 45a3e63aec78..ac2ed30a281a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -27198,6 +28643,24 @@ index 45a3e63aec78..ac2ed30a281a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27232,54 +28695,51 @@ index 45a3e63aec78..ac2ed30a281a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_bwe_gn") diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build -index c42692b9d6ce..69ae05ccd717 100644 +index 7a816f43289d..9c1a7bd6de3f 100644 --- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build +++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -27294,7 +28754,7 @@ index c42692b9d6ce..69ae05ccd717 100644 FINAL_LIBRARY = "webrtc" -@@ -46,173 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27306,7 +28766,6 @@ index c42692b9d6ce..69ae05ccd717 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -27319,7 +28778,6 @@ index c42692b9d6ce..69ae05ccd717 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -27348,7 +28806,6 @@ index c42692b9d6ce..69ae05ccd717 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -27364,7 +28821,6 @@ index c42692b9d6ce..69ae05ccd717 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -27402,6 +28858,24 @@ index c42692b9d6ce..69ae05ccd717 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27436,54 +28910,51 @@ index c42692b9d6ce..69ae05ccd717 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_field_gn") -diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build -index 8640eb610207..2f8b98d969bb 100644 ---- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build +index d9020f9a56c3..5362e89efe76 100644 +--- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -27498,7 +28969,200 @@ index 8640eb610207..2f8b98d969bb 100644 FINAL_LIBRARY = "webrtc" -@@ -45,169 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("rtc_event_log_parse_status_gn") +diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build +index ad1c2615454e..7838b57024ae 100644 +--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27510,7 +29174,6 @@ index 8640eb610207..2f8b98d969bb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -27523,7 +29186,6 @@ index 8640eb610207..2f8b98d969bb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -27552,7 +29214,6 @@ index 8640eb610207..2f8b98d969bb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -27568,7 +29229,6 @@ index 8640eb610207..2f8b98d969bb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -27602,6 +29262,24 @@ index 8640eb610207..2f8b98d969bb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27636,54 +29314,51 @@ index 8640eb610207..2f8b98d969bb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_number_encodings_gn") diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -index 215d3877992c..cc818e164af5 100644 +index a920e8d64332..ffe265db0851 100644 --- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build +++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -27698,7 +29373,7 @@ index 215d3877992c..cc818e164af5 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27710,7 +29385,6 @@ index 215d3877992c..cc818e164af5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -27723,7 +29397,6 @@ index 215d3877992c..cc818e164af5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -27752,7 +29425,6 @@ index 215d3877992c..cc818e164af5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -27768,7 +29440,6 @@ index 215d3877992c..cc818e164af5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -27806,6 +29477,24 @@ index 215d3877992c..cc818e164af5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -27840,54 +29529,51 @@ index 215d3877992c..cc818e164af5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_pacing_gn") diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -index 377fff3de42d..4982409d6855 100644 +index bb826e4a720e..b290dc3e72e7 100644 --- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build +++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -27902,7 +29588,7 @@ index 377fff3de42d..4982409d6855 100644 FINAL_LIBRARY = "webrtc" -@@ -46,180 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -27914,7 +29600,6 @@ index 377fff3de42d..4982409d6855 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -27927,7 +29612,6 @@ index 377fff3de42d..4982409d6855 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -27960,7 +29644,6 @@ index 377fff3de42d..4982409d6855 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -27976,7 +29659,6 @@ index 377fff3de42d..4982409d6855 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -28017,6 +29699,24 @@ index 377fff3de42d..4982409d6855 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -28051,54 +29751,51 @@ index 377fff3de42d..4982409d6855 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_rtp_rtcp_gn") diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -index ca1177cfbc7e..bd1c72b3304b 100644 +index 423abc9ec40c..cf444b4316cd 100644 --- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build +++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -28113,7 +29810,7 @@ index ca1177cfbc7e..bd1c72b3304b 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28125,7 +29822,6 @@ index ca1177cfbc7e..bd1c72b3304b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -28138,7 +29834,6 @@ index ca1177cfbc7e..bd1c72b3304b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -28167,7 +29862,6 @@ index ca1177cfbc7e..bd1c72b3304b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -28183,7 +29877,6 @@ index ca1177cfbc7e..bd1c72b3304b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -28221,6 +29914,24 @@ index ca1177cfbc7e..bd1c72b3304b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -28255,54 +29966,51 @@ index ca1177cfbc7e..bd1c72b3304b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_video_gn") diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -index 904e69bad5fb..bccd9167c023 100644 +index 14ba953e29d3..96ef93e69179 100644 --- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build +++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -28317,7 +30025,7 @@ index 904e69bad5fb..bccd9167c023 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28329,7 +30037,6 @@ index 904e69bad5fb..bccd9167c023 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -28342,7 +30049,6 @@ index 904e69bad5fb..bccd9167c023 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -28371,7 +30077,6 @@ index 904e69bad5fb..bccd9167c023 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -28387,7 +30092,6 @@ index 904e69bad5fb..bccd9167c023 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -28425,6 +30129,24 @@ index 904e69bad5fb..bccd9167c023 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -28459,54 +30181,51 @@ index 904e69bad5fb..bccd9167c023 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_stream_config_gn") diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build -index 663a50541bf6..e59cc7d23c35 100644 +index 6b56a082191f..f5bac588d11b 100644 --- third_party/libwebrtc/media/codec_gn/moz.build +++ third_party/libwebrtc/media/codec_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -28521,7 +30240,7 @@ index 663a50541bf6..e59cc7d23c35 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28533,7 +30252,6 @@ index 663a50541bf6..e59cc7d23c35 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -28546,7 +30264,6 @@ index 663a50541bf6..e59cc7d23c35 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -28575,7 +30292,6 @@ index 663a50541bf6..e59cc7d23c35 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -28591,7 +30307,6 @@ index 663a50541bf6..e59cc7d23c35 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -28629,6 +30344,24 @@ index 663a50541bf6..e59cc7d23c35 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -28663,54 +30396,51 @@ index 663a50541bf6..e59cc7d23c35 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("codec_gn") diff --git third_party/libwebrtc/media/delayable_gn/moz.build third_party/libwebrtc/media/delayable_gn/moz.build -index d08c0c2715ea..cfa5c0894424 100644 +index 12b25ac016e3..3a95f5ef1faf 100644 --- third_party/libwebrtc/media/delayable_gn/moz.build +++ third_party/libwebrtc/media/delayable_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -28725,7 +30455,7 @@ index d08c0c2715ea..cfa5c0894424 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28737,7 +30467,6 @@ index d08c0c2715ea..cfa5c0894424 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -28746,7 +30475,6 @@ index d08c0c2715ea..cfa5c0894424 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -28775,7 +30503,6 @@ index d08c0c2715ea..cfa5c0894424 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -28791,7 +30518,6 @@ index d08c0c2715ea..cfa5c0894424 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -28822,6 +30548,22 @@ index d08c0c2715ea..cfa5c0894424 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -28862,37 +30604,32 @@ index d08c0c2715ea..cfa5c0894424 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("delayable_gn") diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build -index 7f30939e28bc..7374b4245abe 100644 +index d031085023fb..863e7fde7105 100644 --- third_party/libwebrtc/media/media_channel_gn/moz.build +++ third_party/libwebrtc/media/media_channel_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -28907,7 +30644,7 @@ index 7f30939e28bc..7374b4245abe 100644 FINAL_LIBRARY = "webrtc" -@@ -39,169 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -28919,7 +30656,6 @@ index 7f30939e28bc..7374b4245abe 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -28933,7 +30669,6 @@ index 7f30939e28bc..7374b4245abe 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -28966,7 +30701,6 @@ index 7f30939e28bc..7374b4245abe 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -28982,7 +30716,6 @@ index 7f30939e28bc..7374b4245abe 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -29020,6 +30753,22 @@ index 7f30939e28bc..7374b4245abe 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -29060,37 +30809,32 @@ index 7f30939e28bc..7374b4245abe 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("media_channel_gn") diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build -index 4147b218c069..9e21e903f397 100644 +index 49b90be2fc51..7f0b3bc10a7f 100644 --- third_party/libwebrtc/media/media_channel_impl_gn/moz.build +++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -29105,7 +30849,7 @@ index 4147b218c069..9e21e903f397 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29117,7 +30861,6 @@ index 4147b218c069..9e21e903f397 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -29126,7 +30869,6 @@ index 4147b218c069..9e21e903f397 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -29155,7 +30897,6 @@ index 4147b218c069..9e21e903f397 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -29171,7 +30912,6 @@ index 4147b218c069..9e21e903f397 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -29202,6 +30942,22 @@ index 4147b218c069..9e21e903f397 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -29242,37 +30998,32 @@ index 4147b218c069..9e21e903f397 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("media_channel_impl_gn") diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build -index c72da4336a49..bdc3691547e6 100644 +index fb30505356f2..28762fdde6a3 100644 --- third_party/libwebrtc/media/media_constants_gn/moz.build +++ third_party/libwebrtc/media/media_constants_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -29287,7 +31038,7 @@ index c72da4336a49..bdc3691547e6 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29299,7 +31050,6 @@ index c72da4336a49..bdc3691547e6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -29308,7 +31058,6 @@ index c72da4336a49..bdc3691547e6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -29337,7 +31086,6 @@ index c72da4336a49..bdc3691547e6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -29353,7 +31101,6 @@ index c72da4336a49..bdc3691547e6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -29387,6 +31134,24 @@ index c72da4336a49..bdc3691547e6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -29420,8 +31185,7 @@ index c72da4336a49..bdc3691547e6 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -29432,43 +31196,41 @@ index c72da4336a49..bdc3691547e6 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("media_constants_gn") diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build -index eb0f6fe980ab..82cdbd6123c1 100644 +index 73ebe8374986..c11ccc5b2902 100644 --- third_party/libwebrtc/media/rid_description_gn/moz.build +++ third_party/libwebrtc/media/rid_description_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -29483,7 +31245,7 @@ index eb0f6fe980ab..82cdbd6123c1 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29495,7 +31257,6 @@ index eb0f6fe980ab..82cdbd6123c1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -29504,7 +31265,6 @@ index eb0f6fe980ab..82cdbd6123c1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -29533,7 +31293,6 @@ index eb0f6fe980ab..82cdbd6123c1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -29549,7 +31308,6 @@ index eb0f6fe980ab..82cdbd6123c1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -29580,6 +31338,22 @@ index eb0f6fe980ab..82cdbd6123c1 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -29620,249 +31394,32 @@ index eb0f6fe980ab..82cdbd6123c1 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rid_description_gn") -diff --git third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -index 83188aa5862a..6358dd3a18f5 100644 ---- third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -+++ third_party/libwebrtc/media/rtc_encoder_simulcast_proxy_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() - DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True - DEFINES["RTC_ENABLE_VP9"] = True -+DEFINES["USE_GLIB"] = "1" -+DEFINES["USE_OZONE"] = "1" -+DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True - DEFINES["WEBRTC_MOZILLA_BUILD"] = True - DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" -+DEFINES["WEBRTC_POSIX"] = True - DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" -+DEFINES["_FILE_OFFSET_BITS"] = "64" -+DEFINES["_LARGEFILE64_SOURCE"] = True -+DEFINES["_LARGEFILE_SOURCE"] = True -+DEFINES["__STDC_CONSTANT_MACROS"] = True -+DEFINES["__STDC_FORMAT_MACROS"] = True - - FINAL_LIBRARY = "webrtc" - -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: - if CONFIG["MOZ_DEBUG"] == "1": - - DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- --if CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["ANDROID"] = True -- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True -- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_AURA"] = "1" -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_NSS_CERTS"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_UDEV"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "rt" -- ] -- --if CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["USE_GLIB"] = "1" -- DEFINES["USE_OZONE"] = "1" -- DEFINES["USE_X11"] = "1" -- DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_FILE_OFFSET_BITS"] = "64" -- DEFINES["_LARGEFILE64_SOURCE"] = True -- DEFINES["_LARGEFILE_SOURCE"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- --if CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True -- DEFINES["NOMINMAX"] = True -- DEFINES["NTDDI_VERSION"] = "0x0A000000" -- DEFINES["PSAPI_VERSION"] = "2" -- DEFINES["UNICODE"] = True -- DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_WIN"] = True -- DEFINES["WIN32"] = True -- DEFINES["WIN32_LEAN_AND_MEAN"] = True -- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" -- DEFINES["WINVER"] = "0x0A00" -- DEFINES["_ATL_NO_OPENGL"] = True -- DEFINES["_CRT_RAND_S"] = True -- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True -- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True -- DEFINES["_HAS_EXCEPTIONS"] = "0" -- DEFINES["_HAS_NODISCARD"] = True -- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True -- DEFINES["_SECURE_ATL"] = True -- DEFINES["_UNICODE"] = True -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["CPU_ARCH"] == "aarch64": - - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- -- OS_LIBS += [ -- "android_support" -- ] -- --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True -- --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True -+ DEFINES["USE_X11"] = "1" - - Library("rtc_encoder_simulcast_proxy_gn") diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build -index 2dac02c03b78..d646c162bd84 100644 +index a48b9886dd24..fcc31ea11376 100644 --- third_party/libwebrtc/media/rtc_media_base_gn/moz.build +++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -29877,7 +31434,7 @@ index 2dac02c03b78..d646c162bd84 100644 FINAL_LIBRARY = "webrtc" -@@ -46,181 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -29889,7 +31446,6 @@ index 2dac02c03b78..d646c162bd84 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -29903,7 +31459,6 @@ index 2dac02c03b78..d646c162bd84 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -29936,7 +31491,6 @@ index 2dac02c03b78..d646c162bd84 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -29952,7 +31506,6 @@ index 2dac02c03b78..d646c162bd84 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -29993,6 +31546,24 @@ index 2dac02c03b78..d646c162bd84 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -30027,54 +31598,51 @@ index 2dac02c03b78..d646c162bd84 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_media_base_gn") diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build -index 83875d21aec4..f5f9daef4e07 100644 +index 568632c48fb8..94c43caef47b 100644 --- third_party/libwebrtc/media/rtc_media_config_gn/moz.build +++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -30089,7 +31657,7 @@ index 83875d21aec4..f5f9daef4e07 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30101,7 +31669,6 @@ index 83875d21aec4..f5f9daef4e07 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -30110,7 +31677,6 @@ index 83875d21aec4..f5f9daef4e07 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -30139,7 +31705,6 @@ index 83875d21aec4..f5f9daef4e07 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -30155,7 +31720,6 @@ index 83875d21aec4..f5f9daef4e07 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -30186,6 +31750,22 @@ index 83875d21aec4..f5f9daef4e07 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -30226,37 +31806,32 @@ index 83875d21aec4..f5f9daef4e07 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rtc_media_config_gn") diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build -index 204b7e3ba39d..288ff0182765 100644 +index 4293ba6d9066..01eda12bd559 100644 --- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build +++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -30271,7 +31846,7 @@ index 204b7e3ba39d..288ff0182765 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30283,7 +31858,6 @@ index 204b7e3ba39d..288ff0182765 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -30297,7 +31871,6 @@ index 204b7e3ba39d..288ff0182765 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -30330,7 +31903,6 @@ index 204b7e3ba39d..288ff0182765 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -30346,7 +31918,6 @@ index 204b7e3ba39d..288ff0182765 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -30387,6 +31958,24 @@ index 204b7e3ba39d..288ff0182765 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -30421,54 +32010,51 @@ index 204b7e3ba39d..288ff0182765 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_simulcast_encoder_adapter_gn") diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build -index bf9d15d19351..2078e36a102c 100644 +index d12f755865a5..a5d44da104b6 100644 --- third_party/libwebrtc/media/rtp_utils_gn/moz.build +++ third_party/libwebrtc/media/rtp_utils_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -30483,7 +32069,7 @@ index bf9d15d19351..2078e36a102c 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30495,7 +32081,6 @@ index bf9d15d19351..2078e36a102c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -30504,7 +32089,6 @@ index bf9d15d19351..2078e36a102c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -30533,7 +32117,6 @@ index bf9d15d19351..2078e36a102c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -30549,7 +32132,6 @@ index bf9d15d19351..2078e36a102c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -30580,6 +32162,22 @@ index bf9d15d19351..2078e36a102c 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -30620,37 +32218,32 @@ index bf9d15d19351..2078e36a102c 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rtp_utils_gn") diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build -index eeae95fb92bb..88cba2da6736 100644 +index 2deba906b932..65ec7aef0025 100644 --- third_party/libwebrtc/media/stream_params_gn/moz.build +++ third_party/libwebrtc/media/stream_params_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -30665,7 +32258,7 @@ index eeae95fb92bb..88cba2da6736 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30677,7 +32270,6 @@ index eeae95fb92bb..88cba2da6736 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -30686,7 +32278,6 @@ index eeae95fb92bb..88cba2da6736 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -30715,7 +32306,6 @@ index eeae95fb92bb..88cba2da6736 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -30731,7 +32321,6 @@ index eeae95fb92bb..88cba2da6736 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -30762,6 +32351,22 @@ index eeae95fb92bb..88cba2da6736 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -30802,37 +32407,32 @@ index eeae95fb92bb..88cba2da6736 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("stream_params_gn") diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build -index 2b7ca3a3e87e..7d07c1492b6f 100644 +index f599fadae2f0..90a52e406005 100644 --- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build +++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -30847,7 +32447,7 @@ index 2b7ca3a3e87e..7d07c1492b6f 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -30859,7 +32459,6 @@ index 2b7ca3a3e87e..7d07c1492b6f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -30872,7 +32471,6 @@ index 2b7ca3a3e87e..7d07c1492b6f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -30901,7 +32499,6 @@ index 2b7ca3a3e87e..7d07c1492b6f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -30917,7 +32514,6 @@ index 2b7ca3a3e87e..7d07c1492b6f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -30955,6 +32551,24 @@ index 2b7ca3a3e87e..7d07c1492b6f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -30989,54 +32603,51 @@ index 2b7ca3a3e87e..7d07c1492b6f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("async_audio_processing_gn") diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build -index d4baf2203b1b..87ae061e3ff7 100644 +index 03d99c93b89a..a1a7c66b6ff0 100644 --- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -31051,7 +32662,7 @@ index d4baf2203b1b..87ae061e3ff7 100644 FINAL_LIBRARY = "webrtc" -@@ -47,180 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31063,7 +32674,6 @@ index d4baf2203b1b..87ae061e3ff7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -31076,7 +32686,6 @@ index d4baf2203b1b..87ae061e3ff7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -31109,7 +32718,6 @@ index d4baf2203b1b..87ae061e3ff7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -31125,7 +32733,6 @@ index d4baf2203b1b..87ae061e3ff7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -31166,6 +32773,24 @@ index d4baf2203b1b..87ae061e3ff7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31200,54 +32825,51 @@ index d4baf2203b1b..87ae061e3ff7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_coding_gn") diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build -index 6ca2cd72d509..76abc55f33d7 100644 +index 2826ed8642f9..e8194cf79b99 100644 --- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -31262,7 +32884,7 @@ index 6ca2cd72d509..76abc55f33d7 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31274,7 +32896,6 @@ index 6ca2cd72d509..76abc55f33d7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -31283,7 +32904,6 @@ index 6ca2cd72d509..76abc55f33d7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -31312,7 +32932,6 @@ index 6ca2cd72d509..76abc55f33d7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -31328,7 +32947,6 @@ index 6ca2cd72d509..76abc55f33d7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -31359,6 +32977,22 @@ index 6ca2cd72d509..76abc55f33d7 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -31399,37 +33033,32 @@ index 6ca2cd72d509..76abc55f33d7 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_coding_module_typedefs_gn") diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build -index 326fcf31c6a7..23ee45b374f0 100644 +index bf852e8442a4..de2e04dffe32 100644 --- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -31444,7 +33073,7 @@ index 326fcf31c6a7..23ee45b374f0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31456,7 +33085,6 @@ index 326fcf31c6a7..23ee45b374f0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -31469,7 +33097,6 @@ index 326fcf31c6a7..23ee45b374f0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -31498,7 +33125,6 @@ index 326fcf31c6a7..23ee45b374f0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -31514,7 +33140,6 @@ index 326fcf31c6a7..23ee45b374f0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -31552,6 +33177,24 @@ index 326fcf31c6a7..23ee45b374f0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31586,54 +33229,51 @@ index 326fcf31c6a7..23ee45b374f0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_coding_opus_common_gn") diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build -index fb97226f4ae2..df0f8ac0d3a5 100644 +index 56b6d50f6cb7..7ef50512ec05 100644 --- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -31648,7 +33288,7 @@ index fb97226f4ae2..df0f8ac0d3a5 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31660,7 +33300,6 @@ index fb97226f4ae2..df0f8ac0d3a5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -31673,7 +33312,6 @@ index fb97226f4ae2..df0f8ac0d3a5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -31706,7 +33344,6 @@ index fb97226f4ae2..df0f8ac0d3a5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -31722,7 +33359,6 @@ index fb97226f4ae2..df0f8ac0d3a5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -31763,6 +33399,24 @@ index fb97226f4ae2..df0f8ac0d3a5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31797,54 +33451,51 @@ index fb97226f4ae2..df0f8ac0d3a5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_encoder_cng_gn") diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build -index b3fc67923be9..e421d9f5d68d 100644 +index 37cf81ad9f54..a17cc5124685 100644 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -31859,7 +33510,7 @@ index b3fc67923be9..e421d9f5d68d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -31871,7 +33522,6 @@ index b3fc67923be9..e421d9f5d68d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -31880,7 +33530,6 @@ index b3fc67923be9..e421d9f5d68d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -31909,7 +33558,6 @@ index b3fc67923be9..e421d9f5d68d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -31925,7 +33573,6 @@ index b3fc67923be9..e421d9f5d68d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -31959,6 +33606,24 @@ index b3fc67923be9..e421d9f5d68d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -31992,8 +33657,7 @@ index b3fc67923be9..e421d9f5d68d 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -32004,43 +33668,41 @@ index b3fc67923be9..e421d9f5d68d 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_network_adaptor_config_gn") diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build -index 6d879a48fd42..74cce762e204 100644 +index 1d0905ebc109..ba348ebeecff 100644 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -32055,7 +33717,7 @@ index 6d879a48fd42..74cce762e204 100644 FINAL_LIBRARY = "webrtc" -@@ -53,180 +63,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -53,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32067,7 +33729,6 @@ index 6d879a48fd42..74cce762e204 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -32080,7 +33741,6 @@ index 6d879a48fd42..74cce762e204 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -32113,7 +33773,6 @@ index 6d879a48fd42..74cce762e204 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -32129,7 +33788,6 @@ index 6d879a48fd42..74cce762e204 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -32170,6 +33828,24 @@ index 6d879a48fd42..74cce762e204 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32204,54 +33880,51 @@ index 6d879a48fd42..74cce762e204 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_network_adaptor_gn") diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -index e9a56835c659..898109fb19ea 100644 +index 206a4ae313fd..145619c84116 100644 --- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -32266,7 +33939,7 @@ index e9a56835c659..898109fb19ea 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32278,7 +33951,6 @@ index e9a56835c659..898109fb19ea 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -32291,7 +33963,6 @@ index e9a56835c659..898109fb19ea 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -32324,7 +33995,6 @@ index e9a56835c659..898109fb19ea 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -32340,7 +34010,6 @@ index e9a56835c659..898109fb19ea 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -32381,6 +34050,24 @@ index e9a56835c659..898109fb19ea 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32415,54 +34102,51 @@ index e9a56835c659..898109fb19ea 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("default_neteq_factory_gn") diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -index aca1360301d7..280f8b76d783 100644 +index 8322910094eb..7bfe819841af 100644 --- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -32477,7 +34161,7 @@ index aca1360301d7..280f8b76d783 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32489,7 +34173,6 @@ index aca1360301d7..280f8b76d783 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -32498,7 +34181,6 @@ index aca1360301d7..280f8b76d783 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -32527,7 +34209,6 @@ index aca1360301d7..280f8b76d783 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -32543,7 +34224,6 @@ index aca1360301d7..280f8b76d783 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -32577,6 +34257,24 @@ index aca1360301d7..280f8b76d783 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32610,8 +34308,7 @@ index aca1360301d7..280f8b76d783 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -32622,43 +34319,41 @@ index aca1360301d7..280f8b76d783 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("g711_c_gn") diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -index 1be3ba93cd84..96b11b68411c 100644 +index 3a21cddc41e2..80e618a7fa10 100644 --- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -32673,7 +34368,7 @@ index 1be3ba93cd84..96b11b68411c 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32685,7 +34380,6 @@ index 1be3ba93cd84..96b11b68411c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -32698,7 +34392,6 @@ index 1be3ba93cd84..96b11b68411c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -32727,7 +34420,6 @@ index 1be3ba93cd84..96b11b68411c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -32743,7 +34435,6 @@ index 1be3ba93cd84..96b11b68411c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -32781,6 +34472,24 @@ index 1be3ba93cd84..96b11b68411c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -32815,54 +34524,51 @@ index 1be3ba93cd84..96b11b68411c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("g711_gn") diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -index 22201e8b6d92..231176b284c1 100644 +index dc05788b8021..add81cce3212 100644 --- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -32877,7 +34583,7 @@ index 22201e8b6d92..231176b284c1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -32889,7 +34595,6 @@ index 22201e8b6d92..231176b284c1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -32898,7 +34603,6 @@ index 22201e8b6d92..231176b284c1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -32927,7 +34631,6 @@ index 22201e8b6d92..231176b284c1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -32943,7 +34646,6 @@ index 22201e8b6d92..231176b284c1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -32977,6 +34679,24 @@ index 22201e8b6d92..231176b284c1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33010,8 +34730,7 @@ index 22201e8b6d92..231176b284c1 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -33022,43 +34741,41 @@ index 22201e8b6d92..231176b284c1 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("g722_c_gn") diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -index 5c8e9c939f0d..9cb8fb2757cb 100644 +index 910eef267ffc..d53536655acd 100644 --- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -33073,7 +34790,7 @@ index 5c8e9c939f0d..9cb8fb2757cb 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33085,7 +34802,6 @@ index 5c8e9c939f0d..9cb8fb2757cb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -33098,7 +34814,6 @@ index 5c8e9c939f0d..9cb8fb2757cb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -33127,7 +34842,6 @@ index 5c8e9c939f0d..9cb8fb2757cb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -33143,7 +34857,6 @@ index 5c8e9c939f0d..9cb8fb2757cb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -33181,6 +34894,24 @@ index 5c8e9c939f0d..9cb8fb2757cb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33215,54 +34946,51 @@ index 5c8e9c939f0d..9cb8fb2757cb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("g722_gn") diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build -index 0a359fb945d6..ba4e0d10214e 100644 +index 1ff9bdf07a4b..9871fbb1c38f 100644 --- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -33277,7 +35005,7 @@ index 0a359fb945d6..ba4e0d10214e 100644 FINAL_LIBRARY = "webrtc" -@@ -111,180 +121,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -111,190 +120,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33289,7 +35017,6 @@ index 0a359fb945d6..ba4e0d10214e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -33302,7 +35029,6 @@ index 0a359fb945d6..ba4e0d10214e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -33335,7 +35061,6 @@ index 0a359fb945d6..ba4e0d10214e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -33351,7 +35076,6 @@ index 0a359fb945d6..ba4e0d10214e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -33392,6 +35116,24 @@ index 0a359fb945d6..ba4e0d10214e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33426,54 +35168,51 @@ index 0a359fb945d6..ba4e0d10214e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CFLAGS += [ -- "-msse2" -- ] -- + CFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CFLAGS += [ - "-msse2" - ] +- CFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("ilbc_c_gn") diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build -index 8e7799870cb7..8b538a1b1153 100644 +index 4a7279386ee5..b1811c428dda 100644 --- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -33488,7 +35227,7 @@ index 8e7799870cb7..8b538a1b1153 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33500,7 +35239,6 @@ index 8e7799870cb7..8b538a1b1153 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -33513,7 +35251,6 @@ index 8e7799870cb7..8b538a1b1153 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -33546,7 +35283,6 @@ index 8e7799870cb7..8b538a1b1153 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -33562,7 +35298,6 @@ index 8e7799870cb7..8b538a1b1153 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -33603,6 +35338,24 @@ index 8e7799870cb7..8b538a1b1153 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -33637,54 +35390,51 @@ index 8e7799870cb7..8b538a1b1153 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("ilbc_gn") diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -index 1d38d04fc31f..1b506bf46ef4 100644 +index bb9cdf4460c3..00d886763be2 100644 --- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -33699,7 +35449,7 @@ index 1d38d04fc31f..1b506bf46ef4 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33711,7 +35461,6 @@ index 1d38d04fc31f..1b506bf46ef4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -33720,7 +35469,6 @@ index 1d38d04fc31f..1b506bf46ef4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -33749,7 +35497,6 @@ index 1d38d04fc31f..1b506bf46ef4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -33765,7 +35512,6 @@ index 1d38d04fc31f..1b506bf46ef4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -33796,6 +35542,22 @@ index 1d38d04fc31f..1b506bf46ef4 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -33836,37 +35598,32 @@ index 1d38d04fc31f..1b506bf46ef4 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("isac_bwinfo_gn") diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build -index f2c1438a48b4..9cc05bd7873a 100644 +index 86f566663ad5..dbed4ddcb476 100644 --- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -33881,7 +35638,7 @@ index f2c1438a48b4..9cc05bd7873a 100644 FINAL_LIBRARY = "webrtc" -@@ -46,165 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,175 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33893,7 +35650,6 @@ index f2c1438a48b4..9cc05bd7873a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -33902,7 +35658,6 @@ index f2c1438a48b4..9cc05bd7873a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -33931,7 +35686,6 @@ index f2c1438a48b4..9cc05bd7873a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -33947,7 +35701,6 @@ index f2c1438a48b4..9cc05bd7873a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -33981,6 +35734,24 @@ index f2c1438a48b4..9cc05bd7873a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34014,8 +35785,7 @@ index f2c1438a48b4..9cc05bd7873a 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -34026,43 +35796,41 @@ index f2c1438a48b4..9cc05bd7873a 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("isac_vad_gn") diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build -index d5d8bda8998f..3ef348f9dc74 100644 +index b642ffbe952b..9c04c9bb3900 100644 --- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -34077,7 +35845,7 @@ index d5d8bda8998f..3ef348f9dc74 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34089,7 +35857,6 @@ index d5d8bda8998f..3ef348f9dc74 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -34102,7 +35869,6 @@ index d5d8bda8998f..3ef348f9dc74 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -34131,7 +35897,6 @@ index d5d8bda8998f..3ef348f9dc74 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -34147,7 +35912,6 @@ index d5d8bda8998f..3ef348f9dc74 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -34185,6 +35949,24 @@ index d5d8bda8998f..3ef348f9dc74 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34219,54 +36001,51 @@ index d5d8bda8998f..3ef348f9dc74 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("legacy_encoded_audio_frame_gn") diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build -index 26eeafb7e316..82d33d778d32 100644 +index 823aea6ddaa0..ecf6b3b2fde3 100644 --- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -34281,7 +36060,7 @@ index 26eeafb7e316..82d33d778d32 100644 FINAL_LIBRARY = "webrtc" -@@ -78,180 +88,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -78,190 +87,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34293,7 +36072,6 @@ index 26eeafb7e316..82d33d778d32 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -34306,7 +36084,6 @@ index 26eeafb7e316..82d33d778d32 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -34339,7 +36116,6 @@ index 26eeafb7e316..82d33d778d32 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -34355,7 +36131,6 @@ index 26eeafb7e316..82d33d778d32 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -34396,6 +36171,24 @@ index 26eeafb7e316..82d33d778d32 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34430,54 +36223,51 @@ index 26eeafb7e316..82d33d778d32 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("neteq_gn") diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build -index 5a5a7f57d3ad..aca761c6d525 100644 +index 54863e95aee7..936368e4205a 100644 --- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -34492,7 +36282,7 @@ index 5a5a7f57d3ad..aca761c6d525 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34504,7 +36294,6 @@ index 5a5a7f57d3ad..aca761c6d525 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -34513,7 +36302,6 @@ index 5a5a7f57d3ad..aca761c6d525 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -34542,7 +36330,6 @@ index 5a5a7f57d3ad..aca761c6d525 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -34558,7 +36345,6 @@ index 5a5a7f57d3ad..aca761c6d525 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -34592,6 +36378,24 @@ index 5a5a7f57d3ad..aca761c6d525 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34625,8 +36429,7 @@ index 5a5a7f57d3ad..aca761c6d525 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -34637,43 +36440,41 @@ index 5a5a7f57d3ad..aca761c6d525 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("pcm16b_c_gn") diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build -index 404aea0e9b73..9aaf0e91ceb9 100644 +index afee108cb3a1..436a0dda6fd4 100644 --- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -34688,7 +36489,7 @@ index 404aea0e9b73..9aaf0e91ceb9 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34700,7 +36501,6 @@ index 404aea0e9b73..9aaf0e91ceb9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -34713,7 +36513,6 @@ index 404aea0e9b73..9aaf0e91ceb9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -34742,7 +36541,6 @@ index 404aea0e9b73..9aaf0e91ceb9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -34758,7 +36556,6 @@ index 404aea0e9b73..9aaf0e91ceb9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -34796,6 +36593,24 @@ index 404aea0e9b73..9aaf0e91ceb9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -34830,54 +36645,51 @@ index 404aea0e9b73..9aaf0e91ceb9 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("pcm16b_gn") diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build -index 1be0caf7d3bf..dc361b3de675 100644 +index c4fa5c8bc4fe..7be902bc7b5d 100644 --- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -34892,7 +36704,7 @@ index 1be0caf7d3bf..dc361b3de675 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34904,7 +36716,6 @@ index 1be0caf7d3bf..dc361b3de675 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -34917,7 +36728,6 @@ index 1be0caf7d3bf..dc361b3de675 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -34950,7 +36760,6 @@ index 1be0caf7d3bf..dc361b3de675 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -34966,7 +36775,6 @@ index 1be0caf7d3bf..dc361b3de675 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -35007,6 +36815,24 @@ index 1be0caf7d3bf..dc361b3de675 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -35041,54 +36867,51 @@ index 1be0caf7d3bf..dc361b3de675 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("red_gn") diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build -index 5d9c0de175b9..441b6ed8b9d1 100644 +index 4a9c24069e74..ea61654f618e 100644 --- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -35103,7 +36926,7 @@ index 5d9c0de175b9..441b6ed8b9d1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35115,7 +36938,6 @@ index 5d9c0de175b9..441b6ed8b9d1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -35128,7 +36950,6 @@ index 5d9c0de175b9..441b6ed8b9d1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -35161,7 +36982,6 @@ index 5d9c0de175b9..441b6ed8b9d1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -35177,7 +36997,6 @@ index 5d9c0de175b9..441b6ed8b9d1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -35218,6 +37037,24 @@ index 5d9c0de175b9..441b6ed8b9d1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -35252,47 +37089,45 @@ index 5d9c0de175b9..441b6ed8b9d1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_cng_gn") diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build -index 1eff483cac09..0666dd066ba4 100644 +index 99ea47c13acc..1edab76c795b 100644 --- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build -@@ -12,14 +12,24 @@ AllowCompilerWarnings() +@@ -12,6 +12,9 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -35301,9 +37136,8 @@ index 1eff483cac09..0666dd066ba4 100644 +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_CODEC_ILBC"] = True DEFINES["WEBRTC_CODEC_OPUS"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True +@@ -19,7 +22,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1" @@ -35317,7 +37151,7 @@ index 1eff483cac09..0666dd066ba4 100644 FINAL_LIBRARY = "webrtc" -@@ -48,173 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,183 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35329,7 +37163,6 @@ index 1eff483cac09..0666dd066ba4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -35342,7 +37175,6 @@ index 1eff483cac09..0666dd066ba4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -35371,7 +37203,6 @@ index 1eff483cac09..0666dd066ba4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -35387,7 +37218,6 @@ index 1eff483cac09..0666dd066ba4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -35425,6 +37255,24 @@ index 1eff483cac09..0666dd066ba4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -35459,47 +37307,45 @@ index 1eff483cac09..0666dd066ba4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_multiopus_gn") diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build -index 2913ddd3f624..f4d4fb9ca0cc 100644 +index 49fb552b0d38..bdf1cbbf4c27 100644 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build -@@ -12,14 +12,24 @@ AllowCompilerWarnings() +@@ -12,6 +12,9 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -35508,9 +37354,8 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_CODEC_ILBC"] = True DEFINES["WEBRTC_CODEC_OPUS"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True +@@ -19,7 +22,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1" @@ -35524,7 +37369,7 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 FINAL_LIBRARY = "webrtc" -@@ -48,180 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35536,7 +37381,6 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -35549,7 +37393,6 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -35582,7 +37425,6 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -35598,7 +37440,6 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -35639,6 +37480,24 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -35673,47 +37532,45 @@ index 2913ddd3f624..f4d4fb9ca0cc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_opus_gn") diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build -index bfa798809d55..cdee3fcc3acc 100644 +index 20e1d37306c9..604d2ff1160d 100644 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build -@@ -12,14 +12,24 @@ AllowCompilerWarnings() +@@ -12,6 +12,9 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -35722,9 +37579,8 @@ index bfa798809d55..cdee3fcc3acc 100644 +DEFINES["WEBRTC_BSD"] = True DEFINES["WEBRTC_CODEC_ILBC"] = True DEFINES["WEBRTC_CODEC_OPUS"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" - DEFINES["WEBRTC_LIBRARY_IMPL"] = True +@@ -19,7 +22,13 @@ DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" DEFINES["WEBRTC_OPUS_SUPPORT_120MS_PTIME"] = "1" @@ -35738,7 +37594,7 @@ index bfa798809d55..cdee3fcc3acc 100644 FINAL_LIBRARY = "webrtc" -@@ -47,173 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,183 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35750,7 +37606,6 @@ index bfa798809d55..cdee3fcc3acc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -35763,7 +37618,6 @@ index bfa798809d55..cdee3fcc3acc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -35792,7 +37646,6 @@ index bfa798809d55..cdee3fcc3acc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -35808,7 +37661,6 @@ index bfa798809d55..cdee3fcc3acc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -35846,6 +37698,24 @@ index bfa798809d55..cdee3fcc3acc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -35880,54 +37750,51 @@ index bfa798809d55..cdee3fcc3acc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_opus_wrapper_gn") diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build -index c8575dd0f9ca..016633e82ccf 100644 +index 40ed29f25814..101e685fa20c 100644 --- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build +++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -35942,7 +37809,7 @@ index c8575dd0f9ca..016633e82ccf 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -35954,7 +37821,6 @@ index c8575dd0f9ca..016633e82ccf 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -35963,7 +37829,6 @@ index c8575dd0f9ca..016633e82ccf 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -35992,7 +37857,6 @@ index c8575dd0f9ca..016633e82ccf 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -36008,7 +37872,6 @@ index c8575dd0f9ca..016633e82ccf 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -36039,6 +37902,22 @@ index c8575dd0f9ca..016633e82ccf 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -36079,37 +37958,32 @@ index c8575dd0f9ca..016633e82ccf 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_device_gn") diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build -index afd0b5d46c34..ef309425d8ed 100644 +index c6a45f9a3761..f1359947dd44 100644 --- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build +++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -36124,7 +37998,7 @@ index afd0b5d46c34..ef309425d8ed 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36136,7 +38010,6 @@ index afd0b5d46c34..ef309425d8ed 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -36149,7 +38022,6 @@ index afd0b5d46c34..ef309425d8ed 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -36182,7 +38054,6 @@ index afd0b5d46c34..ef309425d8ed 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -36198,7 +38069,6 @@ index afd0b5d46c34..ef309425d8ed 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -36239,6 +38109,24 @@ index afd0b5d46c34..ef309425d8ed 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -36273,47 +38161,45 @@ index afd0b5d46c34..ef309425d8ed 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_frame_manipulator_gn") diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build -index d60eb0685e32..d7e11c2419b8 100644 +index 32a47e6b064d..44ff455cc768 100644 --- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build +++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -36321,7 +38207,6 @@ index d60eb0685e32..d7e11c2419b8 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -36336,7 +38221,7 @@ index d60eb0685e32..d7e11c2419b8 100644 FINAL_LIBRARY = "webrtc" -@@ -46,180 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36348,7 +38233,6 @@ index d60eb0685e32..d7e11c2419b8 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -36361,7 +38245,6 @@ index d60eb0685e32..d7e11c2419b8 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -36394,7 +38277,6 @@ index d60eb0685e32..d7e11c2419b8 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -36410,7 +38292,6 @@ index d60eb0685e32..d7e11c2419b8 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -36451,6 +38332,24 @@ index d60eb0685e32..d7e11c2419b8 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -36485,54 +38384,51 @@ index d60eb0685e32..d7e11c2419b8 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_mixer_impl_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build -index 0816691488f7..3971fd57aff6 100644 +index 60ecc93ab967..556de6ede5e6 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -36547,7 +38443,7 @@ index 0816691488f7..3971fd57aff6 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36559,7 +38455,6 @@ index 0816691488f7..3971fd57aff6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -36572,7 +38467,6 @@ index 0816691488f7..3971fd57aff6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -36601,7 +38495,6 @@ index 0816691488f7..3971fd57aff6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -36617,7 +38510,6 @@ index 0816691488f7..3971fd57aff6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -36648,6 +38540,22 @@ index 0816691488f7..3971fd57aff6 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -36688,37 +38596,32 @@ index 0816691488f7..3971fd57aff6 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("adaptive_fir_filter_erl_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build -index 9fa727f478c4..13bb5550f641 100644 +index fd78a435604d..aed93b9c682d 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -36733,7 +38636,7 @@ index 9fa727f478c4..13bb5550f641 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -36745,7 +38648,6 @@ index 9fa727f478c4..13bb5550f641 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -36758,7 +38660,6 @@ index 9fa727f478c4..13bb5550f641 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -36791,7 +38692,6 @@ index 9fa727f478c4..13bb5550f641 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -36807,7 +38707,6 @@ index 9fa727f478c4..13bb5550f641 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -36845,6 +38744,22 @@ index 9fa727f478c4..13bb5550f641 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -36885,22 +38800,18 @@ index 9fa727f478c4..13bb5550f641 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("adaptive_fir_filter_gn") @@ -37073,17 +38984,16 @@ index 6f67bd6fad7f..301dd09d6644 100644 Library("aec3_avx2_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build -index 1113f94b818d..74d57ecb66c2 100644 +index b0952a7d0cd8..8a9d53a1b709 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -37098,7 +39008,7 @@ index 1113f94b818d..74d57ecb66c2 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37110,7 +39020,6 @@ index 1113f94b818d..74d57ecb66c2 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -37119,7 +39028,6 @@ index 1113f94b818d..74d57ecb66c2 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -37148,7 +39056,6 @@ index 1113f94b818d..74d57ecb66c2 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -37164,7 +39071,6 @@ index 1113f94b818d..74d57ecb66c2 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -37195,6 +39101,22 @@ index 1113f94b818d..74d57ecb66c2 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -37235,37 +39157,32 @@ index 1113f94b818d..74d57ecb66c2 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("aec3_common_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build -index 2943116c2a6f..7a3446214de9 100644 +index 97bbc435395f..0fba9b70c95b 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -37280,7 +39197,7 @@ index 2943116c2a6f..7a3446214de9 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37292,7 +39209,6 @@ index 2943116c2a6f..7a3446214de9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -37305,7 +39221,6 @@ index 2943116c2a6f..7a3446214de9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -37338,7 +39253,6 @@ index 2943116c2a6f..7a3446214de9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -37354,7 +39268,6 @@ index 2943116c2a6f..7a3446214de9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -37392,6 +39305,22 @@ index 2943116c2a6f..7a3446214de9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -37432,30 +39361,26 @@ index 2943116c2a6f..7a3446214de9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("aec3_fft_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build -index f43e8146e713..47089688b0a0 100644 +index 6646d41ff3a8..b680faacb6b6 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -37463,7 +39388,6 @@ index f43e8146e713..47089688b0a0 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -37478,7 +39402,7 @@ index f43e8146e713..47089688b0a0 100644 FINAL_LIBRARY = "webrtc" -@@ -100,180 +110,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -100,190 +109,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37490,7 +39414,6 @@ index f43e8146e713..47089688b0a0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -37503,7 +39426,6 @@ index f43e8146e713..47089688b0a0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -37536,7 +39458,6 @@ index f43e8146e713..47089688b0a0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -37552,7 +39473,6 @@ index f43e8146e713..47089688b0a0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -37593,6 +39513,24 @@ index f43e8146e713..47089688b0a0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -37627,54 +39565,51 @@ index f43e8146e713..47089688b0a0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("aec3_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build -index da40498722db..2e53469fce9b 100644 +index d77163999ba8..bbfd52a05ced 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -37689,7 +39624,7 @@ index da40498722db..2e53469fce9b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37701,7 +39636,6 @@ index da40498722db..2e53469fce9b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -37714,7 +39648,6 @@ index da40498722db..2e53469fce9b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -37743,7 +39676,6 @@ index da40498722db..2e53469fce9b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -37759,7 +39691,6 @@ index da40498722db..2e53469fce9b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -37790,6 +39721,22 @@ index da40498722db..2e53469fce9b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -37830,37 +39777,32 @@ index da40498722db..2e53469fce9b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("fft_data_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build -index b071810effb8..31ebd11e9c69 100644 +index bae4fa297266..af83e29c22cb 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -37875,7 +39817,7 @@ index b071810effb8..31ebd11e9c69 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -37887,7 +39829,6 @@ index b071810effb8..31ebd11e9c69 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -37900,7 +39841,6 @@ index b071810effb8..31ebd11e9c69 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -37929,7 +39869,6 @@ index b071810effb8..31ebd11e9c69 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -37945,7 +39884,6 @@ index b071810effb8..31ebd11e9c69 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -37976,6 +39914,22 @@ index b071810effb8..31ebd11e9c69 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -38016,37 +39970,32 @@ index b071810effb8..31ebd11e9c69 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("matched_filter_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build -index 2f5a8f3d96d6..bf2ada14772b 100644 +index b7a10f5d7c88..8068d5e8b48a 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -38061,7 +40010,7 @@ index 2f5a8f3d96d6..bf2ada14772b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38073,7 +40022,6 @@ index 2f5a8f3d96d6..bf2ada14772b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -38086,7 +40034,6 @@ index 2f5a8f3d96d6..bf2ada14772b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -38115,7 +40062,6 @@ index 2f5a8f3d96d6..bf2ada14772b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -38131,7 +40077,6 @@ index 2f5a8f3d96d6..bf2ada14772b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -38162,6 +40107,22 @@ index 2f5a8f3d96d6..bf2ada14772b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -38202,37 +40163,32 @@ index 2f5a8f3d96d6..bf2ada14772b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("render_buffer_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build -index a38d05418c72..50db53ce0712 100644 +index 89ee0b6a8172..e2c6c18ff9e0 100644 --- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -38247,7 +40203,7 @@ index a38d05418c72..50db53ce0712 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38259,7 +40215,6 @@ index a38d05418c72..50db53ce0712 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -38272,7 +40227,6 @@ index a38d05418c72..50db53ce0712 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -38301,7 +40255,6 @@ index a38d05418c72..50db53ce0712 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -38317,7 +40270,6 @@ index a38d05418c72..50db53ce0712 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -38348,6 +40300,22 @@ index a38d05418c72..50db53ce0712 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -38388,37 +40356,32 @@ index a38d05418c72..50db53ce0712 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("vector_math_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build -index 128c3f5902e7..2c604269358e 100644 +index 201cd58360cf..28209dac0b7d 100644 --- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -38433,7 +40396,7 @@ index 128c3f5902e7..2c604269358e 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38445,7 +40408,6 @@ index 128c3f5902e7..2c604269358e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -38458,7 +40420,6 @@ index 128c3f5902e7..2c604269358e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -38487,7 +40448,6 @@ index 128c3f5902e7..2c604269358e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -38503,7 +40463,6 @@ index 128c3f5902e7..2c604269358e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -38538,6 +40497,22 @@ index 128c3f5902e7..2c604269358e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -38578,37 +40553,32 @@ index 128c3f5902e7..2c604269358e 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("aec_dump_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build -index e753cd5fff49..2cb6c902a60e 100644 +index 974b70b087d2..e7cd5f585b83 100644 --- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -38623,7 +40593,7 @@ index e753cd5fff49..2cb6c902a60e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38635,7 +40605,6 @@ index e753cd5fff49..2cb6c902a60e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -38648,7 +40617,6 @@ index e753cd5fff49..2cb6c902a60e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -38677,7 +40645,6 @@ index e753cd5fff49..2cb6c902a60e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -38693,7 +40660,6 @@ index e753cd5fff49..2cb6c902a60e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -38731,6 +40697,24 @@ index e753cd5fff49..2cb6c902a60e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -38765,54 +40749,51 @@ index e753cd5fff49..2cb6c902a60e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("null_aec_dump_factory_gn") diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build -index f6f21938c2f6..52d6467340f4 100644 +index 1c47bbd5cc1e..c51fcb7d6a97 100644 --- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -38827,7 +40808,7 @@ index f6f21938c2f6..52d6467340f4 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -38839,7 +40820,6 @@ index f6f21938c2f6..52d6467340f4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -38852,7 +40832,6 @@ index f6f21938c2f6..52d6467340f4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -38881,7 +40860,6 @@ index f6f21938c2f6..52d6467340f4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -38897,7 +40875,6 @@ index f6f21938c2f6..52d6467340f4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -38935,6 +40912,24 @@ index f6f21938c2f6..52d6467340f4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -38969,54 +40964,51 @@ index f6f21938c2f6..52d6467340f4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("aec_dump_interface_gn") diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build -index 0d0e76136d97..32cc424ff071 100644 +index f0e41cd6bd08..9fec01cfbcec 100644 --- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -39031,7 +41023,7 @@ index 0d0e76136d97..32cc424ff071 100644 FINAL_LIBRARY = "webrtc" -@@ -45,101 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,113 +53,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39043,7 +41035,6 @@ index 0d0e76136d97..32cc424ff071 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -39054,9 +41045,12 @@ index 0d0e76136d97..32cc424ff071 100644 - "log" - ] - +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -39064,6 +41058,10 @@ index 0d0e76136d97..32cc424ff071 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -39089,7 +41087,6 @@ index 0d0e76136d97..32cc424ff071 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -39097,6 +41094,10 @@ index 0d0e76136d97..32cc424ff071 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- -if CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True @@ -39105,7 +41106,6 @@ index 0d0e76136d97..32cc424ff071 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -39130,14 +41130,21 @@ index 0d0e76136d97..32cc424ff071 100644 - "secur32", - "winmm" - ] +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": -@@ -150,83 +66,14 @@ if CONFIG["CPU_ARCH"] == "aarch64": - "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" - ] +@@ -158,20 +61,7 @@ if CONFIG["CPU_ARCH"] == "aarch64": + DEFINES["WEBRTC_HAS_NEON"] = True + SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" +- ] +- -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ @@ -39149,8 +41156,44 @@ index 0d0e76136d97..32cc424ff071 100644 - DEFINES["WEBRTC_HAS_NEON"] = True - - SOURCES += [ -- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" ++ "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc", + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_neon.cc" + ] + +@@ -179,7 +69,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True + + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc" +@@ -187,8 +76,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + + if CONFIG["CPU_ARCH"] == "mips64": + +- DEFINES["_GNU_SOURCE"] = True +- + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] +@@ -199,95 +86,28 @@ if CONFIG["CPU_ARCH"] == "ppc64": + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] + +-if CONFIG["CPU_ARCH"] == "riscv64": +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" - ] +- + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39184,8 +41227,7 @@ index 0d0e76136d97..32cc424ff071 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -39196,36 +41238,51 @@ index 0d0e76136d97..32cc424ff071 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["_GNU_SOURCE"] = True - +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] + -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + SOURCES += [ + "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" + ] + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True +- +- SOURCES += [ +- "/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc" +- ] + DEFINES["USE_X11"] = "1" Library("aecm_core_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build -index aa0d4247e6ca..0abb7bbc9a10 100644 +index 45e6cad30638..cafd3cc50045 100644 --- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -39233,7 +41290,6 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -39248,7 +41304,7 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39260,7 +41316,6 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -39273,7 +41328,6 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -39306,7 +41360,6 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -39322,7 +41375,6 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -39363,6 +41415,24 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39397,54 +41467,51 @@ index aa0d4247e6ca..0abb7bbc9a10 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("agc_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build -index 4c8935a45857..4fedc8d3f7ce 100644 +index c6ab9b3160de..6cc48faee4a7 100644 --- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -39459,7 +41526,7 @@ index 4c8935a45857..4fedc8d3f7ce 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39471,7 +41538,6 @@ index 4c8935a45857..4fedc8d3f7ce 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -39480,7 +41546,6 @@ index 4c8935a45857..4fedc8d3f7ce 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -39509,7 +41574,6 @@ index 4c8935a45857..4fedc8d3f7ce 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -39525,7 +41589,6 @@ index 4c8935a45857..4fedc8d3f7ce 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -39556,6 +41619,22 @@ index 4c8935a45857..4fedc8d3f7ce 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -39596,37 +41675,32 @@ index 4c8935a45857..4fedc8d3f7ce 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("gain_control_interface_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build -index 2bd96a79fd6d..912ad2e8fee7 100644 +index 0188a8ac107e..364ef9950f2c 100644 --- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -39641,7 +41715,7 @@ index 2bd96a79fd6d..912ad2e8fee7 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39653,7 +41727,6 @@ index 2bd96a79fd6d..912ad2e8fee7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -39666,7 +41739,6 @@ index 2bd96a79fd6d..912ad2e8fee7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -39699,7 +41771,6 @@ index 2bd96a79fd6d..912ad2e8fee7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -39715,7 +41786,6 @@ index 2bd96a79fd6d..912ad2e8fee7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -39756,6 +41826,24 @@ index 2bd96a79fd6d..912ad2e8fee7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -39790,54 +41878,51 @@ index 2bd96a79fd6d..912ad2e8fee7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("legacy_agc_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build -index 1775faa5a166..f15960f397d9 100644 +index 9db9a639e7ae..865eee21cf92 100644 --- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -39852,7 +41937,7 @@ index 1775faa5a166..f15960f397d9 100644 FINAL_LIBRARY = "webrtc" -@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -39864,7 +41949,6 @@ index 1775faa5a166..f15960f397d9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -39877,7 +41961,6 @@ index 1775faa5a166..f15960f397d9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -39910,7 +41993,6 @@ index 1775faa5a166..f15960f397d9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -39926,7 +42008,6 @@ index 1775faa5a166..f15960f397d9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -39967,6 +42048,24 @@ index 1775faa5a166..f15960f397d9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40001,47 +42100,45 @@ index 1775faa5a166..f15960f397d9 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("level_estimation_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build -index b19c3f9e3e74..d94821849bde 100644 +index 7d16c9a9f5c1..ab3f79521ab8 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -40049,7 +42146,6 @@ index b19c3f9e3e74..d94821849bde 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -40064,7 +42160,7 @@ index b19c3f9e3e74..d94821849bde 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40076,7 +42172,6 @@ index b19c3f9e3e74..d94821849bde 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -40089,7 +42184,6 @@ index b19c3f9e3e74..d94821849bde 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -40122,7 +42216,6 @@ index b19c3f9e3e74..d94821849bde 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -40138,7 +42231,6 @@ index b19c3f9e3e74..d94821849bde 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -40179,6 +42271,24 @@ index b19c3f9e3e74..d94821849bde 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40213,54 +42323,51 @@ index b19c3f9e3e74..d94821849bde 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("adaptive_digital_gain_controller_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build -index a0d04c2f28c1..42e3c43a7679 100644 +index f396f42e5776..1d4e4aaebbe3 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -40275,7 +42382,7 @@ index a0d04c2f28c1..42e3c43a7679 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40287,7 +42394,6 @@ index a0d04c2f28c1..42e3c43a7679 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -40300,7 +42406,6 @@ index a0d04c2f28c1..42e3c43a7679 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -40329,7 +42434,6 @@ index a0d04c2f28c1..42e3c43a7679 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -40345,7 +42449,6 @@ index a0d04c2f28c1..42e3c43a7679 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -40379,6 +42482,24 @@ index a0d04c2f28c1..42e3c43a7679 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40413,54 +42534,51 @@ index a0d04c2f28c1..42e3c43a7679 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("biquad_filter_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build -index d8515f18bf84..2968f39cd193 100644 +index 9cddd69abef4..fc59d2ead813 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -40475,7 +42593,7 @@ index d8515f18bf84..2968f39cd193 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40487,7 +42605,6 @@ index d8515f18bf84..2968f39cd193 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -40500,7 +42617,6 @@ index d8515f18bf84..2968f39cd193 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -40533,7 +42649,6 @@ index d8515f18bf84..2968f39cd193 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -40549,7 +42664,6 @@ index d8515f18bf84..2968f39cd193 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -40590,6 +42704,24 @@ index d8515f18bf84..2968f39cd193 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -40624,54 +42756,51 @@ index d8515f18bf84..2968f39cd193 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("clipping_predictor_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build -index 6691f269c43e..512ea11ff65f 100644 +index 274cae23a398..c4e0b45cf302 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -40686,7 +42815,7 @@ index 6691f269c43e..512ea11ff65f 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40698,7 +42827,6 @@ index 6691f269c43e..512ea11ff65f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -40707,7 +42835,6 @@ index 6691f269c43e..512ea11ff65f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -40736,7 +42863,6 @@ index 6691f269c43e..512ea11ff65f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -40752,7 +42878,6 @@ index 6691f269c43e..512ea11ff65f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -40783,6 +42908,22 @@ index 6691f269c43e..512ea11ff65f 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -40823,37 +42964,32 @@ index 6691f269c43e..512ea11ff65f 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("common_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build -index a6ab51f9384c..52ba8d06d0b5 100644 +index a4572251ad4c..6817471d99c1 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -40868,7 +43004,7 @@ index a6ab51f9384c..52ba8d06d0b5 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40880,7 +43016,6 @@ index a6ab51f9384c..52ba8d06d0b5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -40893,7 +43028,6 @@ index a6ab51f9384c..52ba8d06d0b5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -40926,7 +43060,6 @@ index a6ab51f9384c..52ba8d06d0b5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -40942,7 +43075,6 @@ index a6ab51f9384c..52ba8d06d0b5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -40983,6 +43115,24 @@ index a6ab51f9384c..52ba8d06d0b5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41017,47 +43167,45 @@ index a6ab51f9384c..52ba8d06d0b5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("cpu_features_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build -index 6376e4ea3f88..2f2ec8b656b1 100644 +index 3a54fc31711b..e87103152bc9 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -41065,7 +43213,6 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -41080,7 +43227,7 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 FINAL_LIBRARY = "webrtc" -@@ -46,180 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41092,7 +43239,6 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -41105,7 +43251,6 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -41138,7 +43283,6 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -41154,7 +43298,6 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -41195,6 +43338,24 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41229,54 +43390,51 @@ index 6376e4ea3f88..2f2ec8b656b1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("fixed_digital_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build -index 80f434e255bd..d715bf02bdb3 100644 +index 394aa109faf3..cb41c74ad271 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -41291,7 +43449,7 @@ index 80f434e255bd..d715bf02bdb3 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41303,7 +43461,6 @@ index 80f434e255bd..d715bf02bdb3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -41316,7 +43473,6 @@ index 80f434e255bd..d715bf02bdb3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -41345,7 +43501,6 @@ index 80f434e255bd..d715bf02bdb3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -41361,7 +43516,6 @@ index 80f434e255bd..d715bf02bdb3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -41395,6 +43549,24 @@ index 80f434e255bd..d715bf02bdb3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41429,54 +43601,51 @@ index 80f434e255bd..d715bf02bdb3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("gain_applier_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build -index 0ffb5306f356..670e624a9e06 100644 +index 5b1d68415a52..32bf484b86e7 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -41491,7 +43660,7 @@ index 0ffb5306f356..670e624a9e06 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41503,7 +43672,6 @@ index 0ffb5306f356..670e624a9e06 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -41512,7 +43680,6 @@ index 0ffb5306f356..670e624a9e06 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -41541,7 +43708,6 @@ index 0ffb5306f356..670e624a9e06 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -41557,7 +43723,6 @@ index 0ffb5306f356..670e624a9e06 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -41588,6 +43753,22 @@ index 0ffb5306f356..670e624a9e06 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -41628,30 +43809,26 @@ index 0ffb5306f356..670e624a9e06 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("gain_map_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build -index cd79ec63370f..705705f8fa7e 100644 +index 582eb326f3d6..8fa3a2bba795 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -41659,7 +43836,6 @@ index cd79ec63370f..705705f8fa7e 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -41674,7 +43850,7 @@ index cd79ec63370f..705705f8fa7e 100644 FINAL_LIBRARY = "webrtc" -@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41686,7 +43862,6 @@ index cd79ec63370f..705705f8fa7e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -41699,7 +43874,6 @@ index cd79ec63370f..705705f8fa7e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -41732,7 +43906,6 @@ index cd79ec63370f..705705f8fa7e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -41748,7 +43921,6 @@ index cd79ec63370f..705705f8fa7e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -41789,6 +43961,24 @@ index cd79ec63370f..705705f8fa7e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -41823,54 +44013,51 @@ index cd79ec63370f..705705f8fa7e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("input_volume_controller_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build -index 07d2b331071e..96c8e769323d 100644 +index 5a662f407985..c92be24aa407 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -41885,7 +44072,7 @@ index 07d2b331071e..96c8e769323d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -41897,7 +44084,6 @@ index 07d2b331071e..96c8e769323d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -41910,7 +44096,6 @@ index 07d2b331071e..96c8e769323d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -41939,7 +44124,6 @@ index 07d2b331071e..96c8e769323d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -41955,7 +44139,6 @@ index 07d2b331071e..96c8e769323d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -41993,6 +44176,24 @@ index 07d2b331071e..96c8e769323d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -42027,47 +44228,45 @@ index 07d2b331071e..96c8e769323d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("input_volume_stats_reporter_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build -index 466a998e24be..bc65c694622f 100644 +index ba000d386223..21a9e8b6511a 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -42075,7 +44274,6 @@ index 466a998e24be..bc65c694622f 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -42090,7 +44288,7 @@ index 466a998e24be..bc65c694622f 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42102,7 +44300,6 @@ index 466a998e24be..bc65c694622f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -42115,7 +44312,6 @@ index 466a998e24be..bc65c694622f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -42148,7 +44344,6 @@ index 466a998e24be..bc65c694622f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -42164,7 +44359,6 @@ index 466a998e24be..bc65c694622f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -42205,6 +44399,24 @@ index 466a998e24be..bc65c694622f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -42239,54 +44451,51 @@ index 466a998e24be..bc65c694622f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("noise_level_estimator_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build -index 803ce1c56101..6290b7010ab6 100644 +index 3f00e43e7c28..87c64337304c 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -42301,7 +44510,7 @@ index 803ce1c56101..6290b7010ab6 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42313,7 +44522,6 @@ index 803ce1c56101..6290b7010ab6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -42326,7 +44534,6 @@ index 803ce1c56101..6290b7010ab6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -42359,7 +44566,6 @@ index 803ce1c56101..6290b7010ab6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -42375,7 +44581,6 @@ index 803ce1c56101..6290b7010ab6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -42416,6 +44621,24 @@ index 803ce1c56101..6290b7010ab6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -42450,54 +44673,51 @@ index 803ce1c56101..6290b7010ab6 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rnn_vad_auto_correlation_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build -index aeca3dddfd31..a0b8eb902304 100644 +index 64d3371d81b0..bd147bc9f851 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -42512,7 +44732,7 @@ index aeca3dddfd31..a0b8eb902304 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42524,7 +44744,6 @@ index aeca3dddfd31..a0b8eb902304 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -42537,7 +44756,6 @@ index aeca3dddfd31..a0b8eb902304 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -42570,7 +44788,6 @@ index aeca3dddfd31..a0b8eb902304 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -42586,7 +44803,6 @@ index aeca3dddfd31..a0b8eb902304 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -42624,6 +44840,22 @@ index aeca3dddfd31..a0b8eb902304 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -42664,37 +44896,32 @@ index aeca3dddfd31..a0b8eb902304 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rnn_vad_common_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build -index e55928213e57..4c01e40790a6 100644 +index 82e5302312e5..ef8d61998fa0 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -42709,7 +44936,7 @@ index e55928213e57..4c01e40790a6 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42721,7 +44948,6 @@ index e55928213e57..4c01e40790a6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -42734,7 +44960,6 @@ index e55928213e57..4c01e40790a6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -42767,7 +44992,6 @@ index e55928213e57..4c01e40790a6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -42783,7 +45007,6 @@ index e55928213e57..4c01e40790a6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -42824,6 +45047,24 @@ index e55928213e57..4c01e40790a6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -42858,54 +45099,51 @@ index e55928213e57..4c01e40790a6 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rnn_vad_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build -index 5c63b60b5447..e41c2d424d94 100644 +index 7dd4619965ab..63049c23fc5e 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -42920,7 +45158,7 @@ index 5c63b60b5447..e41c2d424d94 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -42932,7 +45170,6 @@ index 5c63b60b5447..e41c2d424d94 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -42945,7 +45182,6 @@ index 5c63b60b5447..e41c2d424d94 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -42978,7 +45214,6 @@ index 5c63b60b5447..e41c2d424d94 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -42994,7 +45229,6 @@ index 5c63b60b5447..e41c2d424d94 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -43035,6 +45269,24 @@ index 5c63b60b5447..e41c2d424d94 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -43069,54 +45321,51 @@ index 5c63b60b5447..e41c2d424d94 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rnn_vad_layers_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build -index 083f9e617913..62daf5f58619 100644 +index 1fcbbbe408fa..ebc5b9a10d04 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -43131,7 +45380,7 @@ index 083f9e617913..62daf5f58619 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43143,7 +45392,6 @@ index 083f9e617913..62daf5f58619 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -43156,7 +45404,6 @@ index 083f9e617913..62daf5f58619 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -43185,7 +45432,6 @@ index 083f9e617913..62daf5f58619 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -43201,7 +45447,6 @@ index 083f9e617913..62daf5f58619 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -43235,6 +45480,24 @@ index 083f9e617913..62daf5f58619 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -43269,54 +45532,51 @@ index 083f9e617913..62daf5f58619 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rnn_vad_lp_residual_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build -index 42d4436bb7de..fb9465ed02bd 100644 +index 6a69de9e292e..3d0349fab510 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -43331,7 +45591,7 @@ index 42d4436bb7de..fb9465ed02bd 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43343,7 +45603,6 @@ index 42d4436bb7de..fb9465ed02bd 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -43356,7 +45615,6 @@ index 42d4436bb7de..fb9465ed02bd 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -43389,7 +45647,6 @@ index 42d4436bb7de..fb9465ed02bd 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -43405,7 +45662,6 @@ index 42d4436bb7de..fb9465ed02bd 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -43446,6 +45702,24 @@ index 42d4436bb7de..fb9465ed02bd 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -43480,54 +45754,51 @@ index 42d4436bb7de..fb9465ed02bd 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rnn_vad_pitch_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build -index e572b7178abc..72e499632ae5 100644 +index d2a4eb7261b6..1a81378e66f5 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -43542,7 +45813,7 @@ index e572b7178abc..72e499632ae5 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43554,7 +45825,6 @@ index e572b7178abc..72e499632ae5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -43567,7 +45837,6 @@ index e572b7178abc..72e499632ae5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -43596,7 +45865,6 @@ index e572b7178abc..72e499632ae5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -43612,7 +45880,6 @@ index e572b7178abc..72e499632ae5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -43643,6 +45910,22 @@ index e572b7178abc..72e499632ae5 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -43683,37 +45966,32 @@ index e572b7178abc..72e499632ae5 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rnn_vad_ring_buffer_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build -index 675942c280b3..9174d9626bfb 100644 +index c6913470c362..916932ccba9a 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -43728,7 +46006,7 @@ index 675942c280b3..9174d9626bfb 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43740,7 +46018,6 @@ index 675942c280b3..9174d9626bfb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -43753,7 +46030,6 @@ index 675942c280b3..9174d9626bfb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -43782,7 +46058,6 @@ index 675942c280b3..9174d9626bfb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -43798,7 +46073,6 @@ index 675942c280b3..9174d9626bfb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -43829,6 +46103,22 @@ index 675942c280b3..9174d9626bfb 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -43869,37 +46159,32 @@ index 675942c280b3..9174d9626bfb 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rnn_vad_sequence_buffer_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build -index 87dd34f78c8a..47065ae1519b 100644 +index 8298c7e091d7..db6f13136c47 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -43914,7 +46199,7 @@ index 87dd34f78c8a..47065ae1519b 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -43926,7 +46211,6 @@ index 87dd34f78c8a..47065ae1519b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -43939,7 +46223,6 @@ index 87dd34f78c8a..47065ae1519b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -43972,7 +46255,6 @@ index 87dd34f78c8a..47065ae1519b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -43988,7 +46270,6 @@ index 87dd34f78c8a..47065ae1519b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -44029,6 +46310,24 @@ index 87dd34f78c8a..47065ae1519b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -44063,54 +46362,51 @@ index 87dd34f78c8a..47065ae1519b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rnn_vad_spectral_features_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build -index 12486fec4fc3..83fb44708629 100644 +index acb933045439..e9cb91b4da31 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -44125,7 +46421,7 @@ index 12486fec4fc3..83fb44708629 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44137,7 +46433,6 @@ index 12486fec4fc3..83fb44708629 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -44150,7 +46445,6 @@ index 12486fec4fc3..83fb44708629 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -44179,7 +46473,6 @@ index 12486fec4fc3..83fb44708629 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -44195,7 +46488,6 @@ index 12486fec4fc3..83fb44708629 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -44226,6 +46518,22 @@ index 12486fec4fc3..83fb44708629 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -44266,22 +46574,18 @@ index 12486fec4fc3..83fb44708629 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rnn_vad_symmetric_matrix_buffer_gn") @@ -44453,17 +46757,16 @@ index 275c512cf6bb..d8f9ba076c5f 100644 Library("vector_math_avx2_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build -index 740f9ff19ecf..50db53ce0712 100644 +index 263ec679e37d..e2c6c18ff9e0 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -44478,7 +46781,7 @@ index 740f9ff19ecf..50db53ce0712 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44490,7 +46793,6 @@ index 740f9ff19ecf..50db53ce0712 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -44503,7 +46805,6 @@ index 740f9ff19ecf..50db53ce0712 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -44536,7 +46837,6 @@ index 740f9ff19ecf..50db53ce0712 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -44552,7 +46852,6 @@ index 740f9ff19ecf..50db53ce0712 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -44590,6 +46889,22 @@ index 740f9ff19ecf..50db53ce0712 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -44630,30 +46945,26 @@ index 740f9ff19ecf..50db53ce0712 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("vector_math_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build -index 0b754d4fbdde..7d04c02d3232 100644 +index a1e6f309bffa..934bd6d2cdd2 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -44661,7 +46972,6 @@ index 0b754d4fbdde..7d04c02d3232 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -44676,7 +46986,7 @@ index 0b754d4fbdde..7d04c02d3232 100644 FINAL_LIBRARY = "webrtc" -@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44688,7 +46998,6 @@ index 0b754d4fbdde..7d04c02d3232 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -44701,7 +47010,6 @@ index 0b754d4fbdde..7d04c02d3232 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -44734,7 +47042,6 @@ index 0b754d4fbdde..7d04c02d3232 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -44750,7 +47057,6 @@ index 0b754d4fbdde..7d04c02d3232 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -44791,6 +47097,24 @@ index 0b754d4fbdde..7d04c02d3232 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -44825,47 +47149,45 @@ index 0b754d4fbdde..7d04c02d3232 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("saturation_protector_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build -index 3473f2cb05bd..d2b19ddbf446 100644 +index bb1dbc67b847..ad6f735a2729 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -44873,7 +47195,6 @@ index 3473f2cb05bd..d2b19ddbf446 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -44888,7 +47209,7 @@ index 3473f2cb05bd..d2b19ddbf446 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -44900,7 +47221,6 @@ index 3473f2cb05bd..d2b19ddbf446 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -44913,7 +47233,6 @@ index 3473f2cb05bd..d2b19ddbf446 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -44946,7 +47265,6 @@ index 3473f2cb05bd..d2b19ddbf446 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -44962,7 +47280,6 @@ index 3473f2cb05bd..d2b19ddbf446 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -45003,6 +47320,24 @@ index 3473f2cb05bd..d2b19ddbf446 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -45037,54 +47372,51 @@ index 3473f2cb05bd..d2b19ddbf446 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("speech_level_estimator_gn") diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build -index e12c8a7ebc76..2853e6f6ee82 100644 +index dfa276510899..9f02e46a59fd 100644 --- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -45099,7 +47431,7 @@ index e12c8a7ebc76..2853e6f6ee82 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -45111,7 +47443,6 @@ index e12c8a7ebc76..2853e6f6ee82 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -45124,7 +47455,6 @@ index e12c8a7ebc76..2853e6f6ee82 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -45157,7 +47487,6 @@ index e12c8a7ebc76..2853e6f6ee82 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -45173,7 +47502,6 @@ index e12c8a7ebc76..2853e6f6ee82 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -45214,6 +47542,24 @@ index e12c8a7ebc76..2853e6f6ee82 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -45248,54 +47594,51 @@ index e12c8a7ebc76..2853e6f6ee82 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("vad_wrapper_gn") diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build -index ca7cee6ca34f..8b723b2c2c5a 100644 +index 7f1c48ac391e..d6226679c01e 100644 --- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -45310,7 +47653,7 @@ index ca7cee6ca34f..8b723b2c2c5a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -45322,7 +47665,6 @@ index ca7cee6ca34f..8b723b2c2c5a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -45335,7 +47677,6 @@ index ca7cee6ca34f..8b723b2c2c5a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -45364,7 +47705,6 @@ index ca7cee6ca34f..8b723b2c2c5a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -45380,7 +47720,6 @@ index ca7cee6ca34f..8b723b2c2c5a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -45418,6 +47757,24 @@ index ca7cee6ca34f..8b723b2c2c5a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -45452,47 +47809,45 @@ index ca7cee6ca34f..8b723b2c2c5a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("api_gn") diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build -index d28b51e89e12..40be96a020c7 100644 +index b6d96414b469..7a4060eadad0 100644 --- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -45500,7 +47855,6 @@ index d28b51e89e12..40be96a020c7 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -45515,7 +47869,7 @@ index d28b51e89e12..40be96a020c7 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -45527,7 +47881,6 @@ index d28b51e89e12..40be96a020c7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -45540,7 +47893,6 @@ index d28b51e89e12..40be96a020c7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -45573,7 +47925,6 @@ index d28b51e89e12..40be96a020c7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -45589,7 +47940,6 @@ index d28b51e89e12..40be96a020c7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -45630,6 +47980,24 @@ index d28b51e89e12..40be96a020c7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -45664,47 +48032,45 @@ index d28b51e89e12..40be96a020c7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("apm_logging_gn") diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build -index da187a971aee..77e5562e0c6f 100644 +index 2291d2981df8..a6e68e27491a 100644 --- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -45712,7 +48078,6 @@ index da187a971aee..77e5562e0c6f 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -45727,7 +48092,7 @@ index da187a971aee..77e5562e0c6f 100644 FINAL_LIBRARY = "webrtc" -@@ -46,180 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -45739,7 +48104,6 @@ index da187a971aee..77e5562e0c6f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -45752,7 +48116,6 @@ index da187a971aee..77e5562e0c6f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -45785,7 +48148,6 @@ index da187a971aee..77e5562e0c6f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -45801,7 +48163,6 @@ index da187a971aee..77e5562e0c6f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -45842,6 +48203,24 @@ index da187a971aee..77e5562e0c6f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -45876,54 +48255,51 @@ index da187a971aee..77e5562e0c6f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_buffer_gn") diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build -index 2d72bb988a81..1dd2d9219315 100644 +index 683d86e74389..d0b535438023 100644 --- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -45938,7 +48314,7 @@ index 2d72bb988a81..1dd2d9219315 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -45950,7 +48326,6 @@ index 2d72bb988a81..1dd2d9219315 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -45963,7 +48338,6 @@ index 2d72bb988a81..1dd2d9219315 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -45992,7 +48366,6 @@ index 2d72bb988a81..1dd2d9219315 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -46008,7 +48381,6 @@ index 2d72bb988a81..1dd2d9219315 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -46046,6 +48418,24 @@ index 2d72bb988a81..1dd2d9219315 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46080,54 +48470,51 @@ index 2d72bb988a81..1dd2d9219315 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_frame_proxies_gn") diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build -index f4bab4112181..f75f78c609ec 100644 +index 9b90bca379fd..af0fce3d5e23 100644 --- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -46142,7 +48529,7 @@ index f4bab4112181..f75f78c609ec 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46154,7 +48541,6 @@ index f4bab4112181..f75f78c609ec 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -46167,7 +48553,6 @@ index f4bab4112181..f75f78c609ec 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -46196,7 +48581,6 @@ index f4bab4112181..f75f78c609ec 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -46212,7 +48596,6 @@ index f4bab4112181..f75f78c609ec 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -46243,6 +48626,22 @@ index f4bab4112181..f75f78c609ec 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -46283,30 +48682,26 @@ index f4bab4112181..f75f78c609ec 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("audio_frame_view_gn") diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build -index fcd2a8139086..0559f660fe9a 100644 +index ab0ca7113f60..f5628add5044 100644 --- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -46314,7 +48709,6 @@ index fcd2a8139086..0559f660fe9a 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -46329,7 +48723,7 @@ index fcd2a8139086..0559f660fe9a 100644 FINAL_LIBRARY = "webrtc" -@@ -50,180 +60,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46341,7 +48735,6 @@ index fcd2a8139086..0559f660fe9a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -46354,7 +48747,6 @@ index fcd2a8139086..0559f660fe9a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -46387,7 +48779,6 @@ index fcd2a8139086..0559f660fe9a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -46403,7 +48794,6 @@ index fcd2a8139086..0559f660fe9a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -46444,6 +48834,24 @@ index fcd2a8139086..0559f660fe9a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46478,54 +48886,51 @@ index fcd2a8139086..0559f660fe9a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_processing_gn") diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build -index 26451feff187..bd6b1db66b9f 100644 +index f0af20c33521..0e0173197c5f 100644 --- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -46540,7 +48945,7 @@ index 26451feff187..bd6b1db66b9f 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46552,7 +48957,6 @@ index 26451feff187..bd6b1db66b9f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -46561,7 +48965,6 @@ index 26451feff187..bd6b1db66b9f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -46590,7 +48993,6 @@ index 26451feff187..bd6b1db66b9f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -46606,7 +49008,6 @@ index 26451feff187..bd6b1db66b9f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -46640,6 +49041,24 @@ index 26451feff187..bd6b1db66b9f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46673,8 +49092,7 @@ index 26451feff187..bd6b1db66b9f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -46685,43 +49103,41 @@ index 26451feff187..bd6b1db66b9f 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_processing_statistics_gn") diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build -index 1d45edf1ba91..e5c424b0bf3f 100644 +index 3e57c48b6fc4..3ceff91af48f 100644 --- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -46736,7 +49152,7 @@ index 1d45edf1ba91..e5c424b0bf3f 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46748,7 +49164,6 @@ index 1d45edf1ba91..e5c424b0bf3f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -46761,7 +49176,6 @@ index 1d45edf1ba91..e5c424b0bf3f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -46794,7 +49208,6 @@ index 1d45edf1ba91..e5c424b0bf3f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -46810,7 +49223,6 @@ index 1d45edf1ba91..e5c424b0bf3f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -46851,6 +49263,24 @@ index 1d45edf1ba91..e5c424b0bf3f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -46885,47 +49315,45 @@ index 1d45edf1ba91..e5c424b0bf3f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("capture_levels_adjuster_gn") diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build -index 60c17b5509aa..ed37ccc2ed59 100644 +index fcbe873d276a..f87fc5607282 100644 --- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -46933,7 +49361,6 @@ index 60c17b5509aa..ed37ccc2ed59 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -46948,7 +49375,7 @@ index 60c17b5509aa..ed37ccc2ed59 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -46960,7 +49387,6 @@ index 60c17b5509aa..ed37ccc2ed59 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -46973,7 +49399,6 @@ index 60c17b5509aa..ed37ccc2ed59 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -47006,7 +49431,6 @@ index 60c17b5509aa..ed37ccc2ed59 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -47022,7 +49446,6 @@ index 60c17b5509aa..ed37ccc2ed59 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -47063,6 +49486,24 @@ index 60c17b5509aa..ed37ccc2ed59 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47097,54 +49538,51 @@ index 60c17b5509aa..ed37ccc2ed59 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("gain_controller2_gn") diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build -index fb08841b0c48..5b253a45bc40 100644 +index 4c8aac9c3dad..28352a6c74f4 100644 --- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -47159,7 +49597,7 @@ index fb08841b0c48..5b253a45bc40 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47171,7 +49609,6 @@ index fb08841b0c48..5b253a45bc40 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -47184,7 +49621,6 @@ index fb08841b0c48..5b253a45bc40 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -47217,7 +49653,6 @@ index fb08841b0c48..5b253a45bc40 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -47233,7 +49668,6 @@ index fb08841b0c48..5b253a45bc40 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -47274,6 +49708,24 @@ index fb08841b0c48..5b253a45bc40 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47308,47 +49760,45 @@ index fb08841b0c48..5b253a45bc40 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("high_pass_filter_gn") diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build -index 631117eeda9d..7fb20a3d1dc0 100644 +index 12076eedcb58..467f6e1046bb 100644 --- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -47356,7 +49806,6 @@ index 631117eeda9d..7fb20a3d1dc0 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -47371,7 +49820,7 @@ index 631117eeda9d..7fb20a3d1dc0 100644 FINAL_LIBRARY = "webrtc" -@@ -56,180 +66,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47383,7 +49832,6 @@ index 631117eeda9d..7fb20a3d1dc0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -47396,7 +49844,6 @@ index 631117eeda9d..7fb20a3d1dc0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -47429,7 +49876,6 @@ index 631117eeda9d..7fb20a3d1dc0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -47445,7 +49891,6 @@ index 631117eeda9d..7fb20a3d1dc0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -47486,6 +49931,24 @@ index 631117eeda9d..7fb20a3d1dc0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47520,54 +49983,51 @@ index 631117eeda9d..7fb20a3d1dc0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("ns_gn") diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build -index 880455826bd8..0bc8cdfd9481 100644 +index 3e4fa4ca518f..3bd588630b7e 100644 --- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -47582,7 +50042,7 @@ index 880455826bd8..0bc8cdfd9481 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47594,7 +50054,6 @@ index 880455826bd8..0bc8cdfd9481 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -47607,7 +50066,6 @@ index 880455826bd8..0bc8cdfd9481 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -47640,7 +50098,6 @@ index 880455826bd8..0bc8cdfd9481 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -47656,7 +50113,6 @@ index 880455826bd8..0bc8cdfd9481 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -47697,6 +50153,24 @@ index 880455826bd8..0bc8cdfd9481 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47731,54 +50205,51 @@ index 880455826bd8..0bc8cdfd9481 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("optionally_built_submodule_creators_gn") diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build -index a4b835f8926e..d7d08f9f9914 100644 +index ec35734b6dfc..de1436046491 100644 --- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -47793,7 +50264,7 @@ index a4b835f8926e..d7d08f9f9914 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -47805,7 +50276,6 @@ index a4b835f8926e..d7d08f9f9914 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -47818,7 +50288,6 @@ index a4b835f8926e..d7d08f9f9914 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -47847,7 +50316,6 @@ index a4b835f8926e..d7d08f9f9914 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -47863,7 +50331,6 @@ index a4b835f8926e..d7d08f9f9914 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -47897,6 +50364,24 @@ index a4b835f8926e..d7d08f9f9914 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -47931,54 +50416,51 @@ index a4b835f8926e..d7d08f9f9914 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rms_level_gn") diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build -index 3ec1324e8a4d..cdba21f6640e 100644 +index 5988e89a6a2a..5b680cbdd1fb 100644 --- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -47993,7 +50475,7 @@ index 3ec1324e8a4d..cdba21f6640e 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48005,7 +50487,6 @@ index 3ec1324e8a4d..cdba21f6640e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -48014,7 +50495,6 @@ index 3ec1324e8a4d..cdba21f6640e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -48043,7 +50523,6 @@ index 3ec1324e8a4d..cdba21f6640e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -48059,7 +50538,6 @@ index 3ec1324e8a4d..cdba21f6640e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -48090,6 +50568,22 @@ index 3ec1324e8a4d..cdba21f6640e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -48130,37 +50624,32 @@ index 3ec1324e8a4d..cdba21f6640e 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("transient_suppressor_api_gn") diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build -index 91851aa48c0f..bbb64b1afd0d 100644 +index ee6b82a2f629..d7a2d68e8bf0 100644 --- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -48175,7 +50664,7 @@ index 91851aa48c0f..bbb64b1afd0d 100644 FINAL_LIBRARY = "webrtc" -@@ -47,180 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48187,7 +50676,6 @@ index 91851aa48c0f..bbb64b1afd0d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -48200,7 +50688,6 @@ index 91851aa48c0f..bbb64b1afd0d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -48233,7 +50720,6 @@ index 91851aa48c0f..bbb64b1afd0d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -48249,7 +50735,6 @@ index 91851aa48c0f..bbb64b1afd0d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -48290,6 +50775,24 @@ index 91851aa48c0f..bbb64b1afd0d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48324,54 +50827,51 @@ index 91851aa48c0f..bbb64b1afd0d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("transient_suppressor_impl_gn") diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build -index fed7bedc44e7..19a64909ee4a 100644 +index e2abcb849006..6deaa3bbf6a4 100644 --- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -48386,7 +50886,7 @@ index fed7bedc44e7..19a64909ee4a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48398,7 +50898,6 @@ index fed7bedc44e7..19a64909ee4a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -48411,7 +50910,6 @@ index fed7bedc44e7..19a64909ee4a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -48440,7 +50938,6 @@ index fed7bedc44e7..19a64909ee4a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -48456,7 +50953,6 @@ index fed7bedc44e7..19a64909ee4a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -48490,6 +50986,24 @@ index fed7bedc44e7..19a64909ee4a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48524,54 +51038,51 @@ index fed7bedc44e7..19a64909ee4a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("voice_probability_delay_unit_gn") diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build -index d4b5c107e9a0..f69882a959ae 100644 +index 8cf3aaefeb48..ae86ec0ff176 100644 --- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -48586,7 +51097,7 @@ index d4b5c107e9a0..f69882a959ae 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48598,7 +51109,6 @@ index d4b5c107e9a0..f69882a959ae 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -48611,7 +51121,6 @@ index d4b5c107e9a0..f69882a959ae 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -48640,7 +51149,6 @@ index d4b5c107e9a0..f69882a959ae 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -48656,7 +51164,6 @@ index d4b5c107e9a0..f69882a959ae 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -48690,6 +51197,24 @@ index d4b5c107e9a0..f69882a959ae 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48724,54 +51249,51 @@ index d4b5c107e9a0..f69882a959ae 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("cascaded_biquad_filter_gn") diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build -index b726324901cb..445a67cd860c 100644 +index 11294e2aefb8..0d5e4b712c18 100644 --- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -48786,7 +51308,7 @@ index b726324901cb..445a67cd860c 100644 FINAL_LIBRARY = "webrtc" -@@ -44,169 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48798,7 +51320,6 @@ index b726324901cb..445a67cd860c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -48811,7 +51332,6 @@ index b726324901cb..445a67cd860c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -48840,7 +51360,6 @@ index b726324901cb..445a67cd860c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -48856,7 +51375,6 @@ index b726324901cb..445a67cd860c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -48890,6 +51408,24 @@ index b726324901cb..445a67cd860c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -48924,54 +51460,51 @@ index b726324901cb..445a67cd860c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("legacy_delay_estimator_gn") diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build -index 6ac51370c144..1d369e016753 100644 +index 02898359bf06..7d5ad6e0e09e 100644 --- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -48986,7 +51519,7 @@ index 6ac51370c144..1d369e016753 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -48998,7 +51531,6 @@ index 6ac51370c144..1d369e016753 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -49011,7 +51543,6 @@ index 6ac51370c144..1d369e016753 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -49040,7 +51571,6 @@ index 6ac51370c144..1d369e016753 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -49056,7 +51586,6 @@ index 6ac51370c144..1d369e016753 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -49090,6 +51619,24 @@ index 6ac51370c144..1d369e016753 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49124,54 +51671,51 @@ index 6ac51370c144..1d369e016753 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("pffft_wrapper_gn") diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build -index 3188f9057cf4..3d4123fe9245 100644 +index 0e76427c6e5f..b452ab92154e 100644 --- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build +++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -49186,7 +51730,7 @@ index 3188f9057cf4..3d4123fe9245 100644 FINAL_LIBRARY = "webrtc" -@@ -50,180 +60,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49198,7 +51742,6 @@ index 3188f9057cf4..3d4123fe9245 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -49211,7 +51754,6 @@ index 3188f9057cf4..3d4123fe9245 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -49244,7 +51786,6 @@ index 3188f9057cf4..3d4123fe9245 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -49260,7 +51801,6 @@ index 3188f9057cf4..3d4123fe9245 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -49301,6 +51841,24 @@ index 3188f9057cf4..3d4123fe9245 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49335,54 +51893,51 @@ index 3188f9057cf4..3d4123fe9245 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("vad_gn") diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build -index dad1ea662095..70906ddfce2b 100644 +index 700c1d15f44f..02587d185dd1 100644 --- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -49397,7 +51952,7 @@ index dad1ea662095..70906ddfce2b 100644 FINAL_LIBRARY = "webrtc" -@@ -45,181 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49409,7 +51964,6 @@ index dad1ea662095..70906ddfce2b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -49423,7 +51977,6 @@ index dad1ea662095..70906ddfce2b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -49456,7 +52009,6 @@ index dad1ea662095..70906ddfce2b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -49472,7 +52024,6 @@ index dad1ea662095..70906ddfce2b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -49513,6 +52064,24 @@ index dad1ea662095..70906ddfce2b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49547,54 +52116,51 @@ index dad1ea662095..70906ddfce2b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("congestion_controller_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build -index 673e3b28ebc0..18ef7216ba3d 100644 +index f6520bf35800..0b35f2f82c75 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -49609,7 +52175,7 @@ index 673e3b28ebc0..18ef7216ba3d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49621,7 +52187,6 @@ index 673e3b28ebc0..18ef7216ba3d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -49634,7 +52199,6 @@ index 673e3b28ebc0..18ef7216ba3d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -49663,7 +52227,6 @@ index 673e3b28ebc0..18ef7216ba3d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -49679,7 +52242,6 @@ index 673e3b28ebc0..18ef7216ba3d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -49717,6 +52279,24 @@ index 673e3b28ebc0..18ef7216ba3d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49751,54 +52331,51 @@ index 673e3b28ebc0..18ef7216ba3d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("alr_detector_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build -index cacce96f8838..d549b16faaf1 100644 +index 35ba379f71c0..ff1a426bf5d3 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -49813,7 +52390,7 @@ index cacce96f8838..d549b16faaf1 100644 FINAL_LIBRARY = "webrtc" -@@ -45,181 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -49825,7 +52402,6 @@ index cacce96f8838..d549b16faaf1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -49839,7 +52415,6 @@ index cacce96f8838..d549b16faaf1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -49872,7 +52447,6 @@ index cacce96f8838..d549b16faaf1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -49888,7 +52462,6 @@ index cacce96f8838..d549b16faaf1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -49929,6 +52502,24 @@ index cacce96f8838..d549b16faaf1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -49963,54 +52554,51 @@ index cacce96f8838..d549b16faaf1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("delay_based_bwe_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build -index a75ba289fcc7..a37a5a617b4d 100644 +index b15062af41c8..3e8439f74637 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -50025,7 +52613,7 @@ index a75ba289fcc7..a37a5a617b4d 100644 FINAL_LIBRARY = "webrtc" -@@ -49,180 +59,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50037,7 +52625,6 @@ index a75ba289fcc7..a37a5a617b4d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -50050,7 +52637,6 @@ index a75ba289fcc7..a37a5a617b4d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -50083,7 +52669,6 @@ index a75ba289fcc7..a37a5a617b4d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -50099,7 +52684,6 @@ index a75ba289fcc7..a37a5a617b4d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -50140,6 +52724,24 @@ index a75ba289fcc7..a37a5a617b4d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -50174,54 +52776,51 @@ index a75ba289fcc7..a37a5a617b4d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("estimators_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build -index c792c01f32b3..7dd9df879aeb 100644 +index de5ccaa0c810..49adaa09b004 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -50236,7 +52835,7 @@ index c792c01f32b3..7dd9df879aeb 100644 FINAL_LIBRARY = "webrtc" -@@ -44,181 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50248,7 +52847,6 @@ index c792c01f32b3..7dd9df879aeb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -50262,7 +52860,6 @@ index c792c01f32b3..7dd9df879aeb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -50295,7 +52892,6 @@ index c792c01f32b3..7dd9df879aeb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -50311,7 +52907,6 @@ index c792c01f32b3..7dd9df879aeb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -50352,6 +52947,24 @@ index c792c01f32b3..7dd9df879aeb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -50386,54 +52999,51 @@ index c792c01f32b3..7dd9df879aeb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("goog_cc_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build -index 01b9c3c3c91c..4e7b32bec3b1 100644 +index 829ff47d87db..3f777466098c 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -50448,7 +53058,7 @@ index 01b9c3c3c91c..4e7b32bec3b1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50460,7 +53070,6 @@ index 01b9c3c3c91c..4e7b32bec3b1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -50473,7 +53082,6 @@ index 01b9c3c3c91c..4e7b32bec3b1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -50502,7 +53110,6 @@ index 01b9c3c3c91c..4e7b32bec3b1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -50518,7 +53125,6 @@ index 01b9c3c3c91c..4e7b32bec3b1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -50552,6 +53158,24 @@ index 01b9c3c3c91c..4e7b32bec3b1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -50586,54 +53210,51 @@ index 01b9c3c3c91c..4e7b32bec3b1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("link_capacity_estimator_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build -index 732cde0d287a..7c6165c9f66e 100644 +index aae4b8252060..0cad7d4a534c 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -50648,7 +53269,7 @@ index 732cde0d287a..7c6165c9f66e 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50660,7 +53281,6 @@ index 732cde0d287a..7c6165c9f66e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -50673,7 +53293,6 @@ index 732cde0d287a..7c6165c9f66e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -50702,7 +53321,6 @@ index 732cde0d287a..7c6165c9f66e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -50718,7 +53336,6 @@ index 732cde0d287a..7c6165c9f66e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -50756,6 +53373,24 @@ index 732cde0d287a..7c6165c9f66e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -50790,54 +53425,51 @@ index 732cde0d287a..7c6165c9f66e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("loss_based_bwe_v1_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build -index 16329ffec572..86e6866b12ac 100644 +index 5728e0c4b27d..da1bee07288c 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -50852,7 +53484,7 @@ index 16329ffec572..86e6866b12ac 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -50864,7 +53496,6 @@ index 16329ffec572..86e6866b12ac 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -50877,7 +53508,6 @@ index 16329ffec572..86e6866b12ac 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -50910,7 +53540,6 @@ index 16329ffec572..86e6866b12ac 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -50926,7 +53555,6 @@ index 16329ffec572..86e6866b12ac 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -50967,6 +53595,24 @@ index 16329ffec572..86e6866b12ac 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51001,54 +53647,51 @@ index 16329ffec572..86e6866b12ac 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("loss_based_bwe_v2_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build -index a8f2a1234503..0d9409faa0d9 100644 +index 4f4f573cd902..51646a517e70 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -51063,7 +53706,7 @@ index a8f2a1234503..0d9409faa0d9 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51075,7 +53718,6 @@ index a8f2a1234503..0d9409faa0d9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -51088,7 +53730,6 @@ index a8f2a1234503..0d9409faa0d9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -51117,7 +53758,6 @@ index a8f2a1234503..0d9409faa0d9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -51133,7 +53773,6 @@ index a8f2a1234503..0d9409faa0d9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -51171,6 +53810,24 @@ index a8f2a1234503..0d9409faa0d9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51205,54 +53862,51 @@ index a8f2a1234503..0d9409faa0d9 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("probe_controller_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build -index cfea95b862f8..7416b13f0eb1 100644 +index e189363d3ea8..5cf159041ae8 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -51267,7 +53921,7 @@ index cfea95b862f8..7416b13f0eb1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51279,7 +53933,6 @@ index cfea95b862f8..7416b13f0eb1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -51292,7 +53945,6 @@ index cfea95b862f8..7416b13f0eb1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -51321,7 +53973,6 @@ index cfea95b862f8..7416b13f0eb1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -51337,7 +53988,6 @@ index cfea95b862f8..7416b13f0eb1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -51375,6 +54025,24 @@ index cfea95b862f8..7416b13f0eb1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51409,54 +54077,51 @@ index cfea95b862f8..7416b13f0eb1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("pushback_controller_gn") diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build -index e5085dddc7cc..1e2eae1bb0e5 100644 +index c93e412e836f..0b6eb6ed39e9 100644 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -51471,7 +54136,7 @@ index e5085dddc7cc..1e2eae1bb0e5 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51483,7 +54148,6 @@ index e5085dddc7cc..1e2eae1bb0e5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -51496,7 +54160,6 @@ index e5085dddc7cc..1e2eae1bb0e5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -51529,7 +54192,6 @@ index e5085dddc7cc..1e2eae1bb0e5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -51545,7 +54207,6 @@ index e5085dddc7cc..1e2eae1bb0e5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -51586,6 +54247,24 @@ index e5085dddc7cc..1e2eae1bb0e5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51620,54 +54299,51 @@ index e5085dddc7cc..1e2eae1bb0e5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("send_side_bwe_gn") diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build -index 7303066f89fd..e107dc439687 100644 +index 980bc79d04c3..313ac07d0c15 100644 --- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -51682,7 +54358,7 @@ index 7303066f89fd..e107dc439687 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51694,7 +54370,6 @@ index 7303066f89fd..e107dc439687 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -51708,7 +54383,6 @@ index 7303066f89fd..e107dc439687 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -51741,7 +54415,6 @@ index 7303066f89fd..e107dc439687 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -51757,7 +54430,6 @@ index 7303066f89fd..e107dc439687 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -51798,6 +54470,24 @@ index 7303066f89fd..e107dc439687 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -51832,54 +54522,51 @@ index 7303066f89fd..e107dc439687 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("control_handler_gn") diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build -index f8225bdb6ab2..bf4b7fa514e1 100644 +index eb5a2a87e058..b4e083731eed 100644 --- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build +++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -51894,7 +54581,7 @@ index f8225bdb6ab2..bf4b7fa514e1 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -51906,7 +54593,6 @@ index f8225bdb6ab2..bf4b7fa514e1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -51919,7 +54605,6 @@ index f8225bdb6ab2..bf4b7fa514e1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -51952,7 +54637,6 @@ index f8225bdb6ab2..bf4b7fa514e1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -51968,7 +54652,6 @@ index f8225bdb6ab2..bf4b7fa514e1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -52009,6 +54692,24 @@ index f8225bdb6ab2..bf4b7fa514e1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -52043,38 +54744,36 @@ index f8225bdb6ab2..bf4b7fa514e1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" @@ -52222,17 +54921,16 @@ index 06e178901e14..8c38587543bd 100644 - Library("desktop_capture_differ_sse2_gn") diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -index d556763c7a51..a655376d372a 100644 +index 63c0e0b52d57..77ef9f7209ee 100644 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build -@@ -14,11 +14,21 @@ AllowCompilerWarnings() +@@ -14,11 +14,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -52247,14 +54945,13 @@ index d556763c7a51..a655376d372a 100644 FINAL_LIBRARY = "webrtc" -@@ -70,436 +80,28 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -70,180 +79,13 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -52302,7 +54999,6 @@ index d556763c7a51..a655376d372a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["WEBRTC_USE_X11"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -52349,7 +55045,6 @@ index d556763c7a51..a655376d372a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -52417,7 +55112,7 @@ index d556763c7a51..a655376d372a 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True - +- -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ @@ -52426,32 +55121,82 @@ index d556763c7a51..a655376d372a 100644 - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -256,7 +98,8 @@ if CONFIG["CPU_ARCH"] == "arm": + ] + + SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" + ] + + UNIFIED_SOURCES += [ +@@ -266,7 +109,9 @@ if CONFIG["CPU_ARCH"] == "arm": + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" + ] + + if CONFIG["CPU_ARCH"] == "mips32": +@@ -274,7 +119,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -287,7 +131,8 @@ if CONFIG["CPU_ARCH"] == "mips32": + ] + + SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" + ] + + UNIFIED_SOURCES += [ +@@ -297,13 +142,14 @@ if CONFIG["CPU_ARCH"] == "mips32": + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" + ] + + if CONFIG["CPU_ARCH"] == "mips64": + + DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -316,7 +162,8 @@ if CONFIG["CPU_ARCH"] == "mips64": + ] + + SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" + ] + + UNIFIED_SOURCES += [ +@@ -326,128 +173,19 @@ if CONFIG["CPU_ARCH"] == "mips64": + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - @@ -52511,7 +55256,18 @@ index d556763c7a51..a655376d372a 100644 - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" -- ] ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" + ] + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - @@ -52531,7 +55287,6 @@ index d556763c7a51..a655376d372a 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -52560,67 +55315,60 @@ index d556763c7a51..a655376d372a 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -460,7 +198,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + ] + + SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" + ] + + UNIFIED_SOURCES += [ +@@ -470,13 +209,15 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" -- ] -- ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" + ] + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- SOURCES += [ + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -489,7 +230,8 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": + ] + + SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/mouse_cursor_monitor_linux.cc" + ] + + UNIFIED_SOURCES += [ +@@ -499,97 +241,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", + "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - @@ -52668,7 +55416,77 @@ index d556763c7a51..a655376d372a 100644 - "Xrender", - "Xtst" - ] -+if not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD": +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" +- ] +- +-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" + ] + +-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + DEFINES["WEBRTC_USE_X11"] = True +@@ -618,62 +275,23 @@ if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TA + "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" + ] + +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_USE_X11"] = True +- +- OS_LIBS += [ +- "X11", +- "Xcomposite", +- "Xdamage", +- "Xext", +- "Xfixes", +- "Xrandr", +- "Xrender", +- "Xtst" +- ] ++if CONFIG["CPU_ARCH"] == "ppc64" and not CONFIG["MOZ_X11"] and CONFIG["OS_TARGET"] == "FreeBSD": UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", @@ -52686,33 +55504,12 @@ index d556763c7a51..a655376d372a 100644 + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_null.cc" ] --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_USE_X11"] = True -@@ -515,33 +117,8 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGE - "Xtst" - ] - -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", -- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" -- ] -- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_USE_X11"] = True -- ++if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - OS_LIBS += [ - "X11", - "Xcomposite", @@ -52727,12 +55524,16 @@ index d556763c7a51..a655376d372a 100644 ] UNIFIED_SOURCES += [ -@@ -554,7 +131,9 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TA - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", +- "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" -+ "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc", + "/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc", + "/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc" ] @@ -52740,10 +55541,10 @@ index d556763c7a51..a655376d372a 100644 Library("desktop_capture_gn") diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build deleted file mode 100644 -index c1f487a75c4c..000000000000 +index 2706bed4a65f..000000000000 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build +++ /dev/null -@@ -1,74 +0,0 @@ +@@ -1,77 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -52762,7 +55563,6 @@ index c1f487a75c4c..000000000000 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MAC"] = True @@ -52817,19 +55617,22 @@ index c1f487a75c4c..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("desktop_capture_objc_gn") diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -index 3425de316975..d75c3ca29539 100644 +index 59c2ba037b83..4458ad4e5673 100644 --- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build +++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -52844,14 +55647,13 @@ index 3425de316975..d75c3ca29539 100644 FINAL_LIBRARY = "webrtc" -@@ -49,146 +59,20 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,165 +58,31 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -52880,7 +55682,6 @@ index 3425de316975..d75c3ca29539 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -52896,7 +55697,6 @@ index 3425de316975..d75c3ca29539 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -52929,9 +55729,18 @@ index 3425de316975..d75c3ca29539 100644 - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["_GNU_SOURCE"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "ppc64": - @@ -52940,6 +55749,14 @@ index 3425de316975..d75c3ca29539 100644 -if CONFIG["CPU_ARCH"] == "riscv64": - - DEFINES["USE_X11"] = "1" + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - @@ -52959,22 +55776,18 @@ index 3425de316975..d75c3ca29539 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": @@ -52985,27 +55798,37 @@ index 3425de316975..d75c3ca29539 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_X11"] = "1" - +-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_X11"] = "1" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["CPU_ARCH"] == "x86_64": + +- DEFINES["USE_X11"] = "1" ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": DEFINES["USE_X11"] = "1" diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build -index 21b0e835e29f..4a4c80b04b03 100644 +index 3b999fdfdfe9..b5cd5bd51eb9 100644 --- third_party/libwebrtc/modules/module_api_gn/moz.build +++ third_party/libwebrtc/modules/module_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -53020,7 +55843,7 @@ index 21b0e835e29f..4a4c80b04b03 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53032,7 +55855,6 @@ index 21b0e835e29f..4a4c80b04b03 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -53041,7 +55863,6 @@ index 21b0e835e29f..4a4c80b04b03 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -53070,7 +55891,6 @@ index 21b0e835e29f..4a4c80b04b03 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -53086,7 +55906,6 @@ index 21b0e835e29f..4a4c80b04b03 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -53117,6 +55936,22 @@ index 21b0e835e29f..4a4c80b04b03 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -53157,37 +55992,32 @@ index 21b0e835e29f..4a4c80b04b03 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("module_api_gn") diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build -index b86bc9b51d12..95376e496be8 100644 +index 6d3952410c70..6d2484302b75 100644 --- third_party/libwebrtc/modules/module_api_public_gn/moz.build +++ third_party/libwebrtc/modules/module_api_public_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -53202,7 +56032,7 @@ index b86bc9b51d12..95376e496be8 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53214,7 +56044,6 @@ index b86bc9b51d12..95376e496be8 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -53223,7 +56052,6 @@ index b86bc9b51d12..95376e496be8 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -53252,7 +56080,6 @@ index b86bc9b51d12..95376e496be8 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -53268,7 +56095,6 @@ index b86bc9b51d12..95376e496be8 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -53299,6 +56125,22 @@ index b86bc9b51d12..95376e496be8 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -53339,37 +56181,32 @@ index b86bc9b51d12..95376e496be8 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("module_api_public_gn") diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build -index a30fe0907272..b52e6fb1acad 100644 +index 3badc9ded12e..b50fec7f7d98 100644 --- third_party/libwebrtc/modules/module_fec_api_gn/moz.build +++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -53384,7 +56221,7 @@ index a30fe0907272..b52e6fb1acad 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53396,7 +56233,6 @@ index a30fe0907272..b52e6fb1acad 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -53405,7 +56241,6 @@ index a30fe0907272..b52e6fb1acad 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -53434,7 +56269,6 @@ index a30fe0907272..b52e6fb1acad 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -53450,7 +56284,6 @@ index a30fe0907272..b52e6fb1acad 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -53481,6 +56314,22 @@ index a30fe0907272..b52e6fb1acad 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -53521,37 +56370,32 @@ index a30fe0907272..b52e6fb1acad 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("module_fec_api_gn") diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build -index 27033613552f..0aeb0b97b0db 100644 +index 17d4371d72e0..f42d208ca469 100644 --- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build +++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -53566,7 +56410,7 @@ index 27033613552f..0aeb0b97b0db 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53578,7 +56422,6 @@ index 27033613552f..0aeb0b97b0db 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -53591,7 +56434,6 @@ index 27033613552f..0aeb0b97b0db 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -53620,7 +56462,6 @@ index 27033613552f..0aeb0b97b0db 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -53636,7 +56477,6 @@ index 27033613552f..0aeb0b97b0db 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -53670,6 +56510,24 @@ index 27033613552f..0aeb0b97b0db 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -53704,54 +56562,51 @@ index 27033613552f..0aeb0b97b0db 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("interval_budget_gn") diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build -index a6c94f62609f..010c64914b95 100644 +index 6fb893c2db14..5605df303cd7 100644 --- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build +++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -53766,7 +56621,7 @@ index a6c94f62609f..010c64914b95 100644 FINAL_LIBRARY = "webrtc" -@@ -50,181 +60,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,191 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -53778,7 +56633,6 @@ index a6c94f62609f..010c64914b95 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -53792,7 +56646,6 @@ index a6c94f62609f..010c64914b95 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -53825,7 +56678,6 @@ index a6c94f62609f..010c64914b95 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -53841,7 +56693,6 @@ index a6c94f62609f..010c64914b95 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -53882,6 +56733,24 @@ index a6c94f62609f..010c64914b95 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -53916,126 +56785,71 @@ index a6c94f62609f..010c64914b95 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("pacing_gn") diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build -deleted file mode 100644 -index 92ca36986be3..000000000000 +index 77603c780bdc..2ab84b3fe759 100644 --- third_party/libwebrtc/modules/portal/portal_gn/moz.build -+++ /dev/null -@@ -1,99 +0,0 @@ --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### --if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": -- CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] -- --COMPILE_FLAGS["OS_INCLUDES"] = [] --AllowCompilerWarnings() -- --DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True ++++ third_party/libwebrtc/modules/portal/portal_gn/moz.build +@@ -14,21 +14,17 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["USE_GLIB"] = "1" + DEFINES["USE_GLIB"] = "1" -DEFINES["USE_NSS_CERTS"] = "1" --DEFINES["USE_OZONE"] = "1" + DEFINES["USE_OZONE"] = "1" -DEFINES["USE_UDEV"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_POSIX"] = True --DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_USE_PIPEWIRE"] = True --DEFINES["_FILE_OFFSET_BITS"] = "64" + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" + DEFINES["WEBRTC_USE_PIPEWIRE"] = True + DEFINES["_FILE_OFFSET_BITS"] = "64" -DEFINES["_GNU_SOURCE"] = True --DEFINES["_LARGEFILE64_SOURCE"] = True --DEFINES["_LARGEFILE_SOURCE"] = True --DEFINES["__STDC_CONSTANT_MACROS"] = True --DEFINES["__STDC_FORMAT_MACROS"] = True -- --FINAL_LIBRARY = "webrtc" -- -- --LOCAL_INCLUDES += [ -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/gfx/angle/checkout/include/", -- "/ipc/chromium/src", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/libwebrtc/", -- "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/third_party/pipewire/", -- "/tools/profiler/public" --] -- --UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/portal/pipewire_utils.cc", -- "/third_party/libwebrtc/modules/portal/scoped_glib.cc", -- "/third_party/libwebrtc/modules/portal/xdg_desktop_portal_utils.cc" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_DEBUG"] = True -- --if CONFIG["CPU_ARCH"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- + DEFINES["_LARGEFILE64_SOURCE"] = True + DEFINES["_LARGEFILE_SOURCE"] = True + DEFINES["__STDC_CONSTANT_MACROS"] = True +@@ -75,16 +71,6 @@ if CONFIG["CPU_ARCH"] == "aarch64": + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ @@ -54046,29 +56860,29 @@ index 92ca36986be3..000000000000 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - --if CONFIG["CPU_ARCH"] == "x86": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True +@@ -102,7 +88,7 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --Library("portal_gn") ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build -index b34f8e90cf4f..2b57d98d8ea4 100644 +index e572e90c311a..712c9fe0bacd 100644 --- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build +++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -54083,7 +56897,7 @@ index b34f8e90cf4f..2b57d98d8ea4 100644 FINAL_LIBRARY = "webrtc" -@@ -55,180 +65,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -55,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54095,7 +56909,6 @@ index b34f8e90cf4f..2b57d98d8ea4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -54108,7 +56921,6 @@ index b34f8e90cf4f..2b57d98d8ea4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -54141,7 +56953,6 @@ index b34f8e90cf4f..2b57d98d8ea4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -54157,7 +56968,6 @@ index b34f8e90cf4f..2b57d98d8ea4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -54198,6 +57008,24 @@ index b34f8e90cf4f..2b57d98d8ea4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -54232,54 +57060,51 @@ index b34f8e90cf4f..2b57d98d8ea4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("remote_bitrate_estimator_gn") diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build -index cddca5d2a61f..1eb46e1cd668 100644 +index f03986e482da..8cfbc6b1ddb3 100644 --- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build +++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -54294,7 +57119,7 @@ index cddca5d2a61f..1eb46e1cd668 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54306,7 +57131,6 @@ index cddca5d2a61f..1eb46e1cd668 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -54315,7 +57139,6 @@ index cddca5d2a61f..1eb46e1cd668 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -54344,7 +57167,6 @@ index cddca5d2a61f..1eb46e1cd668 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -54360,7 +57182,6 @@ index cddca5d2a61f..1eb46e1cd668 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -54394,6 +57215,24 @@ index cddca5d2a61f..1eb46e1cd668 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -54427,8 +57266,7 @@ index cddca5d2a61f..1eb46e1cd668 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -54439,43 +57277,41 @@ index cddca5d2a61f..1eb46e1cd668 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("leb128_gn") diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build -index 67966cf7a9e3..6ed3a251e50c 100644 +index da69b456d323..3a86740343d2 100644 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -54490,7 +57326,7 @@ index 67966cf7a9e3..6ed3a251e50c 100644 FINAL_LIBRARY = "webrtc" -@@ -85,180 +95,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -85,190 +94,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54502,7 +57338,6 @@ index 67966cf7a9e3..6ed3a251e50c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -54515,7 +57350,6 @@ index 67966cf7a9e3..6ed3a251e50c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -54548,7 +57382,6 @@ index 67966cf7a9e3..6ed3a251e50c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -54564,7 +57397,6 @@ index 67966cf7a9e3..6ed3a251e50c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -54605,6 +57437,24 @@ index 67966cf7a9e3..6ed3a251e50c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -54639,54 +57489,51 @@ index 67966cf7a9e3..6ed3a251e50c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_rtcp_format_gn") diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -index cde6cd406467..8777095f3316 100644 +index d4d42e4dcf5c..ca2824350d12 100644 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -@@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" +@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["BWE_TEST_LOGGING_COMPILE_TIME_ENABLE"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -54701,7 +57548,7 @@ index cde6cd406467..8777095f3316 100644 FINAL_LIBRARY = "webrtc" -@@ -97,181 +107,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -97,191 +106,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54713,7 +57560,6 @@ index cde6cd406467..8777095f3316 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -54727,7 +57573,6 @@ index cde6cd406467..8777095f3316 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -54760,7 +57605,6 @@ index cde6cd406467..8777095f3316 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -54776,7 +57620,6 @@ index cde6cd406467..8777095f3316 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -54817,6 +57660,24 @@ index cde6cd406467..8777095f3316 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -54851,54 +57712,51 @@ index cde6cd406467..8777095f3316 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_rtcp_gn") diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build -index feccc20f86a3..108cc1c4bca7 100644 +index 99447dd14992..4743dce9a666 100644 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -54913,7 +57771,7 @@ index feccc20f86a3..108cc1c4bca7 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54925,7 +57783,6 @@ index feccc20f86a3..108cc1c4bca7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -54938,7 +57795,6 @@ index feccc20f86a3..108cc1c4bca7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -54967,7 +57823,6 @@ index feccc20f86a3..108cc1c4bca7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -54983,7 +57838,6 @@ index feccc20f86a3..108cc1c4bca7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -55021,6 +57875,24 @@ index feccc20f86a3..108cc1c4bca7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55055,54 +57927,51 @@ index feccc20f86a3..108cc1c4bca7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtp_video_header_gn") diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build -index 6f53d309c608..b223641d8ed3 100644 +index 40022820400d..a8dff360398f 100644 --- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build +++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -55117,7 +57986,7 @@ index 6f53d309c608..b223641d8ed3 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55129,7 +57998,6 @@ index 6f53d309c608..b223641d8ed3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -55138,7 +58006,6 @@ index 6f53d309c608..b223641d8ed3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -55167,7 +58034,6 @@ index 6f53d309c608..b223641d8ed3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -55183,7 +58049,6 @@ index 6f53d309c608..b223641d8ed3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -55217,6 +58082,24 @@ index 6f53d309c608..b223641d8ed3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55250,8 +58133,7 @@ index 6f53d309c608..b223641d8ed3 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -55262,43 +58144,41 @@ index 6f53d309c608..b223641d8ed3 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("fft_gn") diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build -index ca69ebcb69d2..b0d6eca834d9 100644 +index 3b2ee5ee3d97..af84f0dd5f5a 100644 --- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build +++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -55313,7 +58193,7 @@ index ca69ebcb69d2..b0d6eca834d9 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55325,7 +58205,6 @@ index ca69ebcb69d2..b0d6eca834d9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -55334,7 +58213,6 @@ index ca69ebcb69d2..b0d6eca834d9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -55363,7 +58241,6 @@ index ca69ebcb69d2..b0d6eca834d9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -55379,7 +58256,6 @@ index ca69ebcb69d2..b0d6eca834d9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -55413,6 +58289,24 @@ index ca69ebcb69d2..b0d6eca834d9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55446,8 +58340,7 @@ index ca69ebcb69d2..b0d6eca834d9 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -55458,43 +58351,41 @@ index ca69ebcb69d2..b0d6eca834d9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("g711_3p_gn") diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build -index b06d36ecf564..878b8134ccb9 100644 +index f40abbac1407..d320b4ef86f8 100644 --- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build +++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -55509,7 +58400,7 @@ index b06d36ecf564..878b8134ccb9 100644 FINAL_LIBRARY = "webrtc" -@@ -47,165 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,175 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55521,7 +58412,6 @@ index b06d36ecf564..878b8134ccb9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -55530,7 +58420,6 @@ index b06d36ecf564..878b8134ccb9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -55559,7 +58448,6 @@ index b06d36ecf564..878b8134ccb9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -55575,7 +58463,6 @@ index b06d36ecf564..878b8134ccb9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -55609,6 +58496,24 @@ index b06d36ecf564..878b8134ccb9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55642,8 +58547,7 @@ index b06d36ecf564..878b8134ccb9 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CFLAGS += [ "-msse2" ] @@ -55654,43 +58558,41 @@ index b06d36ecf564..878b8134ccb9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("g722_3p_gn") diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build -index 0046075b68b4..8d216e646134 100644 +index b932f5da73da..49d074bc4db2 100644 --- third_party/libwebrtc/modules/utility/utility_gn/moz.build +++ third_party/libwebrtc/modules/utility/utility_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -55705,7 +58607,7 @@ index 0046075b68b4..8d216e646134 100644 FINAL_LIBRARY = "webrtc" -@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55717,7 +58619,6 @@ index 0046075b68b4..8d216e646134 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -55734,7 +58635,6 @@ index 0046075b68b4..8d216e646134 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -55763,7 +58663,6 @@ index 0046075b68b4..8d216e646134 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -55779,7 +58678,6 @@ index 0046075b68b4..8d216e646134 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -55817,6 +58715,24 @@ index 0046075b68b4..8d216e646134 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -55850,8 +58766,7 @@ index 0046075b68b4..8d216e646134 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -55861,44 +58776,42 @@ index 0046075b68b4..8d216e646134 100644 - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("utility_gn") diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build -index e64763f2ee81..d4b1d0888a7d 100644 +index 4b4b418c551f..6daff73f66b4 100644 --- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build +++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build -@@ -14,11 +14,21 @@ AllowCompilerWarnings() +@@ -14,11 +14,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -55913,7 +58826,7 @@ index e64763f2ee81..d4b1d0888a7d 100644 FINAL_LIBRARY = "webrtc" -@@ -33,6 +43,10 @@ LOCAL_INCLUDES += [ +@@ -33,6 +42,10 @@ LOCAL_INCLUDES += [ ] UNIFIED_SOURCES += [ @@ -55924,7 +58837,7 @@ index e64763f2ee81..d4b1d0888a7d 100644 "/third_party/libwebrtc/modules/video_capture/video_capture_options.cc" ] -@@ -45,282 +59,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,149 +58,13 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -55936,7 +58849,6 @@ index e64763f2ee81..d4b1d0888a7d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -55950,7 +58862,6 @@ index e64763f2ee81..d4b1d0888a7d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -55990,7 +58901,6 @@ index e64763f2ee81..d4b1d0888a7d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -56013,7 +58923,6 @@ index e64763f2ee81..d4b1d0888a7d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -56059,7 +58968,7 @@ index e64763f2ee81..d4b1d0888a7d 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True - +- -if CONFIG["CPU_ARCH"] == "arm": - - CXXFLAGS += [ @@ -56070,6 +58979,49 @@ index e64763f2ee81..d4b1d0888a7d 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["MIPS32_LE"] = True +- DEFINES["MIPS_FPU_LE"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -206,81 +83,11 @@ if CONFIG["CPU_ARCH"] == "mips32": + "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" + ] + +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +- LOCAL_INCLUDES += [ +- "/gfx/angle/checkout/include/", +- "/third_party/drm/drm/", +- "/third_party/drm/drm/include/", +- "/third_party/drm/drm/include/libdrm/", +- "/third_party/gbm/gbm/", +- "/third_party/libepoxy/libepoxy/include/", +- "/third_party/pipewire/" +- ] +- +- UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc", +- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -56112,51 +59064,31 @@ index e64763f2ee81..d4b1d0888a7d 100644 - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++if CONFIG["CPU_ARCH"] == "mips32": + ++ DEFINES["MIPS32_LE"] = True ++ DEFINES["MIPS_FPU_LE"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" -- ] -- + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -299,10 +106,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" + ] + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++if CONFIG["CPU_ARCH"] == "mips64": + + DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" -- ] -- + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -321,14 +127,14 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" + ] + -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["CPU_ARCH"] == "x86": @@ -56164,65 +59096,45 @@ index e64763f2ee81..d4b1d0888a7d 100644 "-msse2" ] -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" -- ] -- + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -347,10 +153,10 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" + ] + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_PIPEWIRE"] = True -- DEFINES["_GNU_SOURCE"] = True -- -- LOCAL_INCLUDES += [ -- "/gfx/angle/checkout/include/", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/gbm/gbm/", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/pipewire/" -- ] -- -- UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc", -- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" -- ] -+ DEFINES["USE_X11"] = "1" ++if CONFIG["CPU_ARCH"] == "x86_64": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True + + LOCAL_INCLUDES += [ + "/gfx/angle/checkout/include/", +@@ -369,4 +175,8 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc" + ] + ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ ++ DEFINES["USE_X11"] = "1" ++ Library("video_capture_internal_impl_gn") diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build -index e1a77c54b7e9..0a6357828748 100644 +index 8aa245b127c1..1f157fe113a0 100644 --- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build +++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -56237,7 +59149,7 @@ index e1a77c54b7e9..0a6357828748 100644 FINAL_LIBRARY = "webrtc" -@@ -47,181 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,191 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56249,7 +59161,6 @@ index e1a77c54b7e9..0a6357828748 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -56263,7 +59174,6 @@ index e1a77c54b7e9..0a6357828748 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -56296,7 +59206,6 @@ index e1a77c54b7e9..0a6357828748 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -56312,7 +59221,6 @@ index e1a77c54b7e9..0a6357828748 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -56353,6 +59261,24 @@ index e1a77c54b7e9..0a6357828748 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -56387,54 +59313,51 @@ index e1a77c54b7e9..0a6357828748 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_capture_module_gn") diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build -index 9ff1a44870b7..939814663cdd 100644 +index 9020f11067fc..fcc8a73423ab 100644 --- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -56449,7 +59372,7 @@ index 9ff1a44870b7..939814663cdd 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56461,7 +59384,6 @@ index 9ff1a44870b7..939814663cdd 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -56474,7 +59396,6 @@ index 9ff1a44870b7..939814663cdd 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -56503,7 +59424,6 @@ index 9ff1a44870b7..939814663cdd 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -56519,7 +59439,6 @@ index 9ff1a44870b7..939814663cdd 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -56557,6 +59476,24 @@ index 9ff1a44870b7..939814663cdd 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -56591,54 +59528,51 @@ index 9ff1a44870b7..939814663cdd 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("chain_diff_calculator_gn") diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build -index 6024488b122c..a621ef872ee3 100644 +index 7c87e340afde..b4f0490937ff 100644 --- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -56653,7 +59587,7 @@ index 6024488b122c..a621ef872ee3 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56665,7 +59599,6 @@ index 6024488b122c..a621ef872ee3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -56678,7 +59611,6 @@ index 6024488b122c..a621ef872ee3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -56707,7 +59639,6 @@ index 6024488b122c..a621ef872ee3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -56723,7 +59654,6 @@ index 6024488b122c..a621ef872ee3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -56754,6 +59684,22 @@ index 6024488b122c..a621ef872ee3 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -56794,37 +59740,32 @@ index 6024488b122c..a621ef872ee3 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("codec_globals_headers_gn") diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build -index bae653022f52..2d7f0877da4f 100644 +index cc297017e3d5..12901738a75f 100644 --- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -56839,7 +59780,7 @@ index bae653022f52..2d7f0877da4f 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -56851,7 +59792,6 @@ index bae653022f52..2d7f0877da4f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -56864,7 +59804,6 @@ index bae653022f52..2d7f0877da4f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -56893,7 +59832,6 @@ index bae653022f52..2d7f0877da4f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -56909,7 +59847,6 @@ index bae653022f52..2d7f0877da4f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -56947,6 +59884,24 @@ index bae653022f52..2d7f0877da4f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -56981,54 +59936,51 @@ index bae653022f52..2d7f0877da4f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("av1_svc_config_gn") diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build -index 6e56cb813409..4357aaf03f6d 100644 +index 159b77d10cab..217d265bacee 100644 --- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -57043,7 +59995,7 @@ index 6e56cb813409..4357aaf03f6d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57055,7 +60007,6 @@ index 6e56cb813409..4357aaf03f6d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -57068,7 +60019,6 @@ index 6e56cb813409..4357aaf03f6d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -57101,7 +60051,6 @@ index 6e56cb813409..4357aaf03f6d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -57117,7 +60066,6 @@ index 6e56cb813409..4357aaf03f6d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -57158,6 +60106,24 @@ index 6e56cb813409..4357aaf03f6d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57192,54 +60158,51 @@ index 6e56cb813409..4357aaf03f6d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("encoded_frame_gn") diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build -index ab6b014f62c1..a6a0b783342e 100644 +index c518044c948a..74af6c5dc520 100644 --- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -57254,7 +60217,7 @@ index ab6b014f62c1..a6a0b783342e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57266,7 +60229,6 @@ index ab6b014f62c1..a6a0b783342e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -57279,7 +60241,6 @@ index ab6b014f62c1..a6a0b783342e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -57308,7 +60269,6 @@ index ab6b014f62c1..a6a0b783342e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -57324,7 +60284,6 @@ index ab6b014f62c1..a6a0b783342e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -57362,6 +60321,24 @@ index ab6b014f62c1..a6a0b783342e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57396,54 +60373,51 @@ index ab6b014f62c1..a6a0b783342e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frame_dependencies_calculator_gn") diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build -index ed5b1bdf6b27..97c33c3db1d0 100644 +index d6342c48f713..544a97f60aad 100644 --- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -57458,7 +60432,7 @@ index ed5b1bdf6b27..97c33c3db1d0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57470,7 +60444,6 @@ index ed5b1bdf6b27..97c33c3db1d0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -57483,7 +60456,6 @@ index ed5b1bdf6b27..97c33c3db1d0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -57516,7 +60488,6 @@ index ed5b1bdf6b27..97c33c3db1d0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -57532,7 +60503,6 @@ index ed5b1bdf6b27..97c33c3db1d0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -57573,6 +60543,24 @@ index ed5b1bdf6b27..97c33c3db1d0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57607,54 +60595,51 @@ index ed5b1bdf6b27..97c33c3db1d0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frame_helpers_gn") diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build -index 5a1af2206d9e..6aba10d80f6a 100644 +index 33e763a48d7e..e1db6e2439d5 100644 --- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -57669,7 +60654,7 @@ index 5a1af2206d9e..6aba10d80f6a 100644 FINAL_LIBRARY = "webrtc" -@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57681,7 +60666,6 @@ index 5a1af2206d9e..6aba10d80f6a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -57694,7 +60678,6 @@ index 5a1af2206d9e..6aba10d80f6a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -57727,7 +60710,6 @@ index 5a1af2206d9e..6aba10d80f6a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -57743,7 +60725,6 @@ index 5a1af2206d9e..6aba10d80f6a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -57784,6 +60765,24 @@ index 5a1af2206d9e..6aba10d80f6a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -57818,54 +60817,51 @@ index 5a1af2206d9e..6aba10d80f6a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("nack_requester_gn") diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build -index d5fa516bf494..713c12629daa 100644 +index 9561cb88e8eb..65e5b4757c29 100644 --- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -57880,7 +60876,7 @@ index d5fa516bf494..713c12629daa 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -57892,7 +60888,6 @@ index d5fa516bf494..713c12629daa 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -57905,7 +60900,6 @@ index d5fa516bf494..713c12629daa 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -57938,7 +60932,6 @@ index d5fa516bf494..713c12629daa 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -57954,7 +60947,6 @@ index d5fa516bf494..713c12629daa 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -57995,6 +60987,24 @@ index d5fa516bf494..713c12629daa 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -58029,54 +61039,51 @@ index d5fa516bf494..713c12629daa 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("packet_buffer_gn") diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build -index bf43b8285baf..437a238416c0 100644 +index f786b1161681..e6d655af95dc 100644 --- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -58091,7 +61098,7 @@ index bf43b8285baf..437a238416c0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58103,7 +61110,6 @@ index bf43b8285baf..437a238416c0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -58116,7 +61122,6 @@ index bf43b8285baf..437a238416c0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -58145,7 +61150,6 @@ index bf43b8285baf..437a238416c0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -58161,7 +61165,6 @@ index bf43b8285baf..437a238416c0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -58199,6 +61202,24 @@ index bf43b8285baf..437a238416c0 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -58233,54 +61254,51 @@ index bf43b8285baf..437a238416c0 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("scalability_mode_util_gn") diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build -index 60563bfa1a65..781406006283 100644 +index a3e45b1cd7ba..12c34079a6e6 100644 --- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -58295,7 +61313,7 @@ index 60563bfa1a65..781406006283 100644 FINAL_LIBRARY = "webrtc" -@@ -50,173 +60,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,183 +59,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58307,7 +61325,6 @@ index 60563bfa1a65..781406006283 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -58320,7 +61337,6 @@ index 60563bfa1a65..781406006283 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -58349,7 +61365,6 @@ index 60563bfa1a65..781406006283 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -58365,7 +61380,6 @@ index 60563bfa1a65..781406006283 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -58403,6 +61417,24 @@ index 60563bfa1a65..781406006283 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -58437,54 +61469,51 @@ index 60563bfa1a65..781406006283 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("scalability_structures_gn") diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build -index c044a2a33487..c6dcdbd04ac2 100644 +index 42b8307362fe..9348473d2af9 100644 --- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -58499,7 +61528,7 @@ index c044a2a33487..c6dcdbd04ac2 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58511,7 +61540,6 @@ index c044a2a33487..c6dcdbd04ac2 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -58524,7 +61552,6 @@ index c044a2a33487..c6dcdbd04ac2 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -58553,7 +61580,6 @@ index c044a2a33487..c6dcdbd04ac2 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -58569,7 +61595,6 @@ index c044a2a33487..c6dcdbd04ac2 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -58603,6 +61628,24 @@ index c044a2a33487..c6dcdbd04ac2 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -58637,54 +61680,51 @@ index c044a2a33487..c6dcdbd04ac2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("scalable_video_controller_gn") diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build -index 580529c54a58..5362bea2a05c 100644 +index 5d7d952a69b9..7157f0bd74ba 100644 --- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -58699,7 +61739,7 @@ index 580529c54a58..5362bea2a05c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58711,7 +61751,6 @@ index 580529c54a58..5362bea2a05c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -58724,7 +61763,6 @@ index 580529c54a58..5362bea2a05c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -58753,7 +61791,6 @@ index 580529c54a58..5362bea2a05c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -58769,7 +61806,6 @@ index 580529c54a58..5362bea2a05c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -58807,6 +61843,24 @@ index 580529c54a58..5362bea2a05c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -58841,54 +61895,51 @@ index 580529c54a58..5362bea2a05c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("svc_rate_allocator_gn") diff --git third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build -index a167a068b34a..165a217477fb 100644 +index 86a34e861ec4..1e4f00d3f730 100644 --- third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -58903,7 +61954,7 @@ index a167a068b34a..165a217477fb 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -58915,7 +61966,6 @@ index a167a068b34a..165a217477fb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -58928,7 +61978,6 @@ index a167a068b34a..165a217477fb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -58957,7 +62006,6 @@ index a167a068b34a..165a217477fb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -58973,7 +62021,6 @@ index a167a068b34a..165a217477fb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -59007,6 +62054,24 @@ index a167a068b34a..165a217477fb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59041,54 +62106,51 @@ index a167a068b34a..165a217477fb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("decode_time_percentile_filter_gn") diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build -index d74b4c376a81..c37c18b0e42e 100644 +index ecdcfc93e128..47bc48987a96 100644 --- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -59103,7 +62165,7 @@ index d74b4c376a81..c37c18b0e42e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59115,7 +62177,6 @@ index d74b4c376a81..c37c18b0e42e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -59128,7 +62189,6 @@ index d74b4c376a81..c37c18b0e42e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -59157,7 +62217,6 @@ index d74b4c376a81..c37c18b0e42e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -59173,7 +62232,6 @@ index d74b4c376a81..c37c18b0e42e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -59207,6 +62265,24 @@ index d74b4c376a81..c37c18b0e42e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59241,54 +62317,51 @@ index d74b4c376a81..c37c18b0e42e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frame_delay_variation_kalman_filter_gn") -diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build -index ad375d8f04c4..f41b3bb7a842 100644 ---- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build -+++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build +index 56b01f3f41eb..a451183c0b23 100644 +--- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -59303,7 +62376,7 @@ index ad375d8f04c4..f41b3bb7a842 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59315,7 +62388,6 @@ index ad375d8f04c4..f41b3bb7a842 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -59328,7 +62400,6 @@ index ad375d8f04c4..f41b3bb7a842 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -59357,7 +62428,6 @@ index ad375d8f04c4..f41b3bb7a842 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -59373,7 +62443,6 @@ index ad375d8f04c4..f41b3bb7a842 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -59407,6 +62476,24 @@ index ad375d8f04c4..f41b3bb7a842 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59441,54 +62528,51 @@ index ad375d8f04c4..f41b3bb7a842 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("inter_frame_delay_gn") + Library("inter_frame_delay_variation_calculator_gn") diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build -index 2fce89e85571..e784c7b6eceb 100644 +index a0d6154d785f..b158655cdd5d 100644 --- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -59503,7 +62587,7 @@ index 2fce89e85571..e784c7b6eceb 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59515,7 +62599,6 @@ index 2fce89e85571..e784c7b6eceb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -59528,7 +62611,6 @@ index 2fce89e85571..e784c7b6eceb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -59561,7 +62643,6 @@ index 2fce89e85571..e784c7b6eceb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -59577,7 +62658,6 @@ index 2fce89e85571..e784c7b6eceb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -59618,6 +62698,24 @@ index 2fce89e85571..e784c7b6eceb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59652,54 +62750,51 @@ index 2fce89e85571..e784c7b6eceb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("jitter_estimator_gn") diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build -index f8e60ad2f955..fb23394414e9 100644 +index 488a49d9c26b..bc1e328ba2ec 100644 --- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -59714,7 +62809,7 @@ index f8e60ad2f955..fb23394414e9 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59726,7 +62821,6 @@ index f8e60ad2f955..fb23394414e9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -59739,7 +62833,6 @@ index f8e60ad2f955..fb23394414e9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -59768,7 +62861,6 @@ index f8e60ad2f955..fb23394414e9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -59784,7 +62876,6 @@ index f8e60ad2f955..fb23394414e9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -59818,6 +62909,24 @@ index f8e60ad2f955..fb23394414e9 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -59852,54 +62961,51 @@ index f8e60ad2f955..fb23394414e9 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtt_filter_gn") diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build -index 693092ebbeda..7971d5beaabb 100644 +index 4cd085dd0962..2865a2290f7d 100644 --- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -59914,7 +63020,7 @@ index 693092ebbeda..7971d5beaabb 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -59926,7 +63032,6 @@ index 693092ebbeda..7971d5beaabb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -59939,7 +63044,6 @@ index 693092ebbeda..7971d5beaabb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -59968,7 +63072,6 @@ index 693092ebbeda..7971d5beaabb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -59984,7 +63087,6 @@ index 693092ebbeda..7971d5beaabb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -60018,6 +63120,24 @@ index 693092ebbeda..7971d5beaabb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -60052,54 +63172,51 @@ index 693092ebbeda..7971d5beaabb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("timestamp_extrapolator_gn") diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build -index 6c5bddfa28e4..4bdcc798300e 100644 +index 8ab43fb7484d..4fd77d42f049 100644 --- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -60114,7 +63231,7 @@ index 6c5bddfa28e4..4bdcc798300e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60126,7 +63243,6 @@ index 6c5bddfa28e4..4bdcc798300e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -60139,7 +63255,6 @@ index 6c5bddfa28e4..4bdcc798300e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -60172,7 +63287,6 @@ index 6c5bddfa28e4..4bdcc798300e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -60188,7 +63302,6 @@ index 6c5bddfa28e4..4bdcc798300e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -60229,6 +63342,24 @@ index 6c5bddfa28e4..4bdcc798300e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -60263,54 +63394,51 @@ index 6c5bddfa28e4..4bdcc798300e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("timing_module_gn") diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build -index 9b89c3175ffd..a43d3b87df85 100644 +index f01783ebd1f3..89deb11da94a 100644 --- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -60325,7 +63453,7 @@ index 9b89c3175ffd..a43d3b87df85 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60337,7 +63465,6 @@ index 9b89c3175ffd..a43d3b87df85 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -60350,7 +63477,6 @@ index 9b89c3175ffd..a43d3b87df85 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -60379,7 +63505,6 @@ index 9b89c3175ffd..a43d3b87df85 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -60395,7 +63520,6 @@ index 9b89c3175ffd..a43d3b87df85 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -60433,6 +63557,24 @@ index 9b89c3175ffd..a43d3b87df85 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -60467,54 +63609,51 @@ index 9b89c3175ffd..a43d3b87df85 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_codec_interface_gn") diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -index 1505ee19362d..9eba28938355 100644 +index 3c92397fe562..197ccefb29d9 100644 --- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -60529,7 +63668,7 @@ index 1505ee19362d..9eba28938355 100644 FINAL_LIBRARY = "webrtc" -@@ -57,181 +67,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -57,191 +66,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60541,7 +63680,6 @@ index 1505ee19362d..9eba28938355 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -60555,7 +63693,6 @@ index 1505ee19362d..9eba28938355 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -60588,7 +63725,6 @@ index 1505ee19362d..9eba28938355 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -60604,7 +63740,6 @@ index 1505ee19362d..9eba28938355 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -60645,6 +63780,24 @@ index 1505ee19362d..9eba28938355 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -60679,54 +63832,51 @@ index 1505ee19362d..9eba28938355 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_coding_gn") diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build -index 6e83554f9b13..deedbe512b88 100644 +index 3bbec9fb3074..92ff8a1d9819 100644 --- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -60741,7 +63891,7 @@ index 6e83554f9b13..deedbe512b88 100644 FINAL_LIBRARY = "webrtc" -@@ -54,181 +64,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -54,191 +63,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60753,7 +63903,6 @@ index 6e83554f9b13..deedbe512b88 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -60767,7 +63916,6 @@ index 6e83554f9b13..deedbe512b88 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -60800,7 +63948,6 @@ index 6e83554f9b13..deedbe512b88 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -60816,7 +63963,6 @@ index 6e83554f9b13..deedbe512b88 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -60857,6 +64003,24 @@ index 6e83554f9b13..deedbe512b88 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -60891,54 +64055,51 @@ index 6e83554f9b13..deedbe512b88 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_coding_utility_gn") diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build -index a31368bc624d..537f3d9fe0f5 100644 +index 03437c5d57de..2adbff018445 100644 --- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -60953,7 +64114,7 @@ index a31368bc624d..537f3d9fe0f5 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -60965,7 +64126,6 @@ index a31368bc624d..537f3d9fe0f5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -60978,7 +64138,6 @@ index a31368bc624d..537f3d9fe0f5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -61007,7 +64166,6 @@ index a31368bc624d..537f3d9fe0f5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -61023,7 +64181,6 @@ index a31368bc624d..537f3d9fe0f5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -61057,6 +64214,24 @@ index a31368bc624d..537f3d9fe0f5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61091,54 +64266,51 @@ index a31368bc624d..537f3d9fe0f5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_libvpx_interface_gn") diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -index 70a6c615c6d1..92b1a296d219 100644 +index eb02eda6631d..8988f6d4b0ac 100644 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -61153,7 +64325,7 @@ index 70a6c615c6d1..92b1a296d219 100644 FINAL_LIBRARY = "webrtc" -@@ -46,181 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61165,7 +64337,6 @@ index 70a6c615c6d1..92b1a296d219 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -61179,7 +64350,6 @@ index 70a6c615c6d1..92b1a296d219 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -61212,7 +64382,6 @@ index 70a6c615c6d1..92b1a296d219 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -61228,7 +64397,6 @@ index 70a6c615c6d1..92b1a296d219 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -61269,6 +64437,24 @@ index 70a6c615c6d1..92b1a296d219 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61303,54 +64489,51 @@ index 70a6c615c6d1..92b1a296d219 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_vp8_gn") diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build -index f05efa9f5bb9..fb174b5b0de7 100644 +index 3d5642df008a..3efc79029a22 100644 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -61365,7 +64548,7 @@ index f05efa9f5bb9..fb174b5b0de7 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61377,7 +64560,6 @@ index f05efa9f5bb9..fb174b5b0de7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -61390,7 +64572,6 @@ index f05efa9f5bb9..fb174b5b0de7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -61419,7 +64600,6 @@ index f05efa9f5bb9..fb174b5b0de7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -61435,7 +64615,6 @@ index f05efa9f5bb9..fb174b5b0de7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -61469,6 +64648,24 @@ index f05efa9f5bb9..fb174b5b0de7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61503,54 +64700,51 @@ index f05efa9f5bb9..fb174b5b0de7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_vp8_scalability_gn") diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build -index 7bdf47883470..faf71b356c4f 100644 +index 7977e03d428c..64f1526a2eb2 100644 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -61565,7 +64759,7 @@ index 7bdf47883470..faf71b356c4f 100644 FINAL_LIBRARY = "webrtc" -@@ -48,181 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61577,7 +64771,6 @@ index 7bdf47883470..faf71b356c4f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -61591,7 +64784,6 @@ index 7bdf47883470..faf71b356c4f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -61624,7 +64816,6 @@ index 7bdf47883470..faf71b356c4f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -61640,7 +64831,6 @@ index 7bdf47883470..faf71b356c4f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -61681,6 +64871,24 @@ index 7bdf47883470..faf71b356c4f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61715,54 +64923,51 @@ index 7bdf47883470..faf71b356c4f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_vp8_temporal_layers_gn") diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -index d044446ea180..bc5984be48f6 100644 +index f470652e6d6c..03f7307e20ea 100644 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -61777,7 +64982,7 @@ index d044446ea180..bc5984be48f6 100644 FINAL_LIBRARY = "webrtc" -@@ -48,181 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -61789,7 +64994,6 @@ index d044446ea180..bc5984be48f6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -61803,7 +65007,6 @@ index d044446ea180..bc5984be48f6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -61836,7 +65039,6 @@ index d044446ea180..bc5984be48f6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -61852,7 +65054,6 @@ index d044446ea180..bc5984be48f6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -61893,6 +65094,24 @@ index d044446ea180..bc5984be48f6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -61927,54 +65146,51 @@ index d044446ea180..bc5984be48f6 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_vp9_gn") diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build -index 48aba2c13119..1680842fab69 100644 +index 77a0c38f9903..0390ceb82364 100644 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -61989,7 +65205,7 @@ index 48aba2c13119..1680842fab69 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62001,7 +65217,6 @@ index 48aba2c13119..1680842fab69 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -62015,7 +65230,6 @@ index 48aba2c13119..1680842fab69 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -62048,7 +65262,6 @@ index 48aba2c13119..1680842fab69 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -62064,7 +65277,6 @@ index 48aba2c13119..1680842fab69 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -62105,6 +65317,24 @@ index 48aba2c13119..1680842fab69 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62139,47 +65369,45 @@ index 48aba2c13119..1680842fab69 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("webrtc_vp9_helpers_gn") diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build -index e559ad62cd7b..9197eaa6c68f 100644 +index 5c9a364dd518..96c9b9570028 100644 --- third_party/libwebrtc/moz.build +++ third_party/libwebrtc/moz.build -@@ -262,6 +262,8 @@ DIRS += [ +@@ -263,6 +263,8 @@ DIRS += [ "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn", "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn", "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn", @@ -62188,7 +65416,7 @@ index e559ad62cd7b..9197eaa6c68f 100644 "/third_party/libwebrtc/modules/module_api_gn", "/third_party/libwebrtc/modules/module_api_public_gn", "/third_party/libwebrtc/modules/module_fec_api_gn", -@@ -456,86 +458,14 @@ DIRS += [ +@@ -457,102 +459,11 @@ DIRS += [ "/third_party/libwebrtc/webrtc_gn" ] @@ -62232,13 +65460,12 @@ index e559ad62cd7b..9197eaa6c68f 100644 - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn" - ] - +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", +- "/third_party/libwebrtc/common_audio/common_audio_neon_gn" +- ] +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - DIRS += [ @@ -62273,31 +65500,34 @@ index e559ad62cd7b..9197eaa6c68f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": -+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -@@ -545,104 +475,7 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Darwin": - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DIRS += [ -- "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -- "/third_party/libwebrtc/common_audio/common_audio_neon_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/modules/portal/portal_gn", -- "/third_party/libwebrtc/third_party/drm/drm_gn", -- "/third_party/libwebrtc/third_party/gbm/gbm_gn", -- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", -- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" +- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", +- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", +- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" - ] - +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ + "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", + "/third_party/libwebrtc/common_audio/common_audio_neon_gn", +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", +- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", + "/third_party/libwebrtc/modules/portal/portal_gn", + "/third_party/libwebrtc/third_party/drm/drm_gn", + "/third_party/libwebrtc/third_party/gbm/gbm_gn", +@@ -560,26 +471,9 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" + ] + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -- -- DIRS += [ ++if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", - "/third_party/libwebrtc/common_audio/common_audio_neon_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", @@ -62310,39 +65540,66 @@ index e559ad62cd7b..9197eaa6c68f 100644 - "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" - ] - +-if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["OS_TARGET"] == "Linux": +- +- DIRS += [ +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", +- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", + "/third_party/libwebrtc/modules/portal/portal_gn", + "/third_party/libwebrtc/third_party/drm/drm_gn", + "/third_party/libwebrtc/third_party/gbm/gbm_gn", +@@ -587,11 +481,9 @@ if CONFIG["CPU_ARCH"] == "mips32" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" + ] + +-if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", +- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", + "/third_party/libwebrtc/modules/portal/portal_gn", + "/third_party/libwebrtc/third_party/drm/drm_gn", + "/third_party/libwebrtc/third_party/gbm/gbm_gn", +@@ -599,7 +491,7 @@ if CONFIG["CPU_ARCH"] == "mips64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" + ] + -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- -- DIRS += [ -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", ++if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ + "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +@@ -607,8 +499,6 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", + "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", + "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/modules/portal/portal_gn", -- "/third_party/libwebrtc/third_party/drm/drm_gn", -- "/third_party/libwebrtc/third_party/gbm/gbm_gn", -- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", -- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" -- ] -- + "/third_party/libwebrtc/modules/portal/portal_gn", + "/third_party/libwebrtc/third_party/drm/drm_gn", + "/third_party/libwebrtc/third_party/gbm/gbm_gn", +@@ -616,7 +506,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" + ] + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DIRS += [ -- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", -- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", -- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", -- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", ++if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD": + + DIRS += [ + "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +@@ -624,69 +514,9 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": + "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", + "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", + "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", -- "/third_party/libwebrtc/modules/portal/portal_gn", -- "/third_party/libwebrtc/third_party/drm/drm_gn", -- "/third_party/libwebrtc/third_party/gbm/gbm_gn", -- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", -- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" -- ] + "/third_party/libwebrtc/modules/portal/portal_gn", + "/third_party/libwebrtc/third_party/drm/drm_gn", + "/third_party/libwebrtc/third_party/gbm/gbm_gn", + "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn", + "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" + ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD": - @@ -62379,14 +65636,14 @@ index e559ad62cd7b..9197eaa6c68f 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT": -+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD": - - DIRS += [ - "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -@@ -651,17 +484,3 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "WINNT": - "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" - ] +- +- DIRS += [ +- "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", +- "/third_party/libwebrtc/common_audio/common_audio_sse2_gn", +- "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn", +- "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn", +- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn" +- ] - -if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - @@ -62402,17 +65659,16 @@ index e559ad62cd7b..9197eaa6c68f 100644 - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" - ] diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build -index d30e26fa8e66..384b3d8d2a9b 100644 +index b93fca231d69..be25257373e5 100644 --- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build +++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -62427,7 +65683,7 @@ index d30e26fa8e66..384b3d8d2a9b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62439,7 +65695,6 @@ index d30e26fa8e66..384b3d8d2a9b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -62448,7 +65703,6 @@ index d30e26fa8e66..384b3d8d2a9b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -62477,7 +65731,6 @@ index d30e26fa8e66..384b3d8d2a9b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -62493,7 +65746,6 @@ index d30e26fa8e66..384b3d8d2a9b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -62524,6 +65776,22 @@ index d30e26fa8e66..384b3d8d2a9b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -62564,37 +65832,32 @@ index d30e26fa8e66..384b3d8d2a9b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("async_packet_socket_gn") diff --git third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build -index aabb47219565..dca18c885b81 100644 +index 8e1b4e454d4d..ee64165c31d3 100644 --- third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build +++ third_party/libwebrtc/rtc_base/async_resolver_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -62609,7 +65872,7 @@ index aabb47219565..dca18c885b81 100644 FINAL_LIBRARY = "webrtc" -@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62621,7 +65884,6 @@ index aabb47219565..dca18c885b81 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -62635,7 +65897,6 @@ index aabb47219565..dca18c885b81 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -62664,7 +65925,6 @@ index aabb47219565..dca18c885b81 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -62680,7 +65940,6 @@ index aabb47219565..dca18c885b81 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -62721,6 +65980,24 @@ index aabb47219565..dca18c885b81 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62755,54 +66032,51 @@ index aabb47219565..dca18c885b81 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("async_resolver_interface_gn") diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -index a5707fbf2ab8..e98dc056eaa4 100644 +index d5cc0504b1d5..41df619ecefa 100644 --- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build +++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -62817,7 +66091,7 @@ index a5707fbf2ab8..e98dc056eaa4 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62829,7 +66103,6 @@ index a5707fbf2ab8..e98dc056eaa4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -62842,7 +66115,6 @@ index a5707fbf2ab8..e98dc056eaa4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -62871,7 +66143,6 @@ index a5707fbf2ab8..e98dc056eaa4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -62887,7 +66158,6 @@ index a5707fbf2ab8..e98dc056eaa4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -62925,6 +66195,24 @@ index a5707fbf2ab8..e98dc056eaa4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -62959,54 +66247,51 @@ index a5707fbf2ab8..e98dc056eaa4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("audio_format_to_string_gn") diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build -index d74437d80c73..b3dc826123bc 100644 +index 858cc304ba75..9d16e13e8efa 100644 --- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build +++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -63021,7 +66306,7 @@ index d74437d80c73..b3dc826123bc 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63033,7 +66318,6 @@ index d74437d80c73..b3dc826123bc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -63046,7 +66330,6 @@ index d74437d80c73..b3dc826123bc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -63075,7 +66358,6 @@ index d74437d80c73..b3dc826123bc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -63091,7 +66373,6 @@ index d74437d80c73..b3dc826123bc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -63125,6 +66406,24 @@ index d74437d80c73..b3dc826123bc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63159,54 +66458,51 @@ index d74437d80c73..b3dc826123bc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bit_buffer_gn") diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build -index 4f12aa47b60c..165215234b34 100644 +index 77059cd34301..c5dabe6ad79f 100644 --- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build +++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -63221,7 +66517,7 @@ index 4f12aa47b60c..165215234b34 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63233,7 +66529,6 @@ index 4f12aa47b60c..165215234b34 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -63246,7 +66541,6 @@ index 4f12aa47b60c..165215234b34 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -63275,7 +66569,6 @@ index 4f12aa47b60c..165215234b34 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -63291,7 +66584,6 @@ index 4f12aa47b60c..165215234b34 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -63325,6 +66617,24 @@ index 4f12aa47b60c..165215234b34 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63359,54 +66669,51 @@ index 4f12aa47b60c..165215234b34 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bitstream_reader_gn") diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build -index 4e07edef8d48..c2fc9f3a1d9a 100644 +index c378c3a0b2ac..31ea8d65c7ce 100644 --- third_party/libwebrtc/rtc_base/buffer_gn/moz.build +++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -63421,7 +66728,7 @@ index 4e07edef8d48..c2fc9f3a1d9a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63433,7 +66740,6 @@ index 4e07edef8d48..c2fc9f3a1d9a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -63446,7 +66752,6 @@ index 4e07edef8d48..c2fc9f3a1d9a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -63475,7 +66780,6 @@ index 4e07edef8d48..c2fc9f3a1d9a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -63491,7 +66795,6 @@ index 4e07edef8d48..c2fc9f3a1d9a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -63522,6 +66825,22 @@ index 4e07edef8d48..c2fc9f3a1d9a 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -63562,37 +66881,32 @@ index 4e07edef8d48..c2fc9f3a1d9a 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("buffer_gn") diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build -index 6d8985b06c74..358db4d2a82c 100644 +index 43ed668b71ad..292e0dc836d1 100644 --- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build +++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -63607,7 +66921,7 @@ index 6d8985b06c74..358db4d2a82c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63619,7 +66933,6 @@ index 6d8985b06c74..358db4d2a82c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -63632,7 +66945,6 @@ index 6d8985b06c74..358db4d2a82c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -63661,7 +66973,6 @@ index 6d8985b06c74..358db4d2a82c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -63677,7 +66988,6 @@ index 6d8985b06c74..358db4d2a82c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -63711,6 +67021,24 @@ index 6d8985b06c74..358db4d2a82c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -63745,54 +67073,51 @@ index 6d8985b06c74..358db4d2a82c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("byte_buffer_gn") diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build -index 2ad50e863646..9ae8d977aa36 100644 +index b49346b1540f..c8dbc51e612a 100644 --- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build +++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -63807,7 +67132,7 @@ index 2ad50e863646..9ae8d977aa36 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -63819,7 +67144,6 @@ index 2ad50e863646..9ae8d977aa36 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -63828,7 +67152,6 @@ index 2ad50e863646..9ae8d977aa36 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -63857,7 +67180,6 @@ index 2ad50e863646..9ae8d977aa36 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -63873,7 +67195,6 @@ index 2ad50e863646..9ae8d977aa36 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -63904,6 +67225,22 @@ index 2ad50e863646..9ae8d977aa36 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -63944,37 +67281,32 @@ index 2ad50e863646..9ae8d977aa36 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("byte_order_gn") diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build -index dcf6c9a72b80..fdbaad2e302a 100644 +index 769362b62a5a..97a3da2b775a 100644 --- third_party/libwebrtc/rtc_base/checks_gn/moz.build +++ third_party/libwebrtc/rtc_base/checks_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -63989,7 +67321,7 @@ index dcf6c9a72b80..fdbaad2e302a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64001,7 +67333,6 @@ index dcf6c9a72b80..fdbaad2e302a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -64014,7 +67345,6 @@ index dcf6c9a72b80..fdbaad2e302a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -64043,7 +67373,6 @@ index dcf6c9a72b80..fdbaad2e302a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -64059,7 +67388,6 @@ index dcf6c9a72b80..fdbaad2e302a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -64093,6 +67421,24 @@ index dcf6c9a72b80..fdbaad2e302a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64127,54 +67473,51 @@ index dcf6c9a72b80..fdbaad2e302a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("checks_gn") diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build -index c903e8d34926..cb62ac34dba9 100644 +index 5fd417eefd5a..b997040b164c 100644 --- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build +++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -64189,7 +67532,7 @@ index c903e8d34926..cb62ac34dba9 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64201,7 +67544,6 @@ index c903e8d34926..cb62ac34dba9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -64210,7 +67552,6 @@ index c903e8d34926..cb62ac34dba9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -64239,7 +67580,6 @@ index c903e8d34926..cb62ac34dba9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -64255,7 +67595,6 @@ index c903e8d34926..cb62ac34dba9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -64286,6 +67625,22 @@ index c903e8d34926..cb62ac34dba9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -64326,37 +67681,32 @@ index c903e8d34926..cb62ac34dba9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("compile_assert_c_gn") diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build -index 87795114516e..d07291bee8dc 100644 +index 2d02d778fffe..07b174d0c11e 100644 --- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build +++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -64371,7 +67721,7 @@ index 87795114516e..d07291bee8dc 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64383,7 +67733,6 @@ index 87795114516e..d07291bee8dc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -64396,7 +67745,6 @@ index 87795114516e..d07291bee8dc 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -64425,7 +67773,6 @@ index 87795114516e..d07291bee8dc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -64441,7 +67788,6 @@ index 87795114516e..d07291bee8dc 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -64475,6 +67821,24 @@ index 87795114516e..d07291bee8dc 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -64509,54 +67873,51 @@ index 87795114516e..d07291bee8dc 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("flat_containers_internal_gn") diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build -index 1036d523dd33..52b9dc5b22ed 100644 +index f2d8ed054e00..df8ec55e92af 100644 --- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build +++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -64571,7 +67932,7 @@ index 1036d523dd33..52b9dc5b22ed 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64583,7 +67944,6 @@ index 1036d523dd33..52b9dc5b22ed 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -64596,7 +67956,6 @@ index 1036d523dd33..52b9dc5b22ed 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -64625,7 +67984,6 @@ index 1036d523dd33..52b9dc5b22ed 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -64641,7 +67999,6 @@ index 1036d523dd33..52b9dc5b22ed 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -64672,6 +68029,22 @@ index 1036d523dd33..52b9dc5b22ed 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -64712,37 +68085,32 @@ index 1036d523dd33..52b9dc5b22ed 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("flat_map_gn") diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build -index d8b47b1b19d6..183b743e4ec4 100644 +index 794ed8feb87a..6d2002a94fbc 100644 --- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build +++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -64757,7 +68125,7 @@ index d8b47b1b19d6..183b743e4ec4 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64769,7 +68137,6 @@ index d8b47b1b19d6..183b743e4ec4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -64782,7 +68149,6 @@ index d8b47b1b19d6..183b743e4ec4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -64811,7 +68177,6 @@ index d8b47b1b19d6..183b743e4ec4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -64827,7 +68192,6 @@ index d8b47b1b19d6..183b743e4ec4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -64858,6 +68222,22 @@ index d8b47b1b19d6..183b743e4ec4 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -64898,37 +68278,32 @@ index d8b47b1b19d6..183b743e4ec4 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("flat_set_gn") diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build -index 0c7c0a7cf358..76cbb5e87ae4 100644 +index eecb53c907da..bcad4a983179 100644 --- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build +++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -64943,7 +68318,7 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -64955,7 +68330,6 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -64968,7 +68342,6 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -64997,7 +68370,6 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -65013,7 +68385,6 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -65047,6 +68418,24 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -65081,54 +68470,51 @@ index 0c7c0a7cf358..76cbb5e87ae4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("copy_on_write_buffer_gn") diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build -index 4302740a4b6e..ee45b4a941f8 100644 +index c8749bb51055..95e71cdfe9cf 100644 --- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build +++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -65143,7 +68529,7 @@ index 4302740a4b6e..ee45b4a941f8 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65155,7 +68541,6 @@ index 4302740a4b6e..ee45b4a941f8 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -65168,7 +68553,6 @@ index 4302740a4b6e..ee45b4a941f8 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -65197,7 +68581,6 @@ index 4302740a4b6e..ee45b4a941f8 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -65213,7 +68596,6 @@ index 4302740a4b6e..ee45b4a941f8 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -65247,6 +68629,24 @@ index 4302740a4b6e..ee45b4a941f8 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -65281,54 +68681,51 @@ index 4302740a4b6e..ee45b4a941f8 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("criticalsection_gn") diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build -index 7e9cafaef90a..0cc5d1ab0025 100644 +index 8bc1e665d50d..729bb35b5b49 100644 --- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build +++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -65343,7 +68740,7 @@ index 7e9cafaef90a..0cc5d1ab0025 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65355,7 +68752,6 @@ index 7e9cafaef90a..0cc5d1ab0025 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -65368,7 +68764,6 @@ index 7e9cafaef90a..0cc5d1ab0025 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -65397,7 +68792,6 @@ index 7e9cafaef90a..0cc5d1ab0025 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -65413,7 +68807,6 @@ index 7e9cafaef90a..0cc5d1ab0025 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -65444,6 +68837,22 @@ index 7e9cafaef90a..0cc5d1ab0025 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -65484,37 +68893,32 @@ index 7e9cafaef90a..0cc5d1ab0025 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("divide_round_gn") diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build -index c22225093c2b..9d6c7a641c84 100644 +index b8b28d8d0161..4050d593d1b1 100644 --- third_party/libwebrtc/rtc_base/dscp_gn/moz.build +++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -65529,7 +68933,7 @@ index c22225093c2b..9d6c7a641c84 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65541,7 +68945,6 @@ index c22225093c2b..9d6c7a641c84 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -65550,7 +68953,6 @@ index c22225093c2b..9d6c7a641c84 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -65579,7 +68981,6 @@ index c22225093c2b..9d6c7a641c84 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -65595,7 +68996,6 @@ index c22225093c2b..9d6c7a641c84 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -65626,6 +69026,22 @@ index c22225093c2b..9d6c7a641c84 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -65666,37 +69082,32 @@ index c22225093c2b..9d6c7a641c84 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("dscp_gn") diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build -index 542f74d16c00..4baf2304eb8c 100644 +index 02fe978ab08d..c655f3b43877 100644 --- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build +++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -65711,7 +69122,7 @@ index 542f74d16c00..4baf2304eb8c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65723,7 +69134,6 @@ index 542f74d16c00..4baf2304eb8c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -65736,7 +69146,6 @@ index 542f74d16c00..4baf2304eb8c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -65765,7 +69174,6 @@ index 542f74d16c00..4baf2304eb8c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -65781,7 +69189,6 @@ index 542f74d16c00..4baf2304eb8c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -65819,6 +69226,24 @@ index 542f74d16c00..4baf2304eb8c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -65853,54 +69278,51 @@ index 542f74d16c00..4baf2304eb8c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("event_tracer_gn") diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build -index 126857140b76..0f451b1c6255 100644 +index 574d7d63026a..0d1253003f3d 100644 --- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -65915,7 +69337,7 @@ index 126857140b76..0f451b1c6255 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -65927,7 +69349,6 @@ index 126857140b76..0f451b1c6255 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -65940,7 +69361,6 @@ index 126857140b76..0f451b1c6255 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -65969,7 +69389,6 @@ index 126857140b76..0f451b1c6255 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -65985,7 +69404,6 @@ index 126857140b76..0f451b1c6255 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -66023,6 +69441,24 @@ index 126857140b76..0f451b1c6255 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -66057,54 +69493,51 @@ index 126857140b76..0f451b1c6255 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("alr_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build -index 17535bf14176..3c51f9776bef 100644 +index 34b388da69ec..e1cf8913860d 100644 --- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -66119,7 +69552,7 @@ index 17535bf14176..3c51f9776bef 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66131,7 +69564,6 @@ index 17535bf14176..3c51f9776bef 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -66144,7 +69576,6 @@ index 17535bf14176..3c51f9776bef 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -66173,7 +69604,6 @@ index 17535bf14176..3c51f9776bef 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66189,7 +69619,6 @@ index 17535bf14176..3c51f9776bef 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -66227,6 +69656,24 @@ index 17535bf14176..3c51f9776bef 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -66261,54 +69708,51 @@ index 17535bf14176..3c51f9776bef 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("balanced_degradation_settings_gn") diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build -index 4e66da3070d4..a18de4954d92 100644 +index ccc00e5296a1..54cef4764697 100644 --- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -66323,7 +69767,7 @@ index 4e66da3070d4..a18de4954d92 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66335,7 +69779,6 @@ index 4e66da3070d4..a18de4954d92 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -66348,7 +69791,6 @@ index 4e66da3070d4..a18de4954d92 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -66377,7 +69819,6 @@ index 4e66da3070d4..a18de4954d92 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66393,7 +69834,6 @@ index 4e66da3070d4..a18de4954d92 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -66431,6 +69871,24 @@ index 4e66da3070d4..a18de4954d92 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -66465,54 +69923,51 @@ index 4e66da3070d4..a18de4954d92 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bandwidth_quality_scaler_settings_gn") diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build -index 599b5f1c57cd..c6571d99c18d 100644 +index 66d21c66a349..8118147f993e 100644 --- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -66527,7 +69982,7 @@ index 599b5f1c57cd..c6571d99c18d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66539,7 +69994,6 @@ index 599b5f1c57cd..c6571d99c18d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -66552,7 +70006,6 @@ index 599b5f1c57cd..c6571d99c18d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -66581,7 +70034,6 @@ index 599b5f1c57cd..c6571d99c18d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66597,7 +70049,6 @@ index 599b5f1c57cd..c6571d99c18d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -66635,6 +70086,24 @@ index 599b5f1c57cd..c6571d99c18d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -66669,54 +70138,51 @@ index 599b5f1c57cd..c6571d99c18d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("cpu_speed_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build -index db59739a214a..841e1b586265 100644 +index 1cf3a5d0f41f..ed59d2508985 100644 --- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -66731,7 +70197,7 @@ index db59739a214a..841e1b586265 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66743,7 +70209,6 @@ index db59739a214a..841e1b586265 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -66756,7 +70221,6 @@ index db59739a214a..841e1b586265 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -66785,7 +70249,6 @@ index db59739a214a..841e1b586265 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -66801,7 +70264,6 @@ index db59739a214a..841e1b586265 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -66839,6 +70301,24 @@ index db59739a214a..841e1b586265 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -66873,54 +70353,51 @@ index db59739a214a..841e1b586265 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("encoder_info_settings_gn") diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build -index 61f8bb38cbc7..a6ed90646a39 100644 +index 8147b9e99a24..3cd6aec92bc8 100644 --- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -66935,7 +70412,7 @@ index 61f8bb38cbc7..a6ed90646a39 100644 FINAL_LIBRARY = "webrtc" -@@ -46,173 +56,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -66947,7 +70424,6 @@ index 61f8bb38cbc7..a6ed90646a39 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -66960,7 +70436,6 @@ index 61f8bb38cbc7..a6ed90646a39 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -66989,7 +70464,6 @@ index 61f8bb38cbc7..a6ed90646a39 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -67005,7 +70479,6 @@ index 61f8bb38cbc7..a6ed90646a39 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -67043,6 +70516,24 @@ index 61f8bb38cbc7..a6ed90646a39 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -67077,54 +70568,51 @@ index 61f8bb38cbc7..a6ed90646a39 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("field_trial_parser_gn") diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build -index e41aae3d9a9a..ec19a50312c7 100644 +index b8ece40f9b6e..cd41f4b0b645 100644 --- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -67139,7 +70627,7 @@ index e41aae3d9a9a..ec19a50312c7 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67151,7 +70639,6 @@ index e41aae3d9a9a..ec19a50312c7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -67164,7 +70651,6 @@ index e41aae3d9a9a..ec19a50312c7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -67193,7 +70679,6 @@ index e41aae3d9a9a..ec19a50312c7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -67209,7 +70694,6 @@ index e41aae3d9a9a..ec19a50312c7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -67247,6 +70731,24 @@ index e41aae3d9a9a..ec19a50312c7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -67281,54 +70783,51 @@ index e41aae3d9a9a..ec19a50312c7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("keyframe_interval_settings_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build -index 8665ad103d75..6f3a1aa76e94 100644 +index 0092a33c3916..0cbfa328d9ea 100644 --- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -67343,7 +70842,7 @@ index 8665ad103d75..6f3a1aa76e94 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67355,7 +70854,6 @@ index 8665ad103d75..6f3a1aa76e94 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -67368,7 +70866,6 @@ index 8665ad103d75..6f3a1aa76e94 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -67397,7 +70894,6 @@ index 8665ad103d75..6f3a1aa76e94 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -67413,7 +70909,6 @@ index 8665ad103d75..6f3a1aa76e94 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -67451,6 +70946,24 @@ index 8665ad103d75..6f3a1aa76e94 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -67485,54 +70998,51 @@ index 8665ad103d75..6f3a1aa76e94 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("min_video_bitrate_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build -index 9b72bdd24206..a32b98cb25c2 100644 +index acf592c7634f..2b4feb9b7bdc 100644 --- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -67547,7 +71057,7 @@ index 9b72bdd24206..a32b98cb25c2 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67559,7 +71069,6 @@ index 9b72bdd24206..a32b98cb25c2 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -67572,7 +71081,6 @@ index 9b72bdd24206..a32b98cb25c2 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -67601,7 +71109,6 @@ index 9b72bdd24206..a32b98cb25c2 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -67617,7 +71124,6 @@ index 9b72bdd24206..a32b98cb25c2 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -67655,6 +71161,24 @@ index 9b72bdd24206..a32b98cb25c2 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -67689,54 +71213,51 @@ index 9b72bdd24206..a32b98cb25c2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("normalize_simulcast_size_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -index 31196067879d..a8b5be15d1d5 100644 +index aa454826f68b..1e8451135790 100644 --- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -67751,7 +71272,7 @@ index 31196067879d..a8b5be15d1d5 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67763,7 +71284,6 @@ index 31196067879d..a8b5be15d1d5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -67776,7 +71296,6 @@ index 31196067879d..a8b5be15d1d5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -67805,7 +71324,6 @@ index 31196067879d..a8b5be15d1d5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -67821,7 +71339,6 @@ index 31196067879d..a8b5be15d1d5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -67859,6 +71376,24 @@ index 31196067879d..a8b5be15d1d5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -67893,54 +71428,51 @@ index 31196067879d..a8b5be15d1d5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("quality_rampup_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build -index 677e6c9120fe..57914b254c04 100644 +index c8c2708eb734..dcc3d66af2f3 100644 --- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -67955,7 +71487,7 @@ index 677e6c9120fe..57914b254c04 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -67967,7 +71499,6 @@ index 677e6c9120fe..57914b254c04 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -67980,7 +71511,6 @@ index 677e6c9120fe..57914b254c04 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -68009,7 +71539,6 @@ index 677e6c9120fe..57914b254c04 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -68025,7 +71554,6 @@ index 677e6c9120fe..57914b254c04 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -68063,6 +71591,24 @@ index 677e6c9120fe..57914b254c04 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -68097,54 +71643,51 @@ index 677e6c9120fe..57914b254c04 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("quality_scaler_settings_gn") diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build -index 9286a4ec64d4..3cb4fc10f249 100644 +index 2a84caa1a115..f4eec0f9ca31 100644 --- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -68159,7 +71702,7 @@ index 9286a4ec64d4..3cb4fc10f249 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68171,7 +71714,6 @@ index 9286a4ec64d4..3cb4fc10f249 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -68184,7 +71726,6 @@ index 9286a4ec64d4..3cb4fc10f249 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -68213,7 +71754,6 @@ index 9286a4ec64d4..3cb4fc10f249 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -68229,7 +71769,6 @@ index 9286a4ec64d4..3cb4fc10f249 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -68267,6 +71806,24 @@ index 9286a4ec64d4..3cb4fc10f249 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -68301,54 +71858,51 @@ index 9286a4ec64d4..3cb4fc10f249 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("quality_scaling_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build -index 1774cbea954e..a5eb1637fe32 100644 +index 6cbe9e8474cf..768d19687442 100644 --- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -68363,7 +71917,7 @@ index 1774cbea954e..a5eb1637fe32 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68375,7 +71929,6 @@ index 1774cbea954e..a5eb1637fe32 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -68388,7 +71941,6 @@ index 1774cbea954e..a5eb1637fe32 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -68417,7 +71969,6 @@ index 1774cbea954e..a5eb1637fe32 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -68433,7 +71984,6 @@ index 1774cbea954e..a5eb1637fe32 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -68471,6 +72021,24 @@ index 1774cbea954e..a5eb1637fe32 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -68505,54 +72073,51 @@ index 1774cbea954e..a5eb1637fe32 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rate_control_settings_gn") diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -index 7f6b0fd12c3f..021e722202aa 100644 +index aea652b1063e..faed80b04af8 100644 --- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -68567,7 +72132,7 @@ index 7f6b0fd12c3f..021e722202aa 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68579,7 +72144,6 @@ index 7f6b0fd12c3f..021e722202aa 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -68592,7 +72156,6 @@ index 7f6b0fd12c3f..021e722202aa 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -68621,7 +72184,6 @@ index 7f6b0fd12c3f..021e722202aa 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -68637,7 +72199,6 @@ index 7f6b0fd12c3f..021e722202aa 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -68675,6 +72236,24 @@ index 7f6b0fd12c3f..021e722202aa 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -68709,54 +72288,51 @@ index 7f6b0fd12c3f..021e722202aa 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtt_mult_experiment_gn") diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -index 12e90f9bdb30..967ec683ad33 100644 +index c1854a7f4dfb..5ba40788ff5d 100644 --- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build +++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -68771,7 +72347,7 @@ index 12e90f9bdb30..967ec683ad33 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68783,7 +72359,6 @@ index 12e90f9bdb30..967ec683ad33 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -68796,7 +72371,6 @@ index 12e90f9bdb30..967ec683ad33 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -68825,7 +72399,6 @@ index 12e90f9bdb30..967ec683ad33 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -68841,7 +72414,6 @@ index 12e90f9bdb30..967ec683ad33 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -68879,6 +72451,24 @@ index 12e90f9bdb30..967ec683ad33 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -68913,54 +72503,51 @@ index 12e90f9bdb30..967ec683ad33 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("stable_target_rate_experiment_gn") diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -index c030fbe1e868..8a31305a0d0d 100644 +index a6650bd66393..393c4a6a5b5f 100644 --- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build +++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -68975,7 +72562,7 @@ index c030fbe1e868..8a31305a0d0d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -68987,7 +72574,6 @@ index c030fbe1e868..8a31305a0d0d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -68996,7 +72582,6 @@ index c030fbe1e868..8a31305a0d0d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -69025,7 +72610,6 @@ index c030fbe1e868..8a31305a0d0d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -69041,7 +72625,6 @@ index c030fbe1e868..8a31305a0d0d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -69072,6 +72655,22 @@ index c030fbe1e868..8a31305a0d0d 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -69112,37 +72711,32 @@ index c030fbe1e868..8a31305a0d0d 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("gtest_prod_gn") diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build -index 7feb1b833a7a..45d3821a0030 100644 +index 88e1ee554758..7f4ca498bb80 100644 --- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build +++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -69157,7 +72751,7 @@ index 7feb1b833a7a..45d3821a0030 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69169,7 +72763,6 @@ index 7feb1b833a7a..45d3821a0030 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -69182,7 +72775,6 @@ index 7feb1b833a7a..45d3821a0030 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -69211,7 +72803,6 @@ index 7feb1b833a7a..45d3821a0030 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -69227,7 +72818,6 @@ index 7feb1b833a7a..45d3821a0030 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -69261,6 +72851,24 @@ index 7feb1b833a7a..45d3821a0030 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -69295,48 +72903,46 @@ index 7feb1b833a7a..45d3821a0030 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("histogram_percentile_counter_gn") diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build deleted file mode 100644 -index 45b89018366b..000000000000 +index 01eeabbf70bc..000000000000 --- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build +++ /dev/null -@@ -1,94 +0,0 @@ +@@ -1,99 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -69356,7 +72962,6 @@ index 45b89018366b..000000000000 -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["WEBRTC_ANDROID"] = True -DEFINES["WEBRTC_ANDROID_OPENSLES"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True @@ -69426,23 +73031,28 @@ index 45b89018366b..000000000000 - "-msse2" - ] - +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- - OS_LIBS += [ - "android_support" - ] - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("ifaddrs_android_gn") diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -index ca8cab0aa883..bfe46318203d 100644 +index d7b06159cea2..ede6074320d3 100644 --- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build +++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -69457,7 +73067,7 @@ index ca8cab0aa883..bfe46318203d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69469,7 +73079,6 @@ index ca8cab0aa883..bfe46318203d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -69478,7 +73087,6 @@ index ca8cab0aa883..bfe46318203d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -69507,7 +73115,6 @@ index ca8cab0aa883..bfe46318203d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -69523,7 +73130,6 @@ index ca8cab0aa883..bfe46318203d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -69554,6 +73160,22 @@ index ca8cab0aa883..bfe46318203d 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -69594,37 +73216,32 @@ index ca8cab0aa883..bfe46318203d 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("ignore_wundef_gn") diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build -index 5d1a52d24af2..643a524c815f 100644 +index a55837b63428..3310e1e14d3c 100644 --- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build +++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -69639,7 +73256,7 @@ index 5d1a52d24af2..643a524c815f 100644 FINAL_LIBRARY = "webrtc" -@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69651,7 +73268,6 @@ index 5d1a52d24af2..643a524c815f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -69665,7 +73281,6 @@ index 5d1a52d24af2..643a524c815f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -69694,7 +73309,6 @@ index 5d1a52d24af2..643a524c815f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -69710,7 +73324,6 @@ index 5d1a52d24af2..643a524c815f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -69751,6 +73364,24 @@ index 5d1a52d24af2..643a524c815f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -69785,54 +73416,51 @@ index 5d1a52d24af2..643a524c815f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("ip_address_gn") diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build -index ffeff75cd6ec..cb21c389f3d2 100644 +index a1b3462893f1..7363168e0153 100644 --- third_party/libwebrtc/rtc_base/logging_gn/moz.build +++ third_party/libwebrtc/rtc_base/logging_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -69847,7 +73475,7 @@ index ffeff75cd6ec..cb21c389f3d2 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69859,7 +73487,6 @@ index ffeff75cd6ec..cb21c389f3d2 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -69872,7 +73499,6 @@ index ffeff75cd6ec..cb21c389f3d2 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -69901,7 +73527,6 @@ index ffeff75cd6ec..cb21c389f3d2 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -69917,7 +73542,6 @@ index ffeff75cd6ec..cb21c389f3d2 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -69955,6 +73579,24 @@ index ffeff75cd6ec..cb21c389f3d2 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -69989,54 +73631,51 @@ index ffeff75cd6ec..cb21c389f3d2 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("logging_gn") diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build -index a69c8b05fd0d..0598fe8192e7 100644 +index 372b4d28f8a7..3a1e46270270 100644 --- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build +++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -70051,7 +73690,7 @@ index a69c8b05fd0d..0598fe8192e7 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -70063,7 +73702,6 @@ index a69c8b05fd0d..0598fe8192e7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -70072,7 +73710,6 @@ index a69c8b05fd0d..0598fe8192e7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -70101,7 +73738,6 @@ index a69c8b05fd0d..0598fe8192e7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -70117,7 +73753,6 @@ index a69c8b05fd0d..0598fe8192e7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -70148,6 +73783,22 @@ index a69c8b05fd0d..0598fe8192e7 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -70188,37 +73839,32 @@ index a69c8b05fd0d..0598fe8192e7 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("macromagic_gn") diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build -index bf7f0a6d65b5..a25f1d2f3d40 100644 +index 139009098bab..eb01e8eadc57 100644 --- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build +++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -70233,7 +73879,7 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -70245,7 +73891,6 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -70258,7 +73903,6 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -70287,7 +73931,6 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -70303,7 +73946,6 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -70337,6 +73979,24 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -70371,54 +74031,51 @@ index bf7f0a6d65b5..a25f1d2f3d40 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("aligned_malloc_gn") diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build -index c7d0b157f2b0..34f9ab7b377d 100644 +index afe42b847585..ac5348af377a 100644 --- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build +++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -70433,7 +74090,7 @@ index c7d0b157f2b0..34f9ab7b377d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -70445,7 +74102,6 @@ index c7d0b157f2b0..34f9ab7b377d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -70458,7 +74114,6 @@ index c7d0b157f2b0..34f9ab7b377d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -70487,7 +74142,6 @@ index c7d0b157f2b0..34f9ab7b377d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -70503,7 +74157,6 @@ index c7d0b157f2b0..34f9ab7b377d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -70534,6 +74187,22 @@ index c7d0b157f2b0..34f9ab7b377d 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -70574,37 +74243,32 @@ index c7d0b157f2b0..34f9ab7b377d 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("mod_ops_gn") diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build -index 7d3b2054e22a..26e19f66e101 100644 +index fdbf859c3749..d20ce225c3f9 100644 --- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build +++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -70619,7 +74283,7 @@ index 7d3b2054e22a..26e19f66e101 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -70631,7 +74295,6 @@ index 7d3b2054e22a..26e19f66e101 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -70644,7 +74307,6 @@ index 7d3b2054e22a..26e19f66e101 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -70673,7 +74335,6 @@ index 7d3b2054e22a..26e19f66e101 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -70689,7 +74350,6 @@ index 7d3b2054e22a..26e19f66e101 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -70720,6 +74380,22 @@ index 7d3b2054e22a..26e19f66e101 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -70760,37 +74436,32 @@ index 7d3b2054e22a..26e19f66e101 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("moving_max_counter_gn") diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build -index ba1806bcc3ba..359e190aeafa 100644 +index 4ac9a06df874..7f32da55511f 100644 --- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build +++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -70805,7 +74476,7 @@ index ba1806bcc3ba..359e190aeafa 100644 FINAL_LIBRARY = "webrtc" -@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -70817,7 +74488,6 @@ index ba1806bcc3ba..359e190aeafa 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -70831,7 +74501,6 @@ index ba1806bcc3ba..359e190aeafa 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -70860,7 +74529,6 @@ index ba1806bcc3ba..359e190aeafa 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -70876,7 +74544,6 @@ index ba1806bcc3ba..359e190aeafa 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -70917,6 +74584,24 @@ index ba1806bcc3ba..359e190aeafa 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -70951,54 +74636,51 @@ index ba1806bcc3ba..359e190aeafa 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("net_helpers_gn") diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build -index ef67f998ceaf..2d18d069dad1 100644 +index cdcbaee77937..ea4f2aacc117 100644 --- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build +++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -71013,7 +74695,7 @@ index ef67f998ceaf..2d18d069dad1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -71025,7 +74707,6 @@ index ef67f998ceaf..2d18d069dad1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -71034,7 +74715,6 @@ index ef67f998ceaf..2d18d069dad1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -71063,7 +74743,6 @@ index ef67f998ceaf..2d18d069dad1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -71079,7 +74758,6 @@ index ef67f998ceaf..2d18d069dad1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -71113,6 +74791,24 @@ index ef67f998ceaf..2d18d069dad1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -71146,8 +74842,7 @@ index ef67f998ceaf..2d18d069dad1 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -71158,43 +74853,41 @@ index ef67f998ceaf..2d18d069dad1 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("sent_packet_gn") diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build -index e9bde339c23d..228d4bbdc472 100644 +index 9b7fb4a6703e..c5b7fcd69e98 100644 --- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build +++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -71209,7 +74902,7 @@ index e9bde339c23d..228d4bbdc472 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -71221,7 +74914,6 @@ index e9bde339c23d..228d4bbdc472 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -71234,7 +74926,6 @@ index e9bde339c23d..228d4bbdc472 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -71263,7 +74954,6 @@ index e9bde339c23d..228d4bbdc472 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -71279,7 +74969,6 @@ index e9bde339c23d..228d4bbdc472 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -71313,6 +75002,24 @@ index e9bde339c23d..228d4bbdc472 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -71347,54 +75054,51 @@ index e9bde339c23d..228d4bbdc472 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("network_constants_gn") diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build -index d0ae8c516228..17315b6e9333 100644 +index 7b0f634578f3..1ec2058feb83 100644 --- third_party/libwebrtc/rtc_base/network_route_gn/moz.build +++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -71409,7 +75113,7 @@ index d0ae8c516228..17315b6e9333 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -71421,7 +75125,6 @@ index d0ae8c516228..17315b6e9333 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -71434,7 +75137,6 @@ index d0ae8c516228..17315b6e9333 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -71463,7 +75165,6 @@ index d0ae8c516228..17315b6e9333 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -71479,7 +75180,6 @@ index d0ae8c516228..17315b6e9333 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -71513,6 +75213,24 @@ index d0ae8c516228..17315b6e9333 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -71547,54 +75265,51 @@ index d0ae8c516228..17315b6e9333 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("network_route_gn") diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build -index 03308e7c471e..354fd3141771 100644 +index f77bcf8aa788..df6cf74c5b16 100644 --- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build +++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -71609,7 +75324,7 @@ index 03308e7c471e..354fd3141771 100644 FINAL_LIBRARY = "webrtc" -@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -71621,7 +75336,6 @@ index 03308e7c471e..354fd3141771 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -71635,7 +75349,6 @@ index 03308e7c471e..354fd3141771 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -71664,7 +75377,6 @@ index 03308e7c471e..354fd3141771 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -71680,7 +75392,6 @@ index 03308e7c471e..354fd3141771 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -71721,6 +75432,24 @@ index 03308e7c471e..354fd3141771 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -71755,54 +75484,51 @@ index 03308e7c471e..354fd3141771 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("null_socket_server_gn") diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build -index 4cf6d0669b76..ee9f06444153 100644 +index ac24f995c6c1..a8d26b774863 100644 --- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build +++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -71817,7 +75543,7 @@ index 4cf6d0669b76..ee9f06444153 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -71829,7 +75555,6 @@ index 4cf6d0669b76..ee9f06444153 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -71842,7 +75567,6 @@ index 4cf6d0669b76..ee9f06444153 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -71871,7 +75595,6 @@ index 4cf6d0669b76..ee9f06444153 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -71887,7 +75610,6 @@ index 4cf6d0669b76..ee9f06444153 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -71918,6 +75640,22 @@ index 4cf6d0669b76..ee9f06444153 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -71958,37 +75696,32 @@ index 4cf6d0669b76..ee9f06444153 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("one_time_event_gn") diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build -index 1d8b40b565d6..692b6bd7a0f5 100644 +index c580f7e67a0a..3fea9a2d6b27 100644 --- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build +++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -72003,7 +75736,7 @@ index 1d8b40b565d6..692b6bd7a0f5 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -72015,7 +75748,6 @@ index 1d8b40b565d6..692b6bd7a0f5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -72028,7 +75760,6 @@ index 1d8b40b565d6..692b6bd7a0f5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -72057,7 +75788,6 @@ index 1d8b40b565d6..692b6bd7a0f5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -72073,7 +75803,6 @@ index 1d8b40b565d6..692b6bd7a0f5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -72111,6 +75840,24 @@ index 1d8b40b565d6..692b6bd7a0f5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -72145,54 +75892,51 @@ index 1d8b40b565d6..692b6bd7a0f5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("platform_thread_gn") diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build -index 0ff0b0a96f69..c8dfa5b9134a 100644 +index 713a9cc2fdf7..99ec083c6586 100644 --- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build +++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -72207,7 +75951,7 @@ index 0ff0b0a96f69..c8dfa5b9134a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -72219,7 +75963,6 @@ index 0ff0b0a96f69..c8dfa5b9134a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -72232,7 +75975,6 @@ index 0ff0b0a96f69..c8dfa5b9134a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -72261,7 +76003,6 @@ index 0ff0b0a96f69..c8dfa5b9134a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -72277,7 +76018,6 @@ index 0ff0b0a96f69..c8dfa5b9134a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -72311,6 +76051,24 @@ index 0ff0b0a96f69..c8dfa5b9134a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -72345,54 +76103,51 @@ index 0ff0b0a96f69..c8dfa5b9134a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("platform_thread_types_gn") diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build -index 0bee904fa493..2166311aeed7 100644 +index a5a3d7492137..d9d75b3b91be 100644 --- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build +++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -72407,7 +76162,7 @@ index 0bee904fa493..2166311aeed7 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -72419,7 +76174,6 @@ index 0bee904fa493..2166311aeed7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -72428,7 +76182,6 @@ index 0bee904fa493..2166311aeed7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -72457,7 +76210,6 @@ index 0bee904fa493..2166311aeed7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -72473,7 +76225,6 @@ index 0bee904fa493..2166311aeed7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -72504,6 +76255,22 @@ index 0bee904fa493..2166311aeed7 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -72544,37 +76311,32 @@ index 0bee904fa493..2166311aeed7 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("protobuf_utils_gn") diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build -index 97bda63da1b1..009054e9af95 100644 +index 514f8957fee9..e3529cc2a54b 100644 --- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build +++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -72589,7 +76351,7 @@ index 97bda63da1b1..009054e9af95 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -72601,7 +76363,6 @@ index 97bda63da1b1..009054e9af95 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -72614,7 +76375,6 @@ index 97bda63da1b1..009054e9af95 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -72643,7 +76403,6 @@ index 97bda63da1b1..009054e9af95 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -72659,7 +76418,6 @@ index 97bda63da1b1..009054e9af95 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -72693,6 +76451,24 @@ index 97bda63da1b1..009054e9af95 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -72727,54 +76503,51 @@ index 97bda63da1b1..009054e9af95 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("race_checker_gn") diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build -index 485ac03f1d2b..47f7b58d8149 100644 +index 9b3592566474..9c8984a140d6 100644 --- third_party/libwebrtc/rtc_base/random_gn/moz.build +++ third_party/libwebrtc/rtc_base/random_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -72789,7 +76562,7 @@ index 485ac03f1d2b..47f7b58d8149 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -72801,7 +76574,6 @@ index 485ac03f1d2b..47f7b58d8149 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -72814,7 +76586,6 @@ index 485ac03f1d2b..47f7b58d8149 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -72843,7 +76614,6 @@ index 485ac03f1d2b..47f7b58d8149 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -72859,7 +76629,6 @@ index 485ac03f1d2b..47f7b58d8149 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -72893,6 +76662,24 @@ index 485ac03f1d2b..47f7b58d8149 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -72927,54 +76714,51 @@ index 485ac03f1d2b..47f7b58d8149 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("random_gn") diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build -index 320bac9d491e..3eb192f9a0ab 100644 +index 969a79b712df..51b27be6a666 100644 --- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build +++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -72989,7 +76773,7 @@ index 320bac9d491e..3eb192f9a0ab 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -73001,7 +76785,6 @@ index 320bac9d491e..3eb192f9a0ab 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -73014,7 +76797,6 @@ index 320bac9d491e..3eb192f9a0ab 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -73047,7 +76829,6 @@ index 320bac9d491e..3eb192f9a0ab 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -73063,7 +76844,6 @@ index 320bac9d491e..3eb192f9a0ab 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -73104,6 +76884,24 @@ index 320bac9d491e..3eb192f9a0ab 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -73138,54 +76936,51 @@ index 320bac9d491e..3eb192f9a0ab 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rate_limiter_gn") diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build -index 1f464d8552ae..883d407b7845 100644 +index b40a4fdda662..ec6d4550feef 100644 --- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build +++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -73200,7 +76995,7 @@ index 1f464d8552ae..883d407b7845 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -73212,7 +77007,6 @@ index 1f464d8552ae..883d407b7845 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -73225,7 +77019,6 @@ index 1f464d8552ae..883d407b7845 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -73254,7 +77047,6 @@ index 1f464d8552ae..883d407b7845 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -73270,7 +77062,6 @@ index 1f464d8552ae..883d407b7845 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -73308,6 +77099,24 @@ index 1f464d8552ae..883d407b7845 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -73342,54 +77151,51 @@ index 1f464d8552ae..883d407b7845 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rate_statistics_gn") diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build -index 828df02136fb..c251c1860046 100644 +index 26f81f4f5ed3..a7abd9b6b0e7 100644 --- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build +++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -73404,7 +77210,7 @@ index 828df02136fb..c251c1860046 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -73416,7 +77222,6 @@ index 828df02136fb..c251c1860046 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -73429,7 +77234,6 @@ index 828df02136fb..c251c1860046 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -73458,7 +77262,6 @@ index 828df02136fb..c251c1860046 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -73474,7 +77277,6 @@ index 828df02136fb..c251c1860046 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -73512,6 +77314,24 @@ index 828df02136fb..c251c1860046 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -73546,54 +77366,51 @@ index 828df02136fb..c251c1860046 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rate_tracker_gn") diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build -index 25f3a388bd6d..982c7f0082fb 100644 +index f8c49daa900e..091d88e0545b 100644 --- third_party/libwebrtc/rtc_base/refcount_gn/moz.build +++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -73608,7 +77425,7 @@ index 25f3a388bd6d..982c7f0082fb 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -73620,7 +77437,6 @@ index 25f3a388bd6d..982c7f0082fb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -73629,7 +77445,6 @@ index 25f3a388bd6d..982c7f0082fb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -73658,7 +77473,6 @@ index 25f3a388bd6d..982c7f0082fb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -73674,7 +77488,6 @@ index 25f3a388bd6d..982c7f0082fb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -73705,6 +77518,22 @@ index 25f3a388bd6d..982c7f0082fb 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -73745,37 +77574,32 @@ index 25f3a388bd6d..982c7f0082fb 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("refcount_gn") diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build -index a61cb1ba3e8b..92ae8a2096e9 100644 +index eef6c6bc5d45..f04b9eb51ce7 100644 --- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build +++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -73790,7 +77614,7 @@ index a61cb1ba3e8b..92ae8a2096e9 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -73802,7 +77626,6 @@ index a61cb1ba3e8b..92ae8a2096e9 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -73815,7 +77638,6 @@ index a61cb1ba3e8b..92ae8a2096e9 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -73844,7 +77666,6 @@ index a61cb1ba3e8b..92ae8a2096e9 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -73860,7 +77681,6 @@ index a61cb1ba3e8b..92ae8a2096e9 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -73891,6 +77711,22 @@ index a61cb1ba3e8b..92ae8a2096e9 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -73931,37 +77767,32 @@ index a61cb1ba3e8b..92ae8a2096e9 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rolling_accumulator_gn") diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build -index d7651183047b..9322f99f1130 100644 +index db71c35a1add..d03fb3f4e7c8 100644 --- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build +++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -73976,7 +77807,7 @@ index d7651183047b..9322f99f1130 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -73988,7 +77819,6 @@ index d7651183047b..9322f99f1130 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -74001,7 +77831,6 @@ index d7651183047b..9322f99f1130 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -74030,7 +77859,6 @@ index d7651183047b..9322f99f1130 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -74046,7 +77874,6 @@ index d7651183047b..9322f99f1130 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -74084,6 +77911,24 @@ index d7651183047b..9322f99f1130 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -74118,54 +77963,51 @@ index d7651183047b..9322f99f1130 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_event_gn") diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build -index b66af6ccae9a..941aff0fc07d 100644 +index 65d2c5bb2a2b..1b6e8cb951db 100644 --- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build +++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -74180,7 +78022,7 @@ index b66af6ccae9a..941aff0fc07d 100644 FINAL_LIBRARY = "webrtc" -@@ -45,169 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -74192,7 +78034,6 @@ index b66af6ccae9a..941aff0fc07d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -74205,7 +78046,6 @@ index b66af6ccae9a..941aff0fc07d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -74234,7 +78074,6 @@ index b66af6ccae9a..941aff0fc07d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -74250,7 +78089,6 @@ index b66af6ccae9a..941aff0fc07d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -74284,6 +78122,24 @@ index b66af6ccae9a..941aff0fc07d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -74318,54 +78174,51 @@ index b66af6ccae9a..941aff0fc07d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_numerics_gn") diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build -index 57ff1122e4da..d3d822db1c03 100644 +index ae0702954d53..8e76dcf845cb 100644 --- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build +++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -74380,7 +78233,7 @@ index 57ff1122e4da..d3d822db1c03 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -74392,7 +78245,6 @@ index 57ff1122e4da..d3d822db1c03 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -74405,7 +78257,6 @@ index 57ff1122e4da..d3d822db1c03 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -74434,7 +78285,6 @@ index 57ff1122e4da..d3d822db1c03 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -74450,7 +78300,6 @@ index 57ff1122e4da..d3d822db1c03 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -74484,6 +78333,24 @@ index 57ff1122e4da..d3d822db1c03 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -74518,54 +78385,51 @@ index 57ff1122e4da..d3d822db1c03 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rtc_task_queue_gn") diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build -index 8c8f4d35b314..4f0df0f51c33 100644 +index 706eb51c9788..5dba9b3a8401 100644 --- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build +++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -74580,7 +78444,7 @@ index 8c8f4d35b314..4f0df0f51c33 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -74592,7 +78456,6 @@ index 8c8f4d35b314..4f0df0f51c33 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -74601,7 +78464,6 @@ index 8c8f4d35b314..4f0df0f51c33 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -74630,7 +78492,6 @@ index 8c8f4d35b314..4f0df0f51c33 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -74646,7 +78507,6 @@ index 8c8f4d35b314..4f0df0f51c33 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -74677,6 +78537,22 @@ index 8c8f4d35b314..4f0df0f51c33 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -74717,37 +78593,32 @@ index 8c8f4d35b314..4f0df0f51c33 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("safe_compare_gn") diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build -index 4a42f49cc1ec..0003c29c5fb0 100644 +index 545467bc2319..bc31d2ede82f 100644 --- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build +++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -74762,7 +78633,7 @@ index 4a42f49cc1ec..0003c29c5fb0 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -74774,7 +78645,6 @@ index 4a42f49cc1ec..0003c29c5fb0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -74787,7 +78657,6 @@ index 4a42f49cc1ec..0003c29c5fb0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -74816,7 +78685,6 @@ index 4a42f49cc1ec..0003c29c5fb0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -74832,7 +78700,6 @@ index 4a42f49cc1ec..0003c29c5fb0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -74863,6 +78730,22 @@ index 4a42f49cc1ec..0003c29c5fb0 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -74903,37 +78786,32 @@ index 4a42f49cc1ec..0003c29c5fb0 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("safe_conversions_gn") diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build -index 082cf367dcca..042bc7a900ac 100644 +index 51c1b7bacdf8..fb72b6128335 100644 --- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build +++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -74948,7 +78826,7 @@ index 082cf367dcca..042bc7a900ac 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -74960,7 +78838,6 @@ index 082cf367dcca..042bc7a900ac 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -74973,7 +78850,6 @@ index 082cf367dcca..042bc7a900ac 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -75002,7 +78878,6 @@ index 082cf367dcca..042bc7a900ac 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -75018,7 +78893,6 @@ index 082cf367dcca..042bc7a900ac 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -75049,6 +78923,22 @@ index 082cf367dcca..042bc7a900ac 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -75089,37 +78979,32 @@ index 082cf367dcca..042bc7a900ac 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("safe_minmax_gn") diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build -index 9b50131ad966..528a6dab2ceb 100644 +index a477e2cd2de2..f8c37e47fe73 100644 --- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build +++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -75134,7 +79019,7 @@ index 9b50131ad966..528a6dab2ceb 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -75146,7 +79031,6 @@ index 9b50131ad966..528a6dab2ceb 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -75159,7 +79043,6 @@ index 9b50131ad966..528a6dab2ceb 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -75188,7 +79071,6 @@ index 9b50131ad966..528a6dab2ceb 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -75204,7 +79086,6 @@ index 9b50131ad966..528a6dab2ceb 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -75238,6 +79119,24 @@ index 9b50131ad966..528a6dab2ceb 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -75272,54 +79171,51 @@ index 9b50131ad966..528a6dab2ceb 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("sample_counter_gn") diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build -index ec590d55970b..8660a5364fac 100644 +index efdfb15485e3..d22a78d96416 100644 --- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build +++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -75334,7 +79230,7 @@ index ec590d55970b..8660a5364fac 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -75346,7 +79242,6 @@ index ec590d55970b..8660a5364fac 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -75355,7 +79250,6 @@ index ec590d55970b..8660a5364fac 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -75384,7 +79278,6 @@ index ec590d55970b..8660a5364fac 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -75400,7 +79293,6 @@ index ec590d55970b..8660a5364fac 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -75431,6 +79323,22 @@ index ec590d55970b..8660a5364fac 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -75471,37 +79379,32 @@ index ec590d55970b..8660a5364fac 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("sanitizer_gn") diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build -index 5dd4c7307f2b..1ef394c58cd1 100644 +index 8315d358e6ec..40ffca5c22d9 100644 --- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build +++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -75516,7 +79419,7 @@ index 5dd4c7307f2b..1ef394c58cd1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -75528,7 +79431,6 @@ index 5dd4c7307f2b..1ef394c58cd1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -75542,7 +79444,6 @@ index 5dd4c7307f2b..1ef394c58cd1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -75571,7 +79472,6 @@ index 5dd4c7307f2b..1ef394c58cd1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -75587,7 +79487,6 @@ index 5dd4c7307f2b..1ef394c58cd1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -75628,6 +79527,24 @@ index 5dd4c7307f2b..1ef394c58cd1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -75662,54 +79579,51 @@ index 5dd4c7307f2b..1ef394c58cd1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("socket_address_gn") diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build -index ccfb5c4d670d..afa43ea2575e 100644 +index 43a7eff46eba..4ba64ef8e106 100644 --- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build +++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -75724,7 +79638,7 @@ index ccfb5c4d670d..afa43ea2575e 100644 FINAL_LIBRARY = "webrtc" -@@ -39,165 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -75736,7 +79650,6 @@ index ccfb5c4d670d..afa43ea2575e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -75750,7 +79663,6 @@ index ccfb5c4d670d..afa43ea2575e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -75779,7 +79691,6 @@ index ccfb5c4d670d..afa43ea2575e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -75795,7 +79706,6 @@ index ccfb5c4d670d..afa43ea2575e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -75833,6 +79743,22 @@ index ccfb5c4d670d..afa43ea2575e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -75873,37 +79799,32 @@ index ccfb5c4d670d..afa43ea2575e 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("socket_factory_gn") diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build -index 02f1f5cb2ceb..007c7e666ff5 100644 +index 8fa7b5f8b019..d603411799ed 100644 --- third_party/libwebrtc/rtc_base/socket_gn/moz.build +++ third_party/libwebrtc/rtc_base/socket_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -75918,7 +79839,7 @@ index 02f1f5cb2ceb..007c7e666ff5 100644 FINAL_LIBRARY = "webrtc" -@@ -43,177 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -75930,7 +79851,6 @@ index 02f1f5cb2ceb..007c7e666ff5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -75944,7 +79864,6 @@ index 02f1f5cb2ceb..007c7e666ff5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -75973,7 +79892,6 @@ index 02f1f5cb2ceb..007c7e666ff5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -75989,7 +79907,6 @@ index 02f1f5cb2ceb..007c7e666ff5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -76030,6 +79947,24 @@ index 02f1f5cb2ceb..007c7e666ff5 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -76064,54 +79999,51 @@ index 02f1f5cb2ceb..007c7e666ff5 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("socket_gn") diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build -index 1d28df20e152..b5b51947b10f 100644 +index 19fae93cf479..8f5896e37a22 100644 --- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build +++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -76126,7 +80058,7 @@ index 1d28df20e152..b5b51947b10f 100644 FINAL_LIBRARY = "webrtc" -@@ -39,165 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -76138,7 +80070,6 @@ index 1d28df20e152..b5b51947b10f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -76152,7 +80083,6 @@ index 1d28df20e152..b5b51947b10f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -76181,7 +80111,6 @@ index 1d28df20e152..b5b51947b10f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -76197,7 +80126,6 @@ index 1d28df20e152..b5b51947b10f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -76235,6 +80163,22 @@ index 1d28df20e152..b5b51947b10f 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -76275,37 +80219,32 @@ index 1d28df20e152..b5b51947b10f 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("socket_server_gn") diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build -index 35975c3cb69f..87ed0e9ea41b 100644 +index 79c9fd515372..ed15371747a9 100644 --- third_party/libwebrtc/rtc_base/ssl_gn/moz.build +++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -76320,7 +80259,7 @@ index 35975c3cb69f..87ed0e9ea41b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -76332,7 +80271,6 @@ index 35975c3cb69f..87ed0e9ea41b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -76341,7 +80279,6 @@ index 35975c3cb69f..87ed0e9ea41b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -76370,7 +80307,6 @@ index 35975c3cb69f..87ed0e9ea41b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -76386,7 +80322,6 @@ index 35975c3cb69f..87ed0e9ea41b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -76417,6 +80352,22 @@ index 35975c3cb69f..87ed0e9ea41b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -76457,37 +80408,32 @@ index 35975c3cb69f..87ed0e9ea41b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("ssl_gn") diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build -index fc552833c01c..f86ec669c404 100644 +index c2ae423ea9b5..a65888b3d464 100644 --- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build +++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -76502,7 +80448,7 @@ index fc552833c01c..f86ec669c404 100644 FINAL_LIBRARY = "webrtc" -@@ -47,169 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -76514,7 +80460,6 @@ index fc552833c01c..f86ec669c404 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -76527,7 +80472,6 @@ index fc552833c01c..f86ec669c404 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -76556,7 +80500,6 @@ index fc552833c01c..f86ec669c404 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -76572,7 +80515,6 @@ index fc552833c01c..f86ec669c404 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -76606,6 +80548,24 @@ index fc552833c01c..f86ec669c404 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -76640,54 +80600,51 @@ index fc552833c01c..f86ec669c404 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("stringutils_gn") diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build -index 90e380fe9601..96e2c649a53b 100644 +index 630648f5f5fa..2863ba28d144 100644 --- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build +++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -76702,7 +80659,7 @@ index 90e380fe9601..96e2c649a53b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -76714,7 +80671,6 @@ index 90e380fe9601..96e2c649a53b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -76727,7 +80683,6 @@ index 90e380fe9601..96e2c649a53b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -76756,7 +80711,6 @@ index 90e380fe9601..96e2c649a53b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -76772,7 +80726,6 @@ index 90e380fe9601..96e2c649a53b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -76803,6 +80756,22 @@ index 90e380fe9601..96e2c649a53b 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -76843,37 +80812,32 @@ index 90e380fe9601..96e2c649a53b 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("swap_queue_gn") diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build -index 073233edf448..7c7479ebb7d8 100644 +index 34792dc4327c..fc8b3b58110e 100644 --- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build +++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -76888,7 +80852,7 @@ index 073233edf448..7c7479ebb7d8 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -76900,7 +80864,6 @@ index 073233edf448..7c7479ebb7d8 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -76913,7 +80876,6 @@ index 073233edf448..7c7479ebb7d8 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -76942,7 +80904,6 @@ index 073233edf448..7c7479ebb7d8 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -76958,7 +80919,6 @@ index 073233edf448..7c7479ebb7d8 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -76989,6 +80949,22 @@ index 073233edf448..7c7479ebb7d8 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -77029,37 +81005,32 @@ index 073233edf448..7c7479ebb7d8 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("mutex_gn") diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build -index dfc976a8835c..97a76a2a1485 100644 +index 85cf1f73b599..fb8a358b2eaa 100644 --- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build +++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -77074,7 +81045,7 @@ index dfc976a8835c..97a76a2a1485 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -77086,7 +81057,6 @@ index dfc976a8835c..97a76a2a1485 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -77099,7 +81069,6 @@ index dfc976a8835c..97a76a2a1485 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -77128,7 +81097,6 @@ index dfc976a8835c..97a76a2a1485 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -77144,7 +81112,6 @@ index dfc976a8835c..97a76a2a1485 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -77178,6 +81145,24 @@ index dfc976a8835c..97a76a2a1485 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -77212,54 +81197,51 @@ index dfc976a8835c..97a76a2a1485 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("sequence_checker_internal_gn") diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build -index 329762ff0a4a..9594c8db6d81 100644 +index 363b084539be..1fe57f535305 100644 --- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build +++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -77274,7 +81256,7 @@ index 329762ff0a4a..9594c8db6d81 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -77286,7 +81268,6 @@ index 329762ff0a4a..9594c8db6d81 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -77295,7 +81276,6 @@ index 329762ff0a4a..9594c8db6d81 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -77324,7 +81304,6 @@ index 329762ff0a4a..9594c8db6d81 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -77340,7 +81319,6 @@ index 329762ff0a4a..9594c8db6d81 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -77374,6 +81352,24 @@ index 329762ff0a4a..9594c8db6d81 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -77407,8 +81403,7 @@ index 329762ff0a4a..9594c8db6d81 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -77419,43 +81414,41 @@ index 329762ff0a4a..9594c8db6d81 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("yield_gn") diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build -index d4a04dbf50eb..eaa108cfe792 100644 +index 9356f30910a3..edfb4475bbd2 100644 --- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build +++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -77470,7 +81463,7 @@ index d4a04dbf50eb..eaa108cfe792 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -77482,7 +81475,6 @@ index d4a04dbf50eb..eaa108cfe792 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -77495,7 +81487,6 @@ index d4a04dbf50eb..eaa108cfe792 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -77524,7 +81515,6 @@ index d4a04dbf50eb..eaa108cfe792 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -77540,7 +81530,6 @@ index d4a04dbf50eb..eaa108cfe792 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -77574,6 +81563,24 @@ index d4a04dbf50eb..eaa108cfe792 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -77608,54 +81615,51 @@ index d4a04dbf50eb..eaa108cfe792 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("yield_policy_gn") diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build -index eb04194416c9..2dc63beecc0a 100644 +index 4f8f93c154e2..a836f5db63f0 100644 --- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -77670,7 +81674,7 @@ index eb04194416c9..2dc63beecc0a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -77682,7 +81686,6 @@ index eb04194416c9..2dc63beecc0a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -77691,7 +81694,6 @@ index eb04194416c9..2dc63beecc0a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -77720,7 +81722,6 @@ index eb04194416c9..2dc63beecc0a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -77736,7 +81737,6 @@ index eb04194416c9..2dc63beecc0a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -77767,6 +81767,22 @@ index eb04194416c9..2dc63beecc0a 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -77807,31 +81823,27 @@ index eb04194416c9..2dc63beecc0a 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("arch_gn") diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build deleted file mode 100644 -index 9425e8825167..000000000000 +index ab3e701885e8..000000000000 --- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build +++ /dev/null -@@ -1,81 +0,0 @@ +@@ -1,80 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -77848,7 +81860,6 @@ index 9425e8825167..000000000000 -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["WEBRTC_ARCH_ARM"] = True -DEFINES["WEBRTC_ARCH_ARM_V7"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_HAS_NEON"] = True -DEFINES["WEBRTC_LIBRARY_IMPL"] = True @@ -77915,10 +81926,10 @@ index 9425e8825167..000000000000 -Library("asm_defines_gn") diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build deleted file mode 100644 -index 8bbe2b95100c..000000000000 +index f897cf46fc39..000000000000 --- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build +++ /dev/null -@@ -1,64 +0,0 @@ +@@ -1,67 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -77937,7 +81948,6 @@ index 8bbe2b95100c..000000000000 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MAC"] = True @@ -77982,19 +81992,22 @@ index 8bbe2b95100c..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("cocoa_threading_gn") diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build -index c0580be18978..16ca167619b7 100644 +index 9954e2772e10..7cc6dfb3b3a6 100644 --- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -78009,7 +82022,7 @@ index c0580be18978..16ca167619b7 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -78021,7 +82034,6 @@ index c0580be18978..16ca167619b7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -78034,7 +82046,6 @@ index c0580be18978..16ca167619b7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -78063,7 +82074,6 @@ index c0580be18978..16ca167619b7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -78079,7 +82089,6 @@ index c0580be18978..16ca167619b7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -78113,6 +82122,24 @@ index c0580be18978..16ca167619b7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -78147,48 +82174,46 @@ index c0580be18978..16ca167619b7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("file_wrapper_gn") diff --git third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build deleted file mode 100644 -index 9ff5863fddfa..000000000000 +index 99fbd80dd967..000000000000 --- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build +++ /dev/null -@@ -1,64 +0,0 @@ +@@ -1,67 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -78207,7 +82232,6 @@ index 9ff5863fddfa..000000000000 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MAC"] = True @@ -78252,19 +82276,22 @@ index 9ff5863fddfa..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("gcd_helpers_gn") diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build -index 7f20d33160c8..ef18e6fbed95 100644 +index 396d7286299f..ae27ee47b74f 100644 --- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -78279,7 +82306,7 @@ index 7f20d33160c8..ef18e6fbed95 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -78291,7 +82318,6 @@ index 7f20d33160c8..ef18e6fbed95 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -78300,7 +82326,6 @@ index 7f20d33160c8..ef18e6fbed95 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -78329,7 +82354,6 @@ index 7f20d33160c8..ef18e6fbed95 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -78345,7 +82369,6 @@ index 7f20d33160c8..ef18e6fbed95 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -78376,6 +82399,22 @@ index 7f20d33160c8..ef18e6fbed95 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -78416,37 +82455,32 @@ index 7f20d33160c8..ef18e6fbed95 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("ignore_warnings_gn") diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build -index 4e867c0657be..fca71f230b1f 100644 +index 110c04a6be19..47a6efea00c5 100644 --- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -78461,7 +82495,7 @@ index 4e867c0657be..fca71f230b1f 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -78473,7 +82507,6 @@ index 4e867c0657be..fca71f230b1f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -78482,7 +82515,6 @@ index 4e867c0657be..fca71f230b1f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -78511,7 +82543,6 @@ index 4e867c0657be..fca71f230b1f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -78527,7 +82558,6 @@ index 4e867c0657be..fca71f230b1f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -78558,6 +82588,22 @@ index 4e867c0657be..fca71f230b1f 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -78598,37 +82644,32 @@ index 4e867c0657be..fca71f230b1f 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("inline_gn") diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build -index 81926c47233c..19b8bab9edd5 100644 +index bbf86f67bb61..8b4b89ce8c24 100644 --- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -78643,7 +82684,7 @@ index 81926c47233c..19b8bab9edd5 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -78655,7 +82696,6 @@ index 81926c47233c..19b8bab9edd5 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -78664,7 +82704,6 @@ index 81926c47233c..19b8bab9edd5 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -78693,7 +82732,6 @@ index 81926c47233c..19b8bab9edd5 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -78709,7 +82747,6 @@ index 81926c47233c..19b8bab9edd5 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -78740,6 +82777,22 @@ index 81926c47233c..19b8bab9edd5 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -78780,37 +82833,32 @@ index 81926c47233c..19b8bab9edd5 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("no_unique_address_gn") diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build -index 944c6ded51b0..df5282c64b67 100644 +index a26fbd0aecc7..7773038a2267 100644 --- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -78825,7 +82873,7 @@ index 944c6ded51b0..df5282c64b67 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -78837,7 +82885,6 @@ index 944c6ded51b0..df5282c64b67 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -78846,7 +82893,6 @@ index 944c6ded51b0..df5282c64b67 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -78875,7 +82921,6 @@ index 944c6ded51b0..df5282c64b67 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -78891,7 +82936,6 @@ index 944c6ded51b0..df5282c64b67 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -78922,6 +82966,22 @@ index 944c6ded51b0..df5282c64b67 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -78962,37 +83022,32 @@ index 944c6ded51b0..df5282c64b67 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rtc_export_gn") diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build -index 89640a44388c..931817507850 100644 +index c53e1ab3ba55..3c5c6131f5b6 100644 --- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -79007,7 +83062,7 @@ index 89640a44388c..931817507850 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -79019,7 +83074,6 @@ index 89640a44388c..931817507850 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -79028,7 +83082,6 @@ index 89640a44388c..931817507850 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -79057,7 +83110,6 @@ index 89640a44388c..931817507850 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -79073,7 +83125,6 @@ index 89640a44388c..931817507850 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -79104,6 +83155,22 @@ index 89640a44388c..931817507850 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -79144,37 +83211,32 @@ index 89640a44388c..931817507850 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("unused_gn") diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build -index 660c6466b8c9..def6ba576259 100644 +index 6d5043ae77f0..68764f971a8c 100644 --- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build +++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -79189,7 +83251,7 @@ index 660c6466b8c9..def6ba576259 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -79201,7 +83263,6 @@ index 660c6466b8c9..def6ba576259 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -79210,7 +83271,6 @@ index 660c6466b8c9..def6ba576259 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -79239,7 +83299,6 @@ index 660c6466b8c9..def6ba576259 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -79255,7 +83314,6 @@ index 660c6466b8c9..def6ba576259 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -79286,6 +83344,22 @@ index 660c6466b8c9..def6ba576259 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -79326,37 +83400,32 @@ index 660c6466b8c9..def6ba576259 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("warn_current_thread_is_deadlocked_gn") diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build -index 72522f8dab49..627573cb2d87 100644 +index 8aecd5889008..677563f0eafb 100644 --- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build +++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -79371,7 +83440,7 @@ index 72522f8dab49..627573cb2d87 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -79383,7 +83452,6 @@ index 72522f8dab49..627573cb2d87 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -79396,7 +83464,6 @@ index 72522f8dab49..627573cb2d87 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -79429,7 +83496,6 @@ index 72522f8dab49..627573cb2d87 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -79445,7 +83511,6 @@ index 72522f8dab49..627573cb2d87 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -79486,6 +83551,24 @@ index 72522f8dab49..627573cb2d87 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -79520,54 +83603,51 @@ index 72522f8dab49..627573cb2d87 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("repeating_task_gn") diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build -index 493219d5f401..8d10e3b0d1a1 100644 +index 6077e21b3779..af27c83c7e93 100644 --- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build +++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -79582,7 +83662,7 @@ index 493219d5f401..8d10e3b0d1a1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -79594,7 +83674,6 @@ index 493219d5f401..8d10e3b0d1a1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -79607,7 +83686,6 @@ index 493219d5f401..8d10e3b0d1a1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -79636,7 +83714,6 @@ index 493219d5f401..8d10e3b0d1a1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -79652,7 +83729,6 @@ index 493219d5f401..8d10e3b0d1a1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -79686,6 +83762,24 @@ index 493219d5f401..8d10e3b0d1a1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -79720,54 +83814,51 @@ index 493219d5f401..8d10e3b0d1a1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("base64_gn") diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build -index 4cc4c6b16b78..aed8cab8ea75 100644 +index 3f4690993100..c78bc1de22c4 100644 --- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build +++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -79782,7 +83873,7 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -79794,7 +83885,6 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -79803,7 +83893,6 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -79832,7 +83921,6 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -79848,7 +83936,6 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -79882,6 +83969,24 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -79915,8 +84020,7 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -79927,43 +84031,41 @@ index 4cc4c6b16b78..aed8cab8ea75 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("sigslot_gn") diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build -index b1df160534e6..bbaf73a7d731 100644 +index 39235d88fc45..74684735d856 100644 --- third_party/libwebrtc/rtc_base/threading_gn/moz.build +++ third_party/libwebrtc/rtc_base/threading_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -79978,7 +84080,7 @@ index b1df160534e6..bbaf73a7d731 100644 FINAL_LIBRARY = "webrtc" -@@ -48,177 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,187 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -79990,7 +84092,6 @@ index b1df160534e6..bbaf73a7d731 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -80004,7 +84105,6 @@ index b1df160534e6..bbaf73a7d731 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -80033,7 +84133,6 @@ index b1df160534e6..bbaf73a7d731 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -80049,7 +84148,6 @@ index b1df160534e6..bbaf73a7d731 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -80090,6 +84188,24 @@ index b1df160534e6..bbaf73a7d731 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -80124,54 +84240,51 @@ index b1df160534e6..bbaf73a7d731 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("threading_gn") diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build -index 3da79a8e0147..db2f8dd8379b 100644 +index 3f184279a3a0..432c438bdad6 100644 --- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build +++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build -@@ -12,12 +12,22 @@ AllowCompilerWarnings() +@@ -12,12 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_EXCLUDE_SYSTEM_TIME"] = True DEFINES["WEBRTC_LIBRARY_IMPL"] = True @@ -80187,7 +84300,7 @@ index 3da79a8e0147..db2f8dd8379b 100644 FINAL_LIBRARY = "webrtc" -@@ -45,173 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,183 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -80199,7 +84312,6 @@ index 3da79a8e0147..db2f8dd8379b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -80212,7 +84324,6 @@ index 3da79a8e0147..db2f8dd8379b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -80241,7 +84352,6 @@ index 3da79a8e0147..db2f8dd8379b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -80257,7 +84367,6 @@ index 3da79a8e0147..db2f8dd8379b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -80295,6 +84404,24 @@ index 3da79a8e0147..db2f8dd8379b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -80329,54 +84456,51 @@ index 3da79a8e0147..db2f8dd8379b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("timeutils_gn") diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build -index b67ac0fb9ff3..dd83f85e664e 100644 +index b5c9fb51224c..7ff959ba5f38 100644 --- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build +++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -80391,7 +84515,7 @@ index b67ac0fb9ff3..dd83f85e664e 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -80403,7 +84527,6 @@ index b67ac0fb9ff3..dd83f85e664e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -80412,7 +84535,6 @@ index b67ac0fb9ff3..dd83f85e664e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -80441,7 +84563,6 @@ index b67ac0fb9ff3..dd83f85e664e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -80457,7 +84578,6 @@ index b67ac0fb9ff3..dd83f85e664e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -80488,6 +84608,22 @@ index b67ac0fb9ff3..dd83f85e664e 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -80528,37 +84664,32 @@ index b67ac0fb9ff3..dd83f85e664e 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("type_traits_gn") diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build -index 9382cf752652..bd5d3a073fc0 100644 +index 4ff4d51c78ea..93be9abd91cd 100644 --- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build +++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -80573,7 +84704,7 @@ index 9382cf752652..bd5d3a073fc0 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -80585,7 +84716,6 @@ index 9382cf752652..bd5d3a073fc0 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -80594,7 +84724,6 @@ index 9382cf752652..bd5d3a073fc0 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -80623,7 +84752,6 @@ index 9382cf752652..bd5d3a073fc0 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -80639,7 +84767,6 @@ index 9382cf752652..bd5d3a073fc0 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -80670,6 +84797,22 @@ index 9382cf752652..bd5d3a073fc0 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -80710,37 +84853,32 @@ index 9382cf752652..bd5d3a073fc0 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("unique_id_generator_gn") diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build -index ebce9e1aff3d..9c2956925f04 100644 +index 35e3af076731..22bf007b975e 100644 --- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build +++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -80755,7 +84893,7 @@ index ebce9e1aff3d..9c2956925f04 100644 FINAL_LIBRARY = "webrtc" -@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -80767,7 +84905,6 @@ index ebce9e1aff3d..9c2956925f04 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -80780,7 +84917,6 @@ index ebce9e1aff3d..9c2956925f04 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -80809,7 +84945,6 @@ index ebce9e1aff3d..9c2956925f04 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -80825,7 +84960,6 @@ index ebce9e1aff3d..9c2956925f04 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -80856,6 +84990,22 @@ index ebce9e1aff3d..9c2956925f04 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -80896,37 +85046,32 @@ index ebce9e1aff3d..9c2956925f04 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("unit_base_gn") diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build -index 895ce10d8d1d..6962ab6543ba 100644 +index 93a833f2a3a7..c1c245b6e62b 100644 --- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build +++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -80941,7 +85086,7 @@ index 895ce10d8d1d..6962ab6543ba 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -80953,7 +85098,6 @@ index 895ce10d8d1d..6962ab6543ba 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -80966,7 +85110,6 @@ index 895ce10d8d1d..6962ab6543ba 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -80995,7 +85138,6 @@ index 895ce10d8d1d..6962ab6543ba 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -81011,7 +85153,6 @@ index 895ce10d8d1d..6962ab6543ba 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -81045,6 +85186,24 @@ index 895ce10d8d1d..6962ab6543ba 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -81079,48 +85238,46 @@ index 895ce10d8d1d..6962ab6543ba 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("weak_ptr_gn") diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build deleted file mode 100644 -index 5006e13f675e..000000000000 +index d5882af2bb01..000000000000 --- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build +++ /dev/null -@@ -1,77 +0,0 @@ +@@ -1,84 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81141,7 +85298,6 @@ index 5006e13f675e..000000000000 -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -81197,13 +85353,21 @@ index 5006e13f675e..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("create_direct3d_device_gn") diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build deleted file mode 100644 -index e08d377ae462..000000000000 +index d2449d9860b7..000000000000 --- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build +++ /dev/null -@@ -1,77 +0,0 @@ +@@ -1,84 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81224,7 +85388,6 @@ index e08d377ae462..000000000000 -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -81280,13 +85443,21 @@ index e08d377ae462..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("get_activation_factory_gn") diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build deleted file mode 100644 -index c9b33f561146..000000000000 +index 3a495f5b6ca0..000000000000 --- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build +++ /dev/null -@@ -1,77 +0,0 @@ +@@ -1,84 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81307,7 +85478,6 @@ index c9b33f561146..000000000000 -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -81363,13 +85533,21 @@ index c9b33f561146..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("hstring_gn") diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build deleted file mode 100644 -index 44a1d6155ac9..000000000000 +index 88dc67ea4893..000000000000 --- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build +++ /dev/null -@@ -1,77 +0,0 @@ +@@ -1,84 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81390,7 +85568,6 @@ index 44a1d6155ac9..000000000000 -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -81446,13 +85623,21 @@ index 44a1d6155ac9..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("windows_version_gn") diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build deleted file mode 100644 -index 46535ecb4e96..000000000000 +index 656bd4014be6..000000000000 --- third_party/libwebrtc/rtc_base/win32_gn/moz.build +++ /dev/null -@@ -1,86 +0,0 @@ +@@ -1,93 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81473,7 +85658,6 @@ index 46535ecb4e96..000000000000 -DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["UNICODE"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -81538,19 +85722,26 @@ index 46535ecb4e96..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("win32_gn") diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build -index ec5e88c92ac5..9bc7b4221207 100644 +index b186530b19c6..eaf3581aaff9 100644 --- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build +++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -81565,7 +85756,7 @@ index ec5e88c92ac5..9bc7b4221207 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -81577,7 +85768,6 @@ index ec5e88c92ac5..9bc7b4221207 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -81590,7 +85780,6 @@ index ec5e88c92ac5..9bc7b4221207 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -81619,7 +85808,6 @@ index ec5e88c92ac5..9bc7b4221207 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -81635,7 +85823,6 @@ index ec5e88c92ac5..9bc7b4221207 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -81669,6 +85856,24 @@ index ec5e88c92ac5..9bc7b4221207 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -81703,48 +85908,46 @@ index ec5e88c92ac5..9bc7b4221207 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("zero_memory_gn") diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build deleted file mode 100644 -index 0234575d4eb2..000000000000 +index 976c7fceb752..000000000000 --- third_party/libwebrtc/sdk/base_objc_gn/moz.build +++ /dev/null -@@ -1,76 +0,0 @@ +@@ -1,79 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81767,7 +85970,6 @@ index 0234575d4eb2..000000000000 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MAC"] = True @@ -81820,13 +86022,17 @@ index 0234575d4eb2..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("base_objc_gn") diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build deleted file mode 100644 -index 62a38a0dd288..000000000000 +index 7634e1aa7bb0..000000000000 --- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build +++ /dev/null -@@ -1,72 +0,0 @@ +@@ -1,75 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81849,7 +86055,6 @@ index 62a38a0dd288..000000000000 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MAC"] = True @@ -81898,13 +86103,17 @@ index 62a38a0dd288..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("helpers_objc_gn") diff --git third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build deleted file mode 100644 -index e294e5baaa05..000000000000 +index 64a7dbcb6366..000000000000 --- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build +++ /dev/null -@@ -1,67 +0,0 @@ +@@ -1,70 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81923,7 +86132,6 @@ index e294e5baaa05..000000000000 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MAC"] = True @@ -81971,13 +86179,17 @@ index e294e5baaa05..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("videocapture_objc_gn") diff --git third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build deleted file mode 100644 -index f73d2b5f1906..000000000000 +index dea03fa57466..000000000000 --- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build +++ /dev/null -@@ -1,70 +0,0 @@ +@@ -1,73 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -81996,7 +86208,6 @@ index f73d2b5f1906..000000000000 -DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" -DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True -DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True -DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" -DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_MAC"] = True @@ -82047,19 +86258,22 @@ index f73d2b5f1906..000000000000 - DEFINES["WEBRTC_ARCH_ARM64"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -Library("videoframebuffer_objc_gn") diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build -index 8af450048553..421446bf54e8 100644 +index 10482ec2ea89..064ddd6f7ea0 100644 --- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build +++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -82074,7 +86288,7 @@ index 8af450048553..421446bf54e8 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -82086,7 +86300,6 @@ index 8af450048553..421446bf54e8 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -82099,7 +86312,6 @@ index 8af450048553..421446bf54e8 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -82128,7 +86340,6 @@ index 8af450048553..421446bf54e8 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -82144,7 +86355,6 @@ index 8af450048553..421446bf54e8 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -82178,6 +86388,24 @@ index 8af450048553..421446bf54e8 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -82212,54 +86440,51 @@ index 8af450048553..421446bf54e8 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("denormal_disabler_gn") diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build -index f95b2d143cee..a507095a962f 100644 +index 9bbb11725944..53f2c83c65cc 100644 --- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build +++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -82274,7 +86499,7 @@ index f95b2d143cee..a507095a962f 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -82286,7 +86511,6 @@ index f95b2d143cee..a507095a962f 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -82299,7 +86523,6 @@ index f95b2d143cee..a507095a962f 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -82328,7 +86551,6 @@ index f95b2d143cee..a507095a962f 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -82344,7 +86566,6 @@ index f95b2d143cee..a507095a962f 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -82382,6 +86603,24 @@ index f95b2d143cee..a507095a962f 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -82416,54 +86655,51 @@ index f95b2d143cee..a507095a962f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("field_trial_gn") diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build -index d1529d2e5303..1c44146f4ec7 100644 +index b4982671c9fb..a5e24c852a0d 100644 --- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build +++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -82478,7 +86714,7 @@ index d1529d2e5303..1c44146f4ec7 100644 FINAL_LIBRARY = "webrtc" -@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -82490,7 +86726,6 @@ index d1529d2e5303..1c44146f4ec7 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -82503,7 +86738,6 @@ index d1529d2e5303..1c44146f4ec7 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -82532,7 +86766,6 @@ index d1529d2e5303..1c44146f4ec7 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -82548,7 +86781,6 @@ index d1529d2e5303..1c44146f4ec7 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -82582,6 +86814,24 @@ index d1529d2e5303..1c44146f4ec7 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -82616,54 +86866,51 @@ index d1529d2e5303..1c44146f4ec7 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("metrics_gn") diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build -index 75df83a0ce58..b9dd43747840 100644 +index bfc6aa12f922..2c316fbc9e0f 100644 --- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build +++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -82678,7 +86925,7 @@ index 75df83a0ce58..b9dd43747840 100644 FINAL_LIBRARY = "webrtc" -@@ -47,190 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,200 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -82690,7 +86937,6 @@ index 75df83a0ce58..b9dd43747840 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -82709,7 +86955,6 @@ index 75df83a0ce58..b9dd43747840 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -82746,7 +86991,6 @@ index 75df83a0ce58..b9dd43747840 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -82762,7 +87006,6 @@ index 75df83a0ce58..b9dd43747840 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -82803,6 +87046,24 @@ index 75df83a0ce58..b9dd43747840 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -82836,8 +87097,7 @@ index 75df83a0ce58..b9dd43747840 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -82848,43 +87108,41 @@ index 75df83a0ce58..b9dd43747840 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("system_wrappers_gn") diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build -index 056a722f366d..adae028f86db 100644 +index a93c14603d74..c15a9ae02722 100644 --- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build +++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -82899,7 +87157,7 @@ index 056a722f366d..adae028f86db 100644 FINAL_LIBRARY = "webrtc" -@@ -39,169 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -82911,7 +87169,6 @@ index 056a722f366d..adae028f86db 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -82925,7 +87182,6 @@ index 056a722f366d..adae028f86db 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -82958,7 +87214,6 @@ index 056a722f366d..adae028f86db 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -82974,7 +87229,6 @@ index 056a722f366d..adae028f86db 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -83012,6 +87266,22 @@ index 056a722f366d..adae028f86db 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -83052,27 +87322,23 @@ index 056a722f366d..adae028f86db 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("rtp_test_utils_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build -index 5ab9d4eca817..a07cf094c60f 100644 +index 31acde4e32f6..a07cf094c60f 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -83087,7 +87353,7 @@ index 5ab9d4eca817..a07cf094c60f 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -83150,18 +87416,26 @@ index 5ab9d4eca817..a07cf094c60f 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -83206,7 +87480,7 @@ index 5ab9d4eca817..a07cf094c60f 100644 - Library("algorithm_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build -index 3043386eb9e1..ea98e82e69b0 100644 +index ca1f9f85bf02..ea98e82e69b0 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -83221,7 +87495,7 @@ index 3043386eb9e1..ea98e82e69b0 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -83284,18 +87558,26 @@ index 3043386eb9e1..ea98e82e69b0 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -83340,7 +87622,7 @@ index 3043386eb9e1..ea98e82e69b0 100644 - Library("container_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build -index cc15322c1382..49c783cd4c81 100644 +index 5b1e4a8e0ac3..49c783cd4c81 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -83355,7 +87637,7 @@ index cc15322c1382..49c783cd4c81 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -83418,18 +87700,26 @@ index cc15322c1382..49c783cd4c81 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -83474,7 +87764,7 @@ index cc15322c1382..49c783cd4c81 100644 - Library("atomic_hook_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build -index 1bd7c339b5e6..ac7916a85e5d 100644 +index e21dd2812a91..ac7916a85e5d 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -83489,7 +87779,7 @@ index 1bd7c339b5e6..ac7916a85e5d 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -83552,18 +87842,26 @@ index 1bd7c339b5e6..ac7916a85e5d 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -83608,7 +87906,7 @@ index 1bd7c339b5e6..ac7916a85e5d 100644 - Library("base_internal_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build -index df41d4938e14..a1d553dad6db 100644 +index d226f5a9e03c..a1d553dad6db 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -83623,7 +87921,7 @@ index df41d4938e14..a1d553dad6db 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -83686,18 +87984,26 @@ index df41d4938e14..a1d553dad6db 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -83742,7 +88048,7 @@ index df41d4938e14..a1d553dad6db 100644 - Library("config_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build -index 82f714c09912..3e445069597d 100644 +index 9bb661c458d7..3e445069597d 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -83757,7 +88063,7 @@ index 82f714c09912..3e445069597d 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -83820,18 +88126,26 @@ index 82f714c09912..3e445069597d 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -83876,7 +88190,7 @@ index 82f714c09912..3e445069597d 100644 - Library("core_headers_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build -index 85fcec4f8561..edd5959dc1b8 100644 +index a237d04bb798..edd5959dc1b8 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -83891,7 +88205,7 @@ index 85fcec4f8561..edd5959dc1b8 100644 FINAL_LIBRARY = "webrtc" -@@ -36,130 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -83960,6 +88274,14 @@ index 85fcec4f8561..edd5959dc1b8 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -83969,13 +88291,13 @@ index 85fcec4f8561..edd5959dc1b8 100644 - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -84017,16 +88339,16 @@ index 85fcec4f8561..edd5959dc1b8 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("log_severity_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build -index b89c5ddbfc02..f55dd72d008a 100644 +index 8be2f4c300d7..f55dd72d008a 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -84041,7 +88363,7 @@ index b89c5ddbfc02..f55dd72d008a 100644 FINAL_LIBRARY = "webrtc" -@@ -36,130 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -84110,6 +88432,14 @@ index b89c5ddbfc02..f55dd72d008a 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -84119,13 +88449,13 @@ index b89c5ddbfc02..f55dd72d008a 100644 - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -84167,16 +88497,16 @@ index b89c5ddbfc02..f55dd72d008a 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("raw_logging_internal_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build -index 6f0d38845ea5..bc411d424827 100644 +index 813eed764791..bc411d424827 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -84191,7 +88521,7 @@ index 6f0d38845ea5..bc411d424827 100644 FINAL_LIBRARY = "webrtc" -@@ -36,130 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -84260,6 +88590,14 @@ index 6f0d38845ea5..bc411d424827 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -84269,13 +88607,13 @@ index 6f0d38845ea5..bc411d424827 100644 - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -84317,16 +88655,16 @@ index 6f0d38845ea5..bc411d424827 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("throw_delegate_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build -index 6b1e0970f1f3..367c6bd433a3 100644 +index 6cd0d6b473dd..367c6bd433a3 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -84341,7 +88679,7 @@ index 6b1e0970f1f3..367c6bd433a3 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -84404,18 +88742,26 @@ index 6b1e0970f1f3..367c6bd433a3 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -84460,7 +88806,7 @@ index 6b1e0970f1f3..367c6bd433a3 100644 - Library("cleanup_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build -index 21bdd45d8aeb..3f4fc9ed0f88 100644 +index b0fd90e5e1aa..3f4fc9ed0f88 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -84475,7 +88821,7 @@ index 21bdd45d8aeb..3f4fc9ed0f88 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -84538,18 +88884,26 @@ index 21bdd45d8aeb..3f4fc9ed0f88 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -84594,7 +88948,7 @@ index 21bdd45d8aeb..3f4fc9ed0f88 100644 - Library("cleanup_internal_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build -index 36c768828745..38403c4daf5f 100644 +index 29587550a341..38403c4daf5f 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -84609,7 +88963,7 @@ index 36c768828745..38403c4daf5f 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -84672,18 +89026,26 @@ index 36c768828745..38403c4daf5f 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -84728,7 +89090,7 @@ index 36c768828745..38403c4daf5f 100644 - Library("compressed_tuple_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build -index d92dcd18e347..f3c3c2ec8183 100644 +index 9cebdf041bf3..f3c3c2ec8183 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -84743,7 +89105,7 @@ index d92dcd18e347..f3c3c2ec8183 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -84806,18 +89168,26 @@ index d92dcd18e347..f3c3c2ec8183 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -84862,7 +89232,7 @@ index d92dcd18e347..f3c3c2ec8183 100644 - Library("inlined_vector_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build -index 1e5f5bd62e98..b5c250da1c55 100644 +index 6bd470bb56b8..b5c250da1c55 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -84877,7 +89247,7 @@ index 1e5f5bd62e98..b5c250da1c55 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -84940,18 +89310,26 @@ index 1e5f5bd62e98..b5c250da1c55 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -84996,7 +89374,7 @@ index 1e5f5bd62e98..b5c250da1c55 100644 - Library("inlined_vector_internal_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build -index 3a576aab6640..8cc78181cb75 100644 +index c71de94dba7d..8cc78181cb75 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85011,7 +89389,7 @@ index 3a576aab6640..8cc78181cb75 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -85074,18 +89452,26 @@ index 3a576aab6640..8cc78181cb75 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -85130,7 +89516,7 @@ index 3a576aab6640..8cc78181cb75 100644 - Library("any_invocable_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build -index 5e0d139fdb35..5c92f038c84f 100644 +index 6844d6e45b13..5c92f038c84f 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85145,7 +89531,7 @@ index 5e0d139fdb35..5c92f038c84f 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -85208,18 +89594,26 @@ index 5e0d139fdb35..5c92f038c84f 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -85264,7 +89658,7 @@ index 5e0d139fdb35..5c92f038c84f 100644 - Library("bind_front_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build -index c167d64d28da..cf5df0d3048a 100644 +index 092f878b8e82..cf5df0d3048a 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85279,7 +89673,7 @@ index c167d64d28da..cf5df0d3048a 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -85342,18 +89736,26 @@ index c167d64d28da..cf5df0d3048a 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -85398,7 +89800,7 @@ index c167d64d28da..cf5df0d3048a 100644 - Library("memory_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build -index d3a144cff8b0..d7c6a3f7be95 100644 +index ddb9d262175a..d7c6a3f7be95 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85413,7 +89815,7 @@ index d3a144cff8b0..d7c6a3f7be95 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -85476,18 +89878,26 @@ index d3a144cff8b0..d7c6a3f7be95 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -85532,7 +89942,7 @@ index d3a144cff8b0..d7c6a3f7be95 100644 - Library("type_traits_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build -index ac9b0407b4cd..09fa161e8735 100644 +index 9c8d37ad517d..09fa161e8735 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85547,7 +89957,7 @@ index ac9b0407b4cd..09fa161e8735 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -85610,18 +90020,26 @@ index ac9b0407b4cd..09fa161e8735 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -85666,7 +90084,7 @@ index ac9b0407b4cd..09fa161e8735 100644 - Library("bits_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build -index d9a137bffe59..0e364e67c4fc 100644 +index a15b4f43bbe4..0e364e67c4fc 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85681,7 +90099,7 @@ index d9a137bffe59..0e364e67c4fc 100644 FINAL_LIBRARY = "webrtc" -@@ -36,130 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -85750,6 +90168,14 @@ index d9a137bffe59..0e364e67c4fc 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -85759,13 +90185,13 @@ index d9a137bffe59..0e364e67c4fc 100644 - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -85807,16 +90233,16 @@ index d9a137bffe59..0e364e67c4fc 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("int128_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build -index 6a4f9e604360..71fd3a4a576d 100644 +index 2a53b9e647f7..71fd3a4a576d 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85831,7 +90257,7 @@ index 6a4f9e604360..71fd3a4a576d 100644 FINAL_LIBRARY = "webrtc" -@@ -40,130 +45,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -40,138 +45,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -85900,6 +90326,14 @@ index 6a4f9e604360..71fd3a4a576d 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -85909,13 +90343,13 @@ index 6a4f9e604360..71fd3a4a576d 100644 - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -85957,16 +90391,16 @@ index 6a4f9e604360..71fd3a4a576d 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("strings_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build -index c369013df0c7..54aba92be8f6 100644 +index 3a88a0da486e..54aba92be8f6 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -85981,7 +90415,7 @@ index c369013df0c7..54aba92be8f6 100644 FINAL_LIBRARY = "webrtc" -@@ -36,130 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -86050,6 +90484,14 @@ index c369013df0c7..54aba92be8f6 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -86059,13 +90501,13 @@ index c369013df0c7..54aba92be8f6 100644 - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -86107,16 +90549,16 @@ index c369013df0c7..54aba92be8f6 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bad_optional_access_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build -index 5e9417dc495c..edc6c3091d3e 100644 +index 08cc9180d644..edc6c3091d3e 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -86131,7 +90573,7 @@ index 5e9417dc495c..edc6c3091d3e 100644 FINAL_LIBRARY = "webrtc" -@@ -36,130 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -36,138 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -86200,6 +90642,14 @@ index 5e9417dc495c..edc6c3091d3e 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -86209,13 +90659,13 @@ index 5e9417dc495c..edc6c3091d3e 100644 - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" @@ -86257,16 +90707,16 @@ index 5e9417dc495c..edc6c3091d3e 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("bad_variant_access_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build -index e271df462d0b..f68149f85c45 100644 +index 96113b00bd5d..f68149f85c45 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -86281,7 +90731,7 @@ index e271df462d0b..f68149f85c45 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -86344,18 +90794,26 @@ index e271df462d0b..f68149f85c45 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -86400,7 +90858,7 @@ index e271df462d0b..f68149f85c45 100644 - Library("optional_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build -index c0974102fb57..293b2b62e2e5 100644 +index 31e83327e0d0..293b2b62e2e5 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -86415,7 +90873,7 @@ index c0974102fb57..293b2b62e2e5 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -86478,18 +90936,26 @@ index c0974102fb57..293b2b62e2e5 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -86534,7 +91000,7 @@ index c0974102fb57..293b2b62e2e5 100644 - Library("span_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build -index 89fc3aeac271..59ea6584a0f4 100644 +index 90e8e3b9d115..59ea6584a0f4 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -86549,7 +91015,7 @@ index 89fc3aeac271..59ea6584a0f4 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -86612,18 +91078,26 @@ index 89fc3aeac271..59ea6584a0f4 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -86668,7 +91142,7 @@ index 89fc3aeac271..59ea6584a0f4 100644 - Library("variant_gn") diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build -index bb0f653713eb..c06e16fa60f4 100644 +index 180c8a2fbbf7..c06e16fa60f4 100644 --- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build +++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -86683,7 +91157,7 @@ index bb0f653713eb..c06e16fa60f4 100644 FINAL_LIBRARY = "webrtc" -@@ -32,116 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -32,124 +37,10 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -86746,18 +91220,26 @@ index bb0f653713eb..c06e16fa60f4 100644 - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -86802,260 +91284,160 @@ index bb0f653713eb..c06e16fa60f4 100644 - Library("utility_gn") diff --git third_party/libwebrtc/third_party/drm/drm_gn/moz.build third_party/libwebrtc/third_party/drm/drm_gn/moz.build -deleted file mode 100644 -index cc1ff5827c29..000000000000 +index 78ba6b526064..29c9ceb54264 100644 --- third_party/libwebrtc/third_party/drm/drm_gn/moz.build -+++ /dev/null -@@ -1,76 +0,0 @@ --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### -- --COMPILE_FLAGS["OS_INCLUDES"] = [] --AllowCompilerWarnings() -- --DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True ++++ third_party/libwebrtc/third_party/drm/drm_gn/moz.build +@@ -12,20 +12,16 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["USE_GLIB"] = "1" + DEFINES["USE_GLIB"] = "1" -DEFINES["USE_NSS_CERTS"] = "1" --DEFINES["USE_OZONE"] = "1" + DEFINES["USE_OZONE"] = "1" -DEFINES["USE_UDEV"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_POSIX"] = True --DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["_FILE_OFFSET_BITS"] = "64" + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" + DEFINES["_FILE_OFFSET_BITS"] = "64" -DEFINES["_GNU_SOURCE"] = True --DEFINES["_LARGEFILE64_SOURCE"] = True --DEFINES["_LARGEFILE_SOURCE"] = True --DEFINES["__STDC_CONSTANT_MACROS"] = True --DEFINES["__STDC_FORMAT_MACROS"] = True -- --FINAL_LIBRARY = "webrtc" -- -- --LOCAL_INCLUDES += [ -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/ipc/chromium/src", -- "/third_party/drm/drm/", -- "/third_party/drm/drm/include/", -- "/third_party/drm/drm/include/libdrm/", -- "/third_party/libwebrtc/", -- "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/tools/profiler/public" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_DEBUG"] = True -- --if CONFIG["CPU_ARCH"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- + DEFINES["_LARGEFILE64_SOURCE"] = True + DEFINES["_LARGEFILE_SOURCE"] = True + DEFINES["__STDC_CONSTANT_MACROS"] = True +@@ -62,12 +58,6 @@ if CONFIG["CPU_ARCH"] == "aarch64": + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True +@@ -81,7 +71,7 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --Library("drm_gn") ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + diff --git third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build -deleted file mode 100644 -index 0dcdcd3d191a..000000000000 +index 173399cf13bd..9ca41fcadeaa 100644 --- third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build -+++ /dev/null -@@ -1,74 +0,0 @@ --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### -- --COMPILE_FLAGS["OS_INCLUDES"] = [] --AllowCompilerWarnings() -- --DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True ++++ third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build +@@ -12,20 +12,16 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["USE_GLIB"] = "1" + DEFINES["USE_GLIB"] = "1" -DEFINES["USE_NSS_CERTS"] = "1" --DEFINES["USE_OZONE"] = "1" + DEFINES["USE_OZONE"] = "1" -DEFINES["USE_UDEV"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_POSIX"] = True --DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["_FILE_OFFSET_BITS"] = "64" + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" + DEFINES["_FILE_OFFSET_BITS"] = "64" -DEFINES["_GNU_SOURCE"] = True --DEFINES["_LARGEFILE64_SOURCE"] = True --DEFINES["_LARGEFILE_SOURCE"] = True --DEFINES["__STDC_CONSTANT_MACROS"] = True --DEFINES["__STDC_FORMAT_MACROS"] = True -- --FINAL_LIBRARY = "webrtc" -- -- --LOCAL_INCLUDES += [ -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/ipc/chromium/src", -- "/third_party/gbm/gbm/", -- "/third_party/libwebrtc/", -- "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/tools/profiler/public" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_DEBUG"] = True -- --if CONFIG["CPU_ARCH"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- + DEFINES["_LARGEFILE64_SOURCE"] = True + DEFINES["_LARGEFILE_SOURCE"] = True + DEFINES["__STDC_CONSTANT_MACROS"] = True +@@ -60,12 +56,6 @@ if CONFIG["CPU_ARCH"] == "aarch64": + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True +@@ -79,7 +69,7 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --Library("gbm_gn") ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build -deleted file mode 100644 -index 74613b4ac3cb..000000000000 +index 646e12d72d60..d307f2650a1b 100644 --- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build -+++ /dev/null -@@ -1,75 +0,0 @@ --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### -- --COMPILE_FLAGS["OS_INCLUDES"] = [] --AllowCompilerWarnings() -- --DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True ++++ third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build +@@ -12,20 +12,16 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["USE_GLIB"] = "1" + DEFINES["USE_GLIB"] = "1" -DEFINES["USE_NSS_CERTS"] = "1" --DEFINES["USE_OZONE"] = "1" + DEFINES["USE_OZONE"] = "1" -DEFINES["USE_UDEV"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_POSIX"] = True --DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["_FILE_OFFSET_BITS"] = "64" + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" + DEFINES["_FILE_OFFSET_BITS"] = "64" -DEFINES["_GNU_SOURCE"] = True --DEFINES["_LARGEFILE64_SOURCE"] = True --DEFINES["_LARGEFILE_SOURCE"] = True --DEFINES["__STDC_CONSTANT_MACROS"] = True --DEFINES["__STDC_FORMAT_MACROS"] = True -- --FINAL_LIBRARY = "webrtc" -- -- --LOCAL_INCLUDES += [ -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/gfx/angle/checkout/include/", -- "/ipc/chromium/src", -- "/third_party/libepoxy/libepoxy/include/", -- "/third_party/libwebrtc/", -- "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/tools/profiler/public" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_DEBUG"] = True -- --if CONFIG["CPU_ARCH"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- + DEFINES["_LARGEFILE64_SOURCE"] = True + DEFINES["_LARGEFILE_SOURCE"] = True + DEFINES["__STDC_CONSTANT_MACROS"] = True +@@ -61,12 +57,6 @@ if CONFIG["CPU_ARCH"] == "aarch64": + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True +@@ -80,7 +70,7 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --Library("epoxy_gn") ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build -index f35cc1714e43..d193792147ec 100644 +index 2d97f962e7f9..dcece6e53f93 100644 --- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build +++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -87070,7 +91452,7 @@ index f35cc1714e43..d193792147ec 100644 FINAL_LIBRARY = "webrtc" -@@ -41,153 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -41,103 +50,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -87082,7 +91464,6 @@ index f35cc1714e43..d193792147ec 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -87091,7 +91472,6 @@ index f35cc1714e43..d193792147ec 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -87120,7 +91500,6 @@ index f35cc1714e43..d193792147ec 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -87136,7 +91515,6 @@ index f35cc1714e43..d193792147ec 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -87167,6 +91545,22 @@ index f35cc1714e43..d193792147ec 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -147,57 +70,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -87207,27 +91601,23 @@ index f35cc1714e43..d193792147ec 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("yuv_gn") diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build -index e30fcd393fa1..121b54df9033 100644 +index 27095596f717..5394d07cc759 100644 --- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build +++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build @@ -9,6 +9,14 @@ @@ -87245,7 +91635,7 @@ index e30fcd393fa1..121b54df9033 100644 FINAL_LIBRARY = "webrtc" -@@ -33,141 +41,20 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -33,151 +41,28 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -87322,6 +91712,16 @@ index e30fcd393fa1..121b54df9033 100644 - ] + DEFINES["_DEBUG"] = True + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["PFFFT_SIMD_DISABLE"] = True +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "mips64": + + DEFINES["PFFFT_SIMD_DISABLE"] = True +- DEFINES["_GNU_SOURCE"] = True + if CONFIG["CPU_ARCH"] == "ppc64": DEFINES["PFFFT_SIMD_DISABLE"] = True @@ -87392,88 +91792,56 @@ index e30fcd393fa1..121b54df9033 100644 Library("pffft_gn") diff --git third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -deleted file mode 100644 -index 4ad14fff6dcb..000000000000 +index 86a0daf8fa51..7b5a76defe4e 100644 --- third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build -+++ /dev/null -@@ -1,75 +0,0 @@ --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### -- --COMPILE_FLAGS["OS_INCLUDES"] = [] --AllowCompilerWarnings() -- --DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True ++++ third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build +@@ -12,21 +12,17 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True -DEFINES["USE_AURA"] = "1" --DEFINES["USE_GLIB"] = "1" + DEFINES["USE_GLIB"] = "1" -DEFINES["USE_NSS_CERTS"] = "1" --DEFINES["USE_OZONE"] = "1" + DEFINES["USE_OZONE"] = "1" -DEFINES["USE_UDEV"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True ++DEFINES["WEBRTC_BSD"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True -DEFINES["WEBRTC_LINUX"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_POSIX"] = True --DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" --DEFINES["WEBRTC_USE_PIPEWIRE"] = True --DEFINES["_FILE_OFFSET_BITS"] = "64" + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" + DEFINES["WEBRTC_USE_PIPEWIRE"] = True + DEFINES["_FILE_OFFSET_BITS"] = "64" -DEFINES["_GNU_SOURCE"] = True --DEFINES["_LARGEFILE64_SOURCE"] = True --DEFINES["_LARGEFILE_SOURCE"] = True --DEFINES["__STDC_CONSTANT_MACROS"] = True --DEFINES["__STDC_FORMAT_MACROS"] = True -- --FINAL_LIBRARY = "webrtc" -- -- --LOCAL_INCLUDES += [ -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/ipc/chromium/src", -- "/third_party/libwebrtc/", -- "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/third_party/pipewire/", -- "/tools/profiler/public" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_DEBUG"] = True -- --if CONFIG["CPU_ARCH"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- + DEFINES["_LARGEFILE64_SOURCE"] = True + DEFINES["_LARGEFILE_SOURCE"] = True + DEFINES["__STDC_CONSTANT_MACROS"] = True +@@ -61,12 +57,6 @@ if CONFIG["CPU_ARCH"] == "aarch64": + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + -if CONFIG["CPU_ARCH"] == "arm": - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True +@@ -80,7 +70,7 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- --Library("pipewire_gn") ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build -index bac3c415a85e..087012313675 100644 +index 2a3db9a62207..087012313675 100644 --- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build +++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build @@ -9,6 +9,14 @@ @@ -87491,7 +91859,7 @@ index bac3c415a85e..087012313675 100644 FINAL_LIBRARY = "webrtc" -@@ -33,136 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -33,144 +41,16 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -87566,18 +91934,26 @@ index bac3c415a85e..087012313675 100644 - "-mfpu=neon" - ] - +-if CONFIG["CPU_ARCH"] == "mips32": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- - DEFINES["_DEBUG"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True - +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- + DEFINES["_DEBUG"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["_DEBUG"] = True @@ -87623,26 +91999,25 @@ index bac3c415a85e..087012313675 100644 ] - DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("rnn_vad_gn") diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build -index 64c074df80bf..a45836895947 100644 +index 1459a2b50d95..c019774c6343 100644 --- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build +++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -87657,7 +92032,7 @@ index 64c074df80bf..a45836895947 100644 FINAL_LIBRARY = "webrtc" -@@ -52,181 +62,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -87669,7 +92044,6 @@ index 64c074df80bf..a45836895947 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -87683,7 +92057,6 @@ index 64c074df80bf..a45836895947 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -87716,7 +92089,6 @@ index 64c074df80bf..a45836895947 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -87732,7 +92104,6 @@ index 64c074df80bf..a45836895947 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -87773,6 +92144,24 @@ index 64c074df80bf..a45836895947 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -87807,54 +92196,51 @@ index 64c074df80bf..a45836895947 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_adaptation_gn") diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build -index a187c3b980f8..622de274f1e1 100644 +index ea2b54bfb866..2dc027987bb6 100644 --- third_party/libwebrtc/video/config/encoder_config_gn/moz.build +++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -87869,7 +92255,7 @@ index a187c3b980f8..622de274f1e1 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -87881,7 +92267,6 @@ index a187c3b980f8..622de274f1e1 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -87894,7 +92279,6 @@ index a187c3b980f8..622de274f1e1 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -87923,7 +92307,6 @@ index a187c3b980f8..622de274f1e1 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -87939,7 +92322,6 @@ index a187c3b980f8..622de274f1e1 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -87977,6 +92359,24 @@ index a187c3b980f8..622de274f1e1 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -88011,54 +92411,51 @@ index a187c3b980f8..622de274f1e1 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("encoder_config_gn") diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build -index 4fbb1154de19..0c39c898cc2e 100644 +index 9e174cff3ccb..3ab1b0d83805 100644 --- third_party/libwebrtc/video/config/streams_config_gn/moz.build +++ third_party/libwebrtc/video/config/streams_config_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -88073,7 +92470,7 @@ index 4fbb1154de19..0c39c898cc2e 100644 FINAL_LIBRARY = "webrtc" -@@ -44,181 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -88085,7 +92482,6 @@ index 4fbb1154de19..0c39c898cc2e 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -88099,7 +92495,6 @@ index 4fbb1154de19..0c39c898cc2e 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -88132,7 +92527,6 @@ index 4fbb1154de19..0c39c898cc2e 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -88148,7 +92542,6 @@ index 4fbb1154de19..0c39c898cc2e 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -88189,6 +92582,24 @@ index 4fbb1154de19..0c39c898cc2e 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -88223,54 +92634,51 @@ index 4fbb1154de19..0c39c898cc2e 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("streams_config_gn") diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build -index 6e545d5ca8ce..52d27d5285bf 100644 +index de01a944eadc..f306e996bb22 100644 --- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build +++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -88285,7 +92693,7 @@ index 6e545d5ca8ce..52d27d5285bf 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -88297,7 +92705,6 @@ index 6e545d5ca8ce..52d27d5285bf 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -88310,7 +92717,6 @@ index 6e545d5ca8ce..52d27d5285bf 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -88343,7 +92749,6 @@ index 6e545d5ca8ce..52d27d5285bf 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -88359,7 +92764,6 @@ index 6e545d5ca8ce..52d27d5285bf 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -88400,6 +92804,24 @@ index 6e545d5ca8ce..52d27d5285bf 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -88434,54 +92856,51 @@ index 6e545d5ca8ce..52d27d5285bf 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("decode_synchronizer_gn") diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build -index e798fbea5743..e0ae0cca3522 100644 +index 2f7abf4617c9..f0eff3beb31c 100644 --- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build +++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -88496,7 +92915,7 @@ index e798fbea5743..e0ae0cca3522 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -88508,7 +92927,6 @@ index e798fbea5743..e0ae0cca3522 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -88521,7 +92939,6 @@ index e798fbea5743..e0ae0cca3522 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -88554,7 +92971,6 @@ index e798fbea5743..e0ae0cca3522 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -88570,7 +92986,6 @@ index e798fbea5743..e0ae0cca3522 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -88611,6 +93026,24 @@ index e798fbea5743..e0ae0cca3522 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -88645,54 +93078,51 @@ index e798fbea5743..e0ae0cca3522 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frame_cadence_adapter_gn") diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build -index e62fe3afeace..d8ce73678eab 100644 +index 834d9880e79f..b37ca42dd139 100644 --- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build +++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -88707,7 +93137,7 @@ index e62fe3afeace..d8ce73678eab 100644 FINAL_LIBRARY = "webrtc" -@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -88719,7 +93149,6 @@ index e62fe3afeace..d8ce73678eab 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -88732,7 +93161,6 @@ index e62fe3afeace..d8ce73678eab 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -88765,7 +93193,6 @@ index e62fe3afeace..d8ce73678eab 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -88781,7 +93208,6 @@ index e62fe3afeace..d8ce73678eab 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -88819,6 +93245,22 @@ index e62fe3afeace..d8ce73678eab 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -88859,37 +93301,32 @@ index e62fe3afeace..d8ce73678eab 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("frame_decode_scheduler_gn") diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build -index 769cdf016940..a4a3704fca3a 100644 +index 570b927d3a81..40d9a4ffcc46 100644 --- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build +++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -88904,7 +93341,7 @@ index 769cdf016940..a4a3704fca3a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -88916,7 +93353,6 @@ index 769cdf016940..a4a3704fca3a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -88929,7 +93365,6 @@ index 769cdf016940..a4a3704fca3a 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -88962,7 +93397,6 @@ index 769cdf016940..a4a3704fca3a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -88978,7 +93412,6 @@ index 769cdf016940..a4a3704fca3a 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -89019,6 +93452,24 @@ index 769cdf016940..a4a3704fca3a 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -89053,54 +93504,51 @@ index 769cdf016940..a4a3704fca3a 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frame_decode_timing_gn") diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -index 47324d172dee..ad81223fd405 100644 +index 3266e8f07fbf..254d05acd491 100644 --- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build +++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -89115,7 +93563,7 @@ index 47324d172dee..ad81223fd405 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -89127,7 +93575,6 @@ index 47324d172dee..ad81223fd405 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -89141,7 +93588,6 @@ index 47324d172dee..ad81223fd405 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -89174,7 +93620,6 @@ index 47324d172dee..ad81223fd405 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -89190,7 +93635,6 @@ index 47324d172dee..ad81223fd405 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -89231,6 +93675,24 @@ index 47324d172dee..ad81223fd405 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -89265,54 +93727,51 @@ index 47324d172dee..ad81223fd405 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("frame_dumping_decoder_gn") diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build -index df5e08f2abb0..2bae3eeb84b4 100644 +index c8b8614b0499..42958c3afcef 100644 --- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build +++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -89327,7 +93786,7 @@ index df5e08f2abb0..2bae3eeb84b4 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -89339,7 +93798,6 @@ index df5e08f2abb0..2bae3eeb84b4 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -89352,7 +93810,6 @@ index df5e08f2abb0..2bae3eeb84b4 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -89381,7 +93838,6 @@ index df5e08f2abb0..2bae3eeb84b4 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -89397,7 +93853,6 @@ index df5e08f2abb0..2bae3eeb84b4 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -89435,6 +93890,24 @@ index df5e08f2abb0..2bae3eeb84b4 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -89469,54 +93942,51 @@ index df5e08f2abb0..2bae3eeb84b4 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("incoming_video_stream_gn") diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build -index 1a6884fa6943..f96f3dff091b 100644 +index 951c654ef6d2..a3b28f438f5d 100644 --- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build +++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -89531,7 +94001,7 @@ index 1a6884fa6943..f96f3dff091b 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -89543,7 +94013,6 @@ index 1a6884fa6943..f96f3dff091b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -89556,7 +94025,6 @@ index 1a6884fa6943..f96f3dff091b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -89585,7 +94053,6 @@ index 1a6884fa6943..f96f3dff091b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -89601,7 +94068,6 @@ index 1a6884fa6943..f96f3dff091b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -89639,6 +94105,24 @@ index 1a6884fa6943..f96f3dff091b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -89673,54 +94157,51 @@ index 1a6884fa6943..f96f3dff091b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_render_frames_gn") diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build -index 8995901c3fb7..c60519217f0c 100644 +index e9e33818dec5..f8bc9184d923 100644 --- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build +++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -89735,7 +94216,7 @@ index 8995901c3fb7..c60519217f0c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -89747,7 +94228,6 @@ index 8995901c3fb7..c60519217f0c 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -89760,7 +94240,6 @@ index 8995901c3fb7..c60519217f0c 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -89793,7 +94272,6 @@ index 8995901c3fb7..c60519217f0c 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -89809,7 +94287,6 @@ index 8995901c3fb7..c60519217f0c 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -89850,6 +94327,24 @@ index 8995901c3fb7..c60519217f0c 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -89884,54 +94379,51 @@ index 8995901c3fb7..c60519217f0c 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("task_queue_frame_decode_scheduler_gn") diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build -index 56b5fd181389..e71b467261f6 100644 +index de254b0f678e..177b8617949e 100644 --- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build +++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -89946,7 +94438,7 @@ index 56b5fd181389..e71b467261f6 100644 FINAL_LIBRARY = "webrtc" -@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -89958,7 +94450,6 @@ index 56b5fd181389..e71b467261f6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -89967,7 +94458,6 @@ index 56b5fd181389..e71b467261f6 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -89996,7 +94486,6 @@ index 56b5fd181389..e71b467261f6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -90012,7 +94501,6 @@ index 56b5fd181389..e71b467261f6 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -90046,6 +94534,24 @@ index 56b5fd181389..e71b467261f6 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -90079,8 +94585,7 @@ index 56b5fd181389..e71b467261f6 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -+if CONFIG["CPU_ARCH"] == "x86": - +- CXXFLAGS += [ "-msse2" ] @@ -90091,43 +94596,41 @@ index 56b5fd181389..e71b467261f6 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + - CXXFLAGS += [ - "-msse2" - ] -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["CPU_ARCH"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("unique_timestamp_counter_gn") diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build -index 1d771a2ac3ce..e7b59e68ba4d 100644 +index 392c0c16c828..c3232b0bd0ff 100644 --- third_party/libwebrtc/video/video_gn/moz.build +++ third_party/libwebrtc/video/video_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -90142,7 +94645,7 @@ index 1d771a2ac3ce..e7b59e68ba4d 100644 FINAL_LIBRARY = "webrtc" -@@ -64,181 +74,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -64,191 +73,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -90154,7 +94657,6 @@ index 1d771a2ac3ce..e7b59e68ba4d 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -90168,7 +94670,6 @@ index 1d771a2ac3ce..e7b59e68ba4d 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -90201,7 +94702,6 @@ index 1d771a2ac3ce..e7b59e68ba4d 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -90217,7 +94717,6 @@ index 1d771a2ac3ce..e7b59e68ba4d 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -90258,6 +94757,24 @@ index 1d771a2ac3ce..e7b59e68ba4d 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -90292,54 +94809,51 @@ index 1d771a2ac3ce..e7b59e68ba4d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_gn") diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build -index 243f97516367..cdce52b65cca 100644 +index 0de224d0dfb5..b74708587cec 100644 --- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build +++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -90354,7 +94868,7 @@ index 243f97516367..cdce52b65cca 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -90366,7 +94880,6 @@ index 243f97516367..cdce52b65cca 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -90379,7 +94892,6 @@ index 243f97516367..cdce52b65cca 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -90412,7 +94924,6 @@ index 243f97516367..cdce52b65cca 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -90428,7 +94939,6 @@ index 243f97516367..cdce52b65cca 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -90469,6 +94979,24 @@ index 243f97516367..cdce52b65cca 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -90503,54 +95031,51 @@ index 243f97516367..cdce52b65cca 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_receive_stream_timeout_tracker_gn") diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build -index c123026e4887..56a5cb95759b 100644 +index a18b990a8d75..8b1e03633a54 100644 --- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build +++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -90565,7 +95090,7 @@ index c123026e4887..56a5cb95759b 100644 FINAL_LIBRARY = "webrtc" -@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -90577,7 +95102,6 @@ index c123026e4887..56a5cb95759b 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -90591,7 +95115,6 @@ index c123026e4887..56a5cb95759b 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -90624,7 +95147,6 @@ index c123026e4887..56a5cb95759b 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -90640,7 +95162,6 @@ index c123026e4887..56a5cb95759b 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -90681,6 +95202,24 @@ index c123026e4887..56a5cb95759b 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -90715,54 +95254,51 @@ index c123026e4887..56a5cb95759b 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_stream_buffer_controller_gn") diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build -index a1f47fa9f9f5..f0ea0f8bcdb3 100644 +index cd70bcde35e5..004e04207c71 100644 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -90777,7 +95313,7 @@ index a1f47fa9f9f5..f0ea0f8bcdb3 100644 FINAL_LIBRARY = "webrtc" -@@ -48,181 +58,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -90789,7 +95325,6 @@ index a1f47fa9f9f5..f0ea0f8bcdb3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -90803,7 +95338,6 @@ index a1f47fa9f9f5..f0ea0f8bcdb3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -90836,7 +95370,6 @@ index a1f47fa9f9f5..f0ea0f8bcdb3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -90852,7 +95385,6 @@ index a1f47fa9f9f5..f0ea0f8bcdb3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -90893,6 +95425,24 @@ index a1f47fa9f9f5..f0ea0f8bcdb3 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True +- + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -90927,54 +95477,51 @@ index a1f47fa9f9f5..f0ea0f8bcdb3 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["CPU_ARCH"] == "x86_64": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" Library("video_stream_encoder_impl_gn") diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build -index 0e5a20b2d558..8f98c5d580a3 100644 +index e058513d4fb8..d51109a08c5f 100644 --- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build +++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -90989,7 +95536,7 @@ index 0e5a20b2d558..8f98c5d580a3 100644 FINAL_LIBRARY = "webrtc" -@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -91001,7 +95548,6 @@ index 0e5a20b2d558..8f98c5d580a3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -91014,7 +95560,6 @@ index 0e5a20b2d558..8f98c5d580a3 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -91043,7 +95588,6 @@ index 0e5a20b2d558..8f98c5d580a3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -91059,7 +95603,6 @@ index 0e5a20b2d558..8f98c5d580a3 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -91094,6 +95637,22 @@ index 0e5a20b2d558..8f98c5d580a3 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["CPU_ARCH"] == "x86": + +@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -91134,37 +95693,32 @@ index 0e5a20b2d558..8f98c5d580a3 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - Library("video_stream_encoder_interface_gn") diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build -index 8019e9939b56..d905c264b009 100644 +index b91e518cabc7..495fb5b35f3d 100644 --- third_party/libwebrtc/webrtc_gn/moz.build +++ third_party/libwebrtc/webrtc_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() +@@ -12,11 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True -+DEFINES["WEBRTC_ENABLE_AVX2"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -91179,7 +95733,7 @@ index 8019e9939b56..d905c264b009 100644 FINAL_LIBRARY = "webrtc" -@@ -39,158 +49,14 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,139 +48,23 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -91191,7 +95745,6 @@ index 8019e9939b56..d905c264b009 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -91205,7 +95758,6 @@ index 8019e9939b56..d905c264b009 100644 - -if CONFIG["OS_TARGET"] == "Darwin": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True @@ -91243,7 +95795,6 @@ index 8019e9939b56..d905c264b009 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -91270,7 +95821,6 @@ index 8019e9939b56..d905c264b009 100644 - DEFINES["PSAPI_VERSION"] = "2" - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -91308,13 +95858,49 @@ index 8019e9939b56..d905c264b009 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True ++ DEFINES["WEBRTC_USE_PIPEWIRE"] = True -if CONFIG["CPU_ARCH"] == "arm": - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- ++ LOCAL_INCLUDES += [ ++ "/third_party/pipewire/" ++ ] + + if CONFIG["CPU_ARCH"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True + + LOCAL_INCLUDES += [ + "/third_party/pipewire/" +@@ -180,7 +73,6 @@ if CONFIG["CPU_ARCH"] == "mips32": + if CONFIG["CPU_ARCH"] == "mips64": + + DEFINES["WEBRTC_USE_PIPEWIRE"] = True +- DEFINES["_GNU_SOURCE"] = True + + LOCAL_INCLUDES += [ + "/third_party/pipewire/" +@@ -189,32 +81,22 @@ if CONFIG["CPU_ARCH"] == "mips64": + if CONFIG["CPU_ARCH"] == "x86": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True ++ DEFINES["WEBRTC_USE_PIPEWIRE"] = True ++ ++ LOCAL_INCLUDES += [ ++ "/third_party/pipewire/" ++ ] + + if CONFIG["CPU_ARCH"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True ++ DEFINES["WEBRTC_USE_PIPEWIRE"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -91334,13 +95920,16 @@ index 8019e9939b56..d905c264b009 100644 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- ++ LOCAL_INCLUDES += [ ++ "/third_party/pipewire/" ++ ] + -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": DEFINES["USE_X11"] = "1" -@@ -205,57 +71,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +@@ -229,53 +111,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": "Xtst" ] @@ -91359,7 +95948,6 @@ index 8019e9939b56..d905c264b009 100644 - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -91369,7 +95957,6 @@ index 8019e9939b56..d905c264b009 100644 - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -91379,7 +95966,6 @@ index 8019e9939b56..d905c264b009 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True - @@ -91389,7 +95975,6 @@ index 8019e9939b56..d905c264b009 100644 - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - -- DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_USE_PIPEWIRE"] = True - DEFINES["_GNU_SOURCE"] = True - diff --git a/www/firefox/files/patch-modules_fdlibm_src_math__private.h b/www/firefox/files/patch-modules_fdlibm_src_math__private.h new file mode 100644 index 00000000000..8d893f31e87 --- /dev/null +++ b/www/firefox/files/patch-modules_fdlibm_src_math__private.h @@ -0,0 +1,27 @@ +commit 7a20fbf537ee0867244109d1ea48a8ad9de2e4ea +Author: Christoph Moench-Tegeder + + align typedefs with our libm for historical CPUs + +diff --git modules/fdlibm/src/math_private.h modules/fdlibm/src/math_private.h +index f4373f27834a..3b898241660f 100644 +--- modules/fdlibm/src/math_private.h ++++ modules/fdlibm/src/math_private.h +@@ -30,9 +30,17 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#ifdef __LP64__ + typedef double __double_t; ++#else ++typedef long double __double_t; ++#endif + typedef __double_t double_t; ++#ifdef __LP64__ + typedef float __float_t; ++#else ++typedef long double __float_t; ++#endif + + /* + * The original fdlibm code used statements like: diff --git a/www/firefox/files/patch-mozglue_misc_SSE.h b/www/firefox/files/patch-mozglue_misc_SSE.h new file mode 100644 index 00000000000..296c50d060d --- /dev/null +++ b/www/firefox/files/patch-mozglue_misc_SSE.h @@ -0,0 +1,84 @@ +commit 70c3be521da1296f7ba47bd07b67927e43634d1b +Author: Christoph Moench-Tegeder + + disable SSE and friends in builds for legacy architectures + +diff --git gfx/thebes/moz.build gfx/thebes/moz.build +index 71903756ea19..3591cc0f38e8 100644 +--- gfx/thebes/moz.build ++++ gfx/thebes/moz.build +@@ -174,7 +174,7 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": + ] + + # Are we targeting x86 or x64? If so, build gfxAlphaRecoverySSE2.cpp. +-if CONFIG["INTEL_ARCHITECTURE"]: ++if CONFIG["INTEL_ARCHITECTURE"] and CONFIG['CPU_ARCH'] == 'x86_64': + SOURCES += ["gfxAlphaRecoverySSE2.cpp"] + # The file uses SSE2 intrinsics, so it needs special compile flags on some + # compilers. +diff --git mozglue/misc/SSE.h mozglue/misc/SSE.h +index 0b87366a8043..af0a0b38d23c 100644 +--- mozglue/misc/SSE.h ++++ mozglue/misc/SSE.h +@@ -100,36 +100,50 @@ + # define MOZILLA_PRESUME_MMX 1 + # endif + # ifdef __SSE__ ++# if !defined(__386__) + // It's ok to use SSE instructions based on the -march option (or + // the default for x86_64 or for Intel Mac). + # define MOZILLA_PRESUME_SSE 1 + # endif ++# endif + # ifdef __SSE2__ ++# if !defined(__386__) + // It's ok to use SSE2 instructions based on the -march option (or + // the default for x86_64 or for Intel Mac). + # define MOZILLA_PRESUME_SSE2 1 + # endif ++# endif + # ifdef __SSE3__ ++# if !defined(__386__) + // It's ok to use SSE3 instructions based on the -march option (or the + // default for Intel Mac). + # define MOZILLA_PRESUME_SSE3 1 + # endif ++# endif + # ifdef __SSSE3__ ++# if !defined(__386__) + // It's ok to use SSSE3 instructions based on the -march option. + # define MOZILLA_PRESUME_SSSE3 1 + # endif ++# endif + # ifdef __SSE4A__ ++# if !defined(__386__) + // It's ok to use SSE4A instructions based on the -march option. + # define MOZILLA_PRESUME_SSE4A 1 + # endif ++# endif + # ifdef __SSE4_1__ ++# if !defined(__386__) + // It's ok to use SSE4.1 instructions based on the -march option. + # define MOZILLA_PRESUME_SSE4_1 1 + # endif ++# endif + # ifdef __SSE4_2__ ++# if !defined(__386__) + // It's ok to use SSE4.2 instructions based on the -march option. + # define MOZILLA_PRESUME_SSE4_2 1 + # endif ++# endif + # ifdef __AVX__ + // It's ok to use AVX instructions based on the -march option. + # define MOZILLA_PRESUME_AVX 1 +@@ -144,8 +158,10 @@ + # endif + + # ifdef HAVE_CPUID_H ++# if !defined(__i386__) + # define MOZILLA_SSE_HAVE_CPUID_DETECTION + # endif ++# endif + + #elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64)) + diff --git a/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py b/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py index 5b6f401be2b..777e27798d7 100644 --- a/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py +++ b/www/firefox/files/patch-python_mozbuild_mozbuild_gn__processor.py @@ -1,8 +1,13 @@ +commit 8dfec3226ff4d7d7f852ea700a5052976eded46e +Author: Christoph Moench-Tegeder + + chase gn_processor.py changes + diff --git python/mozbuild/mozbuild/gn_processor.py python/mozbuild/mozbuild/gn_processor.py -index a1b8367fc11b..fe1087270fc0 100644 +index b6c51ee010a8..15b4bda9df6e 100644 --- python/mozbuild/mozbuild/gn_processor.py +++ python/mozbuild/mozbuild/gn_processor.py -@@ -183,6 +183,7 @@ def filter_gn_config(path, gn_result, sandbox_vars, input_vars, gn_target): +@@ -185,6 +185,7 @@ def filter_gn_config(path, gn_result, sandbox_vars, input_vars, gn_target): } oses = { "android": "Android", @@ -10,7 +15,7 @@ index a1b8367fc11b..fe1087270fc0 100644 "linux": "Linux", "mac": "Darwin", "openbsd": "OpenBSD", -@@ -733,16 +734,16 @@ def main(): +@@ -735,16 +736,16 @@ def main(): vars_set = [] for is_debug in (True, False): @@ -26,13 +31,13 @@ index a1b8367fc11b..fe1087270fc0 100644 + if target_os in ("android", "freebsd", "linux", "win"): target_cpus.append("x86") - if target_os == "linux": -- target_cpus.extend(["ppc64", "riscv64"]) +- target_cpus.extend(["ppc64", "riscv64", "mipsel", "mips64el"]) + if target_os in ("freebsd", "linux"): -+ target_cpus.append("ppc64") ++ target_cpus.extend(["ppc64", "mipsel", "mips64el"]) for target_cpu in target_cpus: vars = { "host_cpu": "x64", -@@ -750,7 +751,7 @@ def main(): +@@ -752,7 +753,7 @@ def main(): "target_cpu": target_cpu, "target_os": target_os, } diff --git a/www/firefox/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn b/www/firefox/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn index c865374a24e..a6b48ed2d16 100644 --- a/www/firefox/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn +++ b/www/firefox/files/patch-third__party_libwebrtc_build_config_BUILDCONFIG.gn @@ -1,6 +1,21 @@ ---- third_party/libwebrtc/build/config/BUILDCONFIG.gn.orig 2022-10-09 20:42:58.113963000 +0200 -+++ third_party/libwebrtc/build/config/BUILDCONFIG.gn 2022-10-09 20:46:16.128220000 +0200 -@@ -132,6 +132,7 @@ +diff --git third_party/libwebrtc/BUILD.gn third_party/libwebrtc/BUILD.gn +index 6eb14773b0a7..d63fd1d5529f 100644 +--- third_party/libwebrtc/BUILD.gn ++++ third_party/libwebrtc/BUILD.gn +@@ -106,7 +106,7 @@ if (!build_with_chromium && !build_with_mozilla) { + "tools_webrtc/perf:webrtc_dashboard_upload", + ] + } +- if ((is_linux || is_chromeos) && rtc_use_pipewire) { ++ if ((is_linux || is_chromeos || is_bsd) && rtc_use_pipewire) { + deps += [ "modules/desktop_capture:shared_screencast_stream_test" ] + } + if (is_fuchsia) { +diff --git third_party/libwebrtc/build/config/BUILDCONFIG.gn third_party/libwebrtc/build/config/BUILDCONFIG.gn +index 571ae5f0d60d..863d428fc676 100644 +--- third_party/libwebrtc/build/config/BUILDCONFIG.gn ++++ third_party/libwebrtc/build/config/BUILDCONFIG.gn +@@ -132,6 +132,7 @@ declare_args() { # Set to true when compiling with the Clang compiler. is_clang = current_os != "linux" || current_os == "openbsd" || @@ -8,7 +23,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -184,7 +185,7 @@ +@@ -184,7 +185,7 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -17,7 +32,7 @@ if (target_os != "linux") { host_toolchain = "//build/toolchain/linux:clang_$host_cpu" } else if (is_clang) { -@@ -222,7 +223,7 @@ +@@ -222,7 +223,7 @@ if (target_os == "android") { assert(host_os == "linux" || host_os == "mac", "Android builds are only supported on Linux and Mac hosts.") _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" @@ -26,7 +41,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -288,7 +289,7 @@ +@@ -288,7 +289,7 @@ is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" is_linux = current_os == "linux" @@ -35,3 +50,87 @@ is_mac = current_os == "mac" is_nacl = current_os == "nacl" is_win = current_os == "win" || current_os == "winuwp" +diff --git third_party/libwebrtc/modules/desktop_capture/BUILD.gn third_party/libwebrtc/modules/desktop_capture/BUILD.gn +index c184e2fbbcac..e1af29734d8b 100644 +--- third_party/libwebrtc/modules/desktop_capture/BUILD.gn ++++ third_party/libwebrtc/modules/desktop_capture/BUILD.gn +@@ -75,7 +75,7 @@ if (rtc_include_tests) { + "window_finder_unittest.cc", + ] + +- if ((is_linux || is_chromeos) && rtc_use_pipewire) { ++ if ((is_linux || is_chromeos || is_bsd) && rtc_use_pipewire) { + configs += [ "../portal:gio" ] + } + +@@ -87,7 +87,7 @@ if (rtc_include_tests) { + } + } + +- if ((is_linux || is_chromeos) && rtc_use_pipewire) { ++ if ((is_linux || is_chromeos || is_bsd) && rtc_use_pipewire) { + rtc_test("shared_screencast_stream_test") { + testonly = true + +@@ -146,7 +146,7 @@ if (rtc_include_tests) { + "test_utils_unittest.cc", + ] + +- if ((is_linux || is_chromeos) && rtc_use_pipewire) { ++ if ((is_linux || is_chromeos || is_bsd) && rtc_use_pipewire) { + configs += [ "../portal:gio" ] + } + +@@ -255,7 +255,7 @@ if (rtc_include_tests) { + "mock_desktop_capturer_callback.h", + ] + +- if ((is_linux || is_chromeos) && rtc_use_pipewire) { ++ if ((is_linux || is_chromeos || is_bsd) && rtc_use_pipewire) { + configs += [ "../portal:gio" ] + } + +@@ -268,7 +268,7 @@ if (rtc_include_tests) { + } + + # TODO(bugs.webrtc.org/14187): remove when all users are gone +-if ((is_linux || is_chromeos) && rtc_use_pipewire) { ++if ((is_linux || is_chromeos || is_bsd) && rtc_use_pipewire) { + config("pipewire_config") { + configs = [ "../portal:pipewire_config" ] + } +@@ -326,7 +326,7 @@ rtc_library("desktop_capture") { + "window_finder.cc", + "window_finder.h", + ] +- if (is_linux && !is_castos && rtc_use_pipewire) { ++ if ((is_linux || is_bsd) && !is_castos && rtc_use_pipewire) { + sources += [ "desktop_capture_metadata.h" ] + } + if (is_mac) { +diff --git third_party/libwebrtc/modules/portal/BUILD.gn third_party/libwebrtc/modules/portal/BUILD.gn +index d7768b2323c9..3593a6959277 100644 +--- third_party/libwebrtc/modules/portal/BUILD.gn ++++ third_party/libwebrtc/modules/portal/BUILD.gn +@@ -10,7 +10,7 @@ import("//build/config/linux/pkg_config.gni") + import("//tools/generate_stubs/rules.gni") + import("../../webrtc.gni") + +-if ((is_linux || is_chromeos) && rtc_use_pipewire) { ++if ((is_linux || is_chromeos || is_bsd) && rtc_use_pipewire) { + if (!build_with_mozilla) { + pkg_config("gio") { + packages = [ +diff --git third_party/libwebrtc/webrtc.gni third_party/libwebrtc/webrtc.gni +index b1db8ff88415..64e0cb8f7c79 100644 +--- third_party/libwebrtc/webrtc.gni ++++ third_party/libwebrtc/webrtc.gni +@@ -153,7 +153,7 @@ declare_args() { + # By default it's only enabled on desktop Linux (excludes ChromeOS) and + # only when using the sysroot as PipeWire is not available in older and + # supported Ubuntu and Debian distributions. +- rtc_use_pipewire = is_linux && use_sysroot ++ rtc_use_pipewire = (is_linux || is_bsd) && use_sysroot + + # Set this to link PipeWire and required libraries directly instead of using the dlopen. + rtc_link_pipewire = false diff --git a/www/firefox/files/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland__egl__dmabuf.cc b/www/firefox/files/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland__egl__dmabuf.cc new file mode 100644 index 00000000000..fecacd30e20 --- /dev/null +++ b/www/firefox/files/patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland__egl__dmabuf.cc @@ -0,0 +1,21 @@ +diff --git third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc +index 6a019c64b4b3..18bb43d797dd 100644 +--- third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc ++++ third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc +@@ -10,12 +10,16 @@ + + #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" + ++#if !defined(__FreeBSD__) + #include ++#endif + #include + #include + #include + #include ++#if !defined(__FreeBSD__) + #include ++#endif + #include + #include + #include diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile index 2d4613b805c..e8029d66969 100644 --- a/www/miniflux/Makefile +++ b/www/miniflux/Makefile @@ -1,6 +1,5 @@ PORTNAME= miniflux -DISTVERSION= 2.0.46 -PORTREVISION= 1 +DISTVERSION= 2.0.47 CATEGORIES= www MAINTAINER= krion@FreeBSD.org @@ -25,18 +24,18 @@ GH_TUPLE= \ go-jose:go-jose:v3.0.0:go_jose_go_jose_v3/vendor/github.com/go-jose/go-jose/v3 \ go-telegram-bot-api:telegram-bot-api:v4.6.4:go_telegram_bot_api_telegram_bot_api/vendor/github.com/go-telegram-bot-api/telegram-bot-api \ golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \ - golang:crypto:v0.11.0:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:v0.12.0:golang_net/vendor/golang.org/x/net \ - golang:oauth2:v0.10.0:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:crypto:v0.12.0:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:v0.14.0:golang_net/vendor/golang.org/x/net \ + golang:oauth2:v0.11.0:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.5.3:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:v0.10.0:golang_sys/vendor/golang.org/x/sys \ - golang:term:v0.10.0:golang_term/vendor/golang.org/x/term \ - golang:text:v0.11.0:golang_text/vendor/golang.org/x/text \ + golang:sys:v0.11.0:golang_sys/vendor/golang.org/x/sys \ + golang:term:v0.11.0:golang_term/vendor/golang.org/x/term \ + golang:text:v0.12.0:golang_text/vendor/golang.org/x/text \ gorilla:mux:v1.8.0:gorilla_mux/vendor/github.com/gorilla/mux \ lib:pq:v1.10.9:lib_pq/vendor/github.com/lib/pq \ matrix-org:gomatrix:ceba4d9f7530:matrix_org_gomatrix/vendor/github.com/matrix-org/gomatrix \ matttproud:golang_protobuf_extensions:v1.0.4:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ - mccutchen:go-httpbin:v2.10.0:mccutchen_go_httpbin_v2/vendor/github.com/mccutchen/go-httpbin/v2 \ + mccutchen:go-httpbin:v2.11.0:mccutchen_go_httpbin_v2/vendor/github.com/mccutchen/go-httpbin/v2 \ mvdan:xurls:v2.5.0:mvdan_xurls/vendor/mvdan.cc/xurls/v2 \ prometheus:client_golang:v1.16.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ prometheus:client_model:v0.3.0:prometheus_client_model/vendor/github.com/prometheus/client_model \ @@ -44,10 +43,10 @@ GH_TUPLE= \ prometheus:procfs:v0.10.1:prometheus_procfs/vendor/github.com/prometheus/procfs \ protocolbuffers:protobuf-go:v1.31.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \ rylans:getlang:9e7f44ff8aa0:rylans_getlang/vendor/github.com/rylans/getlang \ - tdewolff:minify:v2.12.7:tdewolff_minify_v2/vendor/github.com/tdewolff/minify/v2 \ - tdewolff:parse:v2.6.6:tdewolff_parse_v2/vendor/github.com/tdewolff/parse/v2 \ + tdewolff:minify:v2.12.8:tdewolff_minify_v2/vendor/github.com/tdewolff/minify/v2 \ + tdewolff:parse:v2.6.7:tdewolff_parse_v2/vendor/github.com/tdewolff/parse/v2 \ technoweenie:multipartstreamer:v1.0.1:technoweenie_multipartstreamer/vendor/github.com/technoweenie/multipartstreamer \ - yuin:goldmark:v1.5.4:yuin_goldmark/vendor/github.com/yuin/goldmark + yuin:goldmark:v1.5.6:yuin_goldmark/vendor/github.com/yuin/goldmark USE_RC_SUBR= miniflux GO_PKGNAME= miniflux.app diff --git a/www/miniflux/distinfo b/www/miniflux/distinfo index f2981b3f369..1e2ba0c4494 100644 --- a/www/miniflux/distinfo +++ b/www/miniflux/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1690447771 -SHA256 (miniflux-v2-2.0.46_GH0.tar.gz) = 376e2e5381bc303bd63ee17c3cced37ed72a8a9e67cc2c5afe41b244dfe1d56e -SIZE (miniflux-v2-2.0.46_GH0.tar.gz) = 586119 +TIMESTAMP = 1692771309 +SHA256 (miniflux-v2-2.0.47_GH0.tar.gz) = 782bad1649810d56566a15c9a080ccf7368ba07d18b878c32eea7af5f4035ad2 +SIZE (miniflux-v2-2.0.47_GH0.tar.gz) = 596639 SHA256 (PuerkitoBio-goquery-v1.8.1_GH0.tar.gz) = d6e72ac1c5bb92e1106dab9a03bb29cdabd7b1ef8b915e7a6fbcfedb8e2b9388 SIZE (PuerkitoBio-goquery-v1.8.1_GH0.tar.gz) = 106563 SHA256 (andybalholm-cascadia-v1.3.1_GH0.tar.gz) = ced0bf6f8daadb38619be1e70675c6920c994649b83cd0a20e9e096c3785eb72 @@ -17,20 +17,20 @@ SHA256 (go-telegram-bot-api-telegram-bot-api-v4.6.4_GH0.tar.gz) = bfdb23fda6da24 SIZE (go-telegram-bot-api-telegram-bot-api-v4.6.4_GH0.tar.gz) = 2076453 SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007 -SHA256 (golang-crypto-v0.11.0_GH0.tar.gz) = 6fb82982c2c8217f0018fd10751b2695998321a82e18750d43bbbec69fc99f3b -SIZE (golang-crypto-v0.11.0_GH0.tar.gz) = 1788988 -SHA256 (golang-net-v0.12.0_GH0.tar.gz) = 958a4217da898d6d67d5d286541638ffe60eee810af7e5ca80ed4952a311540d -SIZE (golang-net-v0.12.0_GH0.tar.gz) = 1371410 -SHA256 (golang-oauth2-v0.10.0_GH0.tar.gz) = 4a867b3a5adbec183ec1756f71f996cc63e20bb70e494412047bb2368b3d1013 -SIZE (golang-oauth2-v0.10.0_GH0.tar.gz) = 140832 +SHA256 (golang-crypto-v0.12.0_GH0.tar.gz) = f2e422baedd3a599471bfe6adb8e4b337a80bb8a9665d283a8d0810edadbd31c +SIZE (golang-crypto-v0.12.0_GH0.tar.gz) = 1792261 +SHA256 (golang-net-v0.14.0_GH0.tar.gz) = 4e1e28fced7e751f6e91462463bbd5c291601807a7cc2ead1fcc7373bcc93828 +SIZE (golang-net-v0.14.0_GH0.tar.gz) = 1421533 +SHA256 (golang-oauth2-v0.11.0_GH0.tar.gz) = 8cb6f05e8bf107a1b99fe05450eac7b115d1eccb2aaa115cc3212447058c68b6 +SIZE (golang-oauth2-v0.11.0_GH0.tar.gz) = 87085 SHA256 (golang-protobuf-v1.5.3_GH0.tar.gz) = 48457a6a9e8c78a7556ff5ff4a4c77d7df9bf70e882491ee0f3f1ff06db2bfaa SIZE (golang-protobuf-v1.5.3_GH0.tar.gz) = 171822 -SHA256 (golang-sys-v0.10.0_GH0.tar.gz) = d8ab2cec3d87e5a0e9ecaab8a3aff10d58f0048c7308577eeab19f09411a3bf6 -SIZE (golang-sys-v0.10.0_GH0.tar.gz) = 1441416 -SHA256 (golang-term-v0.10.0_GH0.tar.gz) = e42d0d8bce489d9e635a9a58b3f529ac945e0732a96a048faa42ba780dcf92e8 -SIZE (golang-term-v0.10.0_GH0.tar.gz) = 14796 -SHA256 (golang-text-v0.11.0_GH0.tar.gz) = af010b12c903c75636a1dd7ee9f62f237231e461cbd6dae254e27fef6cee292f -SIZE (golang-text-v0.11.0_GH0.tar.gz) = 8967174 +SHA256 (golang-sys-v0.11.0_GH0.tar.gz) = 907778fbdf5a900ee51fc45e0a3f2cc7bc693af8a9c972c00679b194b61ea24c +SIZE (golang-sys-v0.11.0_GH0.tar.gz) = 1445078 +SHA256 (golang-term-v0.11.0_GH0.tar.gz) = a09581b0ccda33a5b9ee62bf59cb64d738e7fdfc21c354955ae5f01e6fb23b80 +SIZE (golang-term-v0.11.0_GH0.tar.gz) = 14797 +SHA256 (golang-text-v0.12.0_GH0.tar.gz) = 223318d6bd0b76fe5cdff3499a0ad0b3bfe573336951b0b141af6cde704252da +SIZE (golang-text-v0.12.0_GH0.tar.gz) = 8967035 SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139e3cbf80b044ee393ada53757b SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517 SHA256 (lib-pq-v1.10.9_GH0.tar.gz) = b150b286d59b5f0bdde499112e2f01881773ff5bfdff023802e9e01b7314a06f @@ -39,8 +39,8 @@ SHA256 (matrix-org-gomatrix-ceba4d9f7530_GH0.tar.gz) = 8faf04d7a81bc82ba3ab4d73f SIZE (matrix-org-gomatrix-ceba4d9f7530_GH0.tar.gz) = 26589 SHA256 (matttproud-golang_protobuf_extensions-v1.0.4_GH0.tar.gz) = b64cab9cb9ae8b9162c7197aeedc6ed617b4c93e4f5674c3ec6cd2e9b0d9d09c SIZE (matttproud-golang_protobuf_extensions-v1.0.4_GH0.tar.gz) = 37510 -SHA256 (mccutchen-go-httpbin-v2.10.0_GH0.tar.gz) = 6ddbffb7cb7a8ca70fc27a362eee42295a6b8ef68f379df68fa944a61e6c845d -SIZE (mccutchen-go-httpbin-v2.10.0_GH0.tar.gz) = 124354 +SHA256 (mccutchen-go-httpbin-v2.11.0_GH0.tar.gz) = 38c40be0d9ee0aa86bc9266e115988b4094b73707b94d9601b9b034fc6c8c084 +SIZE (mccutchen-go-httpbin-v2.11.0_GH0.tar.gz) = 126541 SHA256 (mvdan-xurls-v2.5.0_GH0.tar.gz) = 552779a765de29e51ff01fe6c85a7d0389faae1b80d354332e7c69db232ee4ad SIZE (mvdan-xurls-v2.5.0_GH0.tar.gz) = 27562 SHA256 (prometheus-client_golang-v1.16.0_GH0.tar.gz) = bccccdd5fc17fb5722064d48b3c2e00e405620a5c5322c7d4508af28278b1456 @@ -55,11 +55,11 @@ SHA256 (protocolbuffers-protobuf-go-v1.31.0_GH0.tar.gz) = 96d670e9bae145ff2dd0f4 SIZE (protocolbuffers-protobuf-go-v1.31.0_GH0.tar.gz) = 1311732 SHA256 (rylans-getlang-9e7f44ff8aa0_GH0.tar.gz) = 0db0ad403163ed161694ddf94251a2854824e409693d3f7d3b8b992b940f46b9 SIZE (rylans-getlang-9e7f44ff8aa0_GH0.tar.gz) = 18596 -SHA256 (tdewolff-minify-v2.12.7_GH0.tar.gz) = 91b262713dc4a3ce817cf71a414856089476c8b400da2cfce07f7519e14dea68 -SIZE (tdewolff-minify-v2.12.7_GH0.tar.gz) = 7029270 -SHA256 (tdewolff-parse-v2.6.6_GH0.tar.gz) = 4cef6edf309b0c4730bd79b832527eb3504a1f8d87cce48c60f9c1cdd5785df8 -SIZE (tdewolff-parse-v2.6.6_GH0.tar.gz) = 104779 +SHA256 (tdewolff-minify-v2.12.8_GH0.tar.gz) = cde878665ec1c8831ef9adea1bb9a9115dba4852c04709ec9b5ae14543a0d9cc +SIZE (tdewolff-minify-v2.12.8_GH0.tar.gz) = 7037501 +SHA256 (tdewolff-parse-v2.6.7_GH0.tar.gz) = 1ba48c331dac2d6c5d01a83ad14cfbe6fcda7e8d58183c03d70daae57c9ea5c5 +SIZE (tdewolff-parse-v2.6.7_GH0.tar.gz) = 105175 SHA256 (technoweenie-multipartstreamer-v1.0.1_GH0.tar.gz) = 9247a9071eb90653e2b70efd6abd9bffbe7498b238c0f06d62d8b5096f7c31e6 SIZE (technoweenie-multipartstreamer-v1.0.1_GH0.tar.gz) = 3246 -SHA256 (yuin-goldmark-v1.5.4_GH0.tar.gz) = edf3e0cd200745f67d2dd1cff3dc24fcbadd34d9fc4faef08f9ab0b4b514c103 -SIZE (yuin-goldmark-v1.5.4_GH0.tar.gz) = 259962 +SHA256 (yuin-goldmark-v1.5.6_GH0.tar.gz) = 6f807d112add7bf6e04c4e5d67dd09721d58242b17ff28e9b85feb9d27d094b2 +SIZE (yuin-goldmark-v1.5.6_GH0.tar.gz) = 248049 diff --git a/www/node18/Makefile b/www/node18/Makefile index 0644e576f33..e66b8ac72cf 100644 --- a/www/node18/Makefile +++ b/www/node18/Makefile @@ -1,5 +1,5 @@ PORTNAME= node -PORTVERSION= 18.17.0 +PORTVERSION= 18.17.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= https://nodejs.org/dist/v${PORTVERSION}/ diff --git a/www/node18/distinfo b/www/node18/distinfo index 8580cb023a5..e2154d76455 100644 --- a/www/node18/distinfo +++ b/www/node18/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069944 -SHA256 (node-v18.17.0.tar.gz) = 7aaa157c0219b5895a4bd51d9e9731e0d0eb0ab9424fdbdcf30d01b3e5fb74e9 -SIZE (node-v18.17.0.tar.gz) = 85943718 +TIMESTAMP = 1692211651 +SHA256 (node-v18.17.1.tar.gz) = 1157525a819c395020795ff8c49eee7472b8666cc256b45558b9cbe2e0864c35 +SIZE (node-v18.17.1.tar.gz) = 85952232 diff --git a/www/node20/Makefile b/www/node20/Makefile index 3feced7cd42..62fd3a43415 100644 --- a/www/node20/Makefile +++ b/www/node20/Makefile @@ -1,5 +1,5 @@ PORTNAME= node -PORTVERSION= 20.5.0 +PORTVERSION= 20.5.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= https://nodejs.org/dist/v${PORTVERSION}/ diff --git a/www/node20/distinfo b/www/node20/distinfo index 201133f2273..664b1cd8aea 100644 --- a/www/node20/distinfo +++ b/www/node20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069946 -SHA256 (node-v20.5.0.tar.gz) = 22ee3adcbc4714ece1d4931b8240e78c8f9bfac6b1f7afd8a3d37e338829cf78 -SIZE (node-v20.5.0.tar.gz) = 87704041 +TIMESTAMP = 1692211653 +SHA256 (node-v20.5.1.tar.gz) = 7e07a56c414a8cbb5ab788e7fe8828902af9e61aaaf7c53beff0688b59c75f83 +SIZE (node-v20.5.1.tar.gz) = 86623005 diff --git a/www/p5-HTML-Selector-XPath/Makefile b/www/p5-HTML-Selector-XPath/Makefile index d068e3d2da3..388eaeb22b6 100644 --- a/www/p5-HTML-Selector-XPath/Makefile +++ b/www/p5-HTML-Selector-XPath/Makefile @@ -1,5 +1,5 @@ PORTNAME= HTML-Selector-XPath -PORTVERSION= 0.26 +PORTVERSION= 0.28 CATEGORIES= www perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CORION diff --git a/www/p5-HTML-Selector-XPath/distinfo b/www/p5-HTML-Selector-XPath/distinfo index 6b5c452c12d..6359cd0b4ca 100644 --- a/www/p5-HTML-Selector-XPath/distinfo +++ b/www/p5-HTML-Selector-XPath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641045864 -SHA256 (HTML-Selector-XPath-0.26.tar.gz) = 3df80a81284d1e375d9d1f6fec16e96c31b2c309451b4ba82e5fd1db23ac1f24 -SIZE (HTML-Selector-XPath-0.26.tar.gz) = 32482 +TIMESTAMP = 1692211687 +SHA256 (HTML-Selector-XPath-0.28.tar.gz) = 432717f03ed2cf3d641130cfd3d4a153f09ad4f856da007813792fe0b2e58d0f +SIZE (HTML-Selector-XPath-0.28.tar.gz) = 33565 diff --git a/www/p5-Rose-HTML-Objects/Makefile b/www/p5-Rose-HTML-Objects/Makefile index 07ade734e9e..5f0e2238539 100644 --- a/www/p5-Rose-HTML-Objects/Makefile +++ b/www/p5-Rose-HTML-Objects/Makefile @@ -1,5 +1,5 @@ PORTNAME= Rose-HTML-Objects -PORTVERSION= 0.625 +PORTVERSION= 0.626 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-Rose-HTML-Objects/distinfo b/www/p5-Rose-HTML-Objects/distinfo index 31a2206cadb..44c9e137496 100644 --- a/www/p5-Rose-HTML-Objects/distinfo +++ b/www/p5-Rose-HTML-Objects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070474 -SHA256 (Rose-HTML-Objects-0.625.tar.gz) = 3a32358e6026414263f05d6045387ed1883d5d4d53faa70e95826df4bb1273fc -SIZE (Rose-HTML-Objects-0.625.tar.gz) = 210358 +TIMESTAMP = 1692212111 +SHA256 (Rose-HTML-Objects-0.626.tar.gz) = 7a8945d52ac1c904c8861183d8f003d876bf659a7655ff3e9e6465d1852a592a +SIZE (Rose-HTML-Objects-0.626.tar.gz) = 210599 diff --git a/www/phpmyfaq/Makefile b/www/phpmyfaq/Makefile index cf0cea156a1..2015af38e02 100644 --- a/www/phpmyfaq/Makefile +++ b/www/phpmyfaq/Makefile @@ -1,5 +1,5 @@ PORTNAME= phpmyfaq -PORTVERSION= 3.1.15 +PORTVERSION= 3.1.16 CATEGORIES= www MASTER_SITES= https://download.phpmyfaq.de/files/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/www/phpmyfaq/distinfo b/www/phpmyfaq/distinfo index c54b15192ce..52439cede3d 100644 --- a/www/phpmyfaq/distinfo +++ b/www/phpmyfaq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687085680 -SHA256 (phpmyfaq-3.1.15.tar.gz) = 6ac0a6adb319393e7695879fa65024af85c012ac6b5e0a9fdb1ec8f8055b5bef -SIZE (phpmyfaq-3.1.15.tar.gz) = 9735602 +TIMESTAMP = 1690394191 +SHA256 (phpmyfaq-3.1.16.tar.gz) = ec6fcd162336a2bebb3fdc54bbdbbd9a56448869c5eb47b624022e3496e19a5b +SIZE (phpmyfaq-3.1.16.tar.gz) = 9735838 diff --git a/www/py-dj41-django-debug-toolbar/Makefile b/www/py-dj41-django-debug-toolbar/Makefile index 53383c055a8..2c03842a6da 100644 --- a/www/py-dj41-django-debug-toolbar/Makefile +++ b/www/py-dj41-django-debug-toolbar/Makefile @@ -1,5 +1,5 @@ PORTNAME= django-debug-toolbar -PORTVERSION= 4.1.0 +PORTVERSION= 4.2.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj41- @@ -7,7 +7,8 @@ DISTNAME= django_debug_toolbar-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Configurable set of panels to display debug information -WWW= https://github.com/jazzband/django-debug-toolbar +WWW= https://django-debug-toolbar.readthedocs.io/en/latest/ \ + https://github.com/jazzband/django-debug-toolbar LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/www/py-dj41-django-debug-toolbar/distinfo b/www/py-dj41-django-debug-toolbar/distinfo index a58afdc4ea6..52b9218a421 100644 --- a/www/py-dj41-django-debug-toolbar/distinfo +++ b/www/py-dj41-django-debug-toolbar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685792346 -SHA256 (django_debug_toolbar-4.1.0.tar.gz) = f57882e335593cb8e74c2bda9f1116bbb9ca8fc0d81b50a75ace0f83de5173c7 -SIZE (django_debug_toolbar-4.1.0.tar.gz) = 116377 +TIMESTAMP = 1692211819 +SHA256 (django_debug_toolbar-4.2.0.tar.gz) = bc7fdaafafcdedefcc67a4a5ad9dac96efd6e41db15bc74d402a54a2ba4854dc +SIZE (django_debug_toolbar-4.2.0.tar.gz) = 259709 diff --git a/www/py-django-bleach/Makefile b/www/py-django-bleach/Makefile index 868942ab2e6..981c35d02b3 100644 --- a/www/py-django-bleach/Makefile +++ b/www/py-django-bleach/Makefile @@ -1,6 +1,5 @@ PORTNAME= django-bleach -PORTVERSION= 3.0.1 -PORTREVISION= 2 +PORTVERSION= 3.1.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +11,7 @@ WWW= https://github.com/marksweb/django-bleach LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bleach>=5:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django32>=3.2:www/py-django32@${PY_FLAVOR} diff --git a/www/py-django-bleach/distinfo b/www/py-django-bleach/distinfo index bedb6147208..cd2c09db54f 100644 --- a/www/py-django-bleach/distinfo +++ b/www/py-django-bleach/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665647979 -SHA256 (django-bleach-3.0.1.tar.gz) = 0e5f145bca1a52e822097853403832d92e957e4a1d47bb90233de9d07219247b -SIZE (django-bleach-3.0.1.tar.gz) = 22219 +TIMESTAMP = 1692211821 +SHA256 (django-bleach-3.1.0.tar.gz) = 766405a32b877a5beb6b377ace0d8bbe2a7d4d6304f04542aa14fd74b14398a7 +SIZE (django-bleach-3.1.0.tar.gz) = 22197 diff --git a/www/py-django-bleach/files/patch-bleach6 b/www/py-django-bleach/files/patch-bleach6 index 3e894a4e271..157e9581e20 100644 --- a/www/py-django-bleach/files/patch-bleach6 +++ b/www/py-django-bleach/files/patch-bleach6 @@ -1,24 +1,64 @@ ---- django_bleach/tests/test_forms.py.orig 2022-10-12 00:33:48 UTC +--- django_bleach/tests/test_forms.py.orig 2023-08-05 01:36:02 UTC +++ django_bleach/tests/test_forms.py -@@ -147,7 +147,7 @@ class TestCustomWidget(TestCase): +@@ -127,7 +127,7 @@ class TestCustomWidget(TestCase): + # Define form inside function with overridden settings so + # get_default_widget() sees the modified setting. no_tags = BleachField( - max_length=100, - strip_tags=True, -- allowed_tags=[] -+ allowed_tags={} +- max_length=100, strip_tags=True, allowed_tags=[] ++ max_length=100, strip_tags=True, allowed_tags={} ) no_strip = BleachField( - max_length=100, ---- testproject/models.py.orig 2022-10-12 00:33:48 UTC + max_length=100, allowed_tags=None, allowed_attributes=None +--- setup.py.orig 2023-08-05 01:36:02 UTC ++++ setup.py +@@ -43,7 +43,7 @@ setup( + license="MIT", + packages=find_packages(exclude=("testproject*",)), + install_requires=[ +- "bleach[css]>=5,<6", ++ "bleach[css]>=5", + "Django>=3.2", + ], + python_requires=">=3.8", +--- testproject/constants.py.orig 2023-08-05 01:36:02 UTC ++++ testproject/constants.py +@@ -2,11 +2,11 @@ ALLOWED_ATTRIBUTES = {"*": ["class", "style"], "a": [" + + ALLOWED_CSS_PROPERTIES = ["color"] + +-ALLOWED_PROTOCOLS = [ ++ALLOWED_PROTOCOLS = { + "https", + "data", +-] ++} + + ALLOWED_STYLES = ALLOWED_CSS_PROPERTIES + +-ALLOWED_TAGS = ["a", "li", "ul"] ++ALLOWED_TAGS = {"a", "li", "ul"} +--- testproject/forms.py.orig 2023-08-05 01:36:02 UTC ++++ testproject/forms.py +@@ -23,7 +23,7 @@ class CustomBleachWidget(forms.Textarea): + class BleachForm(forms.Form): + """Form for testing BleachField""" + +- no_tags = BleachField(max_length=100, strip_tags=True, allowed_tags=[]) ++ no_tags = BleachField(max_length=100, strip_tags=True, allowed_tags={}) + + no_strip = BleachField( + max_length=100, allowed_tags=None, allowed_attributes=None +--- testproject/models.py.orig 2023-08-05 01:36:02 UTC +++ testproject/models.py -@@ -10,8 +10,8 @@ class Person(models.Model): +@@ -10,9 +10,9 @@ class Person(models.Model): biography = BleachField( max_length=100, - verbose_name='Person biography', -- allowed_tags=['p', 'a', 'li', 'ul', 'strong'], -+ allowed_tags={'p', 'a', 'li', 'ul', 'strong'}, - allowed_attributes=['class', 'href', 'style'], -- allowed_protocols=['http', 'https'], -+ allowed_protocols={'http', 'https'}, - css_sanitizer=CSSSanitizer(allowed_css_properties=['color', 'background-color']) - ) + verbose_name="Person biography", +- allowed_tags=["p", "a", "li", "ul", "strong"], ++ allowed_tags={"p", "a", "li", "ul", "strong"}, + allowed_attributes=["class", "href", "style"], +- allowed_protocols=["http", "https"], ++ allowed_protocols={"http", "https"}, + css_sanitizer=CSSSanitizer( + allowed_css_properties=["color", "background-color"] + ), diff --git a/www/py-django-debug-toolbar/Makefile b/www/py-django-debug-toolbar/Makefile index b10ff53097a..61b0fc7889a 100644 --- a/www/py-django-debug-toolbar/Makefile +++ b/www/py-django-debug-toolbar/Makefile @@ -1,5 +1,5 @@ PORTNAME= django-debug-toolbar -PORTVERSION= 4.1.0 +PORTVERSION= 4.2.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -7,7 +7,8 @@ DISTNAME= django_debug_toolbar-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Configurable set of panels to display debug information -WWW= https://github.com/jazzband/django-debug-toolbar +WWW= https://django-debug-toolbar.readthedocs.io/en/latest/ \ + https://github.com/jazzband/django-debug-toolbar LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/www/py-django-debug-toolbar/distinfo b/www/py-django-debug-toolbar/distinfo index 185320aa84f..a3f6286955e 100644 --- a/www/py-django-debug-toolbar/distinfo +++ b/www/py-django-debug-toolbar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685792348 -SHA256 (django_debug_toolbar-4.1.0.tar.gz) = f57882e335593cb8e74c2bda9f1116bbb9ca8fc0d81b50a75ace0f83de5173c7 -SIZE (django_debug_toolbar-4.1.0.tar.gz) = 116377 +TIMESTAMP = 1692211823 +SHA256 (django_debug_toolbar-4.2.0.tar.gz) = bc7fdaafafcdedefcc67a4a5ad9dac96efd6e41db15bc74d402a54a2ba4854dc +SIZE (django_debug_toolbar-4.2.0.tar.gz) = 259709 diff --git a/www/py-forcediphttpsadapter/Makefile b/www/py-forcediphttpsadapter/Makefile index 23fb6bba50a..c2839276b5f 100644 --- a/www/py-forcediphttpsadapter/Makefile +++ b/www/py-forcediphttpsadapter/Makefile @@ -1,5 +1,5 @@ PORTNAME= forcediphttpsadapter -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -8,7 +8,11 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Use IP address when connecting via SSL WWW= https://github.com/Roadmaster/forcediphttpsadapter -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils diff --git a/www/py-forcediphttpsadapter/distinfo b/www/py-forcediphttpsadapter/distinfo index b46c9ec398b..78fc6f43ddb 100644 --- a/www/py-forcediphttpsadapter/distinfo +++ b/www/py-forcediphttpsadapter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636117298 -SHA256 (forcediphttpsadapter-1.0.2.tar.gz) = f7582b34aaa6ab6b17f69ab1abbfe67097b952ed0682b758b5e01e18fe24433e -SIZE (forcediphttpsadapter-1.0.2.tar.gz) = 4173 +TIMESTAMP = 1692211825 +SHA256 (forcediphttpsadapter-1.1.0.tar.gz) = 0d224cf6e8e50eb788c9f5994a7afa6d389bac6dbe540b7dfd77a32590ad0153 +SIZE (forcediphttpsadapter-1.1.0.tar.gz) = 4794 diff --git a/www/py-google-cloud-bigtable/Makefile b/www/py-google-cloud-bigtable/Makefile index 6160e851fa9..afc5fa79a58 100644 --- a/www/py-google-cloud-bigtable/Makefile +++ b/www/py-google-cloud-bigtable/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-bigtable -PORTVERSION= 2.20.0 +PORTVERSION= 2.21.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-google-cloud-bigtable/distinfo b/www/py-google-cloud-bigtable/distinfo index 72c685c8a5a..24cfc731fc3 100644 --- a/www/py-google-cloud-bigtable/distinfo +++ b/www/py-google-cloud-bigtable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070180 -SHA256 (google-cloud-bigtable-2.20.0.tar.gz) = 3d4784a9e77472bcdf1cb0070c3bb81a092d31a36dd759eea2f7cc224cf98b09 -SIZE (google-cloud-bigtable-2.20.0.tar.gz) = 362764 +TIMESTAMP = 1692211827 +SHA256 (google-cloud-bigtable-2.21.0.tar.gz) = d9f0efbf940ca392f07d13787fc2da76d1e168dedafae0f8f1b4208e0c1132dc +SIZE (google-cloud-bigtable-2.21.0.tar.gz) = 362579 diff --git a/www/py-google-cloud-datastore/Makefile b/www/py-google-cloud-datastore/Makefile index 1205682adfd..463f0970a5a 100644 --- a/www/py-google-cloud-datastore/Makefile +++ b/www/py-google-cloud-datastore/Makefile @@ -1,5 +1,5 @@ PORTNAME= google-cloud-datastore -PORTVERSION= 2.16.1 +PORTVERSION= 2.17.0 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-google-cloud-datastore/distinfo b/www/py-google-cloud-datastore/distinfo index 07fb0222af9..b2e5707b5ae 100644 --- a/www/py-google-cloud-datastore/distinfo +++ b/www/py-google-cloud-datastore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902197 -SHA256 (google-cloud-datastore-2.16.1.tar.gz) = 710ef27ebdfb50340f4671c532ad4c1525665985e9421984ffcd6b96b57e34bb -SIZE (google-cloud-datastore-2.16.1.tar.gz) = 205802 +TIMESTAMP = 1692211829 +SHA256 (google-cloud-datastore-2.17.0.tar.gz) = feafad874ed376a9d1f0899eafc9650d21fdb2228f90de9b8741a806c213b422 +SIZE (google-cloud-datastore-2.17.0.tar.gz) = 206492 diff --git a/www/rubygem-actioncable70/Makefile b/www/rubygem-actioncable70/Makefile index db765e1211e..140c65e4e29 100644 --- a/www/rubygem-actioncable70/Makefile +++ b/www/rubygem-actioncable70/Makefile @@ -1,5 +1,5 @@ PORTNAME= actioncable -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/www/rubygem-actioncable70/distinfo b/www/rubygem-actioncable70/distinfo index 2bffea2c704..cc6f8bd73f8 100644 --- a/www/rubygem-actioncable70/distinfo +++ b/www/rubygem-actioncable70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167218 -SHA256 (rubygem/actioncable-7.0.6.gem) = ac88be1e287cd9f228e6d4c0884278790210e59eaa23b603f58025183a66e2b4 -SIZE (rubygem/actioncable-7.0.6.gem) = 44544 +TIMESTAMP = 1692212047 +SHA256 (rubygem/actioncable-7.0.7.gem) = ea1cd05980c0fe89d432c7fa138d7556595ec7550c59a4738356b13369b97fb5 +SIZE (rubygem/actioncable-7.0.7.gem) = 44544 diff --git a/www/rubygem-actionpack70/Makefile b/www/rubygem-actionpack70/Makefile index 110c24074d8..82ed6607006 100644 --- a/www/rubygem-actionpack70/Makefile +++ b/www/rubygem-actionpack70/Makefile @@ -1,5 +1,5 @@ PORTNAME= actionpack -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/www/rubygem-actionpack70/distinfo b/www/rubygem-actionpack70/distinfo index 4c2abc1e2f5..f66b317ce67 100644 --- a/www/rubygem-actionpack70/distinfo +++ b/www/rubygem-actionpack70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167220 -SHA256 (rubygem/actionpack-7.0.6.gem) = 6c659afbffdbb32323df1d44882830206f5d7dc81ed3d840736ac39c5ae0c634 -SIZE (rubygem/actionpack-7.0.6.gem) = 233472 +TIMESTAMP = 1692212049 +SHA256 (rubygem/actionpack-7.0.7.gem) = 4f837254603c8fe329e7a0c1258ad5c8224a44f86c78c9b54af26f11a6961a94 +SIZE (rubygem/actionpack-7.0.7.gem) = 233472 diff --git a/www/rubygem-addressable/Makefile b/www/rubygem-addressable/Makefile index 487cd123c56..dfb900343b3 100644 --- a/www/rubygem-addressable/Makefile +++ b/www/rubygem-addressable/Makefile @@ -1,5 +1,5 @@ PORTNAME= addressable -PORTVERSION= 2.8.4 +PORTVERSION= 2.8.5 CATEGORIES= www devel rubygems MASTER_SITES= RG diff --git a/www/rubygem-addressable/distinfo b/www/rubygem-addressable/distinfo index 06b10c169ca..897fa334e2a 100644 --- a/www/rubygem-addressable/distinfo +++ b/www/rubygem-addressable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681053070 -SHA256 (rubygem/addressable-2.8.4.gem) = 40a88af5285625b7fb14070e550e667d5b0cc91f748068701b4d897cacda4897 -SIZE (rubygem/addressable-2.8.4.gem) = 105984 +TIMESTAMP = 1692212137 +SHA256 (rubygem/addressable-2.8.5.gem) = 63f0fbcde42edf116d6da98a9437f19dd1692152f1efa3fcc4741e443c772117 +SIZE (rubygem/addressable-2.8.5.gem) = 106496 diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile index fd1674640f5..2b361bc6add 100644 --- a/www/rubygem-gollum-lib/Makefile +++ b/www/rubygem-gollum-lib/Makefile @@ -1,6 +1,5 @@ PORTNAME= gollum-lib -PORTVERSION= 5.2 -PORTREVISION= 2 +PORTVERSION= 5.2.4 CATEGORIES= www rubygems MASTER_SITES= RG @@ -13,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-gemojione>=4.1<5:graphics/rubygem-gemojione \ rubygem-github-markup>=4.0<5:textproc/rubygem-github-markup \ - rubygem-gollum-rugged_adapter>=1.0:www/rubygem-gollum-rugged_adapter \ + rubygem-gollum-rugged_adapter>=2.0<3:www/rubygem-gollum-rugged_adapter \ rubygem-loofah>=2.3<3:textproc/rubygem-loofah \ rubygem-nokogiri>=1.8<2:textproc/rubygem-nokogiri \ rubygem-octicons>=12.0:misc/rubygem-octicons \ diff --git a/www/rubygem-gollum-lib/distinfo b/www/rubygem-gollum-lib/distinfo index 71112dd315e..3def4d4d011 100644 --- a/www/rubygem-gollum-lib/distinfo +++ b/www/rubygem-gollum-lib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661599655 -SHA256 (rubygem/gollum-lib-5.2.gem) = 7a75420d05cb6ed7a6b7708e09ff969c3d8b69c4d2a5fde191b4d7263f899da9 -SIZE (rubygem/gollum-lib-5.2.gem) = 52224 +TIMESTAMP = 1692212139 +SHA256 (rubygem/gollum-lib-5.2.4.gem) = ad14a036f61b9dda7e7bd7ac37fc17c2e35735efa5b2b838ca8fd48d1cd5d396 +SIZE (rubygem/gollum-lib-5.2.4.gem) = 52736 diff --git a/www/rubygem-gollum-lib/files/patch-gemspec b/www/rubygem-gollum-lib/files/patch-gemspec index de840e09e53..604f2a87a1d 100644 --- a/www/rubygem-gollum-lib/files/patch-gemspec +++ b/www/rubygem-gollum-lib/files/patch-gemspec @@ -1,13 +1,6 @@ ---- gollum-lib.gemspec.orig 2023-01-06 04:47:44 UTC +--- gollum-lib.gemspec.orig 2023-08-19 00:19:40 UTC +++ gollum-lib.gemspec -@@ -22,13 +22,13 @@ Gem::Specification.new do |s| - - s.specification_version = 4 - -- s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 1.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 3.1"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.8"]) +@@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q.freeze, ["~> 2.3"]) s.add_runtime_dependency(%q.freeze, ["~> 4.0"]) s.add_runtime_dependency(%q.freeze, ["~> 4.1"]) diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile index be1cad815c5..654475edcea 100644 --- a/www/rubygem-gollum/Makefile +++ b/www/rubygem-gollum/Makefile @@ -1,6 +1,6 @@ PORTNAME= gollum PORTVERSION= 5.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG @@ -20,7 +20,7 @@ RUN_DEPENDS= git:devel/git \ rubygem-mustache-sinatra>=1.0<2:devel/rubygem-mustache-sinatra \ rubygem-octicons>=12.0:misc/rubygem-octicons \ rubygem-rdoc>=6:devel/rubygem-rdoc \ - rubygem-rss>=0.2.9<0.3:www/rubygem-rss \ + rubygem-rss>=0.2.9:www/rubygem-rss \ rubygem-sass>=3.5<4:textproc/rubygem-sass \ rubygem-sinatra2>=2.0<3:www/rubygem-sinatra2 \ rubygem-sinatra-contrib2>=2.0<3:www/rubygem-sinatra-contrib2 \ diff --git a/www/rubygem-gollum/files/patch-gemspec b/www/rubygem-gollum/files/patch-gemspec index dbd08207e55..6f81f7677b8 100644 --- a/www/rubygem-gollum/files/patch-gemspec +++ b/www/rubygem-gollum/files/patch-gemspec @@ -1,4 +1,4 @@ ---- gollum.gemspec.orig 2023-01-06 04:45:29 UTC +--- gollum.gemspec.orig 2023-08-18 15:51:03 UTC +++ gollum.gemspec @@ -32,13 +32,12 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q.freeze, [">= 1.0.1", "< 2"]) @@ -10,8 +10,9 @@ s.add_runtime_dependency(%q.freeze, ["~> 3.5"]) s.add_runtime_dependency(%q.freeze, ["~> 4.2"]) s.add_runtime_dependency(%q.freeze, ["~> 1.2"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.2.9"]) +- s.add_runtime_dependency(%q.freeze, ["~> 0.2.9"]) - s.add_runtime_dependency(%q.freeze, ["~> 2.1.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0.2.9"]) s.add_runtime_dependency(%q.freeze, ["~> 1.7"]) s.add_runtime_dependency(%q.freeze, ["~> 1.8"]) s.add_development_dependency(%q.freeze, ["~> 0.6.3"]) diff --git a/www/rubygem-haml/Makefile b/www/rubygem-haml/Makefile index ffb915057ce..86069f05d7d 100644 --- a/www/rubygem-haml/Makefile +++ b/www/rubygem-haml/Makefile @@ -1,5 +1,5 @@ PORTNAME= haml -PORTVERSION= 6.1.1 +PORTVERSION= 6.1.2 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-haml/distinfo b/www/rubygem-haml/distinfo index 04b0a79747f..a9313f2f864 100644 --- a/www/rubygem-haml/distinfo +++ b/www/rubygem-haml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590932 -SHA256 (rubygem/haml-6.1.1.gem) = c8e48e26d94f1140a5aa6cf979b58e8da314c7f48a5e014648582fb7192f99ed -SIZE (rubygem/haml-6.1.1.gem) = 76288 +TIMESTAMP = 1692212141 +SHA256 (rubygem/haml-6.1.2.gem) = 154158bfb7e6f3cb43e6a85d22f5237c3d24607415ddb1a97e07b749f1df9a94 +SIZE (rubygem/haml-6.1.2.gem) = 76288 diff --git a/www/rubygem-protocol-http/Makefile b/www/rubygem-protocol-http/Makefile index 97ce887f53e..545876d2a7b 100644 --- a/www/rubygem-protocol-http/Makefile +++ b/www/rubygem-protocol-http/Makefile @@ -1,5 +1,5 @@ PORTNAME= protocol-http -PORTVERSION= 0.24.5 +PORTVERSION= 0.24.7 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-protocol-http/distinfo b/www/rubygem-protocol-http/distinfo index 55bcc7a0024..de78e54df29 100644 --- a/www/rubygem-protocol-http/distinfo +++ b/www/rubygem-protocol-http/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691070448 -SHA256 (rubygem/protocol-http-0.24.5.gem) = 1c96cbe0b99be2bab065584342fa261a116a62b53ccddf5087a35585df2c8ab5 -SIZE (rubygem/protocol-http-0.24.5.gem) = 26624 +TIMESTAMP = 1692212013 +SHA256 (rubygem/protocol-http-0.24.7.gem) = bf5e4f28c6a917084826955eb29f4ad32ebdc4c064031bf21f018fcbfda6498a +SIZE (rubygem/protocol-http-0.24.7.gem) = 26624 diff --git a/www/rubygem-puma/Makefile b/www/rubygem-puma/Makefile index 1aff990c5e0..71537923f11 100644 --- a/www/rubygem-puma/Makefile +++ b/www/rubygem-puma/Makefile @@ -1,5 +1,5 @@ PORTNAME= puma -PORTVERSION= 6.3.0 +PORTVERSION= 6.3.1 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-puma/distinfo b/www/rubygem-puma/distinfo index a0b464d9ce3..5775bfd5b2a 100644 --- a/www/rubygem-puma/distinfo +++ b/www/rubygem-puma/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687446041 -SHA256 (rubygem/puma-6.3.0.gem) = b0e35b4fe7ae440237a9ff1647c6bb252a1c0951ff356020670d2e62c1aeeeec -SIZE (rubygem/puma-6.3.0.gem) = 225792 +TIMESTAMP = 1692640096 +SHA256 (rubygem/puma-6.3.1.gem) = ec989c775f88f5cbea0c7178b94ed9ff44797241f9245d353d1774a845e78df4 +SIZE (rubygem/puma-6.3.1.gem) = 225792 diff --git a/www/rubygem-rack-protection/Makefile b/www/rubygem-rack-protection/Makefile index d9d789f94e8..bf4346f1c28 100644 --- a/www/rubygem-rack-protection/Makefile +++ b/www/rubygem-rack-protection/Makefile @@ -1,5 +1,5 @@ PORTNAME= rack-protection -PORTVERSION= 3.0.6 +PORTVERSION= 3.1.0 CATEGORIES= www rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ WWW= https://sinatrarb.com/protection/ \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License -RUN_DEPENDS= rubygem-rack>=0,3:www/rubygem-rack +RUN_DEPENDS= rubygem-rack22>=2.2.4,3<3,3:www/rubygem-rack22 USES= gem diff --git a/www/rubygem-rack-protection/distinfo b/www/rubygem-rack-protection/distinfo index e536402917b..dabfbf4ab02 100644 --- a/www/rubygem-rack-protection/distinfo +++ b/www/rubygem-rack-protection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681053040 -SHA256 (rubygem/rack-protection-3.0.6.gem) = 08c6dfdab74abf57243242df73c286de3d75b2b0110803cd79b4f3f0d531f5ce -SIZE (rubygem/rack-protection-3.0.6.gem) = 20480 +TIMESTAMP = 1692212015 +SHA256 (rubygem/rack-protection-3.1.0.gem) = f9bc997fa87ab5fe3eb5d9d00e2a6222df3f9b8e6e9d610909ea3fc6203a5f77 +SIZE (rubygem/rack-protection-3.1.0.gem) = 20480 diff --git a/www/rubygem-rails70/Makefile b/www/rubygem-rails70/Makefile index e33dcddaa36..f23b70f60ef 100644 --- a/www/rubygem-rails70/Makefile +++ b/www/rubygem-rails70/Makefile @@ -1,6 +1,5 @@ PORTNAME= rails -PORTVERSION= 7.0.6 -PORTREVISION= 1 +PORTVERSION= 7.0.7 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/www/rubygem-rails70/distinfo b/www/rubygem-rails70/distinfo index 639481ed538..c562ba51a49 100644 --- a/www/rubygem-rails70/distinfo +++ b/www/rubygem-rails70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167222 -SHA256 (rubygem/rails-7.0.6.gem) = 5dfbd481a23556ad425fc8541399a129a08ed550f877294b44d0170ca5b9f421 -SIZE (rubygem/rails-7.0.6.gem) = 7168 +TIMESTAMP = 1692212051 +SHA256 (rubygem/rails-7.0.7.gem) = 3269693baa58f49fc6f96afa453630a0e4957093d1ac5e287e49bc76d7002d1b +SIZE (rubygem/rails-7.0.7.gem) = 7168 diff --git a/www/rubygem-railties70/Makefile b/www/rubygem-railties70/Makefile index b175be27ecf..7f36229f562 100644 --- a/www/rubygem-railties70/Makefile +++ b/www/rubygem-railties70/Makefile @@ -1,5 +1,5 @@ PORTNAME= railties -PORTVERSION= 7.0.6 +PORTVERSION= 7.0.7 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 70 diff --git a/www/rubygem-railties70/distinfo b/www/rubygem-railties70/distinfo index 3998cd055d4..3fc8e91b39d 100644 --- a/www/rubygem-railties70/distinfo +++ b/www/rubygem-railties70/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167224 -SHA256 (rubygem/railties-7.0.6.gem) = fb0ee3c7a3beea7f4b353c655f9a055c31ca36c3a2a565afaed415baca5c8a35 -SIZE (rubygem/railties-7.0.6.gem) = 161792 +TIMESTAMP = 1692212053 +SHA256 (rubygem/railties-7.0.7.gem) = 79bd90c9b6b2acff43fd2e0935e47ad54e424d7c2b450afa8bd6558c095ac246 +SIZE (rubygem/railties-7.0.7.gem) = 161792 diff --git a/www/rubygem-roda/Makefile b/www/rubygem-roda/Makefile index b0df0e8053c..d5604f1e1ee 100644 --- a/www/rubygem-roda/Makefile +++ b/www/rubygem-roda/Makefile @@ -1,5 +1,5 @@ PORTNAME= roda -PORTVERSION= 3.70.0 +PORTVERSION= 3.71.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-roda/distinfo b/www/rubygem-roda/distinfo index c349367427c..6c1fdb266d9 100644 --- a/www/rubygem-roda/distinfo +++ b/www/rubygem-roda/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689399671 -SHA256 (rubygem/roda-3.70.0.gem) = e962490184da10e7e323698d79c9942677bf62fafb25025481e66cb5d870669e -SIZE (rubygem/roda-3.70.0.gem) = 221184 +TIMESTAMP = 1692212143 +SHA256 (rubygem/roda-3.71.0.gem) = ec003c14fa78e2ad2d0d60503314e4e3aa6f6827c3b4b411537210bac3c87013 +SIZE (rubygem/roda-3.71.0.gem) = 221696 diff --git a/www/rubygem-rss/Makefile b/www/rubygem-rss/Makefile index 2b0d789b2ed..3706a21db5a 100644 --- a/www/rubygem-rss/Makefile +++ b/www/rubygem-rss/Makefile @@ -1,5 +1,5 @@ PORTNAME= rss -PORTVERSION= 0.2.9 +PORTVERSION= 0.3.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-rss/distinfo b/www/rubygem-rss/distinfo index b115e931737..59b0c333cf5 100644 --- a/www/rubygem-rss/distinfo +++ b/www/rubygem-rss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1587445350 -SHA256 (rubygem/rss-0.2.9.gem) = a045876bea9b35456241d4d57b9340d9e3a042264d6b4aea9d93983c0fe83fac -SIZE (rubygem/rss-0.2.9.gem) = 106496 +TIMESTAMP = 1692212017 +SHA256 (rubygem/rss-0.3.0.gem) = 5683a2245dfa33f7b47d0ef67437732a62d956a1cd39552dc810a611bb3a62f3 +SIZE (rubygem/rss-0.3.0.gem) = 52736 diff --git a/www/rubygem-ruby-openai/Makefile b/www/rubygem-ruby-openai/Makefile index 1feea322d6f..6c34e54e643 100644 --- a/www/rubygem-ruby-openai/Makefile +++ b/www/rubygem-ruby-openai/Makefile @@ -1,5 +1,5 @@ PORTNAME= ruby-openai -PORTVERSION= 4.2.0 +PORTVERSION= 5.0.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-ruby-openai/distinfo b/www/rubygem-ruby-openai/distinfo index 972a0dcdb5b..fdff9a3fa4e 100644 --- a/www/rubygem-ruby-openai/distinfo +++ b/www/rubygem-ruby-openai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167170 -SHA256 (rubygem/ruby-openai-4.2.0.gem) = 6c1419cf7d4c9a722910e53f7829c3c6e18e26a9252c97e4df8302f35790c6ce -SIZE (rubygem/ruby-openai-4.2.0.gem) = 19456 +TIMESTAMP = 1692212019 +SHA256 (rubygem/ruby-openai-5.0.0.gem) = d7575d5a4452941f0a90a9e599a9cef68c8230e9e4b252fc350399b0d0eff111 +SIZE (rubygem/ruby-openai-5.0.0.gem) = 22016 diff --git a/www/rubygem-sinatra-contrib/Makefile b/www/rubygem-sinatra-contrib/Makefile index c7f3d41f110..5c1d04fdcc9 100644 --- a/www/rubygem-sinatra-contrib/Makefile +++ b/www/rubygem-sinatra-contrib/Makefile @@ -1,5 +1,5 @@ PORTNAME= sinatra-contrib -PORTVERSION= 3.0.6 +PORTVERSION= 3.1.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-sinatra-contrib/distinfo b/www/rubygem-sinatra-contrib/distinfo index de1963a5ea9..ae719b9b426 100644 --- a/www/rubygem-sinatra-contrib/distinfo +++ b/www/rubygem-sinatra-contrib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681053044 -SHA256 (rubygem/sinatra-contrib-3.0.6.gem) = 9a55aba2a21e5f62c64d908f65a1bd4e1e9c356401d6c872371dd7a99619fa96 -SIZE (rubygem/sinatra-contrib-3.0.6.gem) = 33792 +TIMESTAMP = 1692212023 +SHA256 (rubygem/sinatra-contrib-3.1.0.gem) = 3c3c50b531cf156016997cb4c5d8466de381c0019c6d45ccaf5a2e004229b8b6 +SIZE (rubygem/sinatra-contrib-3.1.0.gem) = 33792 diff --git a/www/rubygem-sinatra/Makefile b/www/rubygem-sinatra/Makefile index e6af77db1ce..79925a9cd80 100644 --- a/www/rubygem-sinatra/Makefile +++ b/www/rubygem-sinatra/Makefile @@ -1,5 +1,5 @@ PORTNAME= sinatra -PORTVERSION= 3.0.6 +PORTVERSION= 3.1.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-sinatra/distinfo b/www/rubygem-sinatra/distinfo index 8d97356aca6..731026954f0 100644 --- a/www/rubygem-sinatra/distinfo +++ b/www/rubygem-sinatra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681053042 -SHA256 (rubygem/sinatra-3.0.6.gem) = 1d1e158ee7fcdf40e01461bc461f13d854d371b135259370130fca875d870fe0 -SIZE (rubygem/sinatra-3.0.6.gem) = 133120 +TIMESTAMP = 1692212021 +SHA256 (rubygem/sinatra-3.1.0.gem) = e89e7352a9e5cacf89d52ad4e47acc4e25b5cda7b87747a3ad01eaeb2d0ba400 +SIZE (rubygem/sinatra-3.1.0.gem) = 135168 diff --git a/www/rubygem-stimulus-rails/Makefile b/www/rubygem-stimulus-rails/Makefile index 2f71257f967..94c458f1bf5 100644 --- a/www/rubygem-stimulus-rails/Makefile +++ b/www/rubygem-stimulus-rails/Makefile @@ -1,5 +1,5 @@ PORTNAME= stimulus-rails -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-stimulus-rails/distinfo b/www/rubygem-stimulus-rails/distinfo index dd55286d91f..60c4a21824d 100644 --- a/www/rubygem-stimulus-rails/distinfo +++ b/www/rubygem-stimulus-rails/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674590622 -SHA256 (rubygem/stimulus-rails-1.2.1.gem) = 831bbcc0c12ea9c751e0a96b85d9908a0e4b42031964724d5b507166e06f0e8a -SIZE (rubygem/stimulus-rails-1.2.1.gem) = 72704 +TIMESTAMP = 1692212025 +SHA256 (rubygem/stimulus-rails-1.2.2.gem) = dee9f9f9552758bf2ebc56157f31b90ef493493f401670c1af327714e9aa4d24 +SIZE (rubygem/stimulus-rails-1.2.2.gem) = 76288 diff --git a/www/rubygem-websocket-client-simple/Makefile b/www/rubygem-websocket-client-simple/Makefile index c2138765bf0..4945fa6c9ee 100644 --- a/www/rubygem-websocket-client-simple/Makefile +++ b/www/rubygem-websocket-client-simple/Makefile @@ -1,5 +1,5 @@ PORTNAME= websocket-client-simple -PORTVERSION= 0.6.1 +PORTVERSION= 0.8.0 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-websocket-client-simple/distinfo b/www/rubygem-websocket-client-simple/distinfo index 1595a15c0b7..84e7f11b19d 100644 --- a/www/rubygem-websocket-client-simple/distinfo +++ b/www/rubygem-websocket-client-simple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679499088 -SHA256 (rubygem/websocket-client-simple-0.6.1.gem) = 2dae335cb137bb199fdec4104f81889f80fdce76510361d74f8915487727f4fa -SIZE (rubygem/websocket-client-simple-0.6.1.gem) = 10752 +TIMESTAMP = 1692212027 +SHA256 (rubygem/websocket-client-simple-0.8.0.gem) = 13a7086d79eec7a15fd5e982fb232b5a05d808d217a73112c8f30259146ef68c +SIZE (rubygem/websocket-client-simple-0.8.0.gem) = 10752 diff --git a/www/sfeed/Makefile b/www/sfeed/Makefile index 44e0aa7cc40..74634d2f9f5 100644 --- a/www/sfeed/Makefile +++ b/www/sfeed/Makefile @@ -1,5 +1,5 @@ PORTNAME= sfeed -PORTVERSION= 1.8 +PORTVERSION= 1.9 CATEGORIES= www MASTER_SITES= https://codemadness.org/releases/sfeed/ diff --git a/www/sfeed/distinfo b/www/sfeed/distinfo index d4a0c741460..e5d83ee5fb8 100644 --- a/www/sfeed/distinfo +++ b/www/sfeed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682616634 -SHA256 (sfeed-1.8.tar.gz) = 173cffaee785110a73c7e02822d7a8de10307e8a2351fca17eebfdb9483ac7b3 -SIZE (sfeed-1.8.tar.gz) = 67335 +TIMESTAMP = 1692640038 +SHA256 (sfeed-1.9.tar.gz) = 7261dada0e4010ea09f67d1fd737404d691b9c7e5e7362334228c117d98a5646 +SIZE (sfeed-1.9.tar.gz) = 67718 diff --git a/www/tinymce/Makefile b/www/tinymce/Makefile index cfdf8f1a892..61d3aa17339 100644 --- a/www/tinymce/Makefile +++ b/www/tinymce/Makefile @@ -1,5 +1,5 @@ PORTNAME= tinymce -PORTVERSION= 6.6.1 +PORTVERSION= 6.6.2 CATEGORIES= www MASTER_SITES= http://download.tiny.cloud/tinymce/community/ \ LOCAL/sunpoet diff --git a/www/tinymce/distinfo b/www/tinymce/distinfo index 778a132fd22..7f9aef72a36 100644 --- a/www/tinymce/distinfo +++ b/www/tinymce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691069950 -SHA256 (tinymce_6.6.1.zip) = efac001b010a34a37685eebbe2e87f67b59b61a185c127eae889abdb286fed28 -SIZE (tinymce_6.6.1.zip) = 846349 +TIMESTAMP = 1692211655 +SHA256 (tinymce_6.6.2.zip) = 4d026325eb9390e4b288f1e0edc66ba1c6fbe5ce81ca0a7394cd0f8c3e598451 +SIZE (tinymce_6.6.2.zip) = 846413 diff --git a/www/trunk/Makefile b/www/trunk/Makefile new file mode 100644 index 00000000000..8b0086aba4d --- /dev/null +++ b/www/trunk/Makefile @@ -0,0 +1,361 @@ +PORTNAME= trunk +DISTVERSIONPREFIX= v +DISTVERSION= 0.17.5 +CATEGORIES= www devel + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Build, bundle & ship your Rust WASM application to the web +WWW= https://trunkrs.dev/ + +LICENSE= APACHE20 MIT +LICENSE_COMB= dual +LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT + +LIB_DEPENDS= libzstd.so:archivers/zstd + +USES= cargo + +USE_GITHUB= yes +GH_ACCOUNT= thedodd + +CARGO_CRATES= addr2line-0.20.0 \ + adler-1.0.2 \ + aes-0.8.3 \ + aho-corasick-1.0.4 \ + aligned-0.4.1 \ + ansi_term-0.12.1 \ + anstream-0.3.2 \ + anstyle-1.0.1 \ + anstyle-parse-0.2.1 \ + anstyle-query-1.0.0 \ + anstyle-wincon-1.0.2 \ + anyhow-1.0.75 \ + as-slice-0.2.1 \ + async-trait-0.1.73 \ + autocfg-1.1.0 \ + axum-0.6.20 \ + axum-core-0.3.4 \ + backtrace-0.3.68 \ + base64-0.21.2 \ + base64ct-1.6.0 \ + bitflags-1.3.2 \ + bitflags-2.4.0 \ + block-buffer-0.10.4 \ + bumpalo-3.13.0 \ + byteorder-1.4.3 \ + bytes-1.4.0 \ + bzip2-0.4.4 \ + bzip2-sys-0.1.11+1.0.8 \ + camino-1.1.6 \ + cargo-lock-9.0.0 \ + cargo-platform-0.1.3 \ + cargo_metadata-0.15.4 \ + cc-1.0.83 \ + cfg-if-1.0.0 \ + cipher-0.4.4 \ + clap-4.3.23 \ + clap_builder-4.3.23 \ + clap_derive-4.3.12 \ + clap_lex-0.5.0 \ + colorchoice-1.0.0 \ + console-0.15.7 \ + constant_time_eq-0.1.5 \ + convert_case-0.4.0 \ + cpufeatures-0.2.9 \ + crc32fast-1.3.2 \ + crossbeam-channel-0.5.8 \ + crossbeam-utils-0.8.16 \ + crypto-common-0.1.6 \ + cssparser-0.27.2 \ + cssparser-macros-0.6.1 \ + cvt-0.1.2 \ + data-encoding-2.4.0 \ + deranged-0.3.8 \ + derive_more-0.99.17 \ + digest-0.10.7 \ + directories-5.0.1 \ + dirs-sys-0.4.1 \ + dtoa-1.0.9 \ + dtoa-short-0.3.4 \ + dunce-1.0.4 \ + either-1.9.0 \ + encode_unicode-0.3.6 \ + encoding_rs-0.8.32 \ + enum-as-inner-0.5.1 \ + envy-0.4.2 \ + equivalent-1.0.1 \ + errno-0.3.2 \ + errno-dragonfly-0.1.2 \ + fastrand-2.0.0 \ + file-id-0.2.1 \ + filetime-0.2.22 \ + flate2-1.0.27 \ + fnv-1.0.7 \ + form_urlencoded-1.2.0 \ + fs_at-0.1.9 \ + fs_extra-1.3.0 \ + fsevent-sys-4.1.0 \ + futf-0.1.5 \ + futures-channel-0.3.28 \ + futures-core-0.3.28 \ + futures-io-0.3.28 \ + futures-macro-0.3.28 \ + futures-sink-0.3.28 \ + futures-task-0.3.28 \ + futures-util-0.3.28 \ + fxhash-0.2.1 \ + generic-array-0.14.7 \ + getrandom-0.1.16 \ + getrandom-0.2.10 \ + gimli-0.27.3 \ + h2-0.3.21 \ + hashbrown-0.12.3 \ + hashbrown-0.14.0 \ + heck-0.4.1 \ + hermit-abi-0.3.2 \ + hmac-0.12.1 \ + hostname-0.3.1 \ + html5ever-0.25.2 \ + http-0.2.9 \ + http-body-0.4.5 \ + http-range-header-0.3.1 \ + httparse-1.8.0 \ + httpdate-1.0.3 \ + hyper-0.14.27 \ + hyper-rustls-0.24.1 \ + idna-0.2.3 \ + idna-0.4.0 \ + indexmap-1.9.3 \ + indexmap-2.0.0 \ + inotify-0.9.6 \ + inotify-sys-0.1.5 \ + inout-0.1.3 \ + ipconfig-0.3.2 \ + ipnet-2.8.0 \ + is-docker-0.2.0 \ + is-terminal-0.4.9 \ + is-wsl-0.4.0 \ + itoa-0.4.8 \ + itoa-1.0.9 \ + jobserver-0.1.26 \ + js-sys-0.3.64 \ + kqueue-1.0.8 \ + kqueue-sys-1.0.4 \ + lazy_static-1.4.0 \ + libc-0.2.147 \ + linked-hash-map-0.5.6 \ + linux-raw-sys-0.4.5 \ + local-ip-address-0.5.4 \ + lock_api-0.4.10 \ + log-0.4.20 \ + lru-cache-0.1.2 \ + mac-0.1.1 \ + markup5ever-0.10.1 \ + match_cfg-0.1.0 \ + matchers-0.1.0 \ + matches-0.1.10 \ + matchit-0.7.2 \ + memchr-2.5.0 \ + mime-0.3.17 \ + mime_guess-2.0.4 \ + miniz_oxide-0.7.1 \ + mio-0.8.8 \ + neli-0.6.4 \ + neli-proc-macros-0.1.3 \ + new_debug_unreachable-1.0.4 \ + nipper-0.1.9 \ + nix-0.26.2 \ + nodrop-0.1.14 \ + normpath-1.1.1 \ + notify-6.1.1 \ + notify-debouncer-full-0.3.1 \ + nu-ansi-term-0.46.0 \ + num_cpus-1.16.0 \ + object-0.31.1 \ + once_cell-1.18.0 \ + open-5.0.0 \ + option-ext-0.2.0 \ + overload-0.1.1 \ + parking_lot-0.12.1 \ + parking_lot_core-0.9.8 \ + password-hash-0.4.2 \ + pathdiff-0.2.1 \ + pbkdf2-0.11.0 \ + percent-encoding-2.3.0 \ + phf-0.8.0 \ + phf_codegen-0.8.0 \ + phf_generator-0.8.0 \ + phf_generator-0.10.0 \ + phf_macros-0.8.0 \ + phf_shared-0.8.0 \ + phf_shared-0.10.0 \ + pin-project-1.1.3 \ + pin-project-internal-1.1.3 \ + pin-project-lite-0.2.12 \ + pin-utils-0.1.0 \ + pkg-config-0.3.27 \ + ppv-lite86-0.2.17 \ + precomputed-hash-0.1.1 \ + proc-macro-hack-0.5.20+deprecated \ + proc-macro2-1.0.66 \ + quick-error-1.2.3 \ + quote-1.0.33 \ + rand-0.7.3 \ + rand-0.8.5 \ + rand_chacha-0.2.2 \ + rand_chacha-0.3.1 \ + rand_core-0.5.1 \ + rand_core-0.6.4 \ + rand_hc-0.2.0 \ + rand_pcg-0.2.1 \ + redox_syscall-0.2.16 \ + redox_syscall-0.3.5 \ + redox_users-0.4.3 \ + regex-1.9.3 \ + regex-automata-0.1.10 \ + regex-automata-0.3.6 \ + regex-syntax-0.6.29 \ + regex-syntax-0.7.4 \ + remove_dir_all-0.8.2 \ + reqwest-0.11.19 \ + resolv-conf-0.7.0 \ + ring-0.16.20 \ + rustc-demangle-0.1.23 \ + rustc_version-0.4.0 \ + rustix-0.38.8 \ + rustls-0.21.6 \ + rustls-pemfile-1.0.3 \ + rustls-webpki-0.101.3 \ + rustversion-1.0.14 \ + ryu-1.0.15 \ + same-file-1.0.6 \ + scopeguard-1.2.0 \ + sct-0.7.0 \ + seahash-4.1.0 \ + selectors-0.22.0 \ + semver-1.0.18 \ + serde-1.0.171 \ + serde_derive-1.0.171 \ + serde_json-1.0.105 \ + serde_path_to_error-0.1.14 \ + serde_spanned-0.6.3 \ + serde_urlencoded-0.7.1 \ + servo_arc-0.1.1 \ + sha1-0.10.5 \ + sha2-0.10.7 \ + sharded-slab-0.1.4 \ + signal-hook-registry-1.4.1 \ + siphasher-0.3.10 \ + slab-0.4.8 \ + smallvec-1.11.0 \ + socket2-0.4.9 \ + socket2-0.5.3 \ + spin-0.5.2 \ + stable_deref_trait-1.2.0 \ + static_assertions-1.1.0 \ + string_cache-0.8.7 \ + string_cache_codegen-0.5.2 \ + strsim-0.10.0 \ + subtle-2.5.0 \ + syn-1.0.109 \ + syn-2.0.29 \ + sync_wrapper-0.1.2 \ + tar-0.4.40 \ + tempfile-3.8.0 \ + tendril-0.4.3 \ + thin-slice-0.1.1 \ + thiserror-1.0.47 \ + thiserror-impl-1.0.47 \ + thread_local-1.1.7 \ + time-0.3.26 \ + time-core-0.1.1 \ + tinyvec-1.6.0 \ + tinyvec_macros-0.1.1 \ + tokio-1.32.0 \ + tokio-macros-2.1.0 \ + tokio-rustls-0.24.1 \ + tokio-stream-0.1.14 \ + tokio-tungstenite-0.19.0 \ + tokio-tungstenite-0.20.0 \ + tokio-util-0.7.8 \ + toml-0.7.6 \ + toml_datetime-0.6.3 \ + toml_edit-0.19.14 \ + tower-0.4.13 \ + tower-http-0.4.3 \ + tower-layer-0.3.2 \ + tower-service-0.3.2 \ + tracing-0.1.37 \ + tracing-attributes-0.1.26 \ + tracing-core-0.1.31 \ + tracing-log-0.1.3 \ + tracing-subscriber-0.3.17 \ + trust-dns-proto-0.22.0 \ + trust-dns-resolver-0.22.0 \ + try-lock-0.2.4 \ + tungstenite-0.19.0 \ + tungstenite-0.20.0 \ + typenum-1.16.0 \ + unicase-2.7.0 \ + unicode-bidi-0.3.13 \ + unicode-ident-1.0.11 \ + unicode-normalization-0.1.22 \ + unicode-width-0.1.10 \ + untrusted-0.7.1 \ + url-2.4.0 \ + utf-8-0.7.6 \ + utf8parse-0.2.1 \ + valuable-0.1.0 \ + version_check-0.9.4 \ + walkdir-2.3.3 \ + want-0.3.1 \ + wasi-0.9.0+wasi-snapshot-preview1 \ + wasi-0.11.0+wasi-snapshot-preview1 \ + wasm-bindgen-0.2.87 \ + wasm-bindgen-backend-0.2.87 \ + wasm-bindgen-futures-0.4.37 \ + wasm-bindgen-macro-0.2.87 \ + wasm-bindgen-macro-support-0.2.87 \ + wasm-bindgen-shared-0.2.87 \ + wasm-streams-0.3.0 \ + web-sys-0.3.64 \ + webpki-roots-0.25.2 \ + which-4.4.0 \ + widestring-1.0.2 \ + winapi-0.3.9 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-util-0.1.5 \ + winapi-x86_64-pc-windows-gnu-0.4.0 \ + windows-sys-0.45.0 \ + windows-sys-0.48.0 \ + windows-targets-0.42.2 \ + windows-targets-0.48.5 \ + windows_aarch64_gnullvm-0.42.2 \ + windows_aarch64_gnullvm-0.48.5 \ + windows_aarch64_msvc-0.42.2 \ + windows_aarch64_msvc-0.48.5 \ + windows_i686_gnu-0.42.2 \ + windows_i686_gnu-0.48.5 \ + windows_i686_msvc-0.42.2 \ + windows_i686_msvc-0.48.5 \ + windows_x86_64_gnu-0.42.2 \ + windows_x86_64_gnu-0.48.5 \ + windows_x86_64_gnullvm-0.42.2 \ + windows_x86_64_gnullvm-0.48.5 \ + windows_x86_64_msvc-0.42.2 \ + windows_x86_64_msvc-0.48.5 \ + winnow-0.5.14 \ + winreg-0.50.0 \ + xattr-1.0.1 \ + zip-0.6.6 \ + zstd-0.11.2+zstd.1.5.2 \ + zstd-safe-5.0.2+zstd.1.5.2 \ + zstd-sys-2.0.8+zstd.1.5.5 + +PLIST_FILES= bin/${PORTNAME} + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +.include diff --git a/www/trunk/distinfo b/www/trunk/distinfo new file mode 100644 index 00000000000..499d265be12 --- /dev/null +++ b/www/trunk/distinfo @@ -0,0 +1,669 @@ +TIMESTAMP = 1692688989 +SHA256 (rust/crates/addr2line-0.20.0.crate) = f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3 +SIZE (rust/crates/addr2line-0.20.0.crate) = 39558 +SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe +SIZE (rust/crates/adler-1.0.2.crate) = 12778 +SHA256 (rust/crates/aes-0.8.3.crate) = ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2 +SIZE (rust/crates/aes-0.8.3.crate) = 124679 +SHA256 (rust/crates/aho-corasick-1.0.4.crate) = 6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a +SIZE (rust/crates/aho-corasick-1.0.4.crate) = 171175 +SHA256 (rust/crates/aligned-0.4.1.crate) = 80a21b9440a626c7fc8573a9e3d3a06b75c7c97754c2949bc7857b90353ca655 +SIZE (rust/crates/aligned-0.4.1.crate) = 8532 +SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2 +SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838 +SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163 +SIZE (rust/crates/anstream-0.3.2.crate) = 19504 +SHA256 (rust/crates/anstyle-1.0.1.crate) = 3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd +SIZE (rust/crates/anstyle-1.0.1.crate) = 13977 +SHA256 (rust/crates/anstyle-parse-0.2.1.crate) = 938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333 +SIZE (rust/crates/anstyle-parse-0.2.1.crate) = 24802 +SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b +SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620 +SHA256 (rust/crates/anstyle-wincon-1.0.2.crate) = c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c +SIZE (rust/crates/anstyle-wincon-1.0.2.crate) = 11712 +SHA256 (rust/crates/anyhow-1.0.75.crate) = a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6 +SIZE (rust/crates/anyhow-1.0.75.crate) = 43901 +SHA256 (rust/crates/as-slice-0.2.1.crate) = 516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516 +SIZE (rust/crates/as-slice-0.2.1.crate) = 6942 +SHA256 (rust/crates/async-trait-0.1.73.crate) = bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0 +SIZE (rust/crates/async-trait-0.1.73.crate) = 28654 +SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa +SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 +SHA256 (rust/crates/axum-0.6.20.crate) = 3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf +SIZE (rust/crates/axum-0.6.20.crate) = 146227 +SHA256 (rust/crates/axum-core-0.3.4.crate) = 759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c +SIZE (rust/crates/axum-core-0.3.4.crate) = 21088 +SHA256 (rust/crates/backtrace-0.3.68.crate) = 4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12 +SIZE (rust/crates/backtrace-0.3.68.crate) = 79891 +SHA256 (rust/crates/base64-0.21.2.crate) = 604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d +SIZE (rust/crates/base64-0.21.2.crate) = 76389 +SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b +SIZE (rust/crates/base64ct-1.6.0.crate) = 28870 +SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a +SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 +SHA256 (rust/crates/bitflags-2.4.0.crate) = b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635 +SIZE (rust/crates/bitflags-2.4.0.crate) = 36954 +SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71 +SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538 +SHA256 (rust/crates/bumpalo-3.13.0.crate) = a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1 +SIZE (rust/crates/bumpalo-3.13.0.crate) = 82114 +SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610 +SIZE (rust/crates/byteorder-1.4.3.crate) = 22512 +SHA256 (rust/crates/bytes-1.4.0.crate) = 89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be +SIZE (rust/crates/bytes-1.4.0.crate) = 58080 +SHA256 (rust/crates/bzip2-0.4.4.crate) = bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8 +SIZE (rust/crates/bzip2-0.4.4.crate) = 34197 +SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc +SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444 +SHA256 (rust/crates/camino-1.1.6.crate) = c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c +SIZE (rust/crates/camino-1.1.6.crate) = 30519 +SHA256 (rust/crates/cargo-lock-9.0.0.crate) = e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72 +SIZE (rust/crates/cargo-lock-9.0.0.crate) = 40465 +SHA256 (rust/crates/cargo-platform-0.1.3.crate) = 2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479 +SIZE (rust/crates/cargo-platform-0.1.3.crate) = 11230 +SHA256 (rust/crates/cargo_metadata-0.15.4.crate) = eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a +SIZE (rust/crates/cargo_metadata-0.15.4.crate) = 19993 +SHA256 (rust/crates/cc-1.0.83.crate) = f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0 +SIZE (rust/crates/cc-1.0.83.crate) = 68343 +SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd +SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 +SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad +SIZE (rust/crates/cipher-0.4.4.crate) = 19073 +SHA256 (rust/crates/clap-4.3.23.crate) = 03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3 +SIZE (rust/crates/clap-4.3.23.crate) = 55026 +SHA256 (rust/crates/clap_builder-4.3.23.crate) = f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98 +SIZE (rust/crates/clap_builder-4.3.23.crate) = 162380 +SHA256 (rust/crates/clap_derive-4.3.12.crate) = 54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050 +SIZE (rust/crates/clap_derive-4.3.12.crate) = 29052 +SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b +SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792 +SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7 +SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857 +SHA256 (rust/crates/console-0.15.7.crate) = c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8 +SIZE (rust/crates/console-0.15.7.crate) = 35409 +SHA256 (rust/crates/constant_time_eq-0.1.5.crate) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc +SIZE (rust/crates/constant_time_eq-0.1.5.crate) = 4936 +SHA256 (rust/crates/convert_case-0.4.0.crate) = 6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e +SIZE (rust/crates/convert_case-0.4.0.crate) = 8098 +SHA256 (rust/crates/cpufeatures-0.2.9.crate) = a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1 +SIZE (rust/crates/cpufeatures-0.2.9.crate) = 11895 +SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d +SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661 +SHA256 (rust/crates/crossbeam-channel-0.5.8.crate) = a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200 +SIZE (rust/crates/crossbeam-channel-0.5.8.crate) = 90455 +SHA256 (rust/crates/crossbeam-utils-0.8.16.crate) = 5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294 +SIZE (rust/crates/crossbeam-utils-0.8.16.crate) = 42508 +SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3 +SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760 +SHA256 (rust/crates/cssparser-0.27.2.crate) = 754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a +SIZE (rust/crates/cssparser-0.27.2.crate) = 56792 +SHA256 (rust/crates/cssparser-macros-0.6.1.crate) = 13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331 +SIZE (rust/crates/cssparser-macros-0.6.1.crate) = 7914 +SHA256 (rust/crates/cvt-0.1.2.crate) = d2ae9bf77fbf2d39ef573205d554d87e86c12f1994e9ea335b0651b9b278bcf1 +SIZE (rust/crates/cvt-0.1.2.crate) = 6214 +SHA256 (rust/crates/data-encoding-2.4.0.crate) = c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308 +SIZE (rust/crates/data-encoding-2.4.0.crate) = 19165 +SHA256 (rust/crates/deranged-0.3.8.crate) = f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946 +SIZE (rust/crates/deranged-0.3.8.crate) = 15314 +SHA256 (rust/crates/derive_more-0.99.17.crate) = 4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321 +SIZE (rust/crates/derive_more-0.99.17.crate) = 55771 +SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292 +SIZE (rust/crates/digest-0.10.7.crate) = 19557 +SHA256 (rust/crates/directories-5.0.1.crate) = 9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35 +SIZE (rust/crates/directories-5.0.1.crate) = 15833 +SHA256 (rust/crates/dirs-sys-0.4.1.crate) = 520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c +SIZE (rust/crates/dirs-sys-0.4.1.crate) = 10719 +SHA256 (rust/crates/dtoa-1.0.9.crate) = dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653 +SIZE (rust/crates/dtoa-1.0.9.crate) = 17002 +SHA256 (rust/crates/dtoa-short-0.3.4.crate) = dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74 +SIZE (rust/crates/dtoa-short-0.3.4.crate) = 8276 +SHA256 (rust/crates/dunce-1.0.4.crate) = 56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b +SIZE (rust/crates/dunce-1.0.4.crate) = 8034 +SHA256 (rust/crates/either-1.9.0.crate) = a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07 +SIZE (rust/crates/either-1.9.0.crate) = 16660 +SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f +SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741 +SHA256 (rust/crates/encoding_rs-0.8.32.crate) = 071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394 +SIZE (rust/crates/encoding_rs-0.8.32.crate) = 1370046 +SHA256 (rust/crates/enum-as-inner-0.5.1.crate) = c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116 +SIZE (rust/crates/enum-as-inner-0.5.1.crate) = 11707 +SHA256 (rust/crates/envy-0.4.2.crate) = 3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965 +SIZE (rust/crates/envy-0.4.2.crate) = 10985 +SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5 +SIZE (rust/crates/equivalent-1.0.1.crate) = 6615 +SHA256 (rust/crates/errno-0.3.2.crate) = 6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f +SIZE (rust/crates/errno-0.3.2.crate) = 10424 +SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf +SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810 +SHA256 (rust/crates/fastrand-2.0.0.crate) = 6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764 +SIZE (rust/crates/fastrand-2.0.0.crate) = 14402 +SHA256 (rust/crates/file-id-0.2.1.crate) = 6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9 +SIZE (rust/crates/file-id-0.2.1.crate) = 10240 +SHA256 (rust/crates/filetime-0.2.22.crate) = d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0 +SIZE (rust/crates/filetime-0.2.22.crate) = 15029 +SHA256 (rust/crates/flate2-1.0.27.crate) = c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010 +SIZE (rust/crates/flate2-1.0.27.crate) = 73460 +SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1 +SIZE (rust/crates/fnv-1.0.7.crate) = 11266 +SHA256 (rust/crates/form_urlencoded-1.2.0.crate) = a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652 +SIZE (rust/crates/form_urlencoded-1.2.0.crate) = 8923 +SHA256 (rust/crates/fs_at-0.1.9.crate) = 13865faf9bae9729a623b591520adb9c5b1b0ecbec8a48394f47f6801a458f9f +SIZE (rust/crates/fs_at-0.1.9.crate) = 36190 +SHA256 (rust/crates/fs_extra-1.3.0.crate) = 42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c +SIZE (rust/crates/fs_extra-1.3.0.crate) = 31298 +SHA256 (rust/crates/fsevent-sys-4.1.0.crate) = 76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2 +SIZE (rust/crates/fsevent-sys-4.1.0.crate) = 4620 +SHA256 (rust/crates/futf-0.1.5.crate) = df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843 +SIZE (rust/crates/futf-0.1.5.crate) = 11344 +SHA256 (rust/crates/futures-channel-0.3.28.crate) = 955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2 +SIZE (rust/crates/futures-channel-0.3.28.crate) = 32281 +SHA256 (rust/crates/futures-core-0.3.28.crate) = 4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c +SIZE (rust/crates/futures-core-0.3.28.crate) = 14780 +SHA256 (rust/crates/futures-io-0.3.28.crate) = 4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964 +SIZE (rust/crates/futures-io-0.3.28.crate) = 8910 +SHA256 (rust/crates/futures-macro-0.3.28.crate) = 89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72 +SIZE (rust/crates/futures-macro-0.3.28.crate) = 11272 +SHA256 (rust/crates/futures-sink-0.3.28.crate) = f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e +SIZE (rust/crates/futures-sink-0.3.28.crate) = 7852 +SHA256 (rust/crates/futures-task-0.3.28.crate) = 76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65 +SIZE (rust/crates/futures-task-0.3.28.crate) = 11848 +SHA256 (rust/crates/futures-util-0.3.28.crate) = 26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533 +SIZE (rust/crates/futures-util-0.3.28.crate) = 158510 +SHA256 (rust/crates/fxhash-0.2.1.crate) = c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c +SIZE (rust/crates/fxhash-0.2.1.crate) = 4102 +SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a +SIZE (rust/crates/generic-array-0.14.7.crate) = 15950 +SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce +SIZE (rust/crates/getrandom-0.1.16.crate) = 25077 +SHA256 (rust/crates/getrandom-0.2.10.crate) = be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427 +SIZE (rust/crates/getrandom-0.2.10.crate) = 34955 +SHA256 (rust/crates/gimli-0.27.3.crate) = b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e +SIZE (rust/crates/gimli-0.27.3.crate) = 287904 +SHA256 (rust/crates/h2-0.3.21.crate) = 91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833 +SIZE (rust/crates/h2-0.3.21.crate) = 166581 +SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888 +SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968 +SHA256 (rust/crates/hashbrown-0.14.0.crate) = 2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a +SIZE (rust/crates/hashbrown-0.14.0.crate) = 116103 +SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8 +SIZE (rust/crates/heck-0.4.1.crate) = 11567 +SHA256 (rust/crates/hermit-abi-0.3.2.crate) = 443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b +SIZE (rust/crates/hermit-abi-0.3.2.crate) = 13783 +SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e +SIZE (rust/crates/hmac-0.12.1.crate) = 42657 +SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867 +SIZE (rust/crates/hostname-0.3.1.crate) = 9272 +SHA256 (rust/crates/html5ever-0.25.2.crate) = e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148 +SIZE (rust/crates/html5ever-0.25.2.crate) = 72780 +SHA256 (rust/crates/http-0.2.9.crate) = bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482 +SIZE (rust/crates/http-0.2.9.crate) = 100146 +SHA256 (rust/crates/http-body-0.4.5.crate) = d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1 +SIZE (rust/crates/http-body-0.4.5.crate) = 9242 +SHA256 (rust/crates/http-range-header-0.3.1.crate) = add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f +SIZE (rust/crates/http-range-header-0.3.1.crate) = 7712 +SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904 +SIZE (rust/crates/httparse-1.8.0.crate) = 29954 +SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9 +SIZE (rust/crates/httpdate-1.0.3.crate) = 10639 +SHA256 (rust/crates/hyper-0.14.27.crate) = ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468 +SIZE (rust/crates/hyper-0.14.27.crate) = 195700 +SHA256 (rust/crates/hyper-rustls-0.24.1.crate) = 8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97 +SIZE (rust/crates/hyper-rustls-0.24.1.crate) = 30224 +SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8 +SIZE (rust/crates/idna-0.2.3.crate) = 271023 +SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c +SIZE (rust/crates/idna-0.4.0.crate) = 271429 +SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99 +SIZE (rust/crates/indexmap-1.9.3.crate) = 54653 +SHA256 (rust/crates/indexmap-2.0.0.crate) = d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d +SIZE (rust/crates/indexmap-2.0.0.crate) = 64038 +SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff +SIZE (rust/crates/inotify-0.9.6.crate) = 22971 +SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb +SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965 +SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5 +SIZE (rust/crates/inout-0.1.3.crate) = 10743 +SHA256 (rust/crates/ipconfig-0.3.2.crate) = b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f +SIZE (rust/crates/ipconfig-0.3.2.crate) = 24468 +SHA256 (rust/crates/ipnet-2.8.0.crate) = 28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6 +SIZE (rust/crates/ipnet-2.8.0.crate) = 27474 +SHA256 (rust/crates/is-docker-0.2.0.crate) = 928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3 +SIZE (rust/crates/is-docker-0.2.0.crate) = 2664 +SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b +SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109 +SHA256 (rust/crates/is-wsl-0.4.0.crate) = 173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5 +SIZE (rust/crates/is-wsl-0.4.0.crate) = 3264 +SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4 +SIZE (rust/crates/itoa-0.4.8.crate) = 11926 +SHA256 (rust/crates/itoa-1.0.9.crate) = af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38 +SIZE (rust/crates/itoa-1.0.9.crate) = 10492 +SHA256 (rust/crates/jobserver-0.1.26.crate) = 936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2 +SIZE (rust/crates/jobserver-0.1.26.crate) = 22645 +SHA256 (rust/crates/js-sys-0.3.64.crate) = c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a +SIZE (rust/crates/js-sys-0.3.64.crate) = 80313 +SHA256 (rust/crates/kqueue-1.0.8.crate) = 7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c +SIZE (rust/crates/kqueue-1.0.8.crate) = 12642 +SHA256 (rust/crates/kqueue-sys-1.0.4.crate) = ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b +SIZE (rust/crates/kqueue-sys-1.0.4.crate) = 7160 +SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 +SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 +SHA256 (rust/crates/libc-0.2.147.crate) = b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3 +SIZE (rust/crates/libc-0.2.147.crate) = 686772 +SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f +SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049 +SHA256 (rust/crates/linux-raw-sys-0.4.5.crate) = 57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503 +SIZE (rust/crates/linux-raw-sys-0.4.5.crate) = 1274380 +SHA256 (rust/crates/local-ip-address-0.5.4.crate) = 885efb07efcd6ae1c6af70be7565544121424fa9e5b1c3e4b58bbbf141a58cef +SIZE (rust/crates/local-ip-address-0.5.4.crate) = 25208 +SHA256 (rust/crates/lock_api-0.4.10.crate) = c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16 +SIZE (rust/crates/lock_api-0.4.10.crate) = 26713 +SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f +SIZE (rust/crates/log-0.4.20.crate) = 38307 +SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c +SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307 +SHA256 (rust/crates/mac-0.1.1.crate) = c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4 +SIZE (rust/crates/mac-0.1.1.crate) = 4838 +SHA256 (rust/crates/markup5ever-0.10.1.crate) = a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd +SIZE (rust/crates/markup5ever-0.10.1.crate) = 34668 +SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4 +SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153 +SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558 +SIZE (rust/crates/matchers-0.1.0.crate) = 6948 +SHA256 (rust/crates/matches-0.1.10.crate) = 2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5 +SIZE (rust/crates/matches-0.1.10.crate) = 2592 +SHA256 (rust/crates/matchit-0.7.2.crate) = ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef +SIZE (rust/crates/matchit-0.7.2.crate) = 28592 +SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d +SIZE (rust/crates/memchr-2.5.0.crate) = 65812 +SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a +SIZE (rust/crates/mime-0.3.17.crate) = 15712 +SHA256 (rust/crates/mime_guess-2.0.4.crate) = 4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef +SIZE (rust/crates/mime_guess-2.0.4.crate) = 26399 +SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7 +SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194 +SHA256 (rust/crates/mio-0.8.8.crate) = 927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2 +SIZE (rust/crates/mio-0.8.8.crate) = 94264 +SHA256 (rust/crates/neli-0.6.4.crate) = 1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43 +SIZE (rust/crates/neli-0.6.4.crate) = 48016 +SHA256 (rust/crates/neli-proc-macros-0.1.3.crate) = c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4 +SIZE (rust/crates/neli-proc-macros-0.1.3.crate) = 10111 +SHA256 (rust/crates/new_debug_unreachable-1.0.4.crate) = e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54 +SIZE (rust/crates/new_debug_unreachable-1.0.4.crate) = 2561 +SHA256 (rust/crates/nipper-0.1.9.crate) = 761382864693f4bb171abf9e8de181a320b00464a83a9a5071059057b1fe0116 +SIZE (rust/crates/nipper-0.1.9.crate) = 222329 +SHA256 (rust/crates/nix-0.26.2.crate) = bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a +SIZE (rust/crates/nix-0.26.2.crate) = 277973 +SHA256 (rust/crates/nodrop-0.1.14.crate) = 72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb +SIZE (rust/crates/nodrop-0.1.14.crate) = 7667 +SHA256 (rust/crates/normpath-1.1.1.crate) = ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5 +SIZE (rust/crates/normpath-1.1.1.crate) = 19786 +SHA256 (rust/crates/notify-6.1.1.crate) = 6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d +SIZE (rust/crates/notify-6.1.1.crate) = 40117 +SHA256 (rust/crates/notify-debouncer-full-0.3.1.crate) = 49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154 +SIZE (rust/crates/notify-debouncer-full-0.3.1.crate) = 18278 +SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84 +SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311 +SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43 +SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713 +SHA256 (rust/crates/object-0.31.1.crate) = 8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1 +SIZE (rust/crates/object-0.31.1.crate) = 272843 +SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d +SIZE (rust/crates/once_cell-1.18.0.crate) = 32969 +SHA256 (rust/crates/open-5.0.0.crate) = cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8 +SIZE (rust/crates/open-5.0.0.crate) = 21085 +SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d +SIZE (rust/crates/option-ext-0.2.0.crate) = 7345 +SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39 +SIZE (rust/crates/overload-0.1.1.crate) = 24439 +SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f +SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 +SHA256 (rust/crates/parking_lot_core-0.9.8.crate) = 93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447 +SIZE (rust/crates/parking_lot_core-0.9.8.crate) = 32383 +SHA256 (rust/crates/password-hash-0.4.2.crate) = 7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700 +SIZE (rust/crates/password-hash-0.4.2.crate) = 26099 +SHA256 (rust/crates/pathdiff-0.2.1.crate) = 8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd +SIZE (rust/crates/pathdiff-0.2.1.crate) = 7142 +SHA256 (rust/crates/pbkdf2-0.11.0.crate) = 83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917 +SIZE (rust/crates/pbkdf2-0.11.0.crate) = 13229 +SHA256 (rust/crates/percent-encoding-2.3.0.crate) = 9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94 +SIZE (rust/crates/percent-encoding-2.3.0.crate) = 10196 +SHA256 (rust/crates/phf-0.8.0.crate) = 3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12 +SIZE (rust/crates/phf-0.8.0.crate) = 3902 +SHA256 (rust/crates/phf_codegen-0.8.0.crate) = cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815 +SIZE (rust/crates/phf_codegen-0.8.0.crate) = 3192 +SHA256 (rust/crates/phf_generator-0.8.0.crate) = 17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526 +SIZE (rust/crates/phf_generator-0.8.0.crate) = 7604 +SHA256 (rust/crates/phf_generator-0.10.0.crate) = 5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6 +SIZE (rust/crates/phf_generator-0.10.0.crate) = 7525 +SHA256 (rust/crates/phf_macros-0.8.0.crate) = 7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c +SIZE (rust/crates/phf_macros-0.8.0.crate) = 5814 +SHA256 (rust/crates/phf_shared-0.8.0.crate) = c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7 +SIZE (rust/crates/phf_shared-0.8.0.crate) = 2860 +SHA256 (rust/crates/phf_shared-0.10.0.crate) = b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096 +SIZE (rust/crates/phf_shared-0.10.0.crate) = 4095 +SHA256 (rust/crates/pin-project-1.1.3.crate) = fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422 +SIZE (rust/crates/pin-project-1.1.3.crate) = 57740 +SHA256 (rust/crates/pin-project-internal-1.1.3.crate) = 4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405 +SIZE (rust/crates/pin-project-internal-1.1.3.crate) = 27824 +SHA256 (rust/crates/pin-project-lite-0.2.12.crate) = 12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05 +SIZE (rust/crates/pin-project-lite-0.2.12.crate) = 29073 +SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 +SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580 +SHA256 (rust/crates/pkg-config-0.3.27.crate) = 26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964 +SIZE (rust/crates/pkg-config-0.3.27.crate) = 18838 +SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de +SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242 +SHA256 (rust/crates/precomputed-hash-0.1.1.crate) = 925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c +SIZE (rust/crates/precomputed-hash-0.1.1.crate) = 1640 +SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068 +SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045 +SHA256 (rust/crates/proc-macro2-1.0.66.crate) = 18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9 +SIZE (rust/crates/proc-macro2-1.0.66.crate) = 43575 +SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 +SIZE (rust/crates/quick-error-1.2.3.crate) = 15066 +SHA256 (rust/crates/quote-1.0.33.crate) = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae +SIZE (rust/crates/quote-1.0.33.crate) = 28090 +SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03 +SIZE (rust/crates/rand-0.7.3.crate) = 112246 +SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404 +SIZE (rust/crates/rand-0.8.5.crate) = 87113 +SHA256 (rust/crates/rand_chacha-0.2.2.crate) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402 +SIZE (rust/crates/rand_chacha-0.2.2.crate) = 13267 +SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88 +SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251 +SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19 +SIZE (rust/crates/rand_core-0.5.1.crate) = 21116 +SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c +SIZE (rust/crates/rand_core-0.6.4.crate) = 22666 +SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c +SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670 +SHA256 (rust/crates/rand_pcg-0.2.1.crate) = 16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429 +SIZE (rust/crates/rand_pcg-0.2.1.crate) = 11291 +SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a +SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 +SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29 +SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 +SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b +SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 +SHA256 (rust/crates/regex-1.9.3.crate) = 81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a +SIZE (rust/crates/regex-1.9.3.crate) = 252676 +SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132 +SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533 +SHA256 (rust/crates/regex-automata-0.3.6.crate) = fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69 +SIZE (rust/crates/regex-automata-0.3.6.crate) = 607174 +SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1 +SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752 +SHA256 (rust/crates/regex-syntax-0.7.4.crate) = e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2 +SIZE (rust/crates/regex-syntax-0.7.4.crate) = 343365 +SHA256 (rust/crates/remove_dir_all-0.8.2.crate) = 23895cfadc1917fed9c6ed76a8c2903615fa3704f7493ff82b364c6540acc02b +SIZE (rust/crates/remove_dir_all-0.8.2.crate) = 19074 +SHA256 (rust/crates/reqwest-0.11.19.crate) = 20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3 +SIZE (rust/crates/reqwest-0.11.19.crate) = 155083 +SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00 +SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352 +SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc +SIZE (rust/crates/ring-0.16.20.crate) = 5082615 +SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76 +SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970 +SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366 +SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175 +SHA256 (rust/crates/rustix-0.38.8.crate) = 19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f +SIZE (rust/crates/rustix-0.38.8.crate) = 333258 +SHA256 (rust/crates/rustls-0.21.6.crate) = 1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb +SIZE (rust/crates/rustls-0.21.6.crate) = 282907 +SHA256 (rust/crates/rustls-pemfile-1.0.3.crate) = 2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2 +SIZE (rust/crates/rustls-pemfile-1.0.3.crate) = 20432 +SHA256 (rust/crates/rustls-webpki-0.101.3.crate) = 261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0 +SIZE (rust/crates/rustls-webpki-0.101.3.crate) = 163517 +SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4 +SIZE (rust/crates/rustversion-1.0.14.crate) = 17261 +SHA256 (rust/crates/ryu-1.0.15.crate) = 1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741 +SIZE (rust/crates/ryu-1.0.15.crate) = 46906 +SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 +SIZE (rust/crates/same-file-1.0.6.crate) = 10183 +SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49 +SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619 +SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4 +SIZE (rust/crates/sct-0.7.0.crate) = 27502 +SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b +SIZE (rust/crates/seahash-4.1.0.crate) = 31976 +SHA256 (rust/crates/selectors-0.22.0.crate) = df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe +SIZE (rust/crates/selectors-0.22.0.crate) = 44199 +SHA256 (rust/crates/semver-1.0.18.crate) = b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918 +SIZE (rust/crates/semver-1.0.18.crate) = 29703 +SHA256 (rust/crates/serde-1.0.171.crate) = 30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9 +SIZE (rust/crates/serde-1.0.171.crate) = 77630 +SHA256 (rust/crates/serde_derive-1.0.171.crate) = 389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682 +SIZE (rust/crates/serde_derive-1.0.171.crate) = 55183 +SHA256 (rust/crates/serde_json-1.0.105.crate) = 693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360 +SIZE (rust/crates/serde_json-1.0.105.crate) = 146316 +SHA256 (rust/crates/serde_path_to_error-0.1.14.crate) = 4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335 +SIZE (rust/crates/serde_path_to_error-0.1.14.crate) = 16553 +SHA256 (rust/crates/serde_spanned-0.6.3.crate) = 96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186 +SIZE (rust/crates/serde_spanned-0.6.3.crate) = 7737 +SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd +SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822 +SHA256 (rust/crates/servo_arc-0.1.1.crate) = d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432 +SIZE (rust/crates/servo_arc-0.1.1.crate) = 9817 +SHA256 (rust/crates/sha1-0.10.5.crate) = f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3 +SIZE (rust/crates/sha1-0.10.5.crate) = 12146 +SHA256 (rust/crates/sha2-0.10.7.crate) = 479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8 +SIZE (rust/crates/sha2-0.10.7.crate) = 22541 +SHA256 (rust/crates/sharded-slab-0.1.4.crate) = 900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31 +SIZE (rust/crates/sharded-slab-0.1.4.crate) = 52479 +SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1 +SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987 +SHA256 (rust/crates/siphasher-0.3.10.crate) = 7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de +SIZE (rust/crates/siphasher-0.3.10.crate) = 9889 +SHA256 (rust/crates/slab-0.4.8.crate) = 6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d +SIZE (rust/crates/slab-0.4.8.crate) = 16928 +SHA256 (rust/crates/smallvec-1.11.0.crate) = 62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9 +SIZE (rust/crates/smallvec-1.11.0.crate) = 34680 +SHA256 (rust/crates/socket2-0.4.9.crate) = 64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662 +SIZE (rust/crates/socket2-0.4.9.crate) = 45421 +SHA256 (rust/crates/socket2-0.5.3.crate) = 2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877 +SIZE (rust/crates/socket2-0.5.3.crate) = 52588 +SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d +SIZE (rust/crates/spin-0.5.2.crate) = 12004 +SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3 +SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054 +SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f +SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480 +SHA256 (rust/crates/string_cache-0.8.7.crate) = f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b +SIZE (rust/crates/string_cache-0.8.7.crate) = 16655 +SHA256 (rust/crates/string_cache_codegen-0.5.2.crate) = 6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988 +SIZE (rust/crates/string_cache_codegen-0.5.2.crate) = 8156 +SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 +SIZE (rust/crates/strsim-0.10.0.crate) = 11355 +SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc +SIZE (rust/crates/subtle-2.5.0.crate) = 13909 +SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 +SIZE (rust/crates/syn-1.0.109.crate) = 237611 +SHA256 (rust/crates/syn-2.0.29.crate) = c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a +SIZE (rust/crates/syn-2.0.29.crate) = 241664 +SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160 +SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933 +SHA256 (rust/crates/tar-0.4.40.crate) = b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb +SIZE (rust/crates/tar-0.4.40.crate) = 51844 +SHA256 (rust/crates/tempfile-3.8.0.crate) = cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef +SIZE (rust/crates/tempfile-3.8.0.crate) = 31720 +SHA256 (rust/crates/tendril-0.4.3.crate) = d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0 +SIZE (rust/crates/tendril-0.4.3.crate) = 37210 +SHA256 (rust/crates/thin-slice-0.1.1.crate) = 8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c +SIZE (rust/crates/thin-slice-0.1.1.crate) = 4484 +SHA256 (rust/crates/thiserror-1.0.47.crate) = 97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f +SIZE (rust/crates/thiserror-1.0.47.crate) = 18811 +SHA256 (rust/crates/thiserror-impl-1.0.47.crate) = 6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b +SIZE (rust/crates/thiserror-impl-1.0.47.crate) = 15080 +SHA256 (rust/crates/thread_local-1.1.7.crate) = 3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152 +SIZE (rust/crates/thread_local-1.1.7.crate) = 13585 +SHA256 (rust/crates/time-0.3.26.crate) = a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07 +SIZE (rust/crates/time-0.3.26.crate) = 116922 +SHA256 (rust/crates/time-core-0.1.1.crate) = 7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb +SIZE (rust/crates/time-core-0.1.1.crate) = 7197 +SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50 +SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991 +SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20 +SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865 +SHA256 (rust/crates/tokio-1.32.0.crate) = 17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9 +SIZE (rust/crates/tokio-1.32.0.crate) = 725004 +SHA256 (rust/crates/tokio-macros-2.1.0.crate) = 630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e +SIZE (rust/crates/tokio-macros-2.1.0.crate) = 11472 +SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081 +SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049 +SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842 +SIZE (rust/crates/tokio-stream-0.1.14.crate) = 35881 +SHA256 (rust/crates/tokio-tungstenite-0.19.0.crate) = ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c +SIZE (rust/crates/tokio-tungstenite-0.19.0.crate) = 27734 +SHA256 (rust/crates/tokio-tungstenite-0.20.0.crate) = 2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2 +SIZE (rust/crates/tokio-tungstenite-0.20.0.crate) = 28529 +SHA256 (rust/crates/tokio-util-0.7.8.crate) = 806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d +SIZE (rust/crates/tokio-util-0.7.8.crate) = 101644 +SHA256 (rust/crates/toml-0.7.6.crate) = c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542 +SIZE (rust/crates/toml-0.7.6.crate) = 49220 +SHA256 (rust/crates/toml_datetime-0.6.3.crate) = 7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b +SIZE (rust/crates/toml_datetime-0.6.3.crate) = 10770 +SHA256 (rust/crates/toml_edit-0.19.14.crate) = f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a +SIZE (rust/crates/toml_edit-0.19.14.crate) = 94875 +SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c +SIZE (rust/crates/tower-0.4.13.crate) = 106906 +SHA256 (rust/crates/tower-http-0.4.3.crate) = 55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82 +SIZE (rust/crates/tower-http-0.4.3.crate) = 115404 +SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0 +SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023 +SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52 +SIZE (rust/crates/tower-service-0.3.2.crate) = 6847 +SHA256 (rust/crates/tracing-0.1.37.crate) = 8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8 +SIZE (rust/crates/tracing-0.1.37.crate) = 73888 +SHA256 (rust/crates/tracing-attributes-0.1.26.crate) = 5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab +SIZE (rust/crates/tracing-attributes-0.1.26.crate) = 32060 +SHA256 (rust/crates/tracing-core-0.1.31.crate) = 0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a +SIZE (rust/crates/tracing-core-0.1.31.crate) = 61263 +SHA256 (rust/crates/tracing-log-0.1.3.crate) = 78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922 +SIZE (rust/crates/tracing-log-0.1.3.crate) = 20549 +SHA256 (rust/crates/tracing-subscriber-0.3.17.crate) = 30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77 +SIZE (rust/crates/tracing-subscriber-0.3.17.crate) = 191711 +SHA256 (rust/crates/trust-dns-proto-0.22.0.crate) = 4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26 +SIZE (rust/crates/trust-dns-proto-0.22.0.crate) = 301568 +SHA256 (rust/crates/trust-dns-resolver-0.22.0.crate) = aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe +SIZE (rust/crates/trust-dns-resolver-0.22.0.crate) = 82505 +SHA256 (rust/crates/try-lock-0.2.4.crate) = 3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed +SIZE (rust/crates/try-lock-0.2.4.crate) = 4467 +SHA256 (rust/crates/tungstenite-0.19.0.crate) = 15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67 +SIZE (rust/crates/tungstenite-0.19.0.crate) = 56325 +SHA256 (rust/crates/tungstenite-0.20.0.crate) = e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649 +SIZE (rust/crates/tungstenite-0.20.0.crate) = 58799 +SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba +SIZE (rust/crates/typenum-1.16.0.crate) = 42477 +SHA256 (rust/crates/unicase-2.7.0.crate) = f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89 +SIZE (rust/crates/unicase-2.7.0.crate) = 23783 +SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460 +SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477 +SHA256 (rust/crates/unicode-ident-1.0.11.crate) = 301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c +SIZE (rust/crates/unicode-ident-1.0.11.crate) = 42067 +SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921 +SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604 +SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b +SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968 +SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a +SIZE (rust/crates/untrusted-0.7.1.crate) = 7924 +SHA256 (rust/crates/url-2.4.0.crate) = 50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb +SIZE (rust/crates/url-2.4.0.crate) = 75670 +SHA256 (rust/crates/utf-8-0.7.6.crate) = 09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9 +SIZE (rust/crates/utf-8-0.7.6.crate) = 10422 +SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a +SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435 +SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d +SIZE (rust/crates/valuable-0.1.0.crate) = 27718 +SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f +SIZE (rust/crates/version_check-0.9.4.crate) = 14895 +SHA256 (rust/crates/walkdir-2.3.3.crate) = 36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698 +SIZE (rust/crates/walkdir-2.3.3.crate) = 23125 +SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e +SIZE (rust/crates/want-0.3.1.crate) = 6398 +SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519 +SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521 +SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 +SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 +SHA256 (rust/crates/wasm-bindgen-0.2.87.crate) = 7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342 +SIZE (rust/crates/wasm-bindgen-0.2.87.crate) = 175052 +SHA256 (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd +SIZE (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 26821 +SHA256 (rust/crates/wasm-bindgen-futures-0.4.37.crate) = c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03 +SIZE (rust/crates/wasm-bindgen-futures-0.4.37.crate) = 15193 +SHA256 (rust/crates/wasm-bindgen-macro-0.2.87.crate) = dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d +SIZE (rust/crates/wasm-bindgen-macro-0.2.87.crate) = 13897 +SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b +SIZE (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 20006 +SHA256 (rust/crates/wasm-bindgen-shared-0.2.87.crate) = ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1 +SIZE (rust/crates/wasm-bindgen-shared-0.2.87.crate) = 7248 +SHA256 (rust/crates/wasm-streams-0.3.0.crate) = b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7 +SIZE (rust/crates/wasm-streams-0.3.0.crate) = 33502 +SHA256 (rust/crates/web-sys-0.3.64.crate) = 9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b +SIZE (rust/crates/web-sys-0.3.64.crate) = 725584 +SHA256 (rust/crates/webpki-roots-0.25.2.crate) = 14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc +SIZE (rust/crates/webpki-roots-0.25.2.crate) = 250405 +SHA256 (rust/crates/which-4.4.0.crate) = 2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269 +SIZE (rust/crates/which-4.4.0.crate) = 10889 +SHA256 (rust/crates/widestring-1.0.2.crate) = 653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8 +SIZE (rust/crates/widestring-1.0.2.crate) = 79706 +SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 +SIZE (rust/crates/winapi-0.3.9.crate) = 1200382 +SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 +SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815 +SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178 +SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164 +SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f +SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 +SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0 +SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659 +SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9 +SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884 +SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071 +SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492 +SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c +SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904 +SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8 +SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071 +SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8 +SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492 +SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43 +SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981 +SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc +SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483 +SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f +SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236 +SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e +SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891 +SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060 +SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951 +SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406 +SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300 +SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36 +SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373 +SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e +SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619 +SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3 +SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068 +SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc +SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486 +SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0 +SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936 +SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538 +SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412 +SHA256 (rust/crates/winnow-0.5.14.crate) = d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97 +SIZE (rust/crates/winnow-0.5.14.crate) = 144956 +SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1 +SIZE (rust/crates/winreg-0.50.0.crate) = 29703 +SHA256 (rust/crates/xattr-1.0.1.crate) = f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985 +SIZE (rust/crates/xattr-1.0.1.crate) = 12258 +SHA256 (rust/crates/zip-0.6.6.crate) = 760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261 +SIZE (rust/crates/zip-0.6.6.crate) = 65789 +SHA256 (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4 +SIZE (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 28987 +SHA256 (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db +SIZE (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 17273 +SHA256 (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c +SIZE (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 736270 +SHA256 (thedodd-trunk-v0.17.5_GH0.tar.gz) = 308b5b24af739e779d05dfbb35f9bbfa87063e8532f09e6cf0b268951db3f604 +SIZE (thedodd-trunk-v0.17.5_GH0.tar.gz) = 368577 diff --git a/www/trunk/pkg-descr b/www/trunk/pkg-descr new file mode 100644 index 00000000000..c00f21f11dc --- /dev/null +++ b/www/trunk/pkg-descr @@ -0,0 +1,9 @@ +Trunk is a WASM web application bundler for Rust. Trunk uses a simple, +optional-config pattern for building & bundling WASM, JS snippets & other +assets (images, css, scss) via a source HTML file. + +Trunk ships with a built-in server for rapid development workflows, as well +as support for HTTP & WebSocket proxies. + +Trunk watches your application for changes and triggers builds for you, +including automatic browser reloading. diff --git a/x11-fonts/afdko/Makefile b/x11-fonts/afdko/Makefile index 2ace93500db..1a9718a74ee 100644 --- a/x11-fonts/afdko/Makefile +++ b/x11-fonts/afdko/Makefile @@ -1,5 +1,5 @@ PORTNAME= afdko -PORTVERSION= 3.9.6 +PORTVERSION= 3.9.7 CATEGORIES= x11-fonts MASTER_SITES= https://github.com/adobe-type-tools/afdko/releases/download/${PORTVERSION}/ diff --git a/x11-fonts/afdko/distinfo b/x11-fonts/afdko/distinfo index c0528399e0c..c91ac122fe3 100644 --- a/x11-fonts/afdko/distinfo +++ b/x11-fonts/afdko/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166110 -SHA256 (afdko-3.9.6.tar.gz) = 4c1404012b271d948c1094f18f98cb77c481be1a1a37f486134f695a74b08682 -SIZE (afdko-3.9.6.tar.gz) = 16278544 +TIMESTAMP = 1692211661 +SHA256 (afdko-3.9.7.tar.gz) = 8954069339998db4abbf4adf83ea7909c8833c80f4d76dc5cfa8b7191d652b5b +SIZE (afdko-3.9.7.tar.gz) = 16278655 diff --git a/x11-fonts/py-afdko/Makefile b/x11-fonts/py-afdko/Makefile index 2051546baa4..0252412416a 100644 --- a/x11-fonts/py-afdko/Makefile +++ b/x11-fonts/py-afdko/Makefile @@ -1,5 +1,5 @@ PORTNAME= afdko -PORTVERSION= 3.9.6 +PORTVERSION= 3.9.7 CATEGORIES= x11-fonts python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,24 +10,21 @@ WWW= https://github.com/adobe-type-tools/afdko LICENSE= APACHE20 -# print/py-fonttools[woff]: archivers/py-brotli and archivers/py-zopfli -# x11-fonts/py-defcon[pens]: print/py-fontpens -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= afdko>=${PORTVERSION}<${PORTVERSION}_99:x11-fonts/afdko \ ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.9.0:x11-fonts/py-booleanOperations@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1:archivers/py-brotli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defcon>=0.10.2:x11-fonts/py-defcon@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fontMath>=0.9.3:x11-fonts/py-fontMath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fontpens>=0.1.0:print/py-fontpens@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools>=4.38.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>=4.9.2:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=4.42.0:print/py-fonttools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=4.9.3:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psautohint>=2.4.0:print/py-psautohint@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.64.1:misc/py-tqdm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.66.1:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ufonormalizer>=0.6.1:x11-fonts/py-ufonormalizer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ufoprocessor>=1.9.0:x11-fonts/py-ufoprocessor@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zopfli>=0.1.4:archivers/py-zopfli@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ufoprocessor>=1.9.0:x11-fonts/py-ufoprocessor@${PY_FLAVOR} +# x11-fonts/py-defcon[pens]: print/py-fontpens +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fontpens>=0.1.0:print/py-fontpens@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 diff --git a/x11-fonts/py-afdko/distinfo b/x11-fonts/py-afdko/distinfo index a45c036e51a..1fb450246d9 100644 --- a/x11-fonts/py-afdko/distinfo +++ b/x11-fonts/py-afdko/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166112 -SHA256 (afdko-3.9.6.tar.gz) = 4c1404012b271d948c1094f18f98cb77c481be1a1a37f486134f695a74b08682 -SIZE (afdko-3.9.6.tar.gz) = 16278544 +TIMESTAMP = 1692211663 +SHA256 (afdko-3.9.7.tar.gz) = 8954069339998db4abbf4adf83ea7909c8833c80f4d76dc5cfa8b7191d652b5b +SIZE (afdko-3.9.7.tar.gz) = 16278655 diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 38bbd9d4651..de2cd513b86 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -206,6 +206,7 @@ SUBDIR += rubygem-tk SUBDIR += rubygem-uh SUBDIR += rubygem-vte3 + SUBDIR += rubygem-vte4 SUBDIR += scintilla SUBDIR += sdl_pango SUBDIR += shared-desktop-ontologies diff --git a/x11-toolkits/rubygem-gdk3/Makefile b/x11-toolkits/rubygem-gdk3/Makefile index 29f51fb89c2..6e851368d21 100644 --- a/x11-toolkits/rubygem-gdk3/Makefile +++ b/x11-toolkits/rubygem-gdk3/Makefile @@ -1,10 +1,10 @@ PORTNAME= gdk3 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Ruby binding of GDK 3.x +COMMENT= Ruby binding of GDK 3 WWW= https://ruby-gnome.github.io/ \ https://github.com/ruby-gnome/ruby-gnome diff --git a/x11-toolkits/rubygem-gdk3/distinfo b/x11-toolkits/rubygem-gdk3/distinfo index bdd92b1c1c1..8a5d2d16153 100644 --- a/x11-toolkits/rubygem-gdk3/distinfo +++ b/x11-toolkits/rubygem-gdk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167250 -SHA256 (rubygem/gdk3-4.1.8.gem) = 1a2035a0131e5a76ba03f0bd6cd5535ebe0c54950dbd864b6ccdbba72cf5244a -SIZE (rubygem/gdk3-4.1.8.gem) = 35840 +TIMESTAMP = 1692212079 +SHA256 (rubygem/gdk3-4.1.9.gem) = a42299c94225b94cb8b3fa23060053514e7c194d87fe7d0b8e379e4b37f73c9a +SIZE (rubygem/gdk3-4.1.9.gem) = 35840 diff --git a/x11-toolkits/rubygem-gdk3/pkg-descr b/x11-toolkits/rubygem-gdk3/pkg-descr index 1a3c58f3bf4..e214d7aaa7c 100644 --- a/x11-toolkits/rubygem-gdk3/pkg-descr +++ b/x11-toolkits/rubygem-gdk3/pkg-descr @@ -1 +1 @@ -Ruby/GDK3 is a Ruby binding of GDK-3.x. +Ruby/GDK3 is a Ruby binding of GDK 3. diff --git a/x11-toolkits/rubygem-gdk4/Makefile b/x11-toolkits/rubygem-gdk4/Makefile index 0141f6375aa..90b291262e0 100644 --- a/x11-toolkits/rubygem-gdk4/Makefile +++ b/x11-toolkits/rubygem-gdk4/Makefile @@ -1,10 +1,10 @@ PORTNAME= gdk4 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Ruby binding of GDK 4.x +COMMENT= Ruby binding of GDK 4 WWW= https://ruby-gnome.github.io/ \ https://github.com/ruby-gnome/ruby-gnome diff --git a/x11-toolkits/rubygem-gdk4/distinfo b/x11-toolkits/rubygem-gdk4/distinfo index c8504425d7e..58b75aff643 100644 --- a/x11-toolkits/rubygem-gdk4/distinfo +++ b/x11-toolkits/rubygem-gdk4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167252 -SHA256 (rubygem/gdk4-4.1.8.gem) = cc8670539b619b61dbcfd438c1165fbe7c60b2b3f0f6bcd553280ecee5a8aed1 -SIZE (rubygem/gdk4-4.1.8.gem) = 30208 +TIMESTAMP = 1692212081 +SHA256 (rubygem/gdk4-4.1.9.gem) = a6b4222fa38b6ad8ecadcfda3f79d0bf5fab17674e14b379973d15008aa88a22 +SIZE (rubygem/gdk4-4.1.9.gem) = 30208 diff --git a/x11-toolkits/rubygem-gdk4/pkg-descr b/x11-toolkits/rubygem-gdk4/pkg-descr index 6c549df4a1d..7da5a2238a8 100644 --- a/x11-toolkits/rubygem-gdk4/pkg-descr +++ b/x11-toolkits/rubygem-gdk4/pkg-descr @@ -1 +1 @@ -Ruby/GDK4 is a Ruby binding of GDK-4.x. +Ruby/GDK4 is a Ruby binding of GDK 4. diff --git a/x11-toolkits/rubygem-gtk3/Makefile b/x11-toolkits/rubygem-gtk3/Makefile index fe7711b7a84..21589b40e74 100644 --- a/x11-toolkits/rubygem-gtk3/Makefile +++ b/x11-toolkits/rubygem-gtk3/Makefile @@ -1,10 +1,10 @@ PORTNAME= gtk3 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Ruby binding of GTK+ 3.x +COMMENT= Ruby binding of GTK 3 WWW= https://ruby-gnome.github.io/ \ https://github.com/ruby-gnome/ruby-gnome diff --git a/x11-toolkits/rubygem-gtk3/distinfo b/x11-toolkits/rubygem-gtk3/distinfo index 52aca791aff..3f7278cf958 100644 --- a/x11-toolkits/rubygem-gtk3/distinfo +++ b/x11-toolkits/rubygem-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167254 -SHA256 (rubygem/gtk3-4.1.8.gem) = 4490866371ff0b6e41d3f75a69b2beb159ff41ef80a024db20f0fc8432de95e3 -SIZE (rubygem/gtk3-4.1.8.gem) = 866816 +TIMESTAMP = 1692212083 +SHA256 (rubygem/gtk3-4.1.9.gem) = 67418f96f3e8a2d0f858b3b022e4f20ac3ea049e8345fac631e23366618bdac2 +SIZE (rubygem/gtk3-4.1.9.gem) = 866816 diff --git a/x11-toolkits/rubygem-gtk3/pkg-descr b/x11-toolkits/rubygem-gtk3/pkg-descr index 3e5a7234b78..ff0ea7b6128 100644 --- a/x11-toolkits/rubygem-gtk3/pkg-descr +++ b/x11-toolkits/rubygem-gtk3/pkg-descr @@ -1 +1 @@ -Ruby/GTK3 is a Ruby binding of GTK+-3.x. +Ruby/GTK3 is a Ruby binding of GTK 3. diff --git a/x11-toolkits/rubygem-gtk4/Makefile b/x11-toolkits/rubygem-gtk4/Makefile index 2895da4576c..408be3e7d5e 100644 --- a/x11-toolkits/rubygem-gtk4/Makefile +++ b/x11-toolkits/rubygem-gtk4/Makefile @@ -1,10 +1,10 @@ PORTNAME= gtk4 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Ruby binding of GTK+ 4.x +COMMENT= Ruby binding of GTK 4 WWW= https://ruby-gnome.github.io/ \ https://github.com/ruby-gnome/ruby-gnome diff --git a/x11-toolkits/rubygem-gtk4/distinfo b/x11-toolkits/rubygem-gtk4/distinfo index c7f0329cd5d..88db11ac5e5 100644 --- a/x11-toolkits/rubygem-gtk4/distinfo +++ b/x11-toolkits/rubygem-gtk4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167256 -SHA256 (rubygem/gtk4-4.1.8.gem) = 2a673b32e7a9ce7b87d34551a2e1779c56f0df8c8369adc120d0129e9ebff144 -SIZE (rubygem/gtk4-4.1.8.gem) = 80384 +TIMESTAMP = 1692212085 +SHA256 (rubygem/gtk4-4.1.9.gem) = f53870530b23fd65c3f6642d6100f9556d44c02d48b87996f82bb091e52aab1e +SIZE (rubygem/gtk4-4.1.9.gem) = 80384 diff --git a/x11-toolkits/rubygem-gtk4/pkg-descr b/x11-toolkits/rubygem-gtk4/pkg-descr index faff3637206..41f831c773f 100644 --- a/x11-toolkits/rubygem-gtk4/pkg-descr +++ b/x11-toolkits/rubygem-gtk4/pkg-descr @@ -1 +1 @@ -Ruby/GTK4 is a Ruby binding of GTK+-4.x. +Ruby/GTK4 is a Ruby binding of GTK 4. diff --git a/x11-toolkits/rubygem-gtksourceview3/Makefile b/x11-toolkits/rubygem-gtksourceview3/Makefile index 7e3d8cd11f9..a92ba2a8d31 100644 --- a/x11-toolkits/rubygem-gtksourceview3/Makefile +++ b/x11-toolkits/rubygem-gtksourceview3/Makefile @@ -1,10 +1,10 @@ PORTNAME= gtksourceview3 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Ruby binding of gtksourceview 3.x +COMMENT= Ruby binding of GtkSourceView 3 WWW= https://ruby-gnome.github.io/ \ https://github.com/ruby-gnome/ruby-gnome diff --git a/x11-toolkits/rubygem-gtksourceview3/distinfo b/x11-toolkits/rubygem-gtksourceview3/distinfo index 51d9e1a6971..5ebc00951d9 100644 --- a/x11-toolkits/rubygem-gtksourceview3/distinfo +++ b/x11-toolkits/rubygem-gtksourceview3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167258 -SHA256 (rubygem/gtksourceview3-4.1.8.gem) = eb0faa9f6468583ba7fd6f2013446b047eeeba423d982901b7f4e72c0a4f6227 -SIZE (rubygem/gtksourceview3-4.1.8.gem) = 16896 +TIMESTAMP = 1692212087 +SHA256 (rubygem/gtksourceview3-4.1.9.gem) = d2ab58da0abb9390aaa9bcbf0f6ecee1a110c140f1db0be7eb8f299c990ba3af +SIZE (rubygem/gtksourceview3-4.1.9.gem) = 16896 diff --git a/x11-toolkits/rubygem-gtksourceview3/pkg-descr b/x11-toolkits/rubygem-gtksourceview3/pkg-descr index cd56343847a..805738724f3 100644 --- a/x11-toolkits/rubygem-gtksourceview3/pkg-descr +++ b/x11-toolkits/rubygem-gtksourceview3/pkg-descr @@ -1 +1 @@ -Ruby/GtkSourceView3 is a Ruby binding of gtksourceview-3.x. +Ruby/GtkSourceView3 is a Ruby binding of GtkSourceView 3. diff --git a/x11-toolkits/rubygem-gtksourceview4/Makefile b/x11-toolkits/rubygem-gtksourceview4/Makefile index b8a5c2cf421..4c014c1f11e 100644 --- a/x11-toolkits/rubygem-gtksourceview4/Makefile +++ b/x11-toolkits/rubygem-gtksourceview4/Makefile @@ -1,10 +1,10 @@ PORTNAME= gtksourceview4 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Ruby binding of gtksourceview 4.x +COMMENT= Ruby binding of GtkSourceView 4 WWW= https://ruby-gnome.github.io/ \ https://github.com/ruby-gnome/ruby-gnome diff --git a/x11-toolkits/rubygem-gtksourceview4/distinfo b/x11-toolkits/rubygem-gtksourceview4/distinfo index 6677a80d8a5..0dac723ffda 100644 --- a/x11-toolkits/rubygem-gtksourceview4/distinfo +++ b/x11-toolkits/rubygem-gtksourceview4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167260 -SHA256 (rubygem/gtksourceview4-4.1.8.gem) = 28d9bb904afdbcbfbc6f60deeafcd5b7292922692c33565b9664469fcb612a1d -SIZE (rubygem/gtksourceview4-4.1.8.gem) = 16896 +TIMESTAMP = 1692212089 +SHA256 (rubygem/gtksourceview4-4.1.9.gem) = 7b0b6c56e983b6d2fddeebe568325588ca15e8fa91229006186f074360b9c19a +SIZE (rubygem/gtksourceview4-4.1.9.gem) = 16896 diff --git a/x11-toolkits/rubygem-gtksourceview4/pkg-descr b/x11-toolkits/rubygem-gtksourceview4/pkg-descr index c85a59b4f7f..ca0e55dd6d1 100644 --- a/x11-toolkits/rubygem-gtksourceview4/pkg-descr +++ b/x11-toolkits/rubygem-gtksourceview4/pkg-descr @@ -1 +1 @@ -Ruby/GtkSourceView3 is a Ruby binding of gtksourceview-4.x. +Ruby/GtkSourceView4 is a Ruby binding of GtkSourceView 4. diff --git a/x11-toolkits/rubygem-pango/Makefile b/x11-toolkits/rubygem-pango/Makefile index 7f01f1a1521..43b8e1d32d8 100644 --- a/x11-toolkits/rubygem-pango/Makefile +++ b/x11-toolkits/rubygem-pango/Makefile @@ -1,5 +1,5 @@ PORTNAME= pango -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG diff --git a/x11-toolkits/rubygem-pango/distinfo b/x11-toolkits/rubygem-pango/distinfo index 2dd2c47d10a..768a4873670 100644 --- a/x11-toolkits/rubygem-pango/distinfo +++ b/x11-toolkits/rubygem-pango/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167262 -SHA256 (rubygem/pango-4.1.8.gem) = 4b30e9c54de311bb73f45c250357e9dc5bea5ab1dbde25124e3d7ac3a9df079c -SIZE (rubygem/pango-4.1.8.gem) = 25088 +TIMESTAMP = 1692212091 +SHA256 (rubygem/pango-4.1.9.gem) = da43d35ca0d2c1060e5a3e59d2ec7d301803c0704de3e3732b9f215192035af7 +SIZE (rubygem/pango-4.1.9.gem) = 25088 diff --git a/x11-toolkits/rubygem-poppler/Makefile b/x11-toolkits/rubygem-poppler/Makefile index 4de9932a39a..c0e3c4416ec 100644 --- a/x11-toolkits/rubygem-poppler/Makefile +++ b/x11-toolkits/rubygem-poppler/Makefile @@ -1,5 +1,5 @@ PORTNAME= poppler -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG diff --git a/x11-toolkits/rubygem-poppler/distinfo b/x11-toolkits/rubygem-poppler/distinfo index 92f183a935d..cd219c363e3 100644 --- a/x11-toolkits/rubygem-poppler/distinfo +++ b/x11-toolkits/rubygem-poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167264 -SHA256 (rubygem/poppler-4.1.8.gem) = 55fe4156f55fad7da847561238e5782927a2fab67890866f0fee4b9d27e29682 -SIZE (rubygem/poppler-4.1.8.gem) = 95232 +TIMESTAMP = 1692212093 +SHA256 (rubygem/poppler-4.1.9.gem) = 5cc8696de7fffa76f0162b7dbf14ffef499cfaca3ae767f5384cdd6f47ec8adc +SIZE (rubygem/poppler-4.1.9.gem) = 95232 diff --git a/x11-toolkits/rubygem-vte3/Makefile b/x11-toolkits/rubygem-vte3/Makefile index 382c5ce5f87..e3c682be0ae 100644 --- a/x11-toolkits/rubygem-vte3/Makefile +++ b/x11-toolkits/rubygem-vte3/Makefile @@ -1,10 +1,10 @@ PORTNAME= vte3 -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Ruby binding of VTE for GTK+ 3 +COMMENT= Ruby binding of VTE for GTK 3 WWW= https://ruby-gnome.github.io/ \ https://github.com/ruby-gnome/ruby-gnome diff --git a/x11-toolkits/rubygem-vte3/distinfo b/x11-toolkits/rubygem-vte3/distinfo index 6a92f42b460..c8e420c3085 100644 --- a/x11-toolkits/rubygem-vte3/distinfo +++ b/x11-toolkits/rubygem-vte3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688167266 -SHA256 (rubygem/vte3-4.1.8.gem) = 8758eeaed896fc7157dbcf03bb4f69d7df8630165a7265f6ae207a6bb4f3a3d4 -SIZE (rubygem/vte3-4.1.8.gem) = 19456 +TIMESTAMP = 1692212095 +SHA256 (rubygem/vte3-4.1.9.gem) = 955252583c351f397a5fd86af42e462c8a9032db372c46ebddabc008baaf6720 +SIZE (rubygem/vte3-4.1.9.gem) = 19456 diff --git a/x11-toolkits/rubygem-vte3/pkg-descr b/x11-toolkits/rubygem-vte3/pkg-descr index 2ed562b79e2..db7d9a111db 100644 --- a/x11-toolkits/rubygem-vte3/pkg-descr +++ b/x11-toolkits/rubygem-vte3/pkg-descr @@ -1 +1 @@ -Ruby/VTE is a Ruby binding of VTE. +Ruby/VTE3 is a Ruby binding of VTE for GTK 3. diff --git a/x11-toolkits/rubygem-vte4/Makefile b/x11-toolkits/rubygem-vte4/Makefile new file mode 100644 index 00000000000..b15d7c681a1 --- /dev/null +++ b/x11-toolkits/rubygem-vte4/Makefile @@ -0,0 +1,22 @@ +PORTNAME= vte4 +PORTVERSION= 4.1.9 +CATEGORIES= x11-toolkits rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Ruby binding of VTE for GTK 4 +WWW= https://ruby-gnome.github.io/ \ + https://github.com/ruby-gnome/ruby-gnome + +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + +BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake +RUN_DEPENDS= rubygem-gtk4>=${PORTVERSION}<${PORTVERSION}_99:x11-toolkits/rubygem-gtk4 + +USES= gem gnome +USE_GNOME= vte3 + +NO_ARCH= yes + +.include diff --git a/x11-toolkits/rubygem-vte4/distinfo b/x11-toolkits/rubygem-vte4/distinfo new file mode 100644 index 00000000000..ff8c6b94717 --- /dev/null +++ b/x11-toolkits/rubygem-vte4/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1692211633 +SHA256 (rubygem/vte4-4.1.9.gem) = a8e600e755cc58f3b1eca8446b89cf89f1650cc61ef481f039469fb634ca00f5 +SIZE (rubygem/vte4-4.1.9.gem) = 18944 diff --git a/x11-toolkits/rubygem-vte4/pkg-descr b/x11-toolkits/rubygem-vte4/pkg-descr new file mode 100644 index 00000000000..3ec7aded836 --- /dev/null +++ b/x11-toolkits/rubygem-vte4/pkg-descr @@ -0,0 +1 @@ +Ruby/VTE4 is a Ruby binding of VTE for GTK 4. diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index b22dfce01b9..d759e50b527 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -16,9 +16,7 @@ WWW= https://wiki.gnome.org/Apps/Terminal/VTE LICENSE= LGPL21 BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libgnutls.so:security/gnutls \ - libfribidi.so:converters/fribidi \ - libpcre2-8.so:devel/pcre2 \ +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libicuuc.so:devel/icu PORTSCOUT= limitw:1,even @@ -26,22 +24,33 @@ PORTSCOUT= limitw:1,even USES= compiler:c++11-lang gettext gnome localbase meson \ pkgconfig python tar:xz vala:build USE_LDCONFIG= yes -USE_GNOME= cairo gdkpixbuf2 gtk30 gtk40 introspection:build +USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build MESON_ARGS= -Da11y=true \ -Dgir=true \ - -Dfribidi=true \ -Dgtk3=true \ - -Dgtk4=true \ -Dicu=true \ -D_systemd=false \ -Dvapi=true -# shlib version numbers comes from gtk3/4 meson options not from PYTHON_VER +# shlib version numbers come from gtk3/4 meson options, not from PYTHON_VER PLIST_SUB= VERSION=2.91 VER3=3.91 BINARY_ALIAS= python3=${PYTHON_CMD} +OPTIONS_DEFINE= FRIBIDI GNUTLS GTK4 +OPTIONS_DEFAULT=FRIBIDI GNUTLS GTK4 +OPTIONS_SUB= yes + +FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi +FRIBIDI_MESON_OFF= -Dfribidi=false + +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_MESON_OFF= -Dgnutls=false + +GTK4_USE= GNOME=gtk40 +GTK4_MESON_ON= -Dgtk4=true + .include .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109 diff --git a/x11-toolkits/vte3/pkg-plist b/x11-toolkits/vte3/pkg-plist index 2b4309e00e0..2323aac7f8f 100644 --- a/x11-toolkits/vte3/pkg-plist +++ b/x11-toolkits/vte3/pkg-plist @@ -1,18 +1,18 @@ bin/vte-%%VERSION%% -bin/vte-%%VERSION%%-gtk4 +%%GTK4%%bin/vte-%%VERSION%%-gtk4 etc/profile.d/vte.csh etc/profile.d/vte.sh -include/vte-%%VERSION%%-gtk4/vte/vte.h -include/vte-%%VERSION%%-gtk4/vte/vtedeprecated.h -include/vte-%%VERSION%%-gtk4/vte/vteenums.h -include/vte-%%VERSION%%-gtk4/vte/vteglobals.h -include/vte-%%VERSION%%-gtk4/vte/vtemacros.h -include/vte-%%VERSION%%-gtk4/vte/vtepty.h -include/vte-%%VERSION%%-gtk4/vte/vteregex.h -include/vte-%%VERSION%%-gtk4/vte/vteterminal.h -include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins-gtk4.h -include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins.h -include/vte-%%VERSION%%-gtk4/vte/vteversion.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vte.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtedeprecated.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteenums.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteglobals.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtemacros.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtepty.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteregex.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteterminal.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins-gtk4.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vtetypebuiltins.h +%%GTK4%%include/vte-%%VERSION%%-gtk4/vte/vteversion.h include/vte-%%VERSION%%/vte/vte.h include/vte-%%VERSION%%/vte/vtedeprecated.h include/vte-%%VERSION%%/vte/vteenums.h @@ -25,17 +25,17 @@ include/vte-%%VERSION%%/vte/vtetypebuiltins-gtk3.h include/vte-%%VERSION%%/vte/vtetypebuiltins.h include/vte-%%VERSION%%/vte/vteversion.h lib/girepository-1.0/Vte-%%VERSION%%.typelib -lib/girepository-1.0/Vte-%%VER3%%.typelib -lib/libvte-%%VERSION%%-gtk4.so -lib/libvte-%%VERSION%%-gtk4.so.0 +%%GTK4%%lib/girepository-1.0/Vte-%%VER3%%.typelib +%%GTK4%%lib/libvte-%%VERSION%%-gtk4.so +%%GTK4%%lib/libvte-%%VERSION%%-gtk4.so.0 lib/libvte-%%VERSION%%.so lib/libvte-%%VERSION%%.so.0 lib/libvte-%%VERSION%%.so.0.7000.2 -libdata/pkgconfig/vte-%%VERSION%%-gtk4.pc +%%GTK4%%libdata/pkgconfig/vte-%%VERSION%%-gtk4.pc libdata/pkgconfig/vte-%%VERSION%%.pc libexec/vte-urlencode-cwd share/gir-1.0/Vte-%%VERSION%%.gir -share/gir-1.0/Vte-%%VER3%%.gir +%%GTK4%%share/gir-1.0/Vte-%%VER3%%.gir share/glade/catalogs/vte-%%VERSION%%.xml share/glade/pixmaps/hicolor/16x16/actions/widget-vte-terminal.png share/glade/pixmaps/hicolor/22x22/actions/widget-vte-terminal.png @@ -137,7 +137,7 @@ share/locale/xh/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/vte-%%VERSION%%.mo -share/vala/vapi/vte-%%VERSION%%-gtk4.deps -share/vala/vapi/vte-%%VERSION%%-gtk4.vapi +%%GTK4%%share/vala/vapi/vte-%%VERSION%%-gtk4.deps +%%GTK4%%share/vala/vapi/vte-%%VERSION%%-gtk4.vapi share/vala/vapi/vte-%%VERSION%%.deps share/vala/vapi/vte-%%VERSION%%.vapi diff --git a/x11/menulibre/Makefile b/x11/menulibre/Makefile index cc91bdbb98a..6dc89143ccf 100644 --- a/x11/menulibre/Makefile +++ b/x11/menulibre/Makefile @@ -1,5 +1,5 @@ PORTNAME= menulibre -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= x11 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ pkexec:sysutils/polkit \ ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR} -USES= desktop-file-utils gettext gnome python +USES= gettext gnome python USE_GNOME= intltool pygobject3 USE_PYTHON= distutils @@ -32,4 +32,7 @@ OPTIONS_DEFINE= DOCS PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS:N--single-version-externally-managed} +post-stage: + ${RMDIR} ${STAGEDIR}${DATADIR} + .include diff --git a/x11/menulibre/distinfo b/x11/menulibre/distinfo index 2b5998f46cb..3ff8117e2ac 100644 --- a/x11/menulibre/distinfo +++ b/x11/menulibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683184619 -SHA256 (bluesabre-menulibre-menulibre-2.3.1_GH0.tar.gz) = 691f3eef4bf343969e644e9c4a131b4c0b300342af74041d71cbf851b8df3a99 -SIZE (bluesabre-menulibre-menulibre-2.3.1_GH0.tar.gz) = 492327 +TIMESTAMP = 1692707864 +SHA256 (bluesabre-menulibre-menulibre-2.3.2_GH0.tar.gz) = 27def29737df0d4eda1f2468f9759d76b9177cbf6b3963fa4309fd56c5d50daa +SIZE (bluesabre-menulibre-menulibre-2.3.2_GH0.tar.gz) = 509256 diff --git a/x11/menulibre/pkg-plist b/x11/menulibre/pkg-plist index 6c2974c1d14..2060dcb1b7f 100644 --- a/x11/menulibre/pkg-plist +++ b/x11/menulibre/pkg-plist @@ -2,38 +2,86 @@ bin/menulibre bin/menulibre-menu-validate %%PYTHON_SITELIBDIR%%/__pycache__/uninstall%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/__pycache__/uninstall%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/ActionEditor.py +%%PYTHON_SITELIBDIR%%/menulibre/AdvancedPage.py +%%PYTHON_SITELIBDIR%%/menulibre/ApplicationEditor.py +%%PYTHON_SITELIBDIR%%/menulibre/CategoryEditor.py +%%PYTHON_SITELIBDIR%%/menulibre/CommandEditor.py %%PYTHON_SITELIBDIR%%/menulibre/Dialogs.py +%%PYTHON_SITELIBDIR%%/menulibre/FieldLabel.py +%%PYTHON_SITELIBDIR%%/menulibre/FileHandler.py +%%PYTHON_SITELIBDIR%%/menulibre/FilenameLabel.py +%%PYTHON_SITELIBDIR%%/menulibre/Headerbar.py +%%PYTHON_SITELIBDIR%%/menulibre/IconEntry.py +%%PYTHON_SITELIBDIR%%/menulibre/LabelWithHidingButton.py %%PYTHON_SITELIBDIR%%/menulibre/MenuEditor.py -%%PYTHON_SITELIBDIR%%/menulibre/MenulibreExecEditor.py %%PYTHON_SITELIBDIR%%/menulibre/MenulibreApplication.py %%PYTHON_SITELIBDIR%%/menulibre/MenulibreHistory.py -%%PYTHON_SITELIBDIR%%/menulibre/MenulibreIconSelection.py -%%PYTHON_SITELIBDIR%%/menulibre/MenulibreLog.py %%PYTHON_SITELIBDIR%%/menulibre/MenulibreStackSwitcher.py %%PYTHON_SITELIBDIR%%/menulibre/MenulibreTreeview.py %%PYTHON_SITELIBDIR%%/menulibre/MenulibreXdg.py +%%PYTHON_SITELIBDIR%%/menulibre/ParsingErrorsDialog.py +%%PYTHON_SITELIBDIR%%/menulibre/PathEntry.py +%%PYTHON_SITELIBDIR%%/menulibre/Section.py +%%PYTHON_SITELIBDIR%%/menulibre/StartupWmClassEntry.py +%%PYTHON_SITELIBDIR%%/menulibre/SwitchEntry.py +%%PYTHON_SITELIBDIR%%/menulibre/TextEntry.py +%%PYTHON_SITELIBDIR%%/menulibre/TextEntryButton.py +%%PYTHON_SITELIBDIR%%/menulibre/Toolbar.py %%PYTHON_SITELIBDIR%%/menulibre/XmlMenuElementTree.py %%PYTHON_SITELIBDIR%%/menulibre/__init__.py +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/ActionEditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/ActionEditor%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/AdvancedPage%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/AdvancedPage%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/ApplicationEditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/ApplicationEditor%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/CategoryEditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/CategoryEditor%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/CommandEditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/CommandEditor%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Dialogs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Dialogs.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/FieldLabel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/FieldLabel%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/FileHandler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/FileHandler%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/FilenameLabel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/FilenameLabel%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Headerbar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Headerbar%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/IconEntry%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/IconEntry%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/LabelWithHidingButton%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/LabelWithHidingButton%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenuEditor.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenuEditor.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreApplication.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreApplication.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreExecEditor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreExecEditor%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreHistory.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreHistory.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreIconSelection.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreIconSelection.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreLog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreLog.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreStackSwitcher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreStackSwitcher.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreTreeview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreTreeview.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreXdg.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/MenulibreXdg.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/ParsingErrorsDialog%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/ParsingErrorsDialog%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/PathEntry%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/PathEntry%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Section%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Section%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/StartupWmClassEntry%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/StartupWmClassEntry%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/SwitchEntry%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/SwitchEntry%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/TextEntry%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/TextEntry%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/TextEntryButton%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/TextEntryButton%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Toolbar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/menulibre/__pycache__/Toolbar%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/XmlMenuElementTree.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/XmlMenuElementTree.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/menulibre/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc @@ -106,7 +154,5 @@ share/locale/uk/LC_MESSAGES/menulibre.mo share/locale/zh_CN/LC_MESSAGES/menulibre.mo share/locale/zh_HK/LC_MESSAGES/menulibre.mo share/locale/zh_TW/LC_MESSAGES/menulibre.mo -%%DATADIR%%/ui/ExecEditor.ui -%%DATADIR%%/ui/MenulibreWindow.ui share/metainfo/menulibre.appdata.xml share/pixmaps/menulibre.png diff --git a/x11/rubygem-gnome/Makefile b/x11/rubygem-gnome/Makefile index 260c50a93b1..8be756c9597 100644 --- a/x11/rubygem-gnome/Makefile +++ b/x11/rubygem-gnome/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome -PORTVERSION= 4.1.8 +PORTVERSION= 4.1.9 CATEGORIES= x11 gnome rubygems PKGNAMEPREFIX= rubygem- @@ -28,7 +28,8 @@ RUN_DEPENDS= rubygem-atk>=${PORTVERSION}<${PORTVERSION}_99:accessibility/rubygem rubygem-pango>=${PORTVERSION}<${PORTVERSION}_99:x11-toolkits/rubygem-pango \ rubygem-poppler>=${PORTVERSION}<${PORTVERSION}_99:x11-toolkits/rubygem-poppler \ rubygem-rsvg2>=${PORTVERSION}<${PORTVERSION}_99:graphics/rubygem-rsvg2 \ - rubygem-vte3>=${PORTVERSION}<${PORTVERSION}_99:x11-toolkits/rubygem-vte3 + rubygem-vte3>=${PORTVERSION}<${PORTVERSION}_99:x11-toolkits/rubygem-vte3 \ + rubygem-vte4>=${PORTVERSION}<${PORTVERSION}_99:x11-toolkits/rubygem-vte4 USES= metaport diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index 10b4e37265e..af41fc70206 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -1,6 +1,5 @@ PORTNAME= xfce4-terminal -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.1.0 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -12,6 +11,8 @@ WWW= https://www.xfce.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 + USES= compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \ xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 vte3 @@ -21,8 +22,7 @@ USE_XORG= ice sm x11 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip SUB_FILES= pkg-message -CONFIGURE_ARGS= --without-gnome-default-appsdir \ - --with-utempter +CONFIGURE_ARGS= --with-utempter OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo index d17fb3c84f2..d18ae78a71c 100644 --- a/x11/xfce4-terminal/distinfo +++ b/x11/xfce4-terminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653221932 -SHA256 (xfce4/xfce4-terminal-1.0.4.tar.bz2) = 78e55957af7c6fc1f283e90be33988661593a4da98383da1b0b54fdf6554baf4 -SIZE (xfce4/xfce4-terminal-1.0.4.tar.bz2) = 1009367 +TIMESTAMP = 1692697792 +SHA256 (xfce4/xfce4-terminal-1.1.0.tar.bz2) = 40823377242b9b09749f5d4a550f41d465153c235c31f34052f804d3453ad4a3 +SIZE (xfce4/xfce4-terminal-1.1.0.tar.bz2) = 1021840 diff --git a/x11/xfce4-terminal/pkg-plist b/x11/xfce4-terminal/pkg-plist index 6a79e0e4390..90855ed9022 100644 --- a/x11/xfce4-terminal/pkg-plist +++ b/x11/xfce4-terminal/pkg-plist @@ -12,6 +12,10 @@ share/icons/hicolor/32x32/apps/org.xfce.terminal-settings.png share/icons/hicolor/32x32/apps/org.xfce.terminal.png share/icons/hicolor/48x48/apps/org.xfce.terminal-settings.png share/icons/hicolor/48x48/apps/org.xfce.terminal.png +share/icons/hicolor/64x64/apps/org.xfce.terminal-settings.png +share/icons/hicolor/64x64/apps/org.xfce.terminal.png +share/icons/hicolor/96x96/apps/org.xfce.terminal-settings.png +share/icons/hicolor/96x96/apps/org.xfce.terminal.png share/icons/hicolor/scalable/apps/org.xfce.terminal-settings.svg share/icons/hicolor/scalable/apps/org.xfce.terminal.svg %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-terminal.mo @@ -29,6 +33,7 @@ share/icons/hicolor/scalable/apps/org.xfce.terminal.svg %%NLS%%share/locale/es/LC_MESSAGES/xfce4-terminal.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-terminal.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-terminal.mo +%%NLS%%share/locale/fa_IR/LC_MESSAGES/xfce4-terminal.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-terminal.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-terminal.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-terminal.mo