From 6b429d45b7c88a377223e02d44b6279b8b021a91 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Thu, 19 Oct 2023 13:46:34 +0200 Subject: [PATCH] www/ungoogled-chromium: update to 118.0.5993.88 + sync WIDEVINE option PR: 274541 Submitted by: Thibault Payet --- www/ungoogled-chromium/Makefile | 10 +++++++--- www/ungoogled-chromium/distinfo | 14 +++++++------- .../files/patch-chrome_common_chrome__features.cc | 11 ++++++++++- www/ungoogled-chromium/files/ungoogled-chromium.in | 6 ++++++ 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 562c277424175..03d30dbbb719c 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 118.0.5993.70 +PORTVERSION= 118.0.5993.88 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ @@ -100,7 +100,8 @@ BINARY_ALIAS= python3=${PYTHON_CMD} \ # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. -GN_ARGS+= fatal_linker_warnings=false \ +GN_ARGS+= enable_widevine=true \ + fatal_linker_warnings=false \ icu_use_data_file=false \ is_clang=true \ optimize_webui=true \ @@ -151,7 +152,7 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles SUB_FILES= ungoogled-chromium.desktop ungoogled-chromium SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST +OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO @@ -226,6 +227,9 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false +WIDEVINE_DESC= Depend on foreign-cdm to enable playback of DRM content +WIDEVINE_RUN_DEPENDS= foreign-cdm>0:www/foreign-cdm + .include "Makefile.tests" TEST_DISTFILES= chromium-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz:external diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 4d70ee6ecf860..1c78eccc080bb 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1697203259 -SHA256 (chromium-118.0.5993.70.tar.xz) = 49ee00a734de3dae7c421eb3c974e8d451b4de6f5b4e34b603fd6435eab6993d -SIZE (chromium-118.0.5993.70.tar.xz) = 3236238920 -SHA256 (ungoogled-chromium-118.0.5993.70-1.tar.gz) = d95a02dc7bad01302ed42c9f50daee53c998149f14ba6a4023198e7b1c6f5a36 -SIZE (ungoogled-chromium-118.0.5993.70-1.tar.gz) = 659633 -SHA256 (chromium-118.0.5993.70-testdata.tar.xz) = f02faeaa1dbc06ba8dbb61caddb9015e213fa548fc27b18533d75ce5cae08ee0 -SIZE (chromium-118.0.5993.70-testdata.tar.xz) = 267730908 +TIMESTAMP = 1697715826 +SHA256 (chromium-118.0.5993.88.tar.xz) = f2c0748f815cc4b5c5007788836cee3f07c505b6e74e2e1cd8ab4808e0ac8e59 +SIZE (chromium-118.0.5993.88.tar.xz) = 3245581816 +SHA256 (ungoogled-chromium-118.0.5993.88-1.tar.gz) = df94ef2aed0fe9ac442a142a22b2b4aef858bfcfbe3da25795849299ac8558f6 +SIZE (ungoogled-chromium-118.0.5993.88-1.tar.gz) = 659930 +SHA256 (chromium-118.0.5993.88-testdata.tar.xz) = 8f22c6b7e78b912509aeceb86ecc82fb35fc96db6c6b34b6f9fb1e05ba2b82a5 +SIZE (chromium-118.0.5993.88-testdata.tar.xz) = 270308544 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc index 4e95197a8255d..6a472ff7edb6e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,5 +1,14 @@ ---- chrome/common/chrome_features.cc.orig 2023-10-13 13:20:35 UTC +--- chrome/common/chrome_features.cc.orig 2023-10-19 07:19:47 UTC +++ chrome/common/chrome_features.cc +@@ -76,7 +76,7 @@ BASE_FEATURE(kAppShimNotificationAttribution, + BASE_FEATURE(kAsyncDns, + "AsyncDns", + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT @@ -84,7 +84,7 @@ BASE_FEATURE(kAsyncDns, ); diff --git a/www/ungoogled-chromium/files/ungoogled-chromium.in b/www/ungoogled-chromium/files/ungoogled-chromium.in index 95ca2054780a2..e149e6960ecac 100644 --- a/www/ungoogled-chromium/files/ungoogled-chromium.in +++ b/www/ungoogled-chromium/files/ungoogled-chromium.in @@ -16,4 +16,10 @@ EOMSG exit 1 fi ulimit -c 0 + +# source foreign-cdm environment +if [ -r %%PREFIX%%/share/foreign-cdm/fcdm-setup-env ] ; then + . %%PREFIX%%/share/foreign-cdm/fcdm-setup-env +fi + exec %%PREFIX%%/share/ungoogled-chromium/ungoogled-chromium ${1+"$@"}