[rpms/libcanberra] rawhide: Merge branch 'cleanup'

[rpms/libcanberra] rawhide: Merge branch 'cleanup'

[Zephyr Lykos]

            A new commit has been pushed.

            Repo   : rpms/libcanberra
            Branch : rawhide
            Commit : 47d69591eec51cf14f97c54acd079269cef53dca
            Author : Zephyr Lykos <git@mochaa.ws>
            Date   : 2026-06-02T11:29:57+08:00
            Stats  : +81/-45 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/libcanberra/c/47d69591eec51cf14f97c54acd079269cef53dca?branch=rawhide

            Log:
            Merge branch 'cleanup'

Squashed commit of the following:

commit 6c8cbf29c77009f904eedab645b2960a614e46c7
Author: Zephyr Lykos <git@mochaa.ws>
Date:   Fri Mar 22 02:28:13 2024 +0800

    Use default ALSA device for canberra-boot

commit 58ef1d20b81381c9d56e03a02cbb7f08ed1fe931
Author: David Shea <dshea@redhat.com>
Date:   Fri Oct 19 14:04:41 2018 -0400

    Split backend modules into separate subpackages

    This way specialized images, such as the Fedora installer environment,
    can use applications linked against libcanberra without necessarily
    pulling in alsa, gstreamer, or pulseaudio as dependencies.

    The main libcanberra package Recommends all of the backend packages, so
    the default set of installed backends remains the same.

commit 0dbfe57d05c995caf048ad80c58dd57f8c7c4640
Author: Tim Landscheidt <tim@tim-landscheidt.de>
Date:   Fri Mar 5 02:21:53 2021 +0000

    Fix broken URL

commit 2b524660897819877bd38008cc8823c5d464b2e9
Author: Tom Stellard <tstellar@redhat.com>
Date:   Mon Jul 13 20:43:13 2020 +0000

    Use make macros

    https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

---
diff --git a/0001-canberra-boot-use-plughw-ALSA-device.patch b/0001-canberra-boot-use-plughw-ALSA-device.patch
new file mode 100644
index 0000000..448c44d
--- /dev/null
+++ b/0001-canberra-boot-use-plughw-ALSA-device.patch
@@ -0,0 +1,33 @@
+From da04010b995b54c4e7de68adaf2e61e6f7d06465 Mon Sep 17 00:00:00 2001
+From: Zephyr Lykos <git@mochaa.ws>
+Date: Fri, 22 Mar 2024 03:49:10 +0800
+Subject: [PATCH] canberra-boot: use plughw ALSA device
+
+On modern systems ALSA is provided by PipeWire or PulseAudio,
+and front:0 no longer works in that case.
+---
+ src/canberra-boot.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/canberra-boot.c b/src/canberra-boot.c
+index b699346..e7a5eca 100644
+--- a/src/canberra-boot.c
++++ b/src/canberra-boot.c
+@@ -124,11 +124,11 @@ static char *find_device(void) {
+         }
+ 
+         if (internal_device >= 0)
+-                asprintf(&s, "front:%i", internal_device);
++                asprintf(&s, "plughw:%i,0", internal_device);
+         else if (pci_device >= 0)
+-                asprintf(&s, "front:%i", pci_device);
++                asprintf(&s, "plughw:%i,0", pci_device);
+         else if (other_device >= 0)
+-                asprintf(&s, "front:%i", other_device);
++                asprintf(&s, "plughw:%i,0", other_device);
+ 
+ finish:
+         if (udev_enum)
+-- 
+2.44.0
+

diff --git a/libcanberra-gtk-module.sh b/libcanberra-gtk-module.sh
deleted file mode 100755
index fbb7ff7..0000000
--- a/libcanberra-gtk-module.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -z "$GTK_MODULES" ] ; then
-	GTK_MODULES="canberra-gtk-module"
-else
-	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-fi
-
-export GTK_MODULES
-

