Hiya, Just a quick note to say that the patch to add back in gstreamer support doesn't properly wrap #ifdefs around all the uses of the error variable that's introduced. As such, with USE=pulseaudio, it generates the following error during compilation: libtool: compile: i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../gnome-settings-daemon -I../../plugins/common -DPIXMAPDIR=\"/usr/share/gnome-settings-daemon\" -DGLADEDIR=\"/usr/share/gnome-settings-daemon\" -DGNOME_SETTINGS_LOCALEDIR=\"/usr/share/locale\" -I../../plugins/media-keys/cut-n-paste -I/usr/include -I/usr/include -I/usr/include -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gnome-desktop-2.0 -I/usr/include/startup-notification-1.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -O2 -march=native -pipe -ggdb -MT libmedia_keys_la-gsd-media-keys-manager.lo -MD -MP -MF .deps/libmedia_keys_la-gsd-media-keys-manager.Tpo -c gsd-media-keys-manager.c -fPIC -DPIC -o .libs/libmedia_keys_la-gsd-media-keys-manager.o mv -f .deps/libmedia_keys_la-gsd-marshal.Tpo .deps/libmedia_keys_la-gsd-marshal.Plo i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../gnome-settings-daemon -I../../plugins/common -DPIXMAPDIR=\""/usr/share/gnome-settings-daemon"\" -DGLADEDIR=\""/usr/share/gnome-settings-daemon"\" -DGNOME_SETTINGS_LOCALEDIR=\""/usr/share/locale"\" -I../../plugins/media-keys/cut-n-paste -I/usr/include -I/usr/include -I/usr/include -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gnome-desktop-2.0 -I/usr/include/startup-notification-1.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -O2 -march=native -pipe -ggdb -MT test_media_keys-test-media-keys.o -MD -MP -MF .deps/test_media_keys-test-media-keys.Tpo -c -o test_media_keys-test-media-keys.o `test -f 'test-media-keys.c' || echo './'`test-media-keys.c gsd-media-keys-manager.c: In function 'do_sound_action': gsd-media-keys-manager.c:677: error: 'error' undeclared (first use in this function) gsd-media-keys-manager.c:677: error: (Each undeclared identifier is reported only once gsd-media-keys-manager.c:677: error: for each function it appears in.) make[5]: *** [test_media_keys-gsd-media-keys-manager.o] Error 1 make[5]: *** Waiting for unfinished jobs.... libtool: compile: i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../gnome-settings-daemon -I../../plugins/common -DPIXMAPDIR=\"/usr/share/gnome-settings-daemon\" -DGLADEDIR=\"/usr/share/gnome-settings-daemon\" -DGNOME_SETTINGS_LOCALEDIR=\"/usr/share/locale\" -I../../plugins/media-keys/cut-n-paste -I/usr/include -I/usr/include -I/usr/include -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gnome-desktop-2.0 -I/usr/include/startup-notification-1.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -O2 -march=native -pipe -ggdb -MT libmedia_keys_la-gsd-media-keys-window.lo -MD -MP -MF .deps/libmedia_keys_la-gsd-media-keys-window.Tpo -c gsd-media-keys-window.c -o libmedia_keys_la-gsd-media-keys-window.o >/dev/null 2>&1 mv -f .deps/test_media_keys-test-media-keys.Tpo .deps/test_media_keys-test-media-keys.Po mv -f .deps/test_media_keys-gsd-media-keys-window.Tpo .deps/test_media_keys-gsd-media-keys-window.Po gsd-media-keys-manager.c: In function 'do_sound_action': gsd-media-keys-manager.c:677: error: 'error' undeclared (first use in this function) gsd-media-keys-manager.c:677: error: (Each undeclared identifier is reported only once gsd-media-keys-manager.c:677: error: for each function it appears in.) make[5]: *** [libmedia_keys_la-gsd-media-keys-manager.lo] Error 1 mv -f .deps/libmedia_keys_la-gsd-media-keys-window.Tpo .deps/libmedia_keys_la-gsd-media-keys-window.Plo make[5]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins/media-keys' make[4]: *** [all-recursive] Error 1 make[4]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins/media-keys' make[3]: *** [all] Error 2 make[3]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins/media-keys' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0' make: *** [all] Error 2 Without the gst patch, everything compiles fine. Specifically the following patch segments show the two unprotected uses of error: +#ifdef HAVE_PULSE guint vol, norm_vol_step; int vol_step; - if (manager->priv->stream == NULL) +#else + int vol; + int vol_step; + GError *error = NULL; + if (manager->priv->volume == NULL) +#endif return; vol_step = gconf_client_get_int (manager->priv->conf_client, GCONF_MISC_DIR "/volume_step", - NULL); + &error); - if (vol_step <= 0 || vol_step > 100) +#ifdef HAVE_PULSE + if (vol_step <= 0 || vol_step > 100) { +#else + if (error) { +#endif vol_step = VOLUME_STEP; + g_error_free (error); + }
Created attachment 187812 [details, diff] Fixed version of gnome-settings-daemon-2.26.0-readd-gst-vol-control-support.patch Here's a complete copy of the fixed patch. Unfortunately git's changed the order of including non-existant files, so the diff between this and the other patch are relatively sizeable, but the only changes are around that location I pointed out earlier (here's a diff snippet to try to make it easier to see): @@ -632,23 +721,29 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-settings-daemon-2. int type) { gboolean muted; ++ int vol_step; +#ifdef HAVE_PULSE guint vol, norm_vol_step; - int vol_step; +- int vol_step; - if (manager->priv->stream == NULL) +#else + int vol; -+ int vol_step; + GError *error = NULL; + if (manager->priv->volume == NULL) +#endif return; ++#ifdef HAVE_PULSE ++ vol_step = gconf_client_get_int (manager->priv->conf_client, ++ GCONF_MISC_DIR "/volume_step", ++ NULL); ++#else vol_step = gconf_client_get_int (manager->priv->conf_client, GCONF_MISC_DIR "/volume_step", - NULL); + &error); ++#endif - if (vol_step <= 0 || vol_step > 100) +#ifdef HAVE_PULSE @@ -657,7 +752,9 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-settings-daemon-2. + if (error) { +#endif vol_step = VOLUME_STEP; ++#ifndef HAVE_PULSE + g_error_free (error); ++#endif + } +#ifdef HAVE_PULSE
*** Bug 265589 has been marked as a duplicate of this bug. ***
Fixed patch works for me.
yeah works for me too ;)
with this patch not work form me :|.If i remove this patch, the source compile and it works fine. This is the build error nclude/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/gnome-desktop-2.0 -I/usr/include/startup-notification-1.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -march=k8 -msse3 -O2 -pipe -MT libmedia_keys_la-gsd-media-keys-window.lo -MD -MP -MF .deps/libmedia_keys_la-gsd-media-keys-window.Tpo -c gsd-media-keys-window.c -fPIC -DPIC -o .libs/libmedia_keys_la-gsd-media-keys-window.o gsd-media-keys-manager.c: In function ‘do_sound_action’: gsd-media-keys-manager.c:677: error: ‘error’ undeclared (first use in this function) gsd-media-keys-manager.c:677: error: (Each undeclared identifier is reported only once gsd-media-keys-manager.c:677: error: for each function it appears in.) make[5]: *** [libmedia_keys_la-gsd-media-keys-manager.lo] Error 1 make[5]: *** Waiting for unfinished jobs.... libtool: compile: x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../gnome-settings-daemon -I../../plugins/common -DPIXMAPDIR=\"/usr/share/gnome-settings-daemon\" -DGLADEDIR=\"/usr/share/gnome-settings-daemon\" -DGNOME_SETTINGS_LOCALEDIR=\"/usr/share/locale\" -I../../plugins/media-keys/cut-n-paste -I/usr/include -I/usr/include -I/usr/include -DORBIT2=1 -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/gnome-desktop-2.0 -I/usr/include/startup-notification-1.0 -I/usr/include/libglade-2.0 -I/usr/include/libxml2 -march=k8 -msse3 -O2 -pipe -MT libmedia_keys_la-gsd-media-keys-window.lo -MD -MP -MF .deps/libmedia_keys_la-gsd-media-keys-window.Tpo -c gsd-media-keys-window.c -o libmedia_keys_la-gsd-media-keys-window.o >/dev/null 2>&1 mv -f .deps/libmedia_keys_la-gsd-media-keys-window.Tpo .deps/libmedia_keys_la-gsd-media-keys-window.Plo make[5]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins/media-keys' make[4]: *** [all-recursive] Error 1 make[4]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins/media-keys' make[3]: *** [all] Error 2 make[3]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins/media-keys' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0/plugins' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/var/tmp/portage/gnome-base/gnome-settings-daemon-2.26.0/work/gnome-settings-daemon-2.26.0' make: *** [all] Error 2 z.
Solved with gnome overlay update. thanks z.
Fixed in overlay, thanks.
