Browse Source

uppkg -> 105.0.5195.125-1

Noah Vogt 2 years ago
parent
commit
bb3ffd8ba0
3 changed files with 59 additions and 12 deletions
  1. 8 7
      .SRCINFO
  2. 12 5
      PKGBUILD
  3. 39 0
      remove-main-main10-profile-limit.patch

+ 8 - 7
.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium-xdg
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
-	pkgver = 105.0.5195.102
-	pkgrel = 2
+	pkgver = 105.0.5195.125
+	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
 	arch = x86_64
 	license = BSD
 	license = BSD
@@ -47,7 +47,6 @@ pkgbase = ungoogled-chromium-xdg
 	depends = harfbuzz
 	depends = harfbuzz
 	depends = re2
 	depends = re2
 	depends = libavif
 	depends = libavif
-	depends = jsoncpp
 	depends = libxslt
 	depends = libxslt
 	depends = libpng
 	depends = libpng
 	depends = freetype2
 	depends = freetype2
@@ -59,7 +58,7 @@ pkgbase = ungoogled-chromium-xdg
 	conflicts = chromium
 	conflicts = chromium
 	options = debug
 	options = debug
 	options = !lto
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-105.0.5195.102.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-105.0.5195.125.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
 	source = https://github.com/stha09/chromium-patches/releases/download/chromium-105-patchset-1/chromium-105-patchset-1.tar.xz
 	source = https://github.com/stha09/chromium-patches/releases/download/chromium-105-patchset-1/chromium-105-patchset-1.tar.xz
 	source = fix-TFLite-build-on-linux-with-system-zlib.patch
 	source = fix-TFLite-build-on-linux-with-system-zlib.patch
@@ -71,10 +70,11 @@ pkgbase = ungoogled-chromium-xdg
 	source = xdg-basedir.patch
 	source = xdg-basedir.patch
 	source = no-omnibox-suggestion-autocomplete.patch
 	source = no-omnibox-suggestion-autocomplete.patch
 	source = index.html
 	source = index.html
-	source = ungoogled-chromium-105.0.5195.102-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/105.0.5195.102-1.tar.gz
+	source = ungoogled-chromium-105.0.5195.125-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/105.0.5195.125-1.tar.gz
 	source = ozone-add-va-api-support-to-wayland.patch
 	source = ozone-add-va-api-support-to-wayland.patch
+	source = remove-main-main10-profile-limit.patch
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	source = chromium-drirc-disable-10bpc-color-configs.conf
-	sha256sums = 1cba0527c951e3c506ade96cf6ec2507ee9d43661764731ed896348182369262
+	sha256sums = 201b5c44668a415e3e05c0a806ab43a0904024340531332fc3ce39eb0cf10a66
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = f0c437c02cab7a6efc958f82fbb4ea35d5440f73d65731bad7c0dcaecb932121
 	sha256sums = f0c437c02cab7a6efc958f82fbb4ea35d5440f73d65731bad7c0dcaecb932121
 	sha256sums = 5db1fae8a452774b5b177e493a2d1a435b980137b16ed74616d1fb86fe342ec7
 	sha256sums = 5db1fae8a452774b5b177e493a2d1a435b980137b16ed74616d1fb86fe342ec7
@@ -86,8 +86,9 @@ pkgbase = ungoogled-chromium-xdg
 	sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a
 	sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = 7f6b3397aee0b659c5964a6419f2cdf28e2b19e16700da4613f3aa9c7dde876d
+	sha256sums = 1b5ae7912099d9a2a9aed97f3978e9c09bedb603313cb18204e2d64ecbe25d1f
 	sha256sums = e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293
 	sha256sums = e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293
+	sha256sums = 01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 
 
 pkgname = ungoogled-chromium-xdg
 pkgname = ungoogled-chromium-xdg

+ 12 - 5
PKGBUILD

@@ -10,8 +10,8 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 
 pkgname=ungoogled-chromium-xdg
 pkgname=ungoogled-chromium-xdg
-pkgver=105.0.5195.102
-pkgrel=2
+pkgver=105.0.5195.125
+pkgrel=1
 _launcher_ver=8
 _launcher_ver=8
 _gcc_patchset=1
 _gcc_patchset=1
 pkgdesc="A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory"
 pkgdesc="A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory"
@@ -40,7 +40,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         xdg-basedir.patch
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
         index.html)
