git: 211af23254f6 - main - www/{*chromium,iridium}: enable all audio backends by default
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 06 Aug 2024 10:56:42 UTC
The branch main has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=211af23254f659ef86b7063c24e2622075286ebd
commit 211af23254f659ef86b7063c24e2622075286ebd
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2024-08-06 10:56:07 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2024-08-06 10:56:37 +0000
www/{*chromium,iridium}: enable all audio backends by default
---
www/chromium/Makefile | 21 +++++++++++++--------
www/chromium/distinfo | 4 +++-
www/iridium/Makefile | 21 +++++++++++++--------
www/iridium/distinfo | 4 +++-
www/ungoogled-chromium/Makefile | 19 ++++++++++++-------
www/ungoogled-chromium/distinfo | 4 +++-
6 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 4b31f58a567e..d905eebf5a6b 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,11 +1,15 @@
PORTNAME= chromium
PORTVERSION= 127.0.6533.88
-PORTREVISION= 1
+PULSEMV= 16
+PULSEV= ${PULSEMV}.1
+PORTREVISION= 2
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
- https://nerd.hu/distfiles/:external
+ https://nerd.hu/distfiles/:external \
+ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external
+ chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external \
+ pulseaudio-${PULSEV}.tar.gz:pulseaudio
MAINTAINER= chromium@FreeBSD.org
COMMENT= Google web browser based on WebKit
@@ -124,7 +128,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_libffi=true \
use_system_libjpeg=true \
use_udev=false \
- extra_cxxflags="${CXXFLAGS}" \
+ extra_cxxflags="${CXXFLAGS} ${PINCLUDES}" \
extra_ldflags="${LDFLAGS}" \
ffmpeg_branding="${FFMPEG_BRAND}"
@@ -142,7 +146,7 @@ SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}"
OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE
-OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO
+OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO
OPTIONS_EXCLUDE_aarch64=LTO
OPTIONS_GROUP= AUDIO
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO
@@ -204,8 +208,8 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \
PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \
GN_ARGS+=rtc_link_pipewire=false
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
-PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true
+PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true \
+ PINCLUDES="-I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
@@ -297,7 +301,8 @@ pre-configure:
.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
- @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
+ touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
+ @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
${WRKSRC}/build/rust/rust_bindgen.gni
do-configure:
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index f8cb93707573..4b9f4d9afb9f 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,8 +1,10 @@
-TIMESTAMP = 1722834759
+TIMESTAMP = 1722922057
SHA256 (chromium-127.0.6533.88.tar.xz) = fd8e2bec6aee113388e2ac269538f9e621a21c449aca925ba7d709c12a9f93a5
SIZE (chromium-127.0.6533.88.tar.xz) = 6614557448
SHA256 (chrome-linux-127.0.6533.88-llvm17.profdata.tar.xz) = 2e4ed9d5d435891f578e81b8525f5491bbbefa2bbae05ab8394735378d36a27b
SIZE (chrome-linux-127.0.6533.88-llvm17.profdata.tar.xz) = 30457324
+SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
+SIZE (pulseaudio-16.1.tar.gz) = 2763111
SHA256 (chromium-127.0.6533.88-testdata.tar.xz) = 11b9d2d629f1ca12a9ea3ce0799b51f95d482fb4a05c88459692fcaced63f6f7
SIZE (chromium-127.0.6533.88-testdata.tar.xz) = 281486940
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index bd3e65425adc..911a75e189c2 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -1,12 +1,16 @@
PORTNAME= iridium
PORTVERSION= 2024.07.127.1
-PORTREVISION= 1
+PULSEMV= 16
+PULSEV= ${PULSEMV}.1
+PORTREVISION= 2
CATEGORIES= www wayland
-MASTER_SITES= https://downloads.iridiumbrowser.de/source/
+MASTER_SITES= https://downloads.iridiumbrowser.de/source/ \
+ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
PKGNAMESUFFIX= -browser
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ pulseaudio-${PULSEV}.tar.gz:pulseaudio
MAINTAINER= chromium@FreeBSD.org
COMMENT= Iridium browser
@@ -125,7 +129,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_libffi=true \
use_system_libjpeg=true \
use_udev=false \
- extra_cxxflags="${CXXFLAGS}" \
+ extra_cxxflags="${CXXFLAGS} ${PINCLUDES}" \
extra_ldflags="${LDFLAGS}" \
ffmpeg_branding="${FFMPEG_BRAND}"
@@ -137,7 +141,7 @@ SUB_FILES= iridium-browser.desktop iridium
SUB_LIST+= COMMENT="${COMMENT}"
OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS LTO PIPEWIRE
-OPTIONS_DEFAULT= CODECS CUPS KERBEROS PIPEWIRE SNDIO
+OPTIONS_DEFAULT= CODECS CUPS KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO
OPTIONS_EXCLUDE_aarch64=LTO
OPTIONS_GROUP= AUDIO
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO
@@ -195,8 +199,8 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \
PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \
GN_ARGS+=rtc_link_pipewire=false
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
-PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true
+PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true \
+ PINCLUDES="-I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
@@ -276,7 +280,8 @@ pre-configure:
.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
- @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
+ touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
+ @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
${WRKSRC}/build/rust/rust_bindgen.gni
do-configure:
diff --git a/www/iridium/distinfo b/www/iridium/distinfo
index a2a4671a94ce..98003a3e08e0 100644
--- a/www/iridium/distinfo
+++ b/www/iridium/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1722870643
+TIMESTAMP = 1722941761
SHA256 (iridium-browser-2024.07.127.1.tar.xz) = 76786af5d0670aaede10a3ce52f8bae3a2855fac9b8ad7a8c5f87df0d3657fb7
SIZE (iridium-browser-2024.07.127.1.tar.xz) = 2866494748
+SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
+SIZE (pulseaudio-16.1.tar.gz) = 2763111
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 616d3144e828..0a5de82128d4 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,12 +1,16 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 127.0.6533.88
-PORTREVISION= 1
+PULSEMV= 16
+PULSEV= ${PULSEMV}.1
+PORTREVISION= 2
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
- https://nerd.hu/distfiles/:external
+ https://nerd.hu/distfiles/:external \
+ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
DISTFILES= chromium-${DISTVERSION}${EXTRACT_SUFX} \
- ungoogled-chromium-${UGVERSION}.tar.gz:external
+ ungoogled-chromium-${UGVERSION}.tar.gz:external \
+ pulseaudio-${PULSEV}.tar.gz:pulseaudio
MAINTAINER= chromium@FreeBSD.org
COMMENT= Google web browser based on WebKit sans integration with Google
@@ -121,7 +125,7 @@ GN_ARGS+= enable_widevine=true \
use_system_libffi=true \
use_system_libjpeg=true \
use_udev=false \
- extra_cxxflags="${CXXFLAGS}" \
+ extra_cxxflags="${CXXFLAGS} ${PINCLUDES}" \
extra_ldflags="${LDFLAGS}" \
ffmpeg_branding="${FFMPEG_BRAND}"
@@ -156,7 +160,7 @@ 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 SNDIO
+OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO
OPTIONS_EXCLUDE_aarch64=LTO
OPTIONS_GROUP= AUDIO
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO
@@ -218,8 +222,8 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \
PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \
GN_ARGS+=rtc_link_pipewire=false
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
-PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true
+PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true \
+ PINCLUDES="-I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}"
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
@@ -322,6 +326,7 @@ pre-configure:
.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
+ touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
@${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \
${WRKSRC}/build/rust/rust_bindgen.gni
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index 5cd5e3add868..5bd79009562f 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,8 +1,10 @@
-TIMESTAMP = 1722870427
+TIMESTAMP = 1722941501
SHA256 (chromium-127.0.6533.88.tar.xz) = fd8e2bec6aee113388e2ac269538f9e621a21c449aca925ba7d709c12a9f93a5
SIZE (chromium-127.0.6533.88.tar.xz) = 6614557448
SHA256 (ungoogled-chromium-127.0.6533.88-1.tar.gz) = d48dc832e53ac37b623162088788583ca3e8bf4eefc565334b7b59da1ffc30eb
SIZE (ungoogled-chromium-127.0.6533.88-1.tar.gz) = 1237525
+SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
+SIZE (pulseaudio-16.1.tar.gz) = 2763111
SHA256 (chromium-127.0.6533.88-testdata.tar.xz) = 11b9d2d629f1ca12a9ea3ce0799b51f95d482fb4a05c88459692fcaced63f6f7
SIZE (chromium-127.0.6533.88-testdata.tar.xz) = 281486940
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8