开源软件构建与测试

_service:tar_scm:alsa-tools.spec Changed

_service:tar_scm:0001-hdajackretask-Fix-build-with-gcc7.patch Added

@@ -0,0 +1,34 @@
+From dd462dd90b87867f59e3dcccd1bdb8b863c97011 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 2 Feb 2024 17:19:47 +0100
+Subject: PATCH hdajackretask: Fix build with gcc7
+
+The old compiler doesn't allow a variable declaration inside switch
+block.
+
+Fixes: d349d20c127b ("hdajackretask: add support for pipewire stop/start")
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ hdajackretask/apply-changes.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/hdajackretask/apply-changes.c b/hdajackretask/apply-changes.c
+index 0d558f7..381ccf2 100644
+--- a/hdajackretask/apply-changes.c
++++ b/hdajackretask/apply-changes.c
+@@ -213,9 +213,11 @@ cleanup:
+ static gboolean restore_soundserver(struct soundserver* state, GError** err)
+ {
+     gboolean ok = FALSE;
++    gchar* clientconf;
++
+     switch (state->type) {
+         case PULSEAUDIO:
+-            gchar* clientconf = get_pulseaudio_client_conf();
++            clientconf = get_pulseaudio_client_conf();
+             if (state->was_killed && g_unlink(clientconf) != 0) {
+                 g_set_error(err, quark(), 0, "%s", g_strerror(errno));
+                 g_free(clientconf);
+-- 
+2.41.0.windows.1
+

_service Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/Makefile -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/Makefile Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/as10k1/as10k1.h -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/as10k1/as10k1.h Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/echomixer/echomixer.c -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/echomixer/echomixer.c Changed

@@ -2105,7 +2105,7 @@
     for (i=0; i<ndmodes; i++) {
       menuitem=gtk_menu_item_new_with_label(dmodeNamei);
       gtk_widget_show(menuitem);
-      gtk_signal_connect(GTK_OBJECT(menuitem), "activate", Digital_mode_activate, (gpointer)(long)i);
+      gtk_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(Digital_mode_activate), (gpointer)(long)i);
       gtk_menu_append(GTK_MENU(menu), menuitem);
     }
     gtk_option_menu_set_menu(GTK_OPTION_MENU(dmodeOpt), menu);
@@ -2131,7 +2131,7 @@
       clocksrc_menuitemi=gtk_menu_item_new_with_label(clocksrcNamei);
       gtk_widget_show(clocksrc_menuitemi);
       gtk_widget_set_sensitive(clocksrc_menuitemi, FALSE);
-      gtk_signal_connect(GTK_OBJECT(clocksrc_menuitemi), "activate", Clock_source_activate, (gpointer)(long)i);
+      gtk_signal_connect(GTK_OBJECT(clocksrc_menuitemi), "activate", G_CALLBACK(Clock_source_activate), (gpointer)(long)i);
       gtk_menu_append(GTK_MENU(menu), clocksrc_menuitemi);
     }
     gtk_option_menu_set_menu(GTK_OPTION_MENU(clocksrcOpt), menu);
@@ -2157,7 +2157,7 @@
     for (i=0; i<nspdifmodes; i++) {
       menuitem=gtk_menu_item_new_with_label(spdifmodeNamei);
       gtk_widget_show(menuitem);
-      gtk_signal_connect(GTK_OBJECT(menuitem), "activate", SPDIF_mode_activate, (gpointer)(long)i);
+      gtk_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(SPDIF_mode_activate), (gpointer)(long)i);
       gtk_menu_append(GTK_MENU(menu), menuitem);
     }
     gtk_option_menu_set_menu(GTK_OPTION_MENU(spdifmodeOpt), menu);
@@ -2182,7 +2182,7 @@
       gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0);
       ReadControl(&i, 1, PhantomPower.id, SND_CTL_ELEM_IFACE_MIXER);
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), i);
-      gtk_signal_connect(GTK_OBJECT(button), "toggled", Switch_toggled, (gpointer)&PhantomPower);
+      gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(Switch_toggled), (gpointer)&PhantomPower);
       PhantomPower.Button=button;
     }
 