diff --git a/libcanberra-quit-add.patch b/libcanberra-quit-add.patch
deleted file mode 100644
index 0094569..0000000
--- a/libcanberra-quit-add.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
---- libcanberra-0.26/src/canberra-gtk-module.c.quit-add	2011-01-07 22:48:49.388992626 -0500
-+++ libcanberra-0.26/src/canberra-gtk-module.c	2011-01-07 22:49:02.339995153 -0500
-@@ -932,11 +932,6 @@ static void connect_settings(void) {
-         connected = TRUE;
- }
- 
--static gboolean quit_handler(gpointer data) {
--        dispatch_queue();
--        return FALSE;
--}
--
- G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
- 
-         /* This is the same quark libgnomeui uses! */
-@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
-         install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
-         install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
-         install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
--
--        gtk_quit_add(1, quit_handler, NULL);
- }
- 
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);

diff --git a/libcanberra.spec b/libcanberra.spec
index 56e3bc4..e89e478 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -7,12 +7,13 @@
 
 Name: libcanberra
 Version: 0.30
-Release: 39%{?dist}
+Release: 40%{?dist}
 Summary: Portable Sound Event Library
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
 Patch0: 0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
+Patch1: 0001-canberra-boot-use-plughw-ALSA-device.patch
 License: LGPL-2.1-or-later
-Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
+URL: https://git.0pointer.net/libcanberra.git/
 BuildRequires: gcc
 %if %{with gtk2}
 BuildRequires: gtk2-devel
@@ -29,12 +30,37 @@ BuildRequires: gettext-devel
 BuildRequires: systemd-devel
 BuildRequires: make
 Requires: sound-theme-freedesktop
-Requires: pulseaudio-libs >= 0.9.15
+
+Recommends: libcanberra-backend-alsa
+Recommends: libcanberra-backend-gstreamer
+Recommends: libcanberra-backend-pulse
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
 (http://0pointer.de/public/sound-theme-spec.html).
 
+%package backend-alsa
+Summary: ALSA backend for libcanberra
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description backend-alsa
+The ALSA backend module for libcanberra
+
+%package backend-gstreamer
+Summary: GStreamer backend for libcanberra
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description backend-gstreamer
+The GStreamer backend module for libcanberra
+
+%package backend-pulse
+Summary: PulseAudio backend for libcanberra
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pulseaudio-libs >= 0.9.15
+
+%description backend-pulse
+The PulseAudio backend module for libcanberra
+
 %if %{with gtk2}
 %package gtk2
 Summary: Gtk+ 2.x Bindings for libcanberra
@@ -72,8 +98,7 @@ Development Files for libcanberra Client Development
 %systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %prep
-%setup -q
-%patch -P0 -p1 
+%autosetup -p1
 
 %build
 %configure \
@@ -86,11 +111,11 @@ Development Files for libcanberra Client Development
     --enable-null \
     --disable-oss \
     --with-builtin=dso \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
-make %{?_smp_mflags}
+    --with-systemdsystemunitdir=%{_unitdir}
+%make_build
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
 rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 
@@ -99,16 +124,22 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %doc README LGPL
 %{_libdir}/libcanberra.so.*
 %dir %{_libdir}/libcanberra-%{version}
-%{_libdir}/libcanberra-%{version}/libcanberra-alsa.so
-%{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
 %{_libdir}/libcanberra-%{version}/libcanberra-null.so
 %{_libdir}/libcanberra-%{version}/libcanberra-multi.so
-%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 %{_prefix}/lib/systemd/system/canberra-system-bootup.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown-reboot.service
 %{_prefix}/lib/systemd/system/canberra-system-shutdown.service
 %{_bindir}/canberra-boot
 
+%files backend-alsa
+%{_libdir}/libcanberra-%{version}/libcanberra-alsa.so
+
+%files backend-gstreamer
+%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
+
+%files backend-pulse
+%{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
+
 %if %{with gtk2}
 %files gtk2
 %{_libdir}/libcanberra-gtk.so.*
@@ -151,6 +182,12 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Mar 21 2024 Zephyr Lykos <fedora@mochaa.ws> - 0.30-40
+- Use plughw ALSA device for canberra-boot
+- Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro (Tom Stellard <tstellar@redhat.com>)
+- Fix broken URL (Tim Landscheidt <tim@tim-landscheidt.de>)
+- Split backend modules into separate subpackages (David Shea <dshea@redhat.com>)
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-39
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild