Attachment 252029 Details for Bug 280268 – v1

[patch] v1

ungoogled-chromium.diff (text/plain), 2.91 KB, created by Vladimir Druzenko on 2024-07-14 00:20:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-07-14 00:20:07 UTC

Size: 2.91 KB

patch

obsolete

>diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
>index caeddd0ee6ec..b31e5bef409d 100644
>--- a/www/ungoogled-chromium/Makefile
>+++ b/www/ungoogled-chromium/Makefile
>@@ -43,10 +43,8 @@ BUILD_DEPENDS=	bash:shells/bash \
> LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
> 		libatspi.so:accessibility/at-spi2-core \
> 		libspeechd.so:accessibility/speech-dispatcher \
>-		libasound.so:audio/alsa-lib \
> 		libFLAC.so:audio/flac \
> 		libopus.so:audio/opus \
>-		libsndio.so:audio/sndio \
> 		libspeex.so:audio/speex \
> 		libdbus-1.so:devel/dbus \
> 		libdbus-glib-1.so:devel/dbus-glib \
>@@ -126,7 +124,6 @@ GN_ARGS+=	enable_widevine=true \
> 		use_system_libffi=true \
> 		use_system_libjpeg=true \
> 		use_udev=false \
>-		extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \
> 		extra_ldflags="${LDFLAGS}" \
> 		ffmpeg_branding="${FFMPEG_BRAND}"
> 
>@@ -153,11 +150,6 @@ GN_ARGS+=	build_with_tflite_lib=false \
> 		use_official_google_api_keys=false \
> 		use_unofficial_version_number=false
> 
>-# Audio backends
>-GN_ARGS+=	use_alsa=true \
>-		use_pulseaudio=true \
>-		use_sndio=true
>-
> # TODO: investigate building with these options:
> # use_system_minigbm
> GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
>@@ -166,8 +158,10 @@ SUB_FILES=	ungoogled-chromium.desktop ungoogled-chromium
> SUB_LIST+=	COMMENT="${COMMENT}"
> 
> OPTIONS_DEFINE=		CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE
>-OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE
>+OPTIONS_DEFAULT=	ALSA CODECS CUPS DRIVER KERBEROS PIPEWIRE PULSEAUDIO SNDIO
> OPTIONS_EXCLUDE_aarch64=LTO
>+OPTIONS_GROUP=		AUDIO
>+OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
> OPTIONS_RADIO=		KERBEROS
> OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
> OPTIONS_SUB=		yes
>@@ -177,6 +171,11 @@ HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
> HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
> MIT_DESC=		MIT Kerberos (security/krb5)
> 
>+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
>+ALSA_VARS=		GN_ARGS+=use_alsa=true
>+ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
>+
> CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
> 			FFMPEG_BRAND="Chrome"
> CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
>@@ -220,6 +219,15 @@ PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
> PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
> 			GN_ARGS+=rtc_link_pipewire=false
> 
>+PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true \
>+			GN_ARGS+=extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
>+PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false \
>+			GN_ARGS+=extra_cxxflags="${CXXFLAGS}"
>+
>+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
>

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 280268: 252029