@@ -2193,7 +2193,7 @@
       gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0);
       ReadControl(&i, 1, Automute.id, SND_CTL_ELEM_IFACE_CARD);
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), i);
-      gtk_signal_connect(GTK_OBJECT(button), "toggled", Switch_toggled, (gpointer)&Automute);
+      gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(Switch_toggled), (gpointer)&Automute);
       Automute.Button=button;
     }
 
@@ -2202,7 +2202,7 @@
       autoclockChkbutton=gtk_check_button_new_with_label("Autoclock");
       gtk_widget_show(autoclockChkbutton);
       gtk_box_pack_start(GTK_BOX(hbox), autoclockChkbutton, TRUE, FALSE, 0);
-      gtk_signal_connect(GTK_OBJECT(autoclockChkbutton), "toggled", AutoClock_toggled, NULL);
+      gtk_signal_connect(GTK_OBJECT(autoclockChkbutton), "toggled", G_CALLBACK(AutoClock_toggled), NULL);
       AutoClock=-1;
     }
   }
@@ -2672,7 +2672,7 @@
   gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), 1);
   gtk_widget_show(button);
-  gtk_signal_connect(GTK_OBJECT(button), "toggled", Gang_button_toggled, 0);
+  gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(Gang_button_toggled), 0);
 
   // Controls frame
   frame=gtk_frame_new("Controls");
@@ -2687,7 +2687,7 @@
     button=gtk_toggle_button_new_with_label("VU");
     gtk_widget_show(button);
     gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
-    gtk_signal_connect(GTK_OBJECT(button), "toggled", VUmeters_button_click, 0);
+    gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(VUmeters_button_click), 0);
     VUw_geom.toggler=button;
     if (VUw_geom.st==1)
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@@ -2697,7 +2697,7 @@
   button=gtk_toggle_button_new_with_label("Line");
   gtk_widget_show(button);
   gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
-  gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)LVwindow);
+  gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)LVwindow);
   LVw_geom.toggler=button;
   if (LVw_geom.st==1)
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@@ -2707,7 +2707,7 @@
     button=gtk_toggle_button_new_with_label("Misc");
     gtk_widget_show(button);
     gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
-    gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)Miscwindow);
+    gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)Miscwindow);
     Miscw_geom.toggler=button;
     if (Miscw_geom.st==1)
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@@ -2718,7 +2718,7 @@
     button=gtk_toggle_button_new_with_label("GrMix");
     gtk_widget_show(button);
     gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
-    gtk_signal_connect(GTK_OBJECT(button), "toggled", GMixer_button_click, 0);
+    gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(GMixer_button_click), 0);
     GMw_geom.toggler=button;
     if (GMw_geom.st==1)
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@@ -2727,7 +2727,7 @@
     button=gtk_toggle_button_new_with_label("Mixer");
     gtk_widget_show(button);
     gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
-    gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)mixerControl.window);
+    gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)mixerControl.window);
     Mixerw_geom.toggler=button;
     if (Mixerw_geom.st==1)
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@@ -2738,7 +2738,7 @@
     button=gtk_toggle_button_new_with_label("Vmixer");
     gtk_widget_show(button);
     gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
-    gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)vmixerControl.window);
+    gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)vmixerControl.window);
     Vmixerw_geom.toggler=button;
     if (Vmixerw_geom.st==1)
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@@ -2749,7 +2749,7 @@
     button=gtk_toggle_button_new_with_label("PCM");
     gtk_widget_show(button);
     gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
-    gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)pcmoutControl.window);
+    gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)pcmoutControl.window);
     PVw_geom.toggler=button;
     if (PVw_geom.st==1)
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdajackretask/README -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdajackretask/README Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdajackretask/apply-changes.c -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdajackretask/apply-changes.c Changed

@@ -15,6 +15,15 @@
 static gchar* scriptfile = NULL;
 static gchar* errorfile = NULL;
 