-sha256sums=('1cba0527c951e3c506ade96cf6ec2507ee9d43661764731ed896348182369262'
+sha256sums=('201b5c44668a415e3e05c0a806ab43a0904024340531332fc3ce39eb0cf10a66'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             'f0c437c02cab7a6efc958f82fbb4ea35d5440f73d65731bad7c0dcaecb932121'
             'f0c437c02cab7a6efc958f82fbb4ea35d5440f73d65731bad7c0dcaecb932121'
             '5db1fae8a452774b5b177e493a2d1a435b980137b16ed74616d1fb86fe342ec7'
             '5db1fae8a452774b5b177e493a2d1a435b980137b16ed74616d1fb86fe342ec7'
@@ -59,10 +59,12 @@ _uc_ver=$pkgver-1
 source=(${source[@]}
 source=(${source[@]}
         ${pkgname%-*}-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz
         ${pkgname%-*}-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz
         ozone-add-va-api-support-to-wayland.patch
         ozone-add-va-api-support-to-wayland.patch
+        remove-main-main10-profile-limit.patch
         chromium-drirc-disable-10bpc-color-configs.conf)
         chromium-drirc-disable-10bpc-color-configs.conf)
 sha256sums=(${sha256sums[@]}
 sha256sums=(${sha256sums[@]}
-            '7f6b3397aee0b659c5964a6419f2cdf28e2b19e16700da4613f3aa9c7dde876d'
+            '1b5ae7912099d9a2a9aed97f3978e9c09bedb603313cb18204e2d64ecbe25d1f'
             'e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293'
             'e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293'
+            '01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb')
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb')
 
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -77,7 +79,7 @@ declare -gA _system_libs=(
   [harfbuzz-ng]=harfbuzz
   [harfbuzz-ng]=harfbuzz
   [icu]=icu
   [icu]=icu
   [libdrm]=
   [libdrm]=
-  [jsoncpp]=jsoncpp
+  #[jsoncpp]=jsoncpp # triggers a CFI violation (https://crbug.com/1365218)
   [libaom]=aom
   [libaom]=aom
   [libavif]=libavif
   [libavif]=libavif
   [libjpeg]=libjpeg
   [libjpeg]=libjpeg
@@ -147,6 +149,9 @@ prepare() {
   # Enable vaapi on wayland
   # Enable vaapi on wayland
   patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
   patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
 
 
+  # Remove HEVC profile limits
+  patch -Np1 -i ../remove-main-main10-profile-limit.patch
+
   # Ungoogled Chromium changes
   # Ungoogled Chromium changes
   _ungoogled_repo="$srcdir/${pkgname%xdg*}$_uc_ver"
   _ungoogled_repo="$srcdir/${pkgname%xdg*}$_uc_ver"
   _utils="${_ungoogled_repo}/utils"
   _utils="${_ungoogled_repo}/utils"
@@ -203,6 +208,8 @@ build() {
     'use_sysroot=false'
     'use_sysroot=false'
     'use_custom_libcxx=false'
     'use_custom_libcxx=false'
     'enable_widevine=true'
     'enable_widevine=true'
+    'enable_platform_hevc=true'
+    'enable_hevc_parser_and_hw_decoder=true'
   )
   )
 
 
   if [[ -n ${_system_libs[icu]+set} ]]; then
   if [[ -n ${_system_libs[icu]+set} ]]; then

+ 39 - 0
remove-main-main10-profile-limit.patch

@@ -0,0 +1,39 @@
+diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc
+index c2efcdb..cc28d84 100644
+--- a/media/base/supported_types.cc
++++ b/media/base/supported_types.cc
+@@ -205,34 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
+     return false;
+ 
+ #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_CHROMEOS_LACROS)
+-  // TODO(b/171813538): For Lacros, the supplemental profile cache will be
+-  // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the
+-  // codec detection is plumbed through to ash-gpu we can do this extra check
+-  // for HEVC support.
+-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kLacrosEnablePlatformHevc)) {
+-    return true;
+-  }
+-#endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+-  return GetSupplementalProfileCache()->IsProfileSupported(type.profile);
+-#elif BUILDFLAG(IS_MAC)
+-  if (__builtin_available(macOS 11.0, *))
+-    return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport) &&
+-           (type.profile == HEVCPROFILE_MAIN ||
+-            type.profile == HEVCPROFILE_MAIN10 ||
+-            type.profile == HEVCPROFILE_MAIN_STILL_PICTURE ||
+-            type.profile == HEVCPROFILE_REXT);
+-  return false;
+-#elif BUILDFLAG(IS_ANDROID)
+-  // Technically android 5.0 mandates support for only HEVC main profile,
+-  // however some platforms (like chromecast) have had more profiles supported
+-  // so we'll see what happens if we just enable them all.
+-  return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport);
+-#else
+   return true;
+-#endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ #else
+   return false;
+ #endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)