From nobody Wed May 01 22:16:03 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VVBGq60JYz5K8Wf; Wed, 1 May 2024 22:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVBGq4QYBz4v4C; Wed, 1 May 2024 22:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714601763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wOZvtFMYIPXF92GSfQYe/+XmbSfMCvENBEOlAolpUAw=; b=auphaTiOt4wwb9lr8I2Ad9JoadAOJ8ZWwCPWGiGcNbkv91iyc2fC2Kb3fDhNxJQN7QfX2V 2HLS94i57xI3njcCC//z4+ECG0LXix+PW8G65cUC8TS2tpUv4g0axfl4LFIzVtXSDTJbDz Stc1q1KdETfxxXfF/dp0dAQop9miyXJjeBW1goKHL7ioRZBCpQI4lopiAORgOITf3lJ9ob SxuIDYAIDNh2d+Q3TVCwfwixqyCng3hevHc8naQ+IKU5iKEatKgb1HSfRaJLWP/6MTOTwG 9hfmcWj+fc1P03ww34edCZEkOYS/g2M8lsCWH9fycuM+oMf05W3w8a6GjRiIeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714601763; a=rsa-sha256; cv=none; b=GPOkUGkeVWTU82533f9NloMpWfTe8/KzmQ3Nvy2iccWeKdOAHxc2dIwuU1fk3ANvL0MZaD 639iWvrjdvMVa26MCgWyG6lEKd7wI5os+PsxdugigEaQkJlC++r+onWAU65HwTYc2UOL8N OX/02hBU5I4hl1WWUqZtayhF+Suj12Ox0eiAZkF5Aj0PIEvxBSo1wJUrd3AlCn10srsVy5 YlS256QwDbIy1b3jePAupWsiwqY8nXBiNXba0SSr/PxsARB+QHMhSK6CKEAv8UrHbTPxag M6FbXffBliohEbd4ai7QMCgYsb42Orb6o1ArNI+LBcUYzuG0ftjsDmifS3/Yqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714601763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wOZvtFMYIPXF92GSfQYe/+XmbSfMCvENBEOlAolpUAw=; b=hbC7BfQoi88xDIGdNqbXFVaw8ib4J7YkclVhSza16dYTw3gPOF1iZzjOLPXiHY1rHEPxyu NtttD8Y5DAH5BAHO/uyvn0YGrU+9TLEiyPKXByBiH/U1zYfT+fj31er3HkRanHAjsxCL+t bmrGMV2j0C1yUKfS8+de9SQMlcT245xrRljSow3nB6v2Xbl+JXcmrHgA/CAmQ0MCouLhLP kFBXTw6vs259y8eTgC9tdRmy4423nKMNs2MTsc0ceeLkBBh7JXC2IjSZr/VglTOOxL5BIq mAmPF/sb6Z8TnplFbFrFzc5JpFe5AzswLr+q9YhOoN1ZIOySFhDM2x1L0dm3Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VVBGq422Hzcp7; Wed, 1 May 2024 22:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 441MG3b0037579; Wed, 1 May 2024 22:16:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 441MG3Sv037576; Wed, 1 May 2024 22:16:03 GMT (envelope-from git) Date: Wed, 1 May 2024 22:16:03 GMT Message-Id: <202405012216.441MG3Sv037576@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: c7106d659f48 - main - multimedia/wireplumber: backport devel/glib20 fix from 0.5.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7106d659f48942c4f4b26dc4aa8e840750a162d Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7106d659f48942c4f4b26dc4aa8e840750a162d commit c7106d659f48942c4f4b26dc4aa8e840750a162d Author: Jan Beich AuthorDate: 2024-05-01 21:51:25 +0000 Commit: Jan Beich CommitDate: 2024-05-01 22:15:00 +0000 multimedia/wireplumber: backport devel/glib20 fix from 0.5.0 In file included from ../src/modules/wireplumber.cpp:1: In file included from ../include/modules/wireplumber.hpp:9: In file included from ../include/ALabel.hpp:4: In file included from /usr/local/include/gtkmm-3.0/gtkmm/label.h:27: In file included from /usr/local/include/gtkmm-3.0/gtkmm/misc.h:27: In file included from /usr/local/include/gtkmm-3.0/gtkmm/widget.h:31: In file included from /usr/local/include/pangomm-1.4/pangomm/context.h:31: In file included from /usr/local/include/glibmm-2.4/glibmm/object.h:30: /usr/local/include/glibmm-2.4/glibmm/wrap.h:92:7: error: use of undeclared identifier 'WP_LOCAL_LOG_TOPIC' 92 | g_warning("Glib::wrap_auto_interface(): The C++ instance (%s) does not dynamic_cast to the " | ^ /usr/local/include/glib-2.0/glib/gmessages.h:362:32: note: expanded from macro 'g_warning' 362 | #define g_warning(...) g_log (G_LOG_DOMAIN, \ | ^ /usr/local/include/wireplumber-0.5/wp/log.h:65:23: note: expanded from macro 'G_LOG_DOMAIN' 65 | #define G_LOG_DOMAIN (WP_LOCAL_LOG_TOPIC->topic_name) | ^ --- multimedia/wireplumber/Makefile | 1 + multimedia/wireplumber/files/patch-glib | 98 +++++++++++++++++++++++++++++++++ x11/waybar/Makefile | 1 - 3 files changed, 99 insertions(+), 1 deletion(-) diff --git a/multimedia/wireplumber/Makefile b/multimedia/wireplumber/Makefile index 2ecad6f3e3a4..a78d375f2c60 100644 --- a/multimedia/wireplumber/Makefile +++ b/multimedia/wireplumber/Makefile @@ -1,5 +1,6 @@ PORTNAME= wireplumber DISTVERSION= 0.4.90 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= arrowd@FreeBSD.org diff --git a/multimedia/wireplumber/files/patch-glib b/multimedia/wireplumber/files/patch-glib new file mode 100644 index 000000000000..8cc15aac9fa7 --- /dev/null +++ b/multimedia/wireplumber/files/patch-glib @@ -0,0 +1,98 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e9d8eeedefa8 + +--- lib/wp/log.h.orig 2024-03-04 17:29:09 UTC ++++ lib/wp/log.h +@@ -59,10 +59,12 @@ struct _WpLogTopic { + WP_LOG_TOPIC_STATIC(WP_LOCAL_LOG_TOPIC, t) + + /* make glib log functions also use the local log topic */ +-#ifdef G_LOG_DOMAIN +-# undef G_LOG_DOMAIN ++#ifdef WP_USE_LOCAL_LOG_TOPIC_IN_G_LOG ++# ifdef G_LOG_DOMAIN ++# undef G_LOG_DOMAIN ++# endif ++# define G_LOG_DOMAIN (WP_LOCAL_LOG_TOPIC->topic_name) + #endif +-#define G_LOG_DOMAIN (WP_LOCAL_LOG_TOPIC->topic_name) + + WP_API + void wp_log_topic_init (WpLogTopic *topic); +--- lib/wp/meson.build.orig 2024-03-04 17:29:09 UTC ++++ lib/wp/meson.build +@@ -126,6 +126,7 @@ wp_lib = library('wireplumber-' + wireplumber_api_vers + c_args : [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + '-DBUILDING_WP', + ], + install: true, +--- modules/meson.build.orig 2024-03-04 17:29:09 UTC ++++ modules/meson.build +@@ -1,6 +1,7 @@ common_c_args = [ + common_c_args = [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + ] + + shared_library( +--- modules/module-lua-scripting/wplua/meson.build.orig 2024-03-04 17:29:09 UTC ++++ modules/module-lua-scripting/wplua/meson.build +@@ -19,6 +19,7 @@ wplua_lib = static_library('wplua-' + wireplumber_api_ + c_args : [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + ], + install: false, + include_directories: wplua_include_dir, +--- src/meson.build.orig 2024-03-04 17:29:09 UTC ++++ src/meson.build +@@ -33,6 +33,7 @@ if build_daemon + c_args : [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + ], + install: true, + dependencies : [gobject_dep, gio_dep, wp_dep, pipewire_dep], +--- src/tools/meson.build.orig 2024-03-04 17:29:09 UTC ++++ src/tools/meson.build +@@ -3,6 +3,7 @@ executable('wpctl', + c_args : [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + ], + install: true, + dependencies : [gobject_dep, gio_dep, wp_dep, pipewire_dep], +@@ -18,6 +19,7 @@ executable('wpexec', + c_args : [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + ], + install: true, + dependencies : [gobject_dep, gio_dep, wp_dep, pipewire_dep], +--- tests/modules/meson.build.orig 2024-03-04 17:29:09 UTC ++++ tests/modules/meson.build +@@ -5,6 +5,7 @@ common_args = [ + common_args = [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + ] + + if get_option('dbus-tests') +--- tests/wp/meson.build.orig 2024-03-04 17:29:09 UTC ++++ tests/wp/meson.build +@@ -5,6 +5,7 @@ common_args = [ + common_args = [ + '-D_GNU_SOURCE', + '-DG_LOG_USE_STRUCTURED', ++ '-DWP_USE_LOCAL_LOG_TOPIC_IN_G_LOG', + ] + + test( diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 21b8a20d702a..6392729061d9 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -47,7 +47,6 @@ SUB_FILES+= date.pc OPTIONS_DEFINE= CAVA DBUS EVDEV ICONSFONT JACK MANPAGES MPD MPRIS PIPEWIRE PULSEAUDIO SNDIO UDEV UPOWER WIREPLUMBER OPTIONS_DEFAULT= CAVA DBUS EVDEV ICONSFONT JACK MANPAGES MPD MPRIS PIPEWIRE PULSEAUDIO SNDIO UDEV UPOWER WIREPLUMBER OPTIONS_EXCLUDE+= CAVA # https://github.com/karlstav/cava/issues/487 -OPTIONS_EXCLUDE+= WIREPLUMBER # https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/571 .if ${FLAVOR:U:M*nopulse} OPTIONS_EXCLUDE+= PULSEAUDIO .endif