From nobody Thu Mar 30 02:12:58 2023 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 4Pn6QL5GJVz42FFC; Thu, 30 Mar 2023 02:12:58 +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 4Pn6QL4RL6z3DlF; Thu, 30 Mar 2023 02:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680142378; 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=0qHgNgCMV+vqqgXoPhZ1mBvVu11SncVfZc8C7r+UIKs=; b=Mj7MIQpE9Tm9b/oIYjuKjSfGbEghOdTQJh4JCBlKIeEssp5eSfl5WAumr3Z3FrF4skWIWG 5Jy9eD5Swe7s5YyfkyIIayyxakqRJK06tGUUBfBbJUf6qtfv/p+KKM6hqOR78z6BLKlou0 iVYp4yAKv3++dTQkSouYOVAGDkBWBgHs6c+fjkxUWvHJAUEPeYhcclw8K5fmMxOGBgPQmI TZTar48VAgvaf62H9vZxVe82PdoZf0tLznOWN+f7wjSlQDoHMbLlBkRMiH2dn2kjD3tOm1 m3qRj0AFNgDbyVffcWbZv7lcbWMFeQNmN0pPpTmr2tgfvlawChJbglyvSZViXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680142378; 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=0qHgNgCMV+vqqgXoPhZ1mBvVu11SncVfZc8C7r+UIKs=; b=Z+82sGKUY8FJkNaLGSJyFABp67moBEHWSXJhgRkpX9lvJsh3BpdZHHLEOTHO1xwNbDypRi yV1HafFGAZve3epgfU+3p3AI4td3SxkoK/V9+kLyRY2t/VIX31YymCQOUtefup2JK3bore gzvzHJDAlz7tu47f2vnnqbdY4noHbV9fnsoZ4s7DjI0ny/SuM0NfCtbMtaiD/SEVBIG/7I 9tMOfMW3f1JugApyxBRGFJl/2ITe841ChlHywUF3tOBEIK58tWMehWuXvx0Iqk8RTwopzn C3WeKYS7oiSpbYjxQTTEOE18pnkgIOrxmhFRuuGRJoY8xCGc53sKCg4p1hMKgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680142378; a=rsa-sha256; cv=none; b=fHIhayFYegP8g2jpS6GdZm+2tVXqC3lIJF1LSARsGa4IoqOvwxlRxL4OzO3qkkKObXiiSa Ceu/O7iEl0kDcICMMsuDxxaqMfO5p8NTZdIJ0HIhQViGDVDg4Kp7MdQyDY2xtcdeeH9ZHZ Lu1Ben0f5nXdY91YMtyuCVp1LhBgfW+FPvY2Hlgy/U7tmdvU87Ae5rd94s74MCSfFL8ZPq cZOFRf+Wm/ccobppeJUjXIudT6BahoplG1D5dOdxJov73V82mi68XTXS0m2s8lB6VoqWYx m15cM7k9gVpESHVmZoPNejMUnvdXKkxdiGLTRZWPSexil3DvsyakCLQLoM0DqA== 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 4Pn6QL3WNHztp0; Thu, 30 Mar 2023 02:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32U2Cwjq062473; Thu, 30 Mar 2023 02:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U2CwYI062472; Thu, 30 Mar 2023 02:12:58 GMT (envelope-from git) Date: Thu, 30 Mar 2023 02:12:58 GMT Message-Id: <202303300212.32U2CwYI062472@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: 9288f153e01b - main - audio/rhythmbox: unbreak with --auto-features=enabled 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 9288f153e01b684b2bb16b51e6cf752f93e4c52c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=9288f153e01b684b2bb16b51e6cf752f93e4c52c commit 9288f153e01b684b2bb16b51e6cf752f93e4c52c Author: Jan Beich AuthorDate: 2023-03-30 01:31:20 +0000 Commit: Jan Beich CommitDate: 2023-03-30 02:11:56 +0000 audio/rhythmbox: unbreak with --auto-features=enabled meson.build:227:0: ERROR: Dependency "lirc" not found, tried pkgconfig PR: 270361 Reported by: antoine (via exp-run) --- audio/rhythmbox/Makefile | 6 +++--- audio/rhythmbox/files/patch-meson.build | 14 ++++++++++++++ audio/rhythmbox/pkg-plist | 6 +++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 40287a5fea46..51fd5ba61bc3 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -38,7 +38,7 @@ USE_LDCONFIG= yes GLIB_SCHEMAS= org.gnome.rhythmbox.gschema.xml OPTIONS_SUB= yes -OPTIONS_DEFINE= BRASERO DAAP DOCS GRILO IPOD MTP NLS NOTIFY PYTHON +OPTIONS_DEFINE= BRASERO DAAP DOCS GRILO IPOD LIRC MTP NLS NOTIFY PYTHON OPTIONS_DEFAULT=BRASERO NOTIFY PYTHON BRASERO_DESC= Brasero disc burning support BRASERO_MESON_ENABLED= brasero @@ -56,8 +56,8 @@ IPOD_MESON_ENABLED= ipod IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ libplist-2.0.so:devel/libplist \ libimobiledevice-1.0.so:comms/libimobiledevice -#LIRC_MESON_ENABLED= lirc -#LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc +LIRC_MESON_ENABLED= lirc +LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc MTP_MESON_ENABLED= mtp MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp NOTIFY_MESON_ENABLED= libnotify diff --git a/audio/rhythmbox/files/patch-meson.build b/audio/rhythmbox/files/patch-meson.build new file mode 100644 index 000000000000..4a2522cee67f --- /dev/null +++ b/audio/rhythmbox/files/patch-meson.build @@ -0,0 +1,14 @@ +Drop after comms/lirc >= 0.9.2 update. +https://sourceforge.net/p/lirc/git/ci/c763e92584a9 + +--- meson.build.orig 2022-06-21 12:04:40 UTC ++++ meson.build +@@ -224,7 +224,7 @@ endif + plugins += 'notification' + endif + +-lirc = dependency('lirc', required: get_option('lirc')) ++lirc = cc.find_library('lirc_client', required: get_option('lirc')) + if lirc.found() + plugins += 'lirc' + endif diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist index afe3d78a3411..a7494a1d3722 100644 --- a/audio/rhythmbox/pkg-plist +++ b/audio/rhythmbox/pkg-plist @@ -146,8 +146,8 @@ lib/rhythmbox/plugins/power-manager/power-manager.plugin %%PYTHON%%lib/rhythmbox/plugins/rb/rb.py %%PYTHON%%lib/rhythmbox/plugins/rb/rbconfig.py %%PYTHON%%lib/rhythmbox/plugins/rb/stringmatch.py -@comment %%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so -@comment %%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin +%%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so +%%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin %%PYTHON%%lib/rhythmbox/plugins/replaygain/config.py %%PYTHON%%lib/rhythmbox/plugins/replaygain/player.py %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.plugin @@ -488,4 +488,4 @@ share/metainfo/org.gnome.Rhythmbox3.appdata.xml %%DATADIR%%/rhythmbox.gep share/vala/vapi/rb.vapi share/vala/vapi/rhythmdb.vapi -@comment %%LIRC%%%%DATADIR%%/plugins/rblirc/rhythmbox_lirc_default +%%LIRC%%%%DATADIR%%/plugins/rblirc/rhythmbox_lirc_default