CVS commit: pkgsrc/audio/rhythmbox

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct 26 21:19:51 UTC 2026

Modified Files:
        pkgsrc/audio/rhythmbox: Makefile PLIST

Log Message:
rhythmbox: remove grilo support

libsoup2 (required by rhythmbox) and libsoup3 (pulled in by grilo)
can not coexist in the same binary, see PR 60929.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 pkgsrc/audio/rhythmbox/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/rhythmbox/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/rhythmbox/Makefile
diff -u pkgsrc/audio/rhythmbox/Makefile:1.228 pkgsrc/audio/rhythmbox/Makefile:1.229
--- pkgsrc/audio/rhythmbox/Makefile:1.228       Tue Sep 29 06:03:55 2026
+++ pkgsrc/audio/rhythmbox/Makefile     Mon Oct 26 21:19:51 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.228 2026/09/29 06:03:55 wiz Exp $
+# $NetBSD: Makefile,v 1.229 2026/10/26 21:19:51 wiz Exp $
 
 DISTNAME=      rhythmbox-3.4.6
-PKGREVISION=   33
+PKGREVISION=   34
 CATEGORIES=    audio gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/rhythmbox/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -15,7 +15,9 @@ TOOL_DEPENDS+=        glib2-introspection-[0-9]
 DEPENDS+=      gst-plugins1-libav-[0-9]*:../../multimedia/gst-plugins1-libav
 DEPENDS+=      gst-plugins1-good-[0-9]*:../../multimedia/gst-plugins1-good
 DEPENDS+=      gst-plugins1-oss-[0-9]*:../../audio/gst-plugins1-oss
-DEPENDS+=      grilo-plugins-[0-9]*:../../net/grilo-plugins
+# grilo uses libsoup3, and rhythmbox 3.4.6 only supports libsoup2,
+# and the different libsoup versions cannot coexist, see PR 60929.
+#DEPENDS+=     grilo-plugins-[0-9]*:../../net/grilo-plugins
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 USE_TOOLS+=            intltool itstool msgfmt pkg-config
@@ -42,7 +44,7 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/totem-pl-parser/buildlink3.mk"
-.include "../../net/grilo/buildlink3.mk"
+#.include "../../net/grilo/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"

Index: pkgsrc/audio/rhythmbox/PLIST
diff -u pkgsrc/audio/rhythmbox/PLIST:1.32 pkgsrc/audio/rhythmbox/PLIST:1.33
--- pkgsrc/audio/rhythmbox/PLIST:1.32   Tue Jan  3 13:23:00 2023
+++ pkgsrc/audio/rhythmbox/PLIST        Mon Oct 26 21:19:51 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2023/01/03 13:23:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.33 2026/10/26 21:19:51 wiz Exp $
 bin/rhythmbox
 bin/rhythmbox-client
 include/rhythmbox/backends/rb-encoder.h
@@ -91,8 +91,6 @@ lib/rhythmbox/plugins/dbus-media-server/
 lib/rhythmbox/plugins/dbus-media-server/libdbus-media-server.so
 lib/rhythmbox/plugins/generic-player/generic-player.plugin
 lib/rhythmbox/plugins/generic-player/libgeneric-player.so
-lib/rhythmbox/plugins/grilo/grilo.plugin
-lib/rhythmbox/plugins/grilo/libgrilo.so
 lib/rhythmbox/plugins/ipod/ipod.plugin
 lib/rhythmbox/plugins/ipod/libipod.so
 lib/rhythmbox/plugins/iradio/iradio.plugin