gnome-control-center r9173 - in trunk: . capplets capplets/sound

[hadess svn gnome org]

Author: hadess
Date: Thu Dec 18 11:19:25 2008
New Revision: 9173
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9173&view=rev

Log:
2008-12-18  Bastien Nocera  <hadess hadess net>

	* capplets/Makefile.am:
	* capplets/sound/Makefile.am:
	* capplets/sound/gnome-settings-sound.desktop.in.in:
	* capplets/sound/icons/16x16/gnome-sound-properties.svg:
	* capplets/sound/icons/22x22/gnome-sound-properties.svg:
	* capplets/sound/icons/32x32/gnome-sound-properties.svg:
	* capplets/sound/icons/scalable/gnome-sound-properties.svg:
	* capplets/sound/mixer-support.c:
	* capplets/sound/mixer-support.h:
	* capplets/sound/pipeline-tests.c:
	* capplets/sound/pipeline-tests.h:
	* capplets/sound/sound-properties-capplet.c:
	* capplets/sound/sound-properties.glade:
	* capplets/sound/sound-theme-definition.h:
	* capplets/sound/sound-theme-file-utils.c:
	* capplets/sound/sound-theme-file-utils.h:
	* capplets/sound/sound-theme.c:
	* capplets/sound/sound-theme.h:
	* configure.in: Remove the sound capplet, it's now in gnome-media
	itself, removes libcanberra-gtk and GStreamer dependencies
	(Closes: #564871)



Removed:
   trunk/capplets/sound/
Modified:
   trunk/ChangeLog
   trunk/capplets/Makefile.am
   trunk/configure.in

Modified: trunk/capplets/Makefile.am
==============================================================================
--- trunk/capplets/Makefile.am	(original)
+++ trunk/capplets/Makefile.am	Thu Dec 18 11:19:25 2008
@@ -19,9 +19,5 @@
 SUBDIRS += about-me
 endif
 
-if BUILD_SOUND
-SUBDIRS += sound
-endif
-
 DIST_SUBDIRS = \
-	$(always_built_SUBDIRS) display about-me sound
+	$(always_built_SUBDIRS) display about-me

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Dec 18 11:19:25 2008
@@ -243,68 +243,6 @@
 AM_GCONF_SOURCE_2
 
 dnl ==============================================
-dnl GStreamer section
-dnl ==============================================
-GST_MAJORMINOR=auto
-
-AC_ARG_ENABLE(gstreamer,
-AC_HELP_STRING([--disable-gstreamer],[disable gstreamer support]),
-[case "${enableval}" in
- yes) ENABLE_GSTREAMER=yes ;;
- 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
- no)  ENABLE_GSTREAMER=no ;;
- *) AC_MSG_ERROR([
-                  *** Bad value ${enableval} for --enable-gstreamer
-                  *** Please use one of the following:
-                  ***    --enable-gstreamer=0.10
-               ]) ;;
-esac],
-[ENABLE_GSTREAMER=yes]) dnl Default value
-
-have_gstreamer=no
-if test "x$ENABLE_GSTREAMER" = "xyes"; then
-   GST_REQS=0.10.1.2
-   PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS"
-
-   PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,
-                     AC_MSG_RESULT([no]))
-
-   GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
-else
-   AC_MSG_NOTICE([*** GStreamer support disabled ***])
-fi
-AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")
-AC_SUBST(GST_LIBS)
-AC_SUBST(GST_CFLAGS)
-
-dnl ==============================================
-dnl sound capplet section
-dnl ==============================================
-
-AC_ARG_WITH(libcanberra,
-  AC_HELP_STRING([--without-libcanberra],[Don't build parts depending on libcanberra]),
-  with_libcanberra=$withval,
-  with_libcanberra=yes)
-
-if test "x$with_libcanberra" != "xno"; then
-  PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= 0.4 gio-2.0, have_canberra=yes, have_canberra=no)
-  if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then
-    SOUND_CAPPLET_LIBS="$GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
-    SOUND_CAPPLET_CFLAGS="$GST_CFLAGS"
-    AC_SUBST(SOUND_CAPPLET_LIBS)
-    AC_SUBST(SOUND_CAPPLET_CFLAGS)
-  else
-    if test "x$with_libcanberra" = "xyes" -a "x$have_canberra" = "xno"; then
-      AC_MSG_ERROR([Sound capplet requested but libcanberra not found])
-    fi
-    AC_MSG_NOTICE([*** Sound capplet will not be built]);
-  fi
-else
-  AC_MSG_NOTICE([*** Sound capplet will not be built]);
-fi
-AM_CONDITIONAL(BUILD_SOUND, test "x$with_libcanberra" = "xyes")
-
-dnl ==============================================
 dnl Define the main variables
 dnl ==============================================
 COMMON_CFLAGS="-I\$(top_srcdir)/capplets/common"
@@ -365,8 +303,6 @@
 capplets/mouse/gnome-settings-mouse.desktop.in
 capplets/network/Makefile
 capplets/network/gnome-network-preferences.desktop.in
-capplets/sound/Makefile
-capplets/sound/gnome-settings-sound.desktop.in
 capplets/windows/Makefile
 capplets/windows/window-properties.desktop.in
 font-viewer/Makefile