index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | extra/chromium/PKGBUILD | 28 | ||||
-rw-r--r-- | extra/chromium/chromium-vaapi-uintptr.patch | 20 | ||||
-rw-r--r-- | extra/chromium/reenable-linux-i686-builds.patch | 19 |
diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index 12564c02..d0d51af5 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -6,17 +6,6 @@ declare -f build | \ ' )" -# fix regression uintptr_t in vaapi -source+=(chromium-vaapi-uintptr.patch) -sha256sums+=('c1b2285dec2acae6108a496cba9230680cd5eedf3467d4563ec4b546fc8224aa') - -eval "$( - declare -f prepare | \ - sed ' - /chromium-vaapi-fix-the/a patch -Np1 -i ../chromium-vaapi-uintptr.patch - ' -)" - # no SAMUFLAGS, see https://www.mail-archive.com/pacman-dev@archlinux.org/msg17258.html # going the sed-way eval "$( @@ -49,13 +38,24 @@ if [ "$CARCH" = 'i686' ]; then )" fi +# disabled: not complete and completely broken, use --no-sandbox for now when running # for for 64-bit time functions in seccomp sanbox (thanks to schnitzeltony) # https://github.com/schnitzeltony/meta-browser/blob/master/recipes-browser/chromium/files/0003-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch -source+=('chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch') -sha256sums+=('4837f797a910795bf3161805a3302d5f3701573ca90da8af32b2f4aa62510d20') +#source+=('chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch') +#sha256sums+=('4837f797a910795bf3161805a3302d5f3701573ca90da8af32b2f4aa62510d20') +#eval "$( +# declare -f prepare | \ +# sed ' +# /cd chromium-$pkgver/a patch -Np1 -i "$srcdir/chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch" +# ' +#)" + +# reenable 32-bit +source+=('reenable-linux-i686-builds.patch') +sha256sums+=('f3d3702106e2307c00f1db97fa2614bbedd208ecb217052e3cc789945e17a139') eval "$( declare -f prepare | \ sed ' - /patch.*skia.*/a patch -Np1 -i "$srcdir/chromium-81.0.4044.122-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch" + /cd chromium-$pkgver/a patch -Np1 -i "$srcdir/reenable-linux-i686-builds.patch" ' )" diff --git a/extra/chromium/chromium-vaapi-uintptr.patch b/extra/chromium/chromium-vaapi-uintptr.patch deleted file mode 100644 index a2405071..00000000 --- a/extra/chromium/chromium-vaapi-uintptr.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rauN chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc chromium-72.0.3626.121-vaapi-uintptr-patch/media/gpu/vaapi/vaapi_wrapper.cc ---- chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc 2019-03-02 05:10:25.000000000 +0100 -+++ chromium-72.0.3626.121-vaapi-uintptr-patch/media/gpu/vaapi/vaapi_wrapper.cc 2019-03-09 19:02:37.795731310 +0100 -@@ -4,6 +4,7 @@ - - #include "media/gpu/vaapi/vaapi_wrapper.h" - -+#include <cstdint> - #include <dlfcn.h> - #include <string.h> - -@@ -1000,7 +1008,7 @@ - } - va_attrib_extbuf.num_planes = num_planes; - -- std::vector<unsigned long> fds(num_fds); -+ std::vector<uintptr_t> fds(num_fds); - for (size_t i = 0; i < num_fds; ++i) { - int dmabuf_fd = pixmap->GetDmaBufFd(i); - if (dmabuf_fd < 0) { diff --git a/extra/chromium/reenable-linux-i686-builds.patch b/extra/chromium/reenable-linux-i686-builds.patch new file mode 100644 index 00000000..b18718e4 --- /dev/null +++ b/extra/chromium/reenable-linux-i686-builds.patch @@ -0,0 +1,19 @@ +--- a/BUILD.gn.orig ++++ b/BUILD.gn +@@ -1616,16 +1616,6 @@ + } + } + +-# TODO(cassew): Add more OS's that don't support x86. +-is_valid_x86_target = +- target_os != "ios" && target_os != "mac" && +- (target_os != "linux" || use_libfuzzer || !build_with_chromium) +- +-# Note: v8_target_cpu == arm allows using the V8 arm simulator on x86 for fuzzing. +-assert( +- is_valid_x86_target || target_cpu != "x86" || v8_target_cpu == "arm", +- "'target_cpu=x86' is not supported for 'target_os=$target_os'. Consider omitting 'target_cpu' (default) or using 'target_cpu=x64' instead.") +- + group("chromium_builder_perf") { + testonly = true + |