From nobody Tue Jun 11 22:05:31 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 4VzN5l6zjtz5N5KZ; Tue, 11 Jun 2024 22:05:31 +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 4VzN5l62DCz4Znk; Tue, 11 Jun 2024 22:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718143531; 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=AVhf83KkOjUN8s7hT/wfU/Wi6lexGKd6u9KjQ7KQz0E=; b=ciBTxcwpQ+Rh56S/S5D/koHFS8dLcHTAQ7PseJtPWRmRoHJojpgakUHQKfmA1wQewFv8uZ ysY8p19C1jfCsFAgTFH9e/p6SxC5XMTRmy3ecV3xe8aFUVK66UK8CzKDsxA0fzeSZV9IDx iswyF/0lOYwlfsIHWWKHdBQyOuBinopoUbo9ACm+SsaaKW57ohNe6aqmILNLkx2GGOy4ZA k0upu1YrDSbKB93AJcU2JMcZOF6g/C8iHzyzT4vVtsazi4L2QHk/cn+QyFKcHHumf9oBba mwDI1hx/OArU4C8celh4CaCLveWITTOCoqmD31UjptOVUR1wzF6Hvimr2bf6GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718143531; a=rsa-sha256; cv=none; b=fAHKLgfdI1bGVfQmYpE/iSS5nheTOA4LvgaR45zSRuVOjKSYEPuVbadahWNgNk/j692fh6 dANNq125yCG+W8GTrNKbMD7pXyeqw7NhANyVqNgRBWASWRznXHo8PxkDuTWIpUZwRa7euk AVBCfsWwKeWlU0KIBUD6ZwRht8A6+5hjvniTmr3bm1BuCjaiAdGaKLllrDGHQyxE3nZShE vixbxSrmyTsMKa9FbfnY72BMrXCiWZQg4jF0Vfht73mnKOb3SrIYm1ESIhEyBLSYXUeKFO RBFO2xIvbvBdaaCXH1AjGG/At8E24bROUUe8GFPUZPW3I6Lu8eWwOT7AmDwXdQ== 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=1718143531; 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=AVhf83KkOjUN8s7hT/wfU/Wi6lexGKd6u9KjQ7KQz0E=; b=LEPO4JXV5cJTtFq16khMOnWeVFJHzOEAKDKbcckYz5188T8vOv1shBLYcjPFHubOVxOzjB V9uogIcUa0nCL/K+Fpovgv0ZGdtY4InETsdB3yrddq/Vkp15jQfiepuFpZYYFozCXgrk/q 5USSzv5vmPEY8hMH+vCn0IljPsBsBtYvVJL73Wd/kJspxeDHniy4N7G6cDK9x9zisaGdf9 /MRU/XeellWn8AAQRDJJPDGGJIZb67LiYDaBIMgQ/ahT3eUvdfPBWQgxNFiU96hE91vdQi jHkYlo5bs+0jy/AgyY31Y9BRmAXRtlUTB6TG1i7NDTvKSNgPMlPw+rtY10Ifjw== 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 4VzN5l5W62zQYt; Tue, 11 Jun 2024 22:05:31 +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 45BM5V9B056880; Tue, 11 Jun 2024 22:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BM5VNV056877; Tue, 11 Jun 2024 22:05:31 GMT (envelope-from git) Date: Tue, 11 Jun 2024 22:05:31 GMT Message-Id: <202406112205.45BM5VNV056877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: fcf990eaf36a - main - audio/sayonara: enable PulseAudio, repair Python scripts 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcf990eaf36a6e26ef5eade77248c24ea9164e9f Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcf990eaf36a6e26ef5eade77248c24ea9164e9f commit fcf990eaf36a6e26ef5eade77248c24ea9164e9f Author: Adriaan de Groot AuthorDate: 2024-06-11 21:56:45 +0000 Commit: Adriaan de Groot CommitDate: 2024-06-11 22:05:29 +0000 audio/sayonara: enable PulseAudio, repair Python scripts Sayonara did not have a dependency on GStreamer PulseAudio plugins, so it would use only ALSA for output. PA is installed anyway in desktop systems, so enable the plugin. Thanks Harald for the simple patch. While here, repair the Python scripts, which need pydbus -- add the dependency, then repair the code to work with the version of pydbus that we have in ports. Reported-by: Harald Schmalzbauer PR: 279568 --- audio/sayonara/Makefile | 4 +++- audio/sayonara/files/patch-src_DBus_sayonara-ctl | 20 ++++++++++++++++++++ audio/sayonara/files/patch-src_DBus_sayonara-query | 20 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile index 70a43737ab04..71dd7a862b2e 100644 --- a/audio/sayonara/Makefile +++ b/audio/sayonara/Makefile @@ -1,6 +1,7 @@ PORTNAME= sayonara DISTVERSION= 1.10.0 DISTVERSIONSUFFIX= -stable1 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= adridg@FreeBSD.org @@ -12,11 +13,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtag.so:audio/taglib \ libmtp.so:multimedia/libmtp +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} USES= cmake compiler:c++11-lib desktop-file-utils gnome gstreamer pkgconfig \ qt:5 python shebangfix USE_GNOME= glib20 -USE_GSTREAMER= flac libav mpg123 ogg opus vorbis +USE_GSTREAMER= flac libav mpg123 ogg opus pulse vorbis USE_QT= dbus core gui network sql sql-sqlite3:run svg widgets xml \ buildtools:build qmake:build linguisttools:build \ testlib:build diff --git a/audio/sayonara/files/patch-src_DBus_sayonara-ctl b/audio/sayonara/files/patch-src_DBus_sayonara-ctl new file mode 100644 index 000000000000..9b7d1b1b198c --- /dev/null +++ b/audio/sayonara/files/patch-src_DBus_sayonara-ctl @@ -0,0 +1,20 @@ +--- src/DBus/sayonara-ctl.orig 2024-06-11 21:55:30 UTC ++++ src/DBus/sayonara-ctl +@@ -5,7 +5,7 @@ import sys + import argparse + + try: +- from pydbus import SessionBus ++ from dbus import SessionBus + except ImportError as e: + print("Cannot find pydbus module. Please install first") + sys.exit(1) +@@ -38,7 +38,7 @@ def main(): + bus = SessionBus() + try: + global gSayonaraInstance +- gSayonaraInstance = bus.get( ++ gSayonaraInstance = bus.get_object( + "org.mpris.MediaPlayer2.sayonara", # Bus name + "/org/mpris/MediaPlayer2" # Object path + ) diff --git a/audio/sayonara/files/patch-src_DBus_sayonara-query b/audio/sayonara/files/patch-src_DBus_sayonara-query new file mode 100644 index 000000000000..8f8baec0a714 --- /dev/null +++ b/audio/sayonara/files/patch-src_DBus_sayonara-query @@ -0,0 +1,20 @@ +--- src/DBus/sayonara-query.orig 2024-06-11 21:55:30 UTC ++++ src/DBus/sayonara-query +@@ -4,7 +4,7 @@ import sys + import argparse + + try: +- from pydbus import SessionBus ++ from dbus import SessionBus + except ImportError as e: + print("Cannot find pydbus module. Please install first") + sys.exit(1) +@@ -77,7 +77,7 @@ def main(): + bus = SessionBus() + + try: +- sayonara = bus.get( ++ sayonara = bus.get_object( + 'org.mpris.MediaPlayer2.sayonara', # Bus name + '/org/mpris/MediaPlayer2' # Object path + )