Resolves: #2010722 Update to 91.2.0
Sync to rhel-8 applying diff minus gating.yaml and changelog and old cruft. Re-add some Provides: bundled(...)
This commit is contained in:
parent
3c41449fe0
commit
6f09c7f922
269
.gitignore
vendored
269
.gitignore
vendored
@ -1,264 +1,7 @@
|
|||||||
thunderbird-3.1.1.source.tar.bz2
|
|
||||||
thunderbird-langpacks-3.1.1-20100720.tar.bz2
|
|
||||||
thunderbird-3.1.2.source.tar.bz2
|
|
||||||
thunderbird-langpacks-3.1.2-20100803.tar.bz2
|
|
||||||
/thunderbird-3.1.3.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.3-20100907.tar.bz2
|
|
||||||
/thunderbird-3.1.5.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.5-20101019.tar.bz2
|
|
||||||
/thunderbird-3.1.6.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.6-20101027.tar.bz2
|
|
||||||
/thunderbird-3.1.7.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.7-20101209.tar.bz2
|
|
||||||
/thunderbird-3.1.8.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.8-20110301.tar.bz2
|
|
||||||
/thunderbird-3.1.9.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.9-20110307.tar.bz2
|
|
||||||
/thunderbird-3.1.10.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.10-20110428.tar.xz
|
|
||||||
/thunderbird-3.1.11.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-3.1.11-20110621.tar.xz
|
|
||||||
/thunderbird-langpacks-5.0-20110628.tar.xz
|
|
||||||
/thunderbird-5.0.source.tar.bz2
|
|
||||||
/thunderbird-6.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-6.0-20110816.tar.xz
|
|
||||||
/thunderbird-6.0.2.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-6.0.2-20110906.tar.xz
|
|
||||||
/thunderbird-7.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-7.0-20110927.tar.xz
|
|
||||||
/thunderbird-7.0.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-7.0.1-20110930.tar.xz
|
|
||||||
/thunderbird-8.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-8.0-20111108.tar.xz
|
|
||||||
/thunderbird-9.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-9.0-20111220.tar.xz
|
|
||||||
/thunderbird-langpacks-9.0-20111222.tar.xz
|
|
||||||
/thunderbird-10.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-10.0-20120131.tar.xz
|
|
||||||
/thunderbird-10.0.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-10.0.1-20120209.tar.xz
|
|
||||||
/thunderbird-11.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-11.0-20120313.tar.xz
|
|
||||||
/thunderbird-11.0.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-11.0.1-20120329.tar.xz
|
|
||||||
/thunderbird-12.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-12.0-20120424.tar.xz
|
|
||||||
/thunderbird-12.0.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-12.0.1-20120430.tar.xz
|
|
||||||
/thunderbird-13.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-13.0-20120605.tar.xz
|
|
||||||
/thunderbird-13.0.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-13.0.1-20120615.tar.xz
|
|
||||||
/thunderbird-14.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-14.0-20120717.tar.xz
|
|
||||||
/thunderbird-15.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-15.0-20120827.tar.xz
|
|
||||||
/thunderbird-15.0.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-15.0.1-20120911.tar.xz
|
|
||||||
/thunderbird-16.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-16.0-20121009.tar.xz
|
|
||||||
/thunderbird-16.0.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-16.0.1-20121011.tar.xz
|
|
||||||
/thunderbird-16.0.2.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-16.0.2-20121029.tar.xz
|
|
||||||
/thunderbird-17.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0-20121119.tar.xz
|
|
||||||
/thunderbird-17.0.2.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0.2-20130110.tar.xz
|
|
||||||
/thunderbird-17.0.3.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0.3-20130219.tar.xz
|
|
||||||
/thunderbird-17.0.4.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0.4-20130311.tar.xz
|
|
||||||
/thunderbird-17.0.5.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0.5-20130402.tar.xz
|
|
||||||
/thunderbird-17.0.6.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0.6-20130514.tar.xz
|
|
||||||
/thunderbird-17.0.7.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0.7-20130625.tar.xz
|
|
||||||
/thunderbird-17.0.8.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-17.0.8-20130805.tar.xz
|
|
||||||
/thunderbird-24.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.0-20130916.tar.xz
|
|
||||||
/thunderbird-24.1.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.1.0-20131030.tar.xz
|
|
||||||
/thunderbird-24.2.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.2.0-20131209.tar.xz
|
|
||||||
/thunderbird-24.3.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.3.0-20140203.tar.xz
|
|
||||||
/thunderbird-24.4.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.4.0-20140318.tar.xz
|
|
||||||
/thunderbird-24.5.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.5.0-20140428.tar.xz
|
|
||||||
/thunderbird-24.6.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.6.0-20140609.tar.xz
|
|
||||||
/thunderbird-24.7.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-24.7.0-20140722.tar.xz
|
|
||||||
/thunderbird-31.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.0-20140729.tar.xz
|
|
||||||
/thunderbird-31.1.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.1.0-20140901.tar.bz2
|
|
||||||
/thunderbird-31.1.1.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.1.1-20140912.tar.bz2
|
|
||||||
/thunderbird-31.2.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.2.0-20141030.tar.bz2
|
|
||||||
/thunderbird-31.3.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.3.0-20141128.tar.bz2
|
|
||||||
/thunderbird-31.4.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.4.0-20150110.tar.bz2
|
|
||||||
/thunderbird-31.5.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.5.0-20150223.tar.bz2
|
|
||||||
/thunderbird-31.7.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-31.7.0-20150510.tar.bz2
|
|
||||||
/l10n-lightning-38.1.0.tar.bz2
|
|
||||||
/thunderbird-38.1.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-38.1.0-20150709.tar.xz
|
|
||||||
/l10n-lightning-38.2.0.tar.bz2
|
|
||||||
/thunderbird-38.2.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-38.2.0-20150814.tar.bz2
|
|
||||||
/thunderbird-38.3.0.source.tar.bz2
|
|
||||||
/thunderbird-langpacks-38.3.0-20150929.tar.bz2
|
|
||||||
/l10n-lightning-38.3.0.tar.bz2
|
|
||||||
/thunderbird-langpacks-45.0-20160412.tar.xz
|
|
||||||
/thunderbird-45.0.source.tar.xz
|
|
||||||
/yasm-1.2.0-3.el5.src.rpm
|
|
||||||
/Python-2.7.8.tgz
|
|
||||||
/l10n-lightning-45.0.tar.xz
|
|
||||||
/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
|
|
||||||
/gcc48-4.8.2-16.el5.src.rpm
|
|
||||||
/thunderbird-45.1.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.1.0-20160517.tar.xz
|
|
||||||
/l10n-lightning-45.1.0.tar.bz2
|
|
||||||
/l10n-lightning-45.1.0.tar.xz
|
|
||||||
/thunderbird-45.1.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.1.1-20160606.tar.xz
|
|
||||||
/l10n-lightning-45.1.1.tar.xz
|
|
||||||
/thunderbird-45.2.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.2-20160629.tar.xz
|
|
||||||
/l10n-lightning-45.2.tar.xz
|
|
||||||
/thunderbird-45.3.0.source.tar.xz
|
|
||||||
/l10n-lightning-45.3.0.tar.xz
|
|
||||||
/thunderbird-langpacks-45.3.0-20160826.tar.xz
|
|
||||||
/thunderbird-45.4.0.source.tar.xz
|
|
||||||
/l10n-lightning-45.4.0.tar.xz
|
|
||||||
/thunderbird-langpacks-45.4.0-20160929.tar.xz
|
|
||||||
/thunderbird-45.5.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.5.0-20161118.tar.xz
|
|
||||||
/l10n-lightning-45.5.0.tar.xz
|
|
||||||
/thunderbird-45.5.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.5.1-20161201.tar.xz
|
|
||||||
/l10n-lightning-45.5.1.tar.xz
|
|
||||||
/l10n-lightning-45.6.0.tar.xz
|
|
||||||
/thunderbird-45.6.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.6.0-20161216.tar.xz
|
|
||||||
/thunderbird-45.7.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.7.0-20170126.tar.xz
|
|
||||||
/l10n-lightning-45.7.0.tar.xz
|
|
||||||
/thunderbird-45.8.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-45.8.0-20170307.tar.xz
|
|
||||||
/l10n-lightning-45.8.0.tar.xz
|
|
||||||
/thunderbird-52.0.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.0.1-20170413.tar.xz
|
|
||||||
/l10n-lightning-52.0.1.tar.xz
|
|
||||||
/thunderbird-52.1.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.1.0-20170502.tar.xz
|
|
||||||
/l10n-lightning-52.1.0.tar.xz
|
|
||||||
/thunderbird-52.2.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.2.0-20170615.tar.xz
|
|
||||||
/l10n-lightning-52.2.0.tar.xz
|
|
||||||
/thunderbird-52.2.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.2.1-20170629.tar.xz
|
|
||||||
/l10n-lightning-52.2.1.tar.xz
|
|
||||||
/thunderbird-52.3.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.3.0-20170821.tar.xz
|
|
||||||
/l10n-lightning-52.3.0.tar.xz
|
|
||||||
/thunderbird-52.4.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.4.0-20171003.tar.xz
|
|
||||||
/l10n-lightning-52.4.0.tar.xz
|
|
||||||
/thunderbird-langpacks-52.4.0-20171004.tar.xz
|
|
||||||
/thunderbird-52.5.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.5.0-20171127.tar.xz
|
|
||||||
/l10n-lightning-52.5.0.tar.xz
|
|
||||||
/thunderbird-52.5.2.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.5.2-20180102.tar.xz
|
|
||||||
/l10n-lightning-52.5.2.tar.xz
|
|
||||||
/thunderbird-52.6.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.6.0-20180126.tar.xz
|
|
||||||
/l10n-lightning-52.6.0.tar.xz
|
|
||||||
/thunderbird-52.7.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-52.7.0-20180326.tar.xz
|
|
||||||
/l10n-lightning-52.7.0.tar.xz
|
|
||||||
/thunderbird-68.1.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.1.1-20191003.tar.xz
|
|
||||||
/libffi-3.0.13-18.el7_3.src.rpm
|
|
||||||
/Python-2.7.13.tar.xz
|
|
||||||
/gtk3-private-3.22.26-1.el6.src.rpm
|
|
||||||
/cbindgen-vendor.tar.xz
|
/cbindgen-vendor.tar.xz
|
||||||
/lightning-langpacks-68.1.1.tar.xz
|
/nspr-4.32.0-1.el8_1.src.rpm
|
||||||
/Python-3.6.8.tar.xz
|
/nss-3.67.0-6.el8_1.src.rpm
|
||||||
/nodejs-8.11.4-1.fc27.src.rpm
|
/thunderbird-91.1.2.processed-source.tar.xz
|
||||||
/nodejs-8.11.4-1.3.fc27.src.rpm
|
/thunderbird-langpacks-91.1.2-20210929.tar.xz
|
||||||
/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
|
/thunderbird-langpacks-91.2.0-20211004.tar.xz
|
||||||
/thunderbird-68.2.0.source.tar.xz
|
/thunderbird-91.2.0.processed-source.tar.xz
|
||||||
/thunderbird-langpacks-68.2.0-20191022.tar.xz
|
|
||||||
/lightning-langpacks-68.2.0.tar.xz
|
|
||||||
/thunderbird-68.3.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.3.0-20191202.tar.xz
|
|
||||||
/lightning-langpacks-68.3.0.tar.xz
|
|
||||||
/thunderbird-68.4.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.4.1-20200113.tar.xz
|
|
||||||
/lightning-langpacks-68.4.1.tar.xz
|
|
||||||
/thunderbird-68.5.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.5.0-20200213.tar.xz
|
|
||||||
/lightning-langpacks-68.5.0.tar.xz
|
|
||||||
/thunderbird-68.6.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.6.0-20200313.tar.xz
|
|
||||||
/lightning-langpacks-68.6.0.tar.xz
|
|
||||||
/thunderbird-68.7.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.7.0-20200414.tar.xz
|
|
||||||
/lightning-langpacks-68.7.0.tar.xz
|
|
||||||
/thunderbird-68.8.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.8.0-20200505.tar.xz
|
|
||||||
/lightning-langpacks-68.8.0.tar.xz
|
|
||||||
/thunderbird-68.9.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.9.0-20200605.tar.xz
|
|
||||||
/lightning-langpacks-68.9.0.tar.xz
|
|
||||||
/thunderbird-68.10.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.10.0-20200708.tar.xz
|
|
||||||
/lightning-langpacks-68.10.0.tar.xz
|
|
||||||
/thunderbird-68.11.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.11.0-20200804.tar.xz
|
|
||||||
/lightning-langpacks-68.11.0.tar.xz
|
|
||||||
/thunderbird-68.12.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-68.12.0-20200902.tar.xz
|
|
||||||
/lightning-langpacks-68.12.0.tar.xz
|
|
||||||
/thunderbird-78.2.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.2.1-20200908.tar.xz
|
|
||||||
/nodejs-10.21.0-4.fc32.src.rpm
|
|
||||||
/nss-3.53.1-3.fc32.src.rpm
|
|
||||||
/nspr-4.25.0-1.el8_0.src.rpm
|
|
||||||
/cbindgen-vendor-0.14.3.tar.xz
|
|
||||||
/thunderbird-78.3.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.3.0-20200919.tar.xz
|
|
||||||
/thunderbird-78.4.3.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.4.3-20201112.tar.xz
|
|
||||||
/thunderbird-78.5.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.5.0-20201118.tar.xz
|
|
||||||
/thunderbird-78.5.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.5.1-20201204.tar.xz
|
|
||||||
/nodejs-10.21.0-5.fc32.src.rpm
|
|
||||||
/thunderbird-78.6.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.6.0-20201215.tar.xz
|
|
||||||
/thunderbird-78.6.1.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.6.1-20210112.tar.xz
|
|
||||||
/thunderbird-78.8.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.8.0-20210222.tar.xz
|
|
||||||
/thunderbird-78.11.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.11.0-20210531.tar.xz
|
|
||||||
/thunderbird-langpacks-78.12.0-20210708.tar.xz
|
|
||||||
/thunderbird-78.12.0.source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.12.0-20210712.tar.xz
|
|
||||||
/thunderbird-78.12.0.processed-source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.13.0-20210804.tar.xz
|
|
||||||
/thunderbird-78.13.0.processed-source.tar.xz
|
|
||||||
/thunderbird-langpacks-78.14.0-20210902.tar.xz
|
|
||||||
/thunderbird-78.14.0.processed-source.tar.xz
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,118 +0,0 @@
|
|||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/archlinux.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/archlinux.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/archlinux.py.D94538-autoconf2.diff 2021-02-25 13:53:04.963982705 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/archlinux.py 2021-02-25 13:53:25.713053151 +0100
|
|
||||||
@@ -26,7 +26,6 @@ class ArchlinuxBootstrapper(
|
|
||||||
'''Archlinux experimental bootstrapper.'''
|
|
||||||
|
|
||||||
SYSTEM_PACKAGES = [
|
|
||||||
- 'autoconf2.13',
|
|
||||||
'base-devel',
|
|
||||||
'nodejs',
|
|
||||||
'python2',
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/centosfedora.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/centosfedora.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/centosfedora.py.D94538-autoconf2.diff 2021-02-17 08:49:42.000000000 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/centosfedora.py 2021-02-25 13:53:04.963982705 +0100
|
|
||||||
@@ -26,7 +26,6 @@ class CentOSFedoraBootstrapper(
|
|
||||||
# For CentOS 7, later versions of nodejs come from nodesource
|
|
||||||
# and include the npm package.
|
|
||||||
self.packages = [
|
|
||||||
- 'autoconf213',
|
|
||||||
'nodejs',
|
|
||||||
'which',
|
|
||||||
]
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/debian.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/debian.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/debian.py.D94538-autoconf2.diff 2021-02-25 13:53:04.963982705 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/debian.py 2021-02-25 13:53:42.874111415 +0100
|
|
||||||
@@ -32,7 +32,6 @@ class DebianBootstrapper(
|
|
||||||
# These are common packages for all Debian-derived distros (such as
|
|
||||||
# Ubuntu).
|
|
||||||
COMMON_PACKAGES = [
|
|
||||||
- 'autoconf2.13',
|
|
||||||
'build-essential',
|
|
||||||
'nodejs',
|
|
||||||
'python-setuptools',
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/freebsd.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/freebsd.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/freebsd.py.D94538-autoconf2.diff 2021-02-17 08:49:42.000000000 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/freebsd.py 2021-02-25 13:53:04.963982705 +0100
|
|
||||||
@@ -15,7 +15,6 @@ class FreeBSDBootstrapper(BaseBootstrapp
|
|
||||||
self.flavor = flavor.lower()
|
|
||||||
|
|
||||||
self.packages = [
|
|
||||||
- 'autoconf213',
|
|
||||||
'gmake',
|
|
||||||
'gtar',
|
|
||||||
'pkgconf',
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/gentoo.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/gentoo.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/gentoo.py.D94538-autoconf2.diff 2021-02-17 08:49:38.000000000 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/gentoo.py 2021-02-25 13:53:04.963982705 +0100
|
|
||||||
@@ -36,7 +36,6 @@ class GentooBootstrapper(
|
|
||||||
def ensure_system_packages(self):
|
|
||||||
self.run_as_root(['emerge', '--noreplace', '--quiet',
|
|
||||||
'app-arch/zip',
|
|
||||||
- 'sys-devel/autoconf:2.1'
|
|
||||||
])
|
|
||||||
|
|
||||||
def ensure_browser_packages(self, artifact_mode=False):
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/openbsd.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/openbsd.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/openbsd.py.D94538-autoconf2.diff 2021-02-17 08:49:15.000000000 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/openbsd.py 2021-02-25 13:53:04.964982709 +0100
|
|
||||||
@@ -12,7 +12,6 @@ class OpenBSDBootstrapper(BaseBootstrapp
|
|
||||||
BaseBootstrapper.__init__(self, **kwargs)
|
|
||||||
|
|
||||||
self.packages = [
|
|
||||||
- 'autoconf-2.13',
|
|
||||||
'gmake',
|
|
||||||
'gtar',
|
|
||||||
'rust',
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/opensuse.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/opensuse.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/opensuse.py.D94538-autoconf2.diff 2021-02-17 08:49:42.000000000 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/opensuse.py 2021-02-25 13:53:04.964982709 +0100
|
|
||||||
@@ -13,7 +13,6 @@ class OpenSUSEBootstrapper(
|
|
||||||
'''openSUSE experimental bootstrapper.'''
|
|
||||||
|
|
||||||
SYSTEM_PACKAGES = [
|
|
||||||
- 'autoconf213',
|
|
||||||
'nodejs',
|
|
||||||
'npm',
|
|
||||||
'which',
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/osx.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/osx.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/osx.py.D94538-autoconf2.diff 2021-02-25 13:53:04.964982709 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/osx.py 2021-02-25 13:54:07.162193882 +0100
|
|
||||||
@@ -353,7 +353,6 @@ class OSXBootstrapper(BaseBootstrapper):
|
|
||||||
# least on 10.8) and because the build system wants a version
|
|
||||||
# newer than what Apple ships.
|
|
||||||
packages = [
|
|
||||||
- 'autoconf@2.13',
|
|
||||||
'git',
|
|
||||||
'gnu-tar',
|
|
||||||
'node',
|
|
||||||
@@ -428,7 +427,6 @@ class OSXBootstrapper(BaseBootstrapper):
|
|
||||||
'python27',
|
|
||||||
'python36',
|
|
||||||
'py27-gnureadline',
|
|
||||||
- 'autoconf213',
|
|
||||||
'gnutar',
|
|
||||||
'watchman',
|
|
||||||
'nodejs8'
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/solus.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/solus.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/solus.py.D94538-autoconf2.diff 2021-02-25 13:53:04.964982709 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/solus.py 2021-02-25 13:53:32.090074802 +0100
|
|
||||||
@@ -23,7 +23,6 @@ class SolusBootstrapper(
|
|
||||||
'''Solus experimental bootstrapper.'''
|
|
||||||
|
|
||||||
SYSTEM_PACKAGES = [
|
|
||||||
- 'autoconf213',
|
|
||||||
'nodejs',
|
|
||||||
'python',
|
|
||||||
'python3',
|
|
||||||
diff -up firefox-78.8.0/python/mozboot/mozboot/windows.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/windows.py
|
|
||||||
--- firefox-78.8.0/python/mozboot/mozboot/windows.py.D94538-autoconf2.diff 2021-02-17 08:49:34.000000000 +0100
|
|
||||||
+++ firefox-78.8.0/python/mozboot/mozboot/windows.py 2021-02-25 13:53:04.978982756 +0100
|
|
||||||
@@ -48,7 +48,6 @@ class WindowsBootstrapper(BaseBootstrapp
|
|
||||||
'patch',
|
|
||||||
'patchutils',
|
|
||||||
'diffutils',
|
|
||||||
- 'autoconf2.13',
|
|
||||||
'tar',
|
|
||||||
'zip',
|
|
||||||
'unzip',
|
|
24
build-debuginfo-fix.patch
Normal file
24
build-debuginfo-fix.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -up firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc.debuginfo-fix firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc
|
||||||
|
--- firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc.debuginfo-fix 2021-09-01 11:11:46.738285751 +0200
|
||||||
|
+++ firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc 2021-09-01 11:11:56.127319530 +0200
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#include "modules/audio_processing//utility/ooura_fft.h"
|
||||||
|
+#include "modules/audio_processing/utility/ooura_fft.h"
|
||||||
|
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
diff -up firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.debuginfo-fix firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
|
||||||
|
--- firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.debuginfo-fix 2021-09-01 11:12:26.513428847 +0200
|
||||||
|
+++ firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc 2021-09-01 11:12:32.117449009 +0200
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#include "modules/audio_processing//utility/ooura_fft.h"
|
||||||
|
+#include "modules/audio_processing/utility/ooura_fft.h"
|
||||||
|
|
||||||
|
#include <emmintrin.h>
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.8.0/intl/icu_sources_data.py.icu-makefile firefox-68.8.0/intl/icu_sources_data.py
|
|
||||||
--- firefox-68.8.0/intl/icu_sources_data.py.icu-makefile 2020-05-11 17:00:03.642605718 +0200
|
|
||||||
+++ firefox-68.8.0/intl/icu_sources_data.py 2020-05-11 17:00:37.774642749 +0200
|
|
||||||
@@ -246,8 +246,7 @@ def update_data_file(topsrcdir):
|
|
||||||
if not try_run(
|
|
||||||
'icu-make',
|
|
||||||
['make',
|
|
||||||
- '--jobs=%d' % multiprocessing.cpu_count(),
|
|
||||||
- '--output-sync'],
|
|
||||||
+ '--jobs=1'],
|
|
||||||
cwd=objdir):
|
|
||||||
return False
|
|
||||||
print('Copying ICU data file...')
|
|
@ -1,12 +1,24 @@
|
|||||||
diff -up firefox-68.3.0/old-configure.in.nss-version firefox-68.3.0/old-configure.in
|
diff -up firefox-91.0.1/build/moz.configure/nspr.configure.nss-nspr-downgrade firefox-91.0.1/build/moz.configure/nspr.configure
|
||||||
--- firefox-68.3.0/old-configure.in.nss-version 2019-11-27 19:48:01.045677621 +0100
|
--- firefox-91.0.1/build/moz.configure/nspr.configure.nss-nspr-downgrade 2021-08-25 13:17:26.265307060 +0200
|
||||||
+++ firefox-68.3.0/old-configure.in 2019-11-27 19:59:52.856894047 +0100
|
+++ firefox-91.0.1/build/moz.configure/nspr.configure 2021-08-25 13:17:28.161313632 +0200
|
||||||
@@ -1537,7 +1537,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
|
@@ -50,7 +50,7 @@ set_define("JS_WITHOUT_NSPR", True, when
|
||||||
_USE_SYSTEM_NSS=1 )
|
def nspr_minver(js_standalone):
|
||||||
|
if js_standalone:
|
||||||
|
return "nspr >= 4.10"
|
||||||
|
- return "nspr >= 4.32"
|
||||||
|
+ return "nspr >= 4.31"
|
||||||
|
|
||||||
if test -n "$_USE_SYSTEM_NSS"; then
|
|
||||||
- AM_PATH_NSS(3.44.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
|
|
||||||
+ AM_PATH_NSS(3.44.0, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
|
|
||||||
fi
|
|
||||||
|
|
||||||
NSS_CFLAGS="$NSS_CFLAGS -I${DIST}/include/nss"
|
nspr_pkg = pkg_check_modules("NSPR", nspr_minver, when="--with-system-nspr")
|
||||||
|
diff -up firefox-91.0.1/build/moz.configure/nss.configure.nss-nspr-downgrade firefox-91.0.1/build/moz.configure/nss.configure
|
||||||
|
--- firefox-91.0.1/build/moz.configure/nss.configure.nss-nspr-downgrade 2021-08-25 13:17:45.049372175 +0200
|
||||||
|
+++ firefox-91.0.1/build/moz.configure/nss.configure 2021-08-25 13:17:37.763346918 +0200
|
||||||
|
@@ -9,7 +9,7 @@ option("--with-system-nss", help="Use sy
|
||||||
|
imply_option("--with-system-nspr", True, when="--with-system-nss")
|
||||||
|
|
||||||
|
nss_pkg = pkg_check_modules(
|
||||||
|
- "NSS", "nss >= 3.68", when="--with-system-nss", config=False
|
||||||
|
+ "NSS", "nss >= 3.67", when="--with-system-nss", config=False
|
||||||
|
)
|
||||||
|
|
||||||
|
set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
|
||||||
|
12
build-rhel7-nasm-dwarf.patch
Normal file
12
build-rhel7-nasm-dwarf.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py
|
||||||
|
--- firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm 2021-08-31 08:02:10.814740774 +0200
|
||||||
|
+++ firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py 2021-08-31 08:04:03.967146994 +0200
|
||||||
|
@@ -420,7 +420,7 @@ class AsmFlags(BaseCompileFlags):
|
||||||
|
if self._context.config.substs.get("OS_ARCH") == "WINNT":
|
||||||
|
debug_flags += ["-F", "cv8"]
|
||||||
|
elif self._context.config.substs.get("OS_ARCH") != "Darwin":
|
||||||
|
- debug_flags += ["-F", "dwarf"]
|
||||||
|
+ debug_flags += ["-f", "elf32"]
|
||||||
|
elif (
|
||||||
|
self._context.config.substs.get("OS_ARCH") == "WINNT"
|
||||||
|
and self._context.config.substs.get("CPU_ARCH") == "aarch64"
|
@ -1,9 +0,0 @@
|
|||||||
diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh
|
|
||||||
--- firefox-73.0/build/unix/run-mozilla.sh.old 2020-02-12 09:58:00.150895904 +0100
|
|
||||||
+++ firefox-73.0/build/unix/run-mozilla.sh 2020-02-12 09:58:06.505860696 +0100
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/bin/sh
|
|
||||||
+#!/usr/bin/sh
|
|
||||||
#
|
|
||||||
# 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
|
|
@ -1,50 +0,0 @@
|
|||||||
diff -up firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/Makefile.old firefox-68.0/media/webrtc/trunk/Makefile
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old 2019-06-12 08:17:02.673268442 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc 2019-06-12 08:17:13.582328073 +0200
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
* be found in the AUTHORS file in the root of the source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include "modules/audio_processing//utility/ooura_fft.h"
|
|
||||||
+#include "modules/audio_processing/utility/ooura_fft.h"
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old 2019-06-12 08:17:36.671454285 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc 2019-06-12 08:17:46.989510679 +0200
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
* be found in the AUTHORS file in the root of the source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include "modules/audio_processing//utility/ooura_fft.h"
|
|
||||||
+#include "modules/audio_processing/utility/ooura_fft.h"
|
|
||||||
|
|
||||||
#include <emmintrin.h>
|
|
||||||
|
|
||||||
diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
|
|
||||||
--- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old 2019-06-12 08:16:15.673011534 +0200
|
|
||||||
+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c 2019-06-12 08:16:22.602049410 +0200
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
#include "aom_dsp/blend.h"
|
|
||||||
#include "aom/aom_integer.h"
|
|
||||||
#include "aom_dsp/x86/synonyms.h"
|
|
||||||
-#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
|
|
||||||
+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
|
|
||||||
|
|
||||||
static INLINE unsigned int masked_sad32xh_avx2(
|
|
||||||
const uint8_t *src_ptr, int src_stride, const uint8_t *a_ptr, int a_stride,
|
|
||||||
diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
|
|
||||||
--- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old 2019-06-12 08:16:35.404119384 +0200
|
|
||||||
+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c 2019-06-12 08:16:43.415163174 +0200
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
#include "aom/aom_integer.h"
|
|
||||||
#include "aom_dsp/x86/synonyms.h"
|
|
||||||
|
|
||||||
-#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
|
|
||||||
+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
|
|
||||||
|
|
||||||
// For width a multiple of 16
|
|
||||||
static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,
|
|
@ -1,62 +0,0 @@
|
|||||||
diff -up firefox-78.12.0/js/xpconnect/src/XPCJSContext.cpp.firefox-glibc-dynstack firefox-78.12.0/js/xpconnect/src/XPCJSContext.cpp
|
|
||||||
--- firefox-78.12.0/js/xpconnect/src/XPCJSContext.cpp.firefox-glibc-dynstack 2021-07-06 21:50:42.000000000 +0200
|
|
||||||
+++ firefox-78.12.0/js/xpconnect/src/XPCJSContext.cpp 2021-08-02 10:26:47.996760110 +0200
|
|
||||||
@@ -81,14 +81,6 @@ using namespace xpc;
|
|
||||||
using namespace JS;
|
|
||||||
using mozilla::dom::AutoEntryScript;
|
|
||||||
|
|
||||||
-// The watchdog thread loop is pretty trivial, and should not require much stack
|
|
||||||
-// space to do its job. So only give it 32KiB or the platform minimum.
|
|
||||||
-#if !defined(PTHREAD_STACK_MIN)
|
|
||||||
-# define PTHREAD_STACK_MIN 0
|
|
||||||
-#endif
|
|
||||||
-static constexpr size_t kWatchdogStackSize =
|
|
||||||
- PTHREAD_STACK_MIN < 32 * 1024 ? 32 * 1024 : PTHREAD_STACK_MIN;
|
|
||||||
-
|
|
||||||
static void WatchdogMain(void* arg);
|
|
||||||
class Watchdog;
|
|
||||||
class WatchdogManager;
|
|
||||||
@@ -161,7 +153,7 @@ class Watchdog {
|
|
||||||
// watchdog, we need to join it on shutdown.
|
|
||||||
mThread = PR_CreateThread(PR_USER_THREAD, WatchdogMain, this,
|
|
||||||
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
|
|
||||||
- PR_JOINABLE_THREAD, kWatchdogStackSize);
|
|
||||||
+ PR_JOINABLE_THREAD, 0);
|
|
||||||
if (!mThread) {
|
|
||||||
MOZ_CRASH("PR_CreateThread failed!");
|
|
||||||
}
|
|
||||||
diff -up firefox-78.12.0/security/sandbox/linux/launch/SandboxLaunch.cpp.firefox-glibc-dynstack firefox-78.12.0/security/sandbox/linux/launch/SandboxLaunch.cpp
|
|
||||||
--- firefox-78.12.0/security/sandbox/linux/launch/SandboxLaunch.cpp.firefox-glibc-dynstack 2021-07-06 21:50:46.000000000 +0200
|
|
||||||
+++ firefox-78.12.0/security/sandbox/linux/launch/SandboxLaunch.cpp 2021-08-02 10:28:48.832946590 +0200
|
|
||||||
@@ -489,7 +489,8 @@ static int CloneCallee(void* aPtr) {
|
|
||||||
// we don't currently support sandboxing under valgrind.
|
|
||||||
MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST static pid_t DoClone(int aFlags,
|
|
||||||
jmp_buf* aCtx) {
|
|
||||||
- uint8_t miniStack[PTHREAD_STACK_MIN];
|
|
||||||
+ static constexpr size_t kStackAlignment = 16;
|
|
||||||
+ uint8_t miniStack[4096] __attribute__((aligned(kStackAlignment)));
|
|
||||||
#ifdef __hppa__
|
|
||||||
void* stackPtr = miniStack;
|
|
||||||
#else
|
|
||||||
@@ -510,13 +511,19 @@ static pid_t ForkWithFlags(int aFlags) {
|
|
||||||
CLONE_CHILD_CLEARTID;
|
|
||||||
MOZ_RELEASE_ASSERT((aFlags & kBadFlags) == 0);
|
|
||||||
|
|
||||||
+ // Block signals due to small stack in DoClone.
|
|
||||||
+ sigset_t oldSigs;
|
|
||||||
+ BlockAllSignals(&oldSigs);
|
|
||||||
+
|
|
||||||
+ int ret = 0;
|
|
||||||
jmp_buf ctx;
|
|
||||||
if (setjmp(ctx) == 0) {
|
|
||||||
// In the parent and just called setjmp:
|
|
||||||
- return DoClone(aFlags | SIGCHLD, &ctx);
|
|
||||||
+ ret = DoClone(aFlags | SIGCHLD, &ctx);
|
|
||||||
}
|
|
||||||
+ RestoreSignals(&oldSigs);
|
|
||||||
// In the child and have longjmp'ed:
|
|
||||||
- return 0;
|
|
||||||
+ return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool WriteStringToFile(const char* aPath, const char* aStr,
|
|
@ -1,846 +0,0 @@
|
|||||||
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
|
|
||||||
index 2081d0c683a4..641133bf1ea4 100644
|
|
||||||
--- a/config/system-headers.mozbuild
|
|
||||||
+++ b/config/system-headers.mozbuild
|
|
||||||
@@ -314,6 +314,7 @@ system_headers = [
|
|
||||||
'Gestalt.h',
|
|
||||||
'getopt.h',
|
|
||||||
'gio/gio.h',
|
|
||||||
+ 'gio/gunixfdlist.h',
|
|
||||||
'glibconfig.h',
|
|
||||||
'glib.h',
|
|
||||||
'glib-object.h',
|
|
||||||
@@ -607,6 +608,7 @@ system_headers = [
|
|
||||||
'Pgenerr.h',
|
|
||||||
'PGenErr.h',
|
|
||||||
'Ph.h',
|
|
||||||
+ 'pipewire/pipewire.h',
|
|
||||||
'pixman.h',
|
|
||||||
'pk11func.h',
|
|
||||||
'pk11pqg.h',
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
|
|
||||||
index ba885217b3ba..201d3b755221 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
|
|
||||||
@@ -158,7 +158,7 @@ if (rtc_include_tests) {
|
|
||||||
if (is_linux) {
|
|
||||||
if (rtc_use_pipewire) {
|
|
||||||
pkg_config("pipewire") {
|
|
||||||
- packages = [ "libpipewire-0.2" ]
|
|
||||||
+ packages = [ "libpipewire-0.3" ]
|
|
||||||
|
|
||||||
defines = [ "WEBRTC_USE_PIPEWIRE" ]
|
|
||||||
}
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
index 90b40431c7e4..d844aa79d591 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
@@ -194,6 +194,30 @@ if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
"/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
|
|
||||||
]
|
|
||||||
|
|
||||||
+# PipeWire specific files
|
|
||||||
+if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
+
|
|
||||||
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
|
|
||||||
+
|
|
||||||
+ OS_LIBS += [
|
|
||||||
+ "rt",
|
|
||||||
+ "pipewire-0.3",
|
|
||||||
+ "glib-2.0",
|
|
||||||
+ "gio-2.0",
|
|
||||||
+ "gobject-2.0"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+ CXXFLAGS += CONFIG['TK_CFLAGS']
|
|
||||||
+ CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ]
|
|
||||||
+ CXXFLAGS += [ "-I/usr/include/spa-0.2" ]
|
|
||||||
+
|
|
||||||
+ UNIFIED_SOURCES += [
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+
|
|
||||||
if CONFIG["OS_TARGET"] == "NetBSD":
|
|
||||||
|
|
||||||
DEFINES["USE_X11"] = "1"
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
index 1eb8ead26efa..316468eed1fc 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
|
|
||||||
bool disable_effects_ = true;
|
|
||||||
bool detect_updated_region_ = false;
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
- bool allow_pipewire_ = false;
|
|
||||||
+ bool allow_pipewire_ = true;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|
||||||
index 379341c833de..76349f1fbd4d 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|
||||||
@@ -15,8 +15,11 @@
|
|
||||||
|
|
||||||
#include <spa/param/format-utils.h>
|
|
||||||
#include <spa/param/props.h>
|
|
||||||
-#include <spa/param/video/raw-utils.h>
|
|
||||||
-#include <spa/support/type-map.h>
|
|
||||||
+
|
|
||||||
+#include <linux/dma-buf.h>
|
|
||||||
+#include <sys/mman.h>
|
|
||||||
+#include <sys/ioctl.h>
|
|
||||||
+#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <utility>
|
|
||||||
@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
|
|
||||||
const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
|
|
||||||
const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
|
|
||||||
|
|
||||||
-// static
|
|
||||||
-void BaseCapturerPipeWire::OnStateChanged(void* data,
|
|
||||||
- pw_remote_state old_state,
|
|
||||||
- pw_remote_state state,
|
|
||||||
- const char* error_message) {
|
|
||||||
- BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
|
|
||||||
- RTC_DCHECK(that);
|
|
||||||
|
|
||||||
- switch (state) {
|
|
||||||
- case PW_REMOTE_STATE_ERROR:
|
|
||||||
- RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
|
|
||||||
- break;
|
|
||||||
- case PW_REMOTE_STATE_CONNECTED:
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
|
|
||||||
- that->CreateReceivingStream();
|
|
||||||
- break;
|
|
||||||
- case PW_REMOTE_STATE_CONNECTING:
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
|
|
||||||
+// static
|
|
||||||
+void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
|
|
||||||
+ struct dma_buf_sync sync = { 0 };
|
|
||||||
+
|
|
||||||
+ sync.flags = start_or_end | DMA_BUF_SYNC_READ;
|
|
||||||
+
|
|
||||||
+ while(true) {
|
|
||||||
+ int ret;
|
|
||||||
+ ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
|
|
||||||
+ if (ret == -1 && errno == EINTR) {
|
|
||||||
+ continue;
|
|
||||||
+ } else if (ret == -1) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to synchronize DMA buffer: " << g_strerror(errno);
|
|
||||||
break;
|
|
||||||
- case PW_REMOTE_STATE_UNCONNECTED:
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire remote state: unconnected.";
|
|
||||||
+ } else {
|
|
||||||
break;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+// static
|
|
||||||
+void BaseCapturerPipeWire::OnCoreError(void *data,
|
|
||||||
+ uint32_t id,
|
|
||||||
+ int seq,
|
|
||||||
+ int res,
|
|
||||||
+ const char *message) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "core error: " << message;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
// static
|
|
||||||
void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
|
|
||||||
pw_stream_state old_state,
|
|
||||||
@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
|
|
||||||
case PW_STREAM_STATE_ERROR:
|
|
||||||
RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
|
|
||||||
break;
|
|
||||||
- case PW_STREAM_STATE_CONFIGURE:
|
|
||||||
- pw_stream_set_active(that->pw_stream_, true);
|
|
||||||
- break;
|
|
||||||
- case PW_STREAM_STATE_UNCONNECTED:
|
|
||||||
- case PW_STREAM_STATE_CONNECTING:
|
|
||||||
- case PW_STREAM_STATE_READY:
|
|
||||||
case PW_STREAM_STATE_PAUSED:
|
|
||||||
case PW_STREAM_STATE_STREAMING:
|
|
||||||
+ case PW_STREAM_STATE_UNCONNECTED:
|
|
||||||
+ case PW_STREAM_STATE_CONNECTING:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// static
|
|
||||||
-void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,
|
|
||||||
- const struct spa_pod* format) {
|
|
||||||
+void BaseCapturerPipeWire::OnStreamParamChanged(void *data, uint32_t id,
|
|
||||||
+ const struct spa_pod *format) {
|
|
||||||
BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
|
|
||||||
RTC_DCHECK(that);
|
|
||||||
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire stream format changed.";
|
|
||||||
+ RTC_LOG(LS_INFO) << "PipeWire stream param changed.";
|
|
||||||
|
|
||||||
- if (!format) {
|
|
||||||
- pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
|
|
||||||
- /*n_params=*/0);
|
|
||||||
+ if (!format || id != SPA_PARAM_Format) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- that->spa_video_format_ = new spa_video_info_raw();
|
|
||||||
- spa_format_video_raw_parse(format, that->spa_video_format_,
|
|
||||||
- &that->pw_type_->format_video);
|
|
||||||
+ spa_format_video_raw_parse(format, &that->spa_video_format_);
|
|
||||||
|
|
||||||
- auto width = that->spa_video_format_->size.width;
|
|
||||||
- auto height = that->spa_video_format_->size.height;
|
|
||||||
+ auto width = that->spa_video_format_.size.width;
|
|
||||||
+ auto height = that->spa_video_format_.size.height;
|
|
||||||
auto stride = SPA_ROUND_UP_N(width * kBytesPerPixel, 4);
|
|
||||||
auto size = height * stride;
|
|
||||||
|
|
||||||
+ that->desktop_size_ = DesktopSize(width, height);
|
|
||||||
+
|
|
||||||
uint8_t buffer[1024] = {};
|
|
||||||
auto builder = spa_pod_builder{buffer, sizeof(buffer)};
|
|
||||||
|
|
||||||
// Setup buffers and meta header for new format.
|
|
||||||
- const struct spa_pod* params[2];
|
|
||||||
- params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
|
|
||||||
- &builder,
|
|
||||||
- // id to enumerate buffer requirements
|
|
||||||
- that->pw_core_type_->param.idBuffers,
|
|
||||||
- that->pw_core_type_->param_buffers.Buffers,
|
|
||||||
- // Size: specified as integer (i) and set to specified size
|
|
||||||
- ":", that->pw_core_type_->param_buffers.size, "i", size,
|
|
||||||
- // Stride: specified as integer (i) and set to specified stride
|
|
||||||
- ":", that->pw_core_type_->param_buffers.stride, "i", stride,
|
|
||||||
- // Buffers: specifies how many buffers we want to deal with, set as
|
|
||||||
- // integer (i) where preferred number is 8, then allowed number is defined
|
|
||||||
- // as range (r) from min and max values and it is undecided (u) to allow
|
|
||||||
- // negotiation
|
|
||||||
- ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
|
|
||||||
- SPA_POD_PROP_MIN_MAX(1, 32),
|
|
||||||
- // Align: memory alignment of the buffer, set as integer (i) to specified
|
|
||||||
- // value
|
|
||||||
- ":", that->pw_core_type_->param_buffers.align, "i", 16));
|
|
||||||
- params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
|
|
||||||
- &builder,
|
|
||||||
- // id to enumerate supported metadata
|
|
||||||
- that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
|
|
||||||
- // Type: specified as id or enum (I)
|
|
||||||
- ":", that->pw_core_type_->param_meta.type, "I",
|
|
||||||
- that->pw_core_type_->meta.Header,
|
|
||||||
- // Size: size of the metadata, specified as integer (i)
|
|
||||||
- ":", that->pw_core_type_->param_meta.size, "i",
|
|
||||||
- sizeof(struct spa_meta_header)));
|
|
||||||
-
|
|
||||||
- pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
|
|
||||||
+ const struct spa_pod* params[3];
|
|
||||||
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
|
|
||||||
+ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
|
|
||||||
+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
|
|
||||||
+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32)));
|
|
||||||
+ params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
|
|
||||||
+ SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
|
|
||||||
+ SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
|
|
||||||
+ params[2] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
|
|
||||||
+ SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop),
|
|
||||||
+ SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
|
|
||||||
+ pw_stream_update_params(that->pw_stream_, params, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
// static
|
|
||||||
@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) {
|
|
||||||
BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
|
|
||||||
RTC_DCHECK(that);
|
|
||||||
|
|
||||||
- pw_buffer* buf = nullptr;
|
|
||||||
+ struct pw_buffer *next_buffer;
|
|
||||||
+ struct pw_buffer *buffer = nullptr;
|
|
||||||
+
|
|
||||||
+ next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
|
|
||||||
+ while (next_buffer) {
|
|
||||||
+ buffer = next_buffer;
|
|
||||||
+ next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
|
|
||||||
|
|
||||||
- if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
|
|
||||||
+ if (next_buffer)
|
|
||||||
+ pw_stream_queue_buffer (that->pw_stream_, buffer);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!buffer) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- that->HandleBuffer(buf);
|
|
||||||
+ that->HandleBuffer(buffer);
|
|
||||||
|
|
||||||
- pw_stream_queue_buffer(that->pw_stream_, buf);
|
|
||||||
+ pw_stream_queue_buffer(that->pw_stream_, buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
|
|
||||||
@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
|
|
||||||
pw_thread_loop_stop(pw_main_loop_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_type_) {
|
|
||||||
- delete pw_type_;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (spa_video_format_) {
|
|
||||||
- delete spa_video_format_;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (pw_stream_) {
|
|
||||||
pw_stream_destroy(pw_stream_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_remote_) {
|
|
||||||
- pw_remote_destroy(pw_remote_);
|
|
||||||
+ if (pw_core_) {
|
|
||||||
+ pw_core_disconnect(pw_core_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_core_) {
|
|
||||||
- pw_core_destroy(pw_core_);
|
|
||||||
+ if (pw_context_) {
|
|
||||||
+ pw_context_destroy(pw_context_);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pw_main_loop_) {
|
|
||||||
pw_thread_loop_destroy(pw_main_loop_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_loop_) {
|
|
||||||
- pw_loop_destroy(pw_loop_);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (current_frame_) {
|
|
||||||
- free(current_frame_);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (start_request_signal_id_) {
|
|
||||||
g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
|
|
||||||
}
|
|
||||||
@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() {
|
|
||||||
void BaseCapturerPipeWire::InitPipeWire() {
|
|
||||||
pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
|
|
||||||
|
|
||||||
- pw_loop_ = pw_loop_new(/*properties=*/nullptr);
|
|
||||||
- pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
|
|
||||||
-
|
|
||||||
- pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
|
|
||||||
- pw_core_type_ = pw_core_get_type(pw_core_);
|
|
||||||
- pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
|
|
||||||
+ pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
|
|
||||||
+ pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
|
|
||||||
+ if (!pw_context_) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to create PipeWire context";
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- InitPipeWireTypes();
|
|
||||||
+ pw_core_ = pw_context_connect(pw_context_, nullptr, 0);
|
|
||||||
+ if (!pw_core_) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
// Initialize event handlers, remote end and stream-related.
|
|
||||||
- pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
|
|
||||||
- pw_remote_events_.state_changed = &OnStateChanged;
|
|
||||||
+ pw_core_events_.version = PW_VERSION_CORE_EVENTS;
|
|
||||||
+ pw_core_events_.error = &OnCoreError;
|
|
||||||
|
|
||||||
pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
|
|
||||||
pw_stream_events_.state_changed = &OnStreamStateChanged;
|
|
||||||
- pw_stream_events_.format_changed = &OnStreamFormatChanged;
|
|
||||||
+ pw_stream_events_.param_changed = &OnStreamParamChanged;
|
|
||||||
pw_stream_events_.process = &OnStreamProcess;
|
|
||||||
|
|
||||||
- pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
|
|
||||||
- this);
|
|
||||||
- pw_remote_connect_fd(pw_remote_, pw_fd_);
|
|
||||||
+ pw_core_add_listener(pw_core_, &spa_core_listener_, &pw_core_events_, this);
|
|
||||||
+
|
|
||||||
+ pw_stream_ = CreateReceivingStream();
|
|
||||||
+ if (!pw_stream_) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to create PipeWire stream";
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (pw_thread_loop_start(pw_main_loop_) < 0) {
|
|
||||||
RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
|
|
||||||
@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-void BaseCapturerPipeWire::InitPipeWireTypes() {
|
|
||||||
- spa_type_map* map = pw_core_type_->map;
|
|
||||||
- pw_type_ = new PipeWireType();
|
|
||||||
-
|
|
||||||
- spa_type_media_type_map(map, &pw_type_->media_type);
|
|
||||||
- spa_type_media_subtype_map(map, &pw_type_->media_subtype);
|
|
||||||
- spa_type_format_video_map(map, &pw_type_->format_video);
|
|
||||||
- spa_type_video_format_map(map, &pw_type_->video_format);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-void BaseCapturerPipeWire::CreateReceivingStream() {
|
|
||||||
+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
|
|
||||||
spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
|
|
||||||
- spa_rectangle pwScreenBounds =
|
|
||||||
- spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
|
|
||||||
- static_cast<uint32_t>(desktop_size_.height())};
|
|
||||||
+ spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
|
|
||||||
|
|
||||||
- spa_fraction pwFrameRateMin = spa_fraction{0, 1};
|
|
||||||
- spa_fraction pwFrameRateMax = spa_fraction{60, 1};
|
|
||||||
+ auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
|
|
||||||
|
|
||||||
- pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
|
|
||||||
- /*end of varargs*/ nullptr);
|
|
||||||
- pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
|
|
||||||
+ if (!stream) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Could not create receiving stream.";
|
|
||||||
+ return nullptr;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
uint8_t buffer[1024] = {};
|
|
||||||
- const spa_pod* params[1];
|
|
||||||
- spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
|
|
||||||
- params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
|
|
||||||
- &builder,
|
|
||||||
- // id to enumerate formats
|
|
||||||
- pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
|
|
||||||
- pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
|
|
||||||
- // Video format: specified as id or enum (I), preferred format is BGRx,
|
|
||||||
- // then allowed formats are enumerated (e) and the format is undecided (u)
|
|
||||||
- // to allow negotiation
|
|
||||||
- ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
|
|
||||||
- SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
|
|
||||||
- pw_type_->video_format.BGRx),
|
|
||||||
- // Video size: specified as rectangle (R), preferred size is specified as
|
|
||||||
- // first parameter, then allowed size is defined as range (r) from min and
|
|
||||||
- // max values and the format is undecided (u) to allow negotiation
|
|
||||||
- ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
|
|
||||||
- &pwMinScreenBounds, &pwScreenBounds,
|
|
||||||
- // Frame rate: specified as fraction (F) and set to minimum frame rate
|
|
||||||
- // value
|
|
||||||
- ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
|
|
||||||
- // Max frame rate: specified as fraction (F), preferred frame rate is set
|
|
||||||
- // to maximum value, then allowed frame rate is defined as range (r) from
|
|
||||||
- // min and max values and it is undecided (u) to allow negotiation
|
|
||||||
- ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
|
|
||||||
- &pwFrameRateMin, &pwFrameRateMax));
|
|
||||||
-
|
|
||||||
- pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
|
|
||||||
- this);
|
|
||||||
+ const spa_pod* params[2];
|
|
||||||
+ spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
|
|
||||||
+
|
|
||||||
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
|
|
||||||
+ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
|
|
||||||
+ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
|
|
||||||
+ SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(5, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
|
|
||||||
+ SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA),
|
|
||||||
+ SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMinScreenBounds,
|
|
||||||
+ &pwMinScreenBounds,
|
|
||||||
+ &pwMaxScreenBounds),
|
|
||||||
+ 0));
|
|
||||||
+ pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
|
|
||||||
+
|
|
||||||
pw_stream_flags flags = static_cast<pw_stream_flags>(
|
|
||||||
- PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
|
|
||||||
- PW_STREAM_FLAG_MAP_BUFFERS);
|
|
||||||
- if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
|
|
||||||
- flags, params,
|
|
||||||
- /*n_params=*/1) != 0) {
|
|
||||||
+ PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE);
|
|
||||||
+
|
|
||||||
+ if (pw_stream_connect(stream, PW_DIRECTION_INPUT, pw_stream_node_id_, PW_STREAM_FLAG_AUTOCONNECT, params, 1) != 0) {
|
|
||||||
RTC_LOG(LS_ERROR) << "Could not connect receiving stream.";
|
|
||||||
portal_init_failed_ = true;
|
|
||||||
- return;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
|
|
||||||
+ struct spa_meta_region* video_crop;
|
|
||||||
spa_buffer* spaBuffer = buffer->buffer;
|
|
||||||
- void* src = nullptr;
|
|
||||||
+ uint8_t *map = nullptr;
|
|
||||||
+ uint8_t* src = nullptr;
|
|
||||||
+ uint8_t* dst = nullptr;
|
|
||||||
+
|
|
||||||
+ if (spaBuffer->datas[0].chunk->size == 0) {
|
|
||||||
+ map = nullptr;
|
|
||||||
+ src = nullptr;
|
|
||||||
+ } else if (spaBuffer->datas[0].type == SPA_DATA_MemFd) {
|
|
||||||
+ map = static_cast<uint8_t*>(mmap(
|
|
||||||
+ nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
|
|
||||||
+ PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0));
|
|
||||||
+
|
|
||||||
+ if (map == MAP_FAILED) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
|
|
||||||
+ } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
|
|
||||||
+ int fd;
|
|
||||||
+ fd = spaBuffer->datas[0].fd;
|
|
||||||
|
|
||||||
- if (!(src = spaBuffer->datas[0].data)) {
|
|
||||||
+ map = static_cast<uint8_t*>(mmap(
|
|
||||||
+ nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
|
|
||||||
+ PROT_READ, MAP_PRIVATE, fd, 0));
|
|
||||||
+
|
|
||||||
+ if (map == MAP_FAILED) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ SyncDmaBuf(fd, DMA_BUF_SYNC_START);
|
|
||||||
+
|
|
||||||
+ src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
|
|
||||||
+ } else if (spaBuffer->datas[0].type == SPA_DATA_MemPtr) {
|
|
||||||
+ map = nullptr;
|
|
||||||
+ src = static_cast<uint8_t*>(spaBuffer->datas[0].data);
|
|
||||||
+ } else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- uint32_t maxSize = spaBuffer->datas[0].maxsize;
|
|
||||||
- int32_t srcStride = spaBuffer->datas[0].chunk->stride;
|
|
||||||
+ if (!src) {
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ DesktopSize prev_crop_size = DesktopSize(0, 0);
|
|
||||||
+ if (video_crop_size_initialized_) {
|
|
||||||
+ prev_crop_size = video_crop_size_;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((video_crop = static_cast<struct spa_meta_region*>(
|
|
||||||
+ spa_buffer_find_meta_data(spaBuffer, SPA_META_VideoCrop, sizeof(*video_crop))))) {
|
|
||||||
+ RTC_DCHECK(video_crop->region.size.width <= desktop_size_.width() &&
|
|
||||||
+ video_crop->region.size.height <= desktop_size_.height());
|
|
||||||
+ if ((video_crop->region.size.width != desktop_size_.width() ||
|
|
||||||
+ video_crop->region.size.height != desktop_size_.height()) && video_crop->region.size.width && video_crop->region.size.height) {
|
|
||||||
+ video_crop_size_ = DesktopSize(video_crop->region.size.width, video_crop->region.size.height);
|
|
||||||
+ video_crop_size_initialized_ = true;
|
|
||||||
+ } else {
|
|
||||||
+ video_crop_size_initialized_ = false;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ video_crop_size_initialized_ = false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ size_t frame_size;
|
|
||||||
+ if (video_crop_size_initialized_) {
|
|
||||||
+ frame_size =
|
|
||||||
+ video_crop_size_.width() * video_crop_size_.height() * kBytesPerPixel;
|
|
||||||
+ } else {
|
|
||||||
+ frame_size =
|
|
||||||
+ desktop_size_.width() * desktop_size_.height() * kBytesPerPixel;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!current_frame_ ||
|
|
||||||
+ (video_crop_size_initialized_ && !video_crop_size_.equals(prev_crop_size))) {
|
|
||||||
+ current_frame_ = std::make_unique<uint8_t[]>(frame_size);
|
|
||||||
+ }
|
|
||||||
+ RTC_DCHECK(current_frame_ != nullptr);
|
|
||||||
+
|
|
||||||
+ const int32_t dstStride = video_crop_size_initialized_
|
|
||||||
+ ? video_crop_size_.width() * kBytesPerPixel
|
|
||||||
+ : desktop_size_.width() * kBytesPerPixel;
|
|
||||||
+ const int32_t srcStride = spaBuffer->datas[0].chunk->stride;
|
|
||||||
+
|
|
||||||
if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
|
|
||||||
RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
|
|
||||||
<< srcStride
|
|
||||||
@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!current_frame_) {
|
|
||||||
- current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
|
|
||||||
+ dst = current_frame_.get();
|
|
||||||
+
|
|
||||||
+ // Adjust source content based on crop video position
|
|
||||||
+ if (video_crop_size_initialized_ &&
|
|
||||||
+ (video_crop->region.position.y + video_crop_size_.height() <= desktop_size_.height())) {
|
|
||||||
+ for (int i = 0; i < video_crop->region.position.y; ++i) {
|
|
||||||
+ src += srcStride;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ const int xOffset =
|
|
||||||
+ video_crop_size_initialized_ && (video_crop->region.position.x + video_crop_size_.width() <=
|
|
||||||
+ desktop_size_.width())
|
|
||||||
+ ? video_crop->region.position.x * kBytesPerPixel
|
|
||||||
+ : 0;
|
|
||||||
+ const int height = video_crop_size_initialized_ ? video_crop_size_.height() : desktop_size_.height();
|
|
||||||
+ for (int i = 0; i < height; ++i) {
|
|
||||||
+ // Adjust source content based on crop video position if needed
|
|
||||||
+ src += xOffset;
|
|
||||||
+ std::memcpy(dst, src, dstStride);
|
|
||||||
+ // If both sides decided to go with the RGBx format we need to convert it to
|
|
||||||
+ // BGRx to match color format expected by WebRTC.
|
|
||||||
+ if (spa_video_format_.format == SPA_VIDEO_FORMAT_RGBx ||
|
|
||||||
+ spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
|
|
||||||
+ ConvertRGBxToBGRx(dst, dstStride);
|
|
||||||
+ }
|
|
||||||
+ src += srcStride - xOffset;
|
|
||||||
+ dst += dstStride;
|
|
||||||
}
|
|
||||||
- RTC_DCHECK(current_frame_ != nullptr);
|
|
||||||
|
|
||||||
- // If both sides decided to go with the RGBx format we need to convert it to
|
|
||||||
- // BGRx to match color format expected by WebRTC.
|
|
||||||
- if (spa_video_format_->format == pw_type_->video_format.RGBx) {
|
|
||||||
- uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
|
|
||||||
- std::memcpy(tempFrame, src, maxSize);
|
|
||||||
- ConvertRGBxToBGRx(tempFrame, maxSize);
|
|
||||||
- std::memcpy(current_frame_, tempFrame, maxSize);
|
|
||||||
- free(tempFrame);
|
|
||||||
- } else {
|
|
||||||
- std::memcpy(current_frame_, src, maxSize);
|
|
||||||
+ if (map) {
|
|
||||||
+ if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
|
|
||||||
+ SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);
|
|
||||||
+ }
|
|
||||||
+ munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal(
|
|
||||||
g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
|
|
||||||
RTC_DCHECK(options != nullptr);
|
|
||||||
|
|
||||||
- g_variant_lookup(options, "size", "(ii)", &width, &height);
|
|
||||||
-
|
|
||||||
- that->desktop_size_.set(width, height);
|
|
||||||
-
|
|
||||||
+ that->pw_stream_node_id_ = stream_id;
|
|
||||||
g_variant_unref(options);
|
|
||||||
g_variant_unref(variant);
|
|
||||||
}
|
|
||||||
@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
|
|
||||||
+ DesktopSize frame_size = desktop_size_;
|
|
||||||
+ if (video_crop_size_initialized_) {
|
|
||||||
+ frame_size = video_crop_size_;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(frame_size));
|
|
||||||
result->CopyPixelsFrom(
|
|
||||||
- current_frame_, (desktop_size_.width() * kBytesPerPixel),
|
|
||||||
- DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
|
|
||||||
+ current_frame_.get(), (frame_size.width() * kBytesPerPixel),
|
|
||||||
+ DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
|
|
||||||
if (!result) {
|
|
||||||
callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
|
|
||||||
return;
|
|
||||||
@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
+// static
|
|
||||||
+std::unique_ptr<DesktopCapturer>
|
|
||||||
+BaseCapturerPipeWire::CreateRawScreenCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options) {
|
|
||||||
+ std::unique_ptr<BaseCapturerPipeWire> capturer =
|
|
||||||
+ std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
|
|
||||||
+ return std::move(capturer);}
|
|
||||||
+
|
|
||||||
+// static
|
|
||||||
+std::unique_ptr<DesktopCapturer>
|
|
||||||
+BaseCapturerPipeWire::CreateRawWindowCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options) {
|
|
||||||
+
|
|
||||||
+ std::unique_ptr<BaseCapturerPipeWire> capturer =
|
|
||||||
+ std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
|
|
||||||
+ return std::move(capturer);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
} // namespace webrtc
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
|
|
||||||
index 56b101acbaa6..de54157d1a2a 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
|
|
||||||
@@ -22,17 +22,13 @@
|
|
||||||
|
|
||||||
namespace webrtc {
|
|
||||||
|
|
||||||
-class PipeWireType {
|
|
||||||
- public:
|
|
||||||
- spa_type_media_type media_type;
|
|
||||||
- spa_type_media_subtype media_subtype;
|
|
||||||
- spa_type_format_video format_video;
|
|
||||||
- spa_type_video_format video_format;
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
class BaseCapturerPipeWire : public DesktopCapturer {
|
|
||||||
public:
|
|
||||||
- enum CaptureSourceType { Screen = 1, Window };
|
|
||||||
+ enum CaptureSourceType : uint32_t {
|
|
||||||
+ kScreen = 0b01,
|
|
||||||
+ kWindow = 0b10,
|
|
||||||
+ kAny = 0b11
|
|
||||||
+ };
|
|
||||||
|
|
||||||
explicit BaseCapturerPipeWire(CaptureSourceType source_type);
|
|
||||||
~BaseCapturerPipeWire() override;
|
|
||||||
@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer {
|
|
||||||
bool GetSourceList(SourceList* sources) override;
|
|
||||||
bool SelectSource(SourceId id) override;
|
|
||||||
|
|
||||||
+ static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options);
|
|
||||||
+
|
|
||||||
+ static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options);
|
|
||||||
+
|
|
||||||
private:
|
|
||||||
// PipeWire types -->
|
|
||||||
+ pw_context* pw_context_ = nullptr;
|
|
||||||
pw_core* pw_core_ = nullptr;
|
|
||||||
- pw_type* pw_core_type_ = nullptr;
|
|
||||||
pw_stream* pw_stream_ = nullptr;
|
|
||||||
- pw_remote* pw_remote_ = nullptr;
|
|
||||||
- pw_loop* pw_loop_ = nullptr;
|
|
||||||
pw_thread_loop* pw_main_loop_ = nullptr;
|
|
||||||
- PipeWireType* pw_type_ = nullptr;
|
|
||||||
|
|
||||||
+ spa_hook spa_core_listener_ = {};
|
|
||||||
spa_hook spa_stream_listener_ = {};
|
|
||||||
- spa_hook spa_remote_listener_ = {};
|
|
||||||
|
|
||||||
+ pw_core_events pw_core_events_ = {};
|
|
||||||
pw_stream_events pw_stream_events_ = {};
|
|
||||||
- pw_remote_events pw_remote_events_ = {};
|
|
||||||
|
|
||||||
- spa_video_info_raw* spa_video_format_ = nullptr;
|
|
||||||
+ struct spa_video_info_raw spa_video_format_;
|
|
||||||
|
|
||||||
+ guint32 pw_stream_node_id_ = 0;
|
|
||||||
gint32 pw_fd_ = -1;
|
|
||||||
|
|
||||||
CaptureSourceType capture_source_type_ =
|
|
||||||
- BaseCapturerPipeWire::CaptureSourceType::Screen;
|
|
||||||
+ BaseCapturerPipeWire::CaptureSourceType::kAny;
|
|
||||||
|
|
||||||
// <-- end of PipeWire types
|
|
||||||
|
|
||||||
@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer {
|
|
||||||
guint sources_request_signal_id_ = 0;
|
|
||||||
guint start_request_signal_id_ = 0;
|
|
||||||
|
|
||||||
+ bool video_crop_size_initialized_ = false;
|
|
||||||
+ DesktopSize video_crop_size_;;
|
|
||||||
DesktopSize desktop_size_ = {};
|
|
||||||
DesktopCaptureOptions options_ = {};
|
|
||||||
|
|
||||||
- uint8_t* current_frame_ = nullptr;
|
|
||||||
+ std::unique_ptr<uint8_t[]> current_frame_;
|
|
||||||
Callback* callback_ = nullptr;
|
|
||||||
|
|
||||||
bool portal_init_failed_ = false;
|
|
||||||
|
|
||||||
void InitPortal();
|
|
||||||
void InitPipeWire();
|
|
||||||
- void InitPipeWireTypes();
|
|
||||||
|
|
||||||
- void CreateReceivingStream();
|
|
||||||
+ pw_stream* CreateReceivingStream();
|
|
||||||
void HandleBuffer(pw_buffer* buffer);
|
|
||||||
|
|
||||||
void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
|
|
||||||
|
|
||||||
- static void OnStateChanged(void* data,
|
|
||||||
- pw_remote_state old_state,
|
|
||||||
- pw_remote_state state,
|
|
||||||
- const char* error);
|
|
||||||
+ static void SyncDmaBuf(int fd, uint64_t start_or_end);
|
|
||||||
+ static void OnCoreError(void *data,
|
|
||||||
+ uint32_t id,
|
|
||||||
+ int seq,
|
|
||||||
+ int res,
|
|
||||||
+ const char *message);
|
|
||||||
+ static void OnStreamParamChanged(void *data,
|
|
||||||
+ uint32_t id,
|
|
||||||
+ const struct spa_pod *format);
|
|
||||||
static void OnStreamStateChanged(void* data,
|
|
||||||
pw_stream_state old_state,
|
|
||||||
pw_stream_state state,
|
|
||||||
const char* error_message);
|
|
||||||
-
|
|
||||||
- static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
|
|
||||||
static void OnStreamProcess(void* data);
|
|
||||||
static void OnNewBuffer(void* data, uint32_t id);
|
|
||||||
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
|
|
||||||
index 26956fc67dc8..3813d697bb38 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
|
|
||||||
@@ -15,7 +15,7 @@
|
|
||||||
namespace webrtc {
|
|
||||||
|
|
||||||
ScreenCapturerPipeWire::ScreenCapturerPipeWire()
|
|
||||||
- : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
|
|
||||||
+ : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}
|
|
||||||
ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
|
|
||||||
|
|
||||||
// static
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
|
|
||||||
index 35436475cb4d..c43a1f1a0c4e 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
|
|
||||||
@@ -15,7 +15,7 @@
|
|
||||||
namespace webrtc {
|
|
||||||
|
|
||||||
WindowCapturerPipeWire::WindowCapturerPipeWire()
|
|
||||||
- : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
|
|
||||||
+ : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}
|
|
||||||
WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
|
|
||||||
|
|
||||||
// static
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
|
|
||||||
index cf8a9dd0e0db..d27fab8d28d9 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
|
|
||||||
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
|
|
||||||
const DesktopCaptureOptions& options) {
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
|
|
||||||
- return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
|
|
||||||
+ return BaseCapturerPipeWire::CreateRawScreenCapturer(options);
|
|
||||||
}
|
|
||||||
#endif // defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
|
|
||||||
index 82359e50c2db..bb9724cf7cc2 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
|
|
||||||
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
|
|
||||||
const DesktopCaptureOptions& options) {
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
|
|
||||||
- return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
|
|
||||||
+ return BaseCapturerPipeWire::CreateRawWindowCapturer(options);
|
|
||||||
}
|
|
||||||
#endif // defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
|||||||
diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68.0/config/system-headers.mozbuild
|
|
||||||
--- firefox-68.0/config/system-headers.mozbuild.firefox-pipewire 2019-07-01 22:30:26.000000000 +0200
|
|
||||||
+++ firefox-68.0/config/system-headers.mozbuild 2019-07-08 15:26:15.397161627 +0200
|
|
||||||
@@ -314,6 +314,7 @@ system_headers = [
|
|
||||||
'Gestalt.h',
|
|
||||||
'getopt.h',
|
|
||||||
'gio/gio.h',
|
|
||||||
+ 'gio/gunixfdlist.h',
|
|
||||||
'glibconfig.h',
|
|
||||||
'glib.h',
|
|
||||||
'glib-object.h',
|
|
||||||
@@ -607,6 +608,7 @@ system_headers = [
|
|
||||||
'Pgenerr.h',
|
|
||||||
'PGenErr.h',
|
|
||||||
'Ph.h',
|
|
||||||
+ 'pipewire/pipewire.h',
|
|
||||||
'pixman.h',
|
|
||||||
'pk11func.h',
|
|
||||||
'pk11pqg.h',
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire 2019-07-01 22:30:33.000000000 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build 2019-07-08 15:26:15.397161627 +0200
|
|
||||||
@@ -194,6 +194,28 @@ if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
"/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
|
|
||||||
]
|
|
||||||
|
|
||||||
+# PipeWire specific files
|
|
||||||
+if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
+
|
|
||||||
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
|
|
||||||
+
|
|
||||||
+ OS_LIBS += [
|
|
||||||
+ "rt",
|
|
||||||
+ "pipewire-0.2",
|
|
||||||
+ "glib-2.0",
|
|
||||||
+ "gio-2.0",
|
|
||||||
+ "gobject-2.0"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+ CXXFLAGS += CONFIG['TK_CFLAGS']
|
|
||||||
+
|
|
||||||
+ UNIFIED_SOURCES += [
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+
|
|
||||||
if CONFIG["OS_TARGET"] == "NetBSD":
|
|
||||||
|
|
||||||
DEFINES["USE_X11"] = "1"
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire 2019-07-08 16:42:13.936254926 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h 2019-07-08 16:42:17.509264974 +0200
|
|
||||||
@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
|
|
||||||
bool disable_effects_ = true;
|
|
||||||
bool detect_updated_region_ = false;
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
- bool allow_pipewire_ = false;
|
|
||||||
+ bool allow_pipewire_ = true;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.1.0/xpcom/threads/nsThread.cpp.old firefox-68.1.0/xpcom/threads/nsThread.cpp
|
|
||||||
--- firefox-68.1.0/xpcom/threads/nsThread.cpp.old 2019-09-20 12:17:35.481661390 +0200
|
|
||||||
+++ firefox-68.1.0/xpcom/threads/nsThread.cpp 2019-09-20 12:19:14.269180516 +0200
|
|
||||||
@@ -556,7 +556,8 @@ void nsThread::InitCommon() {
|
|
||||||
// kernel report them as separate regions, even when they are adjacent to
|
|
||||||
// heap memory. This allows us to accurately track the actual memory
|
|
||||||
// consumption of our allocated stacks.
|
|
||||||
- madvise(mStackBase, stackSize, MADV_NOHUGEPAGE);
|
|
||||||
+ // not supported on RHEL6
|
|
||||||
+ // madvise(mStackBase, stackSize, MADV_NOHUGEPAGE);
|
|
||||||
|
|
||||||
pthread_attr_destroy(&attr);
|
|
||||||
#elif defined(XP_WIN)
|
|
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp.old firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp
|
|
||||||
--- firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp.old 2019-10-24 14:20:21.227037984 +0200
|
|
||||||
+++ firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp 2019-10-24 14:45:52.769506967 +0200
|
|
||||||
@@ -996,6 +996,9 @@ void nsNSSComponent::FillTLSVersionRange
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // Enable TLS 1.3 as our NSS supports it.
|
|
||||||
+ supported.max = 0x304;
|
|
||||||
+
|
|
||||||
// Clip the defaults by what NSS actually supports to enable
|
|
||||||
// working with a system NSS with different ranges.
|
|
||||||
rangeOut.min = std::max(rangeOut.min, supported.min);
|
|
@ -1,7 +1,7 @@
|
|||||||
diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
|
diff -up firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
|
||||||
--- firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2020-06-17 04:18:58.000000000 +0200
|
--- firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2021-07-27 23:29:57.000000000 +0200
|
||||||
+++ firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2020-06-25 13:45:28.816999491 +0200
|
+++ firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2021-07-29 16:20:44.164513998 +0200
|
||||||
@@ -244,8 +244,20 @@ nsresult nsReadConfig::openAndEvaluateJS
|
@@ -249,8 +249,20 @@ nsresult nsReadConfig::openAndEvaluateJS
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
|
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
|
||||||
@ -12,7 +12,7 @@ diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
|
|||||||
+ getter_AddRefs(jsFile));
|
+ getter_AddRefs(jsFile));
|
||||||
+ NS_ENSURE_SUCCESS(rv, rv);
|
+ NS_ENSURE_SUCCESS(rv, rv);
|
||||||
+
|
+
|
||||||
+ rv = jsFile->AppendNative(NS_LITERAL_CSTRING("pref"));
|
+ rv = jsFile->AppendNative(nsLiteralCString("pref"));
|
||||||
+ NS_ENSURE_SUCCESS(rv, rv);
|
+ NS_ENSURE_SUCCESS(rv, rv);
|
||||||
+ rv = jsFile->AppendNative(nsDependentCString(aFileName));
|
+ rv = jsFile->AppendNative(nsDependentCString(aFileName));
|
||||||
+ NS_ENSURE_SUCCESS(rv, rv);
|
+ NS_ENSURE_SUCCESS(rv, rv);
|
||||||
@ -23,10 +23,10 @@ diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
|
|||||||
} else {
|
} else {
|
||||||
nsAutoCString location("resource://gre/defaults/autoconfig/");
|
nsAutoCString location("resource://gre/defaults/autoconfig/");
|
||||||
location += aFileName;
|
location += aFileName;
|
||||||
diff -up firefox-78.0/modules/libpref/Preferences.cpp.1170092 firefox-78.0/modules/libpref/Preferences.cpp
|
diff -up firefox-91.0/modules/libpref/Preferences.cpp.1170092 firefox-91.0/modules/libpref/Preferences.cpp
|
||||||
--- firefox-78.0/modules/libpref/Preferences.cpp.1170092 2020-06-25 13:45:28.818999498 +0200
|
--- firefox-91.0/modules/libpref/Preferences.cpp.1170092 2021-07-27 23:30:34.000000000 +0200
|
||||||
+++ firefox-78.0/modules/libpref/Preferences.cpp 2020-06-25 13:48:45.996708102 +0200
|
+++ firefox-91.0/modules/libpref/Preferences.cpp 2021-07-29 16:20:44.166514005 +0200
|
||||||
@@ -4499,6 +4499,8 @@ nsresult Preferences::InitInitialObjects
|
@@ -4553,6 +4553,8 @@ nsresult Preferences::InitInitialObjects
|
||||||
//
|
//
|
||||||
// Thus, in the omni.jar case, we always load app-specific default
|
// Thus, in the omni.jar case, we always load app-specific default
|
||||||
// preferences from omni.jar, whether or not `$app == $gre`.
|
// preferences from omni.jar, whether or not `$app == $gre`.
|
||||||
@ -35,10 +35,10 @@ diff -up firefox-78.0/modules/libpref/Preferences.cpp.1170092 firefox-78.0/modul
|
|||||||
|
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
UniquePtr<nsZipFind> find;
|
UniquePtr<nsZipFind> find;
|
||||||
diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/toolkit/xre/nsXREDirProvider.cpp
|
diff -up firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-91.0/toolkit/xre/nsXREDirProvider.cpp
|
||||||
--- firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 2020-06-17 04:20:11.000000000 +0200
|
--- firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 2021-07-27 23:30:56.000000000 +0200
|
||||||
+++ firefox-78.0/toolkit/xre/nsXREDirProvider.cpp 2020-06-25 13:48:28.613645633 +0200
|
+++ firefox-91.0/toolkit/xre/nsXREDirProvider.cpp 2021-07-29 16:26:20.071628932 +0200
|
||||||
@@ -60,6 +60,7 @@
|
@@ -71,6 +71,7 @@
|
||||||
#endif
|
#endif
|
||||||
#ifdef XP_UNIX
|
#ifdef XP_UNIX
|
||||||
# include <ctype.h>
|
# include <ctype.h>
|
||||||
@ -46,14 +46,14 @@ diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/tool
|
|||||||
#endif
|
#endif
|
||||||
#ifdef XP_IOS
|
#ifdef XP_IOS
|
||||||
# include "UIKitDirProvider.h"
|
# include "UIKitDirProvider.h"
|
||||||
@@ -533,6 +534,21 @@ nsXREDirProvider::GetFile(const char* aP
|
@@ -550,6 +551,21 @@ nsXREDirProvider::GetFile(const char* aP
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+#if defined(XP_UNIX)
|
+#if defined(XP_UNIX)
|
||||||
+ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
|
+ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
|
||||||
+ nsCString sysConfigDir = NS_LITERAL_CSTRING("/etc/");
|
+ nsCString sysConfigDir = nsLiteralCString("/etc/");
|
||||||
+ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
|
+ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
|
||||||
+ if (!appInfo)
|
+ if (!appInfo)
|
||||||
+ return NS_ERROR_NOT_AVAILABLE;
|
+ return NS_ERROR_NOT_AVAILABLE;
|
||||||
@ -68,28 +68,27 @@ diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/tool
|
|||||||
if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
|
if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
|
||||||
|
|
||||||
if (ensureFilePermissions) {
|
if (ensureFilePermissions) {
|
||||||
@@ -845,6 +861,17 @@ nsresult nsXREDirProvider::GetFilesInter
|
@@ -827,6 +843,16 @@ nsresult nsXREDirProvider::GetFilesInter
|
||||||
|
LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories);
|
||||||
LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
|
}
|
||||||
|
#endif
|
||||||
+ // Add /etc/<application>/pref/ directory if it exists
|
+ // Add /etc/<application>/pref/ directory if it exists
|
||||||
+ nsCOMPtr<nsIFile> systemPrefDir;
|
+ nsCOMPtr<nsIFile> systemPrefDir;
|
||||||
+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
|
+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
|
||||||
+ getter_AddRefs(systemPrefDir));
|
+ getter_AddRefs(systemPrefDir));
|
||||||
+ if (NS_SUCCEEDED(rv)) {
|
+ if (NS_SUCCEEDED(rv)) {
|
||||||
+ rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref"));
|
+ rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
|
||||||
+ if (NS_SUCCEEDED(rv)) {
|
+ if (NS_SUCCEEDED(rv)) {
|
||||||
+ directories.AppendObject(systemPrefDir);
|
+ directories.AppendObject(systemPrefDir);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
|
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
|
||||||
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
|
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
|
||||||
// NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
|
diff -up firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h
|
||||||
diff -up firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h
|
--- firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2021-07-27 23:31:38.000000000 +0200
|
||||||
--- firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2020-06-17 04:20:17.000000000 +0200
|
+++ firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h 2021-07-29 16:20:44.168514012 +0200
|
||||||
+++ firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h 2020-06-25 13:45:28.819999502 +0200
|
@@ -59,6 +59,7 @@
|
||||||
@@ -60,6 +60,7 @@
|
|
||||||
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
|
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
|
||||||
#define NS_APP_PREFS_OVERRIDE_DIR \
|
#define NS_APP_PREFS_OVERRIDE_DIR \
|
||||||
"PrefDOverride" // Directory for per-profile defaults
|
"PrefDOverride" // Directory for per-profile defaults
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.0/widget/gtk/nsWindow.cpp.1196777 firefox-68.0/widget/gtk/nsWindow.cpp
|
|
||||||
--- firefox-68.0/widget/gtk/nsWindow.cpp.1196777 2019-05-21 11:29:55.833376744 +0200
|
|
||||||
+++ firefox-68.0/widget/gtk/nsWindow.cpp 2019-05-21 12:15:35.446089316 +0200
|
|
||||||
@@ -156,7 +156,8 @@ const gint kEvents =
|
|
||||||
#if GTK_CHECK_VERSION(3, 4, 0)
|
|
||||||
GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
|
|
||||||
#endif
|
|
||||||
- GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
|
|
||||||
+ GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
|
|
||||||
+ GDK_FOCUS_CHANGE_MASK;
|
|
||||||
|
|
||||||
#if !GTK_CHECK_VERSION(3, 22, 0)
|
|
||||||
typedef enum {
|
|
@ -1,22 +1,12 @@
|
|||||||
# HG changeset patch
|
diff -up firefox-91.0/toolkit/components/extensions/schemas/runtime.json.mozilla-bmo1554971 firefox-91.0/toolkit/components/extensions/schemas/runtime.json
|
||||||
# Parent a25cebecb02d5460b8ad757fe9cb4a9c8d1d7658
|
--- firefox-91.0/toolkit/components/extensions/schemas/runtime.json.mozilla-bmo1554971 2021-07-29 17:20:08.523253193 +0200
|
||||||
Eliminate startup error message:
|
+++ firefox-91.0/toolkit/components/extensions/schemas/runtime.json 2021-07-29 17:21:23.517498581 +0200
|
||||||
JavaScript error: , line 0: Error: Type error for platformInfo value (Error processing arch: Invalid enumeration value "s390x") for runtime.getPlatformInfo.
|
|
||||||
|
|
||||||
Reported here: https://bugzilla.mozilla.org/show_bug.cgi?id=1554971
|
|
||||||
|
|
||||||
Uncertain if this is causing real problems or not. Also uncertain if the fix actually fixes anything.
|
|
||||||
No response from upstream yet.
|
|
||||||
|
|
||||||
diff -r a25cebecb02d -r 378b81b00e73 toolkit/components/extensions/schemas/runtime.json
|
|
||||||
--- a/toolkit/components/extensions/schemas/runtime.json Fri Jul 05 12:42:44 2019 +0200
|
|
||||||
+++ b/toolkit/components/extensions/schemas/runtime.json Fri Jul 19 13:19:30 2019 +0200
|
|
||||||
@@ -64,7 +64,7 @@
|
@@ -64,7 +64,7 @@
|
||||||
{
|
{
|
||||||
"id": "PlatformArch",
|
"id": "PlatformArch",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
- "enum": ["arm", "x86-32", "x86-64"],
|
- "enum": ["aarch64", "arm", "ppc64", "s390x", "sparc64", "x86-32", "x86-64"],
|
||||||
+ "enum": ["arm", "x86-32", "x86-64", "s390x", "aarch64", "ppc64le"],
|
+ "enum": ["aarch64", "arm", "ppc64", "ppc64le", "s390x", "sparc64", "x86-32", "x86-64"],
|
||||||
"allowedContexts": ["content", "devtools"],
|
"allowedContexts": ["content", "devtools"],
|
||||||
"description": "The machine's processor architecture."
|
"description": "The machine's processor architecture."
|
||||||
},
|
},
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
sed -i 's@%{gtk3_install_path}@%{_buildrootdir}%{gtk3_install_path}@g' %{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig/nss*.pc
|
sed -i 's@%{bundled_install_path}@%{_buildrootdir}%{bundled_install_path}@g' %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nss*.pc
|
||||||
|
|
||||||
export LDFLAGS="-L%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||||
export LDFLAGS="-Wl,-rpath,%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||||
export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||||
export PKG_CONFIG_PATH=%{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig
|
export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig
|
||||||
export PATH="{_buildrootdir}%{gtk3_install_path}/bin:$PATH"
|
export PATH="{_buildrootdir}%{bundled_install_path}/bin:$PATH"
|
||||||
|
@ -1,57 +0,0 @@
|
|||||||
commit 0b91f8a668201fc58fa732b8acc496caedfdbae0
|
|
||||||
Author: Florian Weimer <fw@deneb.enyo.de>
|
|
||||||
Date: Sun Apr 29 12:18:33 2018 -0700
|
|
||||||
|
|
||||||
Indicate that _PyGC_Head is only 8-byte aligned. (closes bpo-33374)
|
|
||||||
|
|
||||||
By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte
|
|
||||||
aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC
|
|
||||||
8 are starting to use alignment information to do store-merging. So, the "long
|
|
||||||
double" needs to be changed to a simple "double" as was long ago done in Python
|
|
||||||
3 by e348c8d154cf6342c79d627ebfe89dfe9de23817. For 2.7, we need to add some
|
|
||||||
dummy padding to make sure _PyGC_Head stays the same size.
|
|
||||||
|
|
||||||
diff --git a/Include/objimpl.h b/Include/objimpl.h
|
|
||||||
index 5f28683329..cbf6bc3f87 100644
|
|
||||||
--- Python-2.7.13/Include/objimpl.h
|
|
||||||
+++ Python-2.7.13/Include/objimpl.h
|
|
||||||
@@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
|
|
||||||
/* for source compatibility with 2.2 */
|
|
||||||
#define _PyObject_GC_Del PyObject_GC_Del
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * Former over-aligned definition of PyGC_Head, used to compute the size of the
|
|
||||||
+ * padding for the new version below.
|
|
||||||
+ */
|
|
||||||
+union _gc_head;
|
|
||||||
+union _gc_head_old {
|
|
||||||
+ struct {
|
|
||||||
+ union _gc_head_old *gc_next;
|
|
||||||
+ union _gc_head_old *gc_prev;
|
|
||||||
+ Py_ssize_t gc_refs;
|
|
||||||
+ } gc;
|
|
||||||
+ long double dummy;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* GC information is stored BEFORE the object structure. */
|
|
||||||
typedef union _gc_head {
|
|
||||||
struct {
|
|
||||||
@@ -255,7 +269,8 @@ typedef union _gc_head {
|
|
||||||
union _gc_head *gc_prev;
|
|
||||||
Py_ssize_t gc_refs;
|
|
||||||
} gc;
|
|
||||||
- long double dummy; /* force worst-case alignment */
|
|
||||||
+ double dummy; /* Force at least 8-byte alignment. */
|
|
||||||
+ char dummy_padding[sizeof(union _gc_head_old)];
|
|
||||||
} PyGC_Head;
|
|
||||||
|
|
||||||
extern PyGC_Head *_PyGC_generation0;
|
|
||||||
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..9ec1a605c8
|
|
||||||
--- /dev/null
|
|
||||||
+++ Python-2.7.13/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
|
|
||||||
@@ -0,0 +1,3 @@
|
|
||||||
+Tweak the definition of PyGC_Head, so compilers do not believe it is always
|
|
||||||
+16-byte aligned on x86. This prevents crashes with more aggressive
|
|
||||||
+optimizations present in GCC 8.
|
|
@ -1,17 +0,0 @@
|
|||||||
diff -up Python-2.7.13/configure.build Python-2.7.13/configure
|
|
||||||
--- Python-2.7.13/configure.build 2019-06-04 13:32:12.772134075 +0200
|
|
||||||
+++ Python-2.7.13/configure 2019-06-04 13:32:26.140144601 +0200
|
|
||||||
@@ -6018,11 +6018,11 @@ then
|
|
||||||
# debug builds.
|
|
||||||
OPT="-g -O0 -Wall $STRICT_PROTO"
|
|
||||||
else
|
|
||||||
- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
|
|
||||||
+ OPT="-g $WRAP -O2 -Wall $STRICT_PROTO"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- OPT="-O3 -Wall $STRICT_PROTO"
|
|
||||||
+ OPT="-O2 -Wall $STRICT_PROTO"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case $ac_sys_system in
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-68.0/python/mozbuild/mozbuild/controller/building.py.old firefox-68.0/python/mozbuild/mozbuild/controller/building.py
|
|
||||||
--- firefox-68.0/python/mozbuild/mozbuild/controller/building.py.old 2019-05-29 10:46:55.403262995 +0200
|
|
||||||
+++ firefox-68.0/python/mozbuild/mozbuild/controller/building.py 2019-05-29 10:47:42.691176970 +0200
|
|
||||||
@@ -571,7 +571,7 @@ class TerminalLoggingHandler(logging.Han
|
|
||||||
if self.footer:
|
|
||||||
self.footer.clear()
|
|
||||||
|
|
||||||
- self.fh.write(msg)
|
|
||||||
+ self.fh.write(msg.encode("utf-8"))
|
|
||||||
self.fh.write('\n')
|
|
||||||
|
|
||||||
if self.footer:
|
|
@ -1,36 +0,0 @@
|
|||||||
diff -up firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418 firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp
|
|
||||||
--- firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418 2020-06-17 04:20:44.000000000 +0200
|
|
||||||
+++ firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp 2020-06-25 14:50:46.369798294 +0200
|
|
||||||
@@ -157,8 +157,12 @@ bool nsAvailableMemoryWatcher::IsVirtual
|
|
||||||
|
|
||||||
/* static */
|
|
||||||
bool nsAvailableMemoryWatcher::IsCommitSpaceLow(const MEMORYSTATUSEX& aStat) {
|
|
||||||
- if ((kLowCommitSpaceThreshold != 0) &&
|
|
||||||
- (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
|
|
||||||
+ const char* threshold = getenv("MOZ_GC_THRESHOLD");
|
|
||||||
+ if (threshold) {
|
|
||||||
+ kLowCommitSpaceThreshold = atoi(threshold);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((kLowCommitSpaceThreshold == 0) || (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
|
|
||||||
sNumLowCommitSpaceEvents++;
|
|
||||||
CrashReporter::AnnotateCrashReport(
|
|
||||||
CrashReporter::Annotation::LowCommitSpaceEvents,
|
|
||||||
@@ -210,12 +214,15 @@ void nsAvailableMemoryWatcher::AdjustPol
|
|
||||||
// polling interval accordingly.
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsAvailableMemoryWatcher::Notify(nsITimer* aTimer) {
|
|
||||||
+ const char* threshold = getenv("MOZ_GC_THRESHOLD");
|
|
||||||
+ bool forceLowMem = (threshold && atoi(threshold) == 0);
|
|
||||||
+
|
|
||||||
MEMORYSTATUSEX stat;
|
|
||||||
stat.dwLength = sizeof(stat);
|
|
||||||
bool success = GlobalMemoryStatusEx(&stat);
|
|
||||||
|
|
||||||
- if (success) {
|
|
||||||
- bool lowMemory = IsVirtualMemoryLow(stat) || IsCommitSpaceLow(stat);
|
|
||||||
+ if (success || forceLowMemory) {
|
|
||||||
+ bool lowMemory = IsVirtualMemoryLow(stat) || IsCommitSpaceLow(stat || forceLowMem);
|
|
||||||
|
|
||||||
if (lowMemory) {
|
|
||||||
SendMemoryPressureEvent();
|
|
17
sources
17
sources
@ -1,12 +1,5 @@
|
|||||||
SHA512 (libffi-3.0.13-18.el7_3.src.rpm) = da8ff110c59468f1ef9c861d93afcfa2fcc37409390664859d57113c7e81e54ca0a1a8925c18bb92097bb9710c737361ca36a81bf50fc137b31c2611e4c8a4e4
|
SHA512 (cbindgen-vendor.tar.xz) = 9cb4a590584c53386a14deb1f1faf7b67ff8f312eff4a8dccab710738183c504387d69fa660021b495ed61603f4df1db689f35234c61e2e886962e40aab20c95
|
||||||
SHA512 (Python-2.7.13.tar.xz) = f37c9a28ce129d01e63c84d7db627a06402854578f62d17927334ea21ede318e04bbf66e890e3f47c85333e6b19f6e5581fb3f3e27efd24be27017d1b6529c4b
|
SHA512 (nss-3.67.0-6.el8_1.src.rpm) = 6697fef5517c8c1d8c881243d60e35494fb6c11537467a38ce281d49fade5780764e81f5c044fe11dd020bc6c5655b77e65105c677a7812718cbc42061b3b5da
|
||||||
SHA512 (yasm-1.2.0-3.el5.src.rpm) = bc8ea63ec9e8191fbbf914708b4c89c471ee7cf8ca2e940eedcc8aa0475feade67dd8993cdfbc8949c236b3b36e96fb0748ef8b62e772524340df925533b9bf7
|
SHA512 (nspr-4.32.0-1.el8_1.src.rpm) = c181a19bc24aeb62aed1745a6a43ae8aa2ee0d903aa16cb6ec7d385286e60f6426049cc9669459434377a215f329502ffe6fc48a1edc52d5b3283ebc259e9dca
|
||||||
SHA512 (gtk3-private-3.22.26-1.el6.src.rpm) = ab1307af3305db38d462015647a5effc24bedbcf1174a2799faf41ae9c33052ec46a0c3d229eb2d472ebe3047ce86e293003ec42d8954342112746430980dc09
|
SHA512 (thunderbird-langpacks-91.2.0-20211004.tar.xz) = edbf6e5605a2539a242159c1e2bb80e879e07d41250edba8d7783a50336d51e1e0746bd743bc11502a5f47133f943d5072267c5f3cf0cc4c6c2479d2f119994b
|
||||||
SHA512 (Python-3.6.8.tar.xz) = b17867e451ebe662f50df83ed112d3656c089e7d750651ea640052b01b713b58e66aac9e082f71fd16f5b5510bc9b797f5ccd30f5399581e9aa406197f02938a
|
SHA512 (thunderbird-91.2.0.processed-source.tar.xz) = aad86c34310c5d37fe24b9c77af6766dad1a39035765c012b2c5b3a75b03e76c6611b39106699ed255c95f12a446887cb5f493e1f011e9f976ea254c7a743c2f
|
||||||
SHA512 (openssl-1.0.2k-19.6.bundle.el7_7.src.rpm) = fc00965c1aa7cc8f03a7e739633452fc51925de0dda8da5f21f8805c2b4764033a5211f376182dbab4c42f1f23d3195275f32616c384b54a83df4363ae711c75
|
|
||||||
SHA512 (nspr-4.25.0-1.el8_0.src.rpm) = 7e39e4484b0d504e1b7f1253d7dc1f9f0d45705fbbc3946272acc4c5998b5279004b227485b003e18b48eaee3a2871c98d5c7f94e5dd89b255284599889c8df6
|
|
||||||
SHA512 (cbindgen-vendor-0.14.3.tar.xz) = 33c8d28547674121f690eea0d3ebac33926a39caacac787bf8ed8b346478822e74da5a4a1f57ab4df4105fa8376739a2ece888845a85bc5712aaed20e4a508bc
|
|
||||||
SHA512 (nss-3.53.1-3.fc32.src.rpm) = 368849487aa8f9d602c9e5d9d7c88ebd03318aece12470283ff31744ef9eed27ef1e32031378a5a673bb06a9ebbcf5542afa13f3ad465409449c218922189acb
|
|
||||||
SHA512 (nodejs-10.21.0-5.fc32.src.rpm) = 4d0c212a2609dc10e242a96f63baa8babb91e8aa6696f66f627c562c1ba30cb3632ed01991c98f48b5942fc7fd89ee34b350f41de901339b49a2c19e979593a7
|
|
||||||
SHA512 (thunderbird-langpacks-78.14.0-20210902.tar.xz) = 1ec49997d71a4835cdb81adaf430e6705cfdeadb523f2559ac51f70910d84b3d9cd661346e856c4a786cdf63501ae938a3f3ffad970adc5ad6b3462528eb0ffb
|
|
||||||
SHA512 (thunderbird-78.14.0.processed-source.tar.xz) = bfcbf391eeecfa77550dc793fa19f9c65b1fa07139d33d56dd69d66fcb26d040049d850bb6387dfe753116a19643f28f1fa2123d01e6ec1a26092dc107be4d12
|
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
ac_add_options --enable-application=comm/mail
|
ac_add_options --enable-application=comm/mail
|
||||||
|
|
||||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
|
||||||
|
|
||||||
ac_add_options --prefix="$PREFIX"
|
ac_add_options --prefix="$PREFIX"
|
||||||
ac_add_options --libdir="$LIBDIR"
|
ac_add_options --libdir="$LIBDIR"
|
||||||
ac_add_options --with-system-zlib
|
ac_add_options --with-system-zlib
|
||||||
@ -10,14 +8,19 @@ ac_add_options --disable-tests
|
|||||||
#ac_add_options --enable-libnotify
|
#ac_add_options --enable-libnotify
|
||||||
ac_add_options --enable-necko-wifi
|
ac_add_options --enable-necko-wifi
|
||||||
ac_add_options --disable-updater
|
ac_add_options --disable-updater
|
||||||
ac_add_options --enable-calendar
|
|
||||||
ac_add_options --enable-chrome-format=omni
|
ac_add_options --enable-chrome-format=omni
|
||||||
ac_add_options --enable-pulseaudio
|
ac_add_options --enable-pulseaudio
|
||||||
ac_add_options --with-system-icu
|
ac_add_options --without-system-icu
|
||||||
|
ac_add_options --enable-release
|
||||||
|
ac_add_options --update-channel=release
|
||||||
|
ac_add_options --allow-addon-sideload
|
||||||
|
ac_add_options --with-system-jpeg
|
||||||
|
ac_add_options --enable-js-shell
|
||||||
|
ac_add_options --with-unsigned-addon-scopes=app,system
|
||||||
|
|
||||||
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
||||||
ac_add_options --with-google-location-service-api-keyfile=../google-api-key
|
ac_add_options --with-google-location-service-api-keyfile=../google-api-key
|
||||||
ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
|
ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
|
||||||
ac_add_options --disable-av1
|
|
||||||
ac_add_options --disable-crashreporter
|
ac_add_options --disable-crashreporter
|
||||||
|
|
||||||
export BUILD_OFFICIAL=1
|
export BUILD_OFFICIAL=1
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
pref("app.update.enabled", false);
|
|
||||||
pref("app.update.autoInstallEnabled", false);
|
|
||||||
# Allow users to set custom colors
|
|
||||||
# pref("browser.display.use_system_colors", true);
|
|
||||||
pref("general.useragent.vendor", "Red Hat");
|
|
||||||
pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
|
|
||||||
pref("intl.locale.matchOS", true);
|
|
||||||
pref("mail.shell.checkDefaultClient", false);
|
|
||||||
pref("toolkit.networkmanager.disable", false);
|
|
||||||
pref("offline.autoDetect", true);
|
|
||||||
|
|
||||||
# Disable global indexing by default
|
|
||||||
pref("mailnews.database.global.indexer.enabled", false);
|
|
||||||
|
|
||||||
# Do not switch to Smart Folders after upgrade to 3.0b4
|
|
||||||
pref("mail.folder.views.version", "1");
|
|
||||||
pref("extensions.shownSelectionUI", true);
|
|
||||||
pref("extensions.autoDisableScope", 0);
|
|
||||||
|
|
||||||
# For rhbz#1024232
|
|
||||||
pref("ui.SpellCheckerUnderlineStyle", 1);
|
|
||||||
|
|
||||||
/* Workaround for rhbz#1134876 */
|
|
||||||
pref("javascript.options.baselinejit", false);
|
|
||||||
/* Workaround for rhbz#1110291 */
|
|
||||||
pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
|
|
||||||
/* Workaround for mozbz#1063315 */
|
|
||||||
pref("security.use_mozillapkix_verification", false);
|
|
||||||
/* Use OS settings for UI language */
|
|
||||||
pref("intl.locale.requested", "");
|
|
||||||
pref("datareporting.healthreport.uploadEnabled", false);
|
|
||||||
pref("datareporting.policy.dataSubmissionEnabled", false);
|
|
||||||
pref("toolkit.telemetry.archive.enabled", false);
|
|
@ -1,7 +1,7 @@
|
|||||||
pref("app.update.enabled", false);
|
pref("app.update.enabled", false);
|
||||||
pref("app.update.autoInstallEnabled", false);
|
pref("app.update.autoInstallEnabled", false);
|
||||||
# Allow users to set custom colors
|
/* Allow users to set custom colors*/
|
||||||
# pref("browser.display.use_system_colors", true);
|
/* pref("browser.display.use_system_colors", true);*/
|
||||||
pref("general.useragent.vendor", "Red Hat");
|
pref("general.useragent.vendor", "Red Hat");
|
||||||
pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
|
pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
|
||||||
pref("intl.locale.matchOS", true);
|
pref("intl.locale.matchOS", true);
|
||||||
@ -9,17 +9,19 @@ pref("mail.shell.checkDefaultClient", false);
|
|||||||
pref("toolkit.networkmanager.disable", false);
|
pref("toolkit.networkmanager.disable", false);
|
||||||
pref("offline.autoDetect", true);
|
pref("offline.autoDetect", true);
|
||||||
|
|
||||||
# Disable global indexing by default
|
/* Disable global indexing by default*/
|
||||||
pref("mailnews.database.global.indexer.enabled", false);
|
pref("mailnews.database.global.indexer.enabled", false);
|
||||||
|
|
||||||
# Do not switch to Smart Folders after upgrade to 3.0b4
|
/* Do not switch to Smart Folders after upgrade to 3.0b4 */
|
||||||
pref("mail.folder.views.version", "1");
|
pref("mail.folder.views.version", "1");
|
||||||
pref("extensions.shownSelectionUI", true);
|
pref("extensions.shownSelectionUI", true);
|
||||||
pref("extensions.autoDisableScope", 0);
|
pref("extensions.autoDisableScopes", 0);
|
||||||
|
|
||||||
# For rhbz#1024232
|
/* For rhbz#1024232 */
|
||||||
pref("ui.SpellCheckerUnderlineStyle", 1);
|
pref("ui.SpellCheckerUnderlineStyle", 1);
|
||||||
|
|
||||||
|
/* Workaround for rhbz#1753011 */
|
||||||
|
pref("spellchecker.dictionary_path", "/usr/share/myspell");
|
||||||
/* Workaround for rhbz#1134876 */
|
/* Workaround for rhbz#1134876 */
|
||||||
pref("javascript.options.baselinejit", false);
|
pref("javascript.options.baselinejit", false);
|
||||||
/* Workaround for rhbz#1110291 */
|
/* Workaround for rhbz#1110291 */
|
||||||
@ -28,6 +30,7 @@ pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
|
|||||||
pref("security.use_mozillapkix_verification", false);
|
pref("security.use_mozillapkix_verification", false);
|
||||||
/* Use OS settings for UI language */
|
/* Use OS settings for UI language */
|
||||||
pref("intl.locale.requested", "");
|
pref("intl.locale.requested", "");
|
||||||
|
/* Disable telemetry */
|
||||||
pref("datareporting.healthreport.uploadEnabled", false);
|
pref("datareporting.healthreport.uploadEnabled", false);
|
||||||
pref("datareporting.policy.dataSubmissionEnabled", false);
|
pref("datareporting.policy.dataSubmissionEnabled", false);
|
||||||
pref("toolkit.telemetry.archive.enabled", false);
|
pref("toolkit.telemetry.archive.enabled", false);
|
||||||
|
@ -10,12 +10,12 @@
|
|||||||
MOZ_ARCH=$(uname -m)
|
MOZ_ARCH=$(uname -m)
|
||||||
case $MOZ_ARCH in
|
case $MOZ_ARCH in
|
||||||
x86_64 | s390x | sparc64 )
|
x86_64 | s390x | sparc64 )
|
||||||
MOZ_LIB_DIR="/usr/lib64"
|
MOZ_LIB_DIR="%PREFIX%/lib64"
|
||||||
SECONDARY_LIB_DIR="/usr/lib"
|
SECONDARY_LIB_DIR="%PREFIX%/lib"
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
MOZ_LIB_DIR="/usr/lib"
|
MOZ_LIB_DIR="%PREFIX%/lib"
|
||||||
SECONDARY_LIB_DIR="/usr/lib64"
|
SECONDARY_LIB_DIR="%PREFIX%/lib64"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-4
|
|||||||
##
|
##
|
||||||
## Set MOZ_APP_LAUNCHER for gnome-session
|
## Set MOZ_APP_LAUNCHER for gnome-session
|
||||||
##
|
##
|
||||||
export MOZ_APP_LAUNCHER="/usr/bin/thunderbird"
|
export MOZ_APP_LAUNCHER="%PREFIX%/bin/thunderbird"
|
||||||
|
|
||||||
##
|
##
|
||||||
## Disable the GNOME crash dialog, Moz has it's own
|
## Disable the GNOME crash dialog, Moz has it's own
|
||||||
@ -137,9 +137,9 @@ if ! dbus-send --session \
|
|||||||
if [ -f "$MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher" ]; then
|
if [ -f "$MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher" ]; then
|
||||||
echo "Starting a11y dbus service..."
|
echo "Starting a11y dbus service..."
|
||||||
$MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher &
|
$MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher &
|
||||||
else
|
else
|
||||||
echo "Running without a11y support!"
|
echo "Running without a11y support!"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec $MOZ_PROGRAM "$@"
|
exec $MOZ_PROGRAM "$@"
|
||||||
|
757
thunderbird.spec
757
thunderbird.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user