+struct soundserver {
+    enum {
+        PULSEAUDIO,
+        PIPEWIRE
+    } type;
+    gboolean was_killed;
+    gchar *user;
+};
+
 static GQuark quark()
 {
     return g_quark_from_static_string("hda-jack-retask-error");
@@ -125,33 +134,73 @@
     return fname;
 }
 
-static gboolean kill_pulseaudio(gboolean* was_killed, int card, GError** err)
+static gboolean call_systemctl(gchar* user, gchar* operation, gchar *unit, GError **err)
+{
+    gchar* s;
+    gboolean ok;
+
+    if (getuid() == 0) {
+        // special case for root
+        // XDG_RUNTIME_DIR setup seems to be mandatory for Fedora, may differ for other distros
+        s = g_strdup_printf("runuser -l %s -c 'XDG_RUNTIME_DIR=/var/run/user/$(id -u) systemctl --user %s %s'", user, operation, unit);
+    } else {
+        s = g_strdup_printf("systemctl --user %s %s", operation, unit);
+    }
+    ok = g_spawn_command_line_sync(s, NULL, NULL, NULL, err);
+    g_free(s);
+    return ok;
+}
+
+static gboolean kill_soundserver(struct soundserver* state, int card, GError** err)
 {
     gchar* fuser = NULL, *fuser2 = NULL;
     gchar* s = NULL;
     gchar* clientconf = NULL;
     gboolean ok;
-    *was_killed = FALSE;
+    char *p;
+    state->type = PULSEAUDIO;
+    state->was_killed = FALSE;
+    state->user = NULL;
     /* Is PA having a lock on the sound card? */
     s = g_strdup_printf("fuser -v /dev/snd/controlC%d", card);
     /* Due to some bug in fuser, stdout and stderr output is unclear. Better check both. */
     if (!(ok = g_spawn_command_line_sync(s, &fuser, &fuser2, NULL, err))) 
         goto cleanup;
-    if ((ok = strstr(fuser, "pulseaudio") == NULL && strstr(fuser2, "pulseaudio") == NULL))
-        goto cleanup; // PulseAudio not locking the sound card
-
-    clientconf = get_pulseaudio_client_conf();
-    if (!(ok = !g_file_test(clientconf, G_FILE_TEST_EXISTS))) {
-        g_set_error(err, quark(), 0, "Cannot block PulseAudio from respawning:\n"
-            "Please either remove '%s' or kill PulseAudio manually.", clientconf);
-        goto cleanup;
+    if (strstr(fuser, "pulseaudio") != NULL || strstr(fuser2, "pulseaudio") != NULL) {
+        clientconf = get_pulseaudio_client_conf();
+        if (!(ok = !g_file_test(clientconf, G_FILE_TEST_EXISTS))) {
+            g_set_error(err, quark(), 0, "Cannot block PulseAudio from respawning:\n"
+                "Please either remove '%s' or kill PulseAudio manually.", clientconf);
+            goto cleanup;
+        }
+        
+        if (!(ok = g_file_set_contents(clientconf, "autospawn=no\n", -1, err)))
+            goto cleanup;
+        state->was_killed = TRUE;
+        ok = g_spawn_command_line_sync("pulseaudio -k", NULL, NULL, NULL, err);
+    } else if ((p = strstr(fuser, "wireplumber")) != NULL || (p = strstr(fuser2, "wireplumber")) != NULL) {
+        *p = '\0';
+        while (p != fuser && p != fuser2 && *p != '\n')
+            p--;
+        if (*p == '\n')
+            p++;
+        
+        GRegex *regex;
+        GMatchInfo *match_info;
+
+        regex = g_regex_new (" (a-zA-Z0-9_-+) ", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, NULL);
+        g_regex_match (regex, p, 0, &match_info);
+        if (g_match_info_matches (match_info))
+            state->user = g_match_info_fetch (match_info, 1);
+        g_match_info_free (match_info);
+        g_regex_unref (regex);
+        
+        state->type = PIPEWIRE;
+        ok = call_systemctl(state->user, "stop", "wireplumber.service", err);
+        state->was_killed = ok;
+    } else {
+        // Sound server not locking the sound card
     }
-    
-    if (!(ok = g_file_set_contents(clientconf, "autospawn=no\n", -1, err)))
-        goto cleanup;
-
-    *was_killed = TRUE;
-    ok = g_spawn_command_line_sync("pulseaudio -k", NULL, NULL, NULL, err);
 
 cleanup:
     g_free(clientconf);
@@ -161,16 +210,32 @@
     return ok;
 }
 
-static gboolean restore_pulseaudio(gboolean was_killed, GError** err) 
+static gboolean restore_soundserver(struct soundserver* state, GError** err)
 {
-    gchar* clientconf = get_pulseaudio_client_conf();
-    if (was_killed && g_unlink(clientconf) != 0) {
-        g_set_error(err, quark(), 0, "%s", g_strerror(errno));
-        g_free(clientconf);
-        return FALSE;
+    gboolean ok = FALSE;
+    switch (state->type) {
+        case PULSEAUDIO:
+            gchar* clientconf = get_pulseaudio_client_conf();
+            if (state->was_killed && g_unlink(clientconf) != 0) {
+                g_set_error(err, quark(), 0, "%s", g_strerror(errno));
+                g_free(clientconf);
+                goto cleanup;
+            }
+            g_free(clientconf);
+            ok = TRUE;
+            break;
+        case PIPEWIRE:
+            if (state->was_killed)
+                ok = call_systemctl(state->user, "start", "wireplumber.service", err);
+            else
+                ok = TRUE;
+            break;
     }
-    g_free(clientconf);
-    return TRUE;
+
+cleanup:
+    g_free(state->user);
+    state->user = NULL;
+    return ok;
 }
 
 gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int device, 
@@ -178,10 +243,10 @@
 {
     gboolean result = FALSE;
 //    gchar* script_name = NULL;
-    gboolean pa_killed = FALSE;
+    struct soundserver state = { 0 };
     /* Check for users of the sound card */
     /* Kill pulseaudio if necessary (and possible) */
-    if (!kill_pulseaudio(&pa_killed, card, err))
+    if (!kill_soundserver(&state, card, err))
         goto cleanup;
     /* Create script */
     if (!create_reconfig_script(pins, entries, card, device, model, hints, err))
@@ -191,7 +256,7 @@
         goto cleanup;
     result = TRUE;
 cleanup:
-    if (!restore_pulseaudio(pa_killed, result ? err : NULL)) {
+    if (!restore_soundserver(&state, result ? err : NULL)) {
         result = FALSE;
     }
 //    g_free(script_name);

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdajackretask/main-gtk.c -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdajackretask/main-gtk.c Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdspconf/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdspconf/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdspconf/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdspconf/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdsploader/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdsploader/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdsploader/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdsploader/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdspmixer/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdspmixer/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdspmixer/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdspmixer/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/hdspmixer/src/hdspmixer.cxx -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/hdspmixer/src/hdspmixer.cxx Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/ld10k1/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/ld10k1/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/ld10k1/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/ld10k1/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/mixartloader/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/mixartloader/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/mixartloader/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/mixartloader/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/pcxhrloader/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/pcxhrloader/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/pcxhrloader/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/pcxhrloader/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/sb16_csp/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/sb16_csp/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/sb16_csp/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/sb16_csp/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/seq/sbiload/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/seq/sbiload/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/seq/sbiload/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/seq/sbiload/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/sscape_ctl/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/sscape_ctl/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/sscape_ctl/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/sscape_ctl/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/us428control/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/us428control/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/us428control/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/us428control/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/usx2yloader/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/usx2yloader/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/usx2yloader/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/usx2yloader/configure Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/vxloader/aclocal.m4 -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/vxloader/aclocal.m4 Changed

_service:tar_scm:alsa-tools-1.2.5.tar.bz2/vxloader/configure -> _service:tar_scm:alsa-tools-1.2.11.tar.bz2/vxloader/configure Changed

Difference Between Revision 6 and Mega-LLVM:24.03 / alsa-tools