[gnome-media] profiles: Moved to libgnome-media-profiles module



commit ce417c6f998ecf3a20ab7bcc63cb51b9b2172f52
Author: Bastien Nocera <hadess hadess net>
Date:   Sun Oct 31 01:20:39 2010 +0100

    profiles: Moved to libgnome-media-profiles module
    
    The libgnome-media-profiles module has moved.

 COPYING.profiles                                   |  481 ---------
 Makefile.am                                        |    6 -
 configure.ac                                       |   51 +-
 grecord/src/Makefile.am                            |    3 +-
 grecord/src/gsr-window.c                           |    2 +-
 profiles/Makefile.am                               |   81 --
 profiles/README                                    |   73 --
 profiles/audio-profile-choose.c                    |  436 --------
 profiles/audio-profile-choose.h                    |   74 --
 profiles/audio-profile-edit.c                      |  426 --------
 profiles/audio-profile-edit.h                      |   63 --
 profiles/audio-profile-private.h                   |   54 -
 profiles/audio-profile.c                           | 1132 --------------------
 profiles/audio-profile.h                           |   84 --
 profiles/audio-profiles-edit.c                     |  988 -----------------
 profiles/audio-profiles-edit.h                     |   67 --
 profiles/glade/Makefile.am                         |   26 -
 profiles/glade/gnome-media-profiles-catalog.c      |    8 -
 profiles/glade/gnome-media-profiles.xml            |   29 -
 profiles/gmp-conf.h                                |   26 -
 profiles/gmp-util.c                                |  164 ---
 profiles/gmp-util.h                                |   40 -
 profiles/gnome-audio-profile-edit.ui               |  204 ----
 profiles/gnome-audio-profile-new.ui                |  195 ----
 profiles/gnome-audio-profiles-properties.c         |   81 --
 profiles/gnome-audio-profiles-test.c               |  188 ----
 profiles/gnome-audio-profiles.schemas.in.in        |  612 -----------
 profiles/gnome-media-profiles-3.0.pc.in            |   13 -
 profiles/gnome-media-profiles.c                    |   72 --
 profiles/gnome-media-profiles.h                    |   27 -
 .../gnome-audio-profiles-profile-window.png        |  Bin 24668 -> 0 bytes
 .../gnome-audio-profiles-profiles-window.png       |  Bin 18913 -> 0 bytes
 profiles/help/C/gnome-audio-profiles.xml           |  262 -----
 profiles/help/C/legal.xml                          |   73 --
 profiles/help/ChangeLog                            |    4 -
 profiles/help/Makefile.am                          |   10 -
 profiles/help/da/da.po                             |  603 -----------
 profiles/help/de/de.po                             |  414 -------
 .../gnome-audio-profiles-profile-window.png        |  Bin 47135 -> 0 bytes
 .../gnome-audio-profiles-profiles-window.png       |  Bin 33639 -> 0 bytes
 profiles/help/el/el.po                             |  270 -----
 profiles/help/es/es.po                             |  417 -------
 .../gnome-audio-profiles-profile-window.png        |  Bin 38715 -> 0 bytes
 .../gnome-audio-profiles-profiles-window.png       |  Bin 26516 -> 0 bytes
 profiles/help/fr/fr.po                             |  418 --------
 profiles/help/gnome-audio-profiles.omf.in          |    9 -
 profiles/help/sl/sl.po                             |  341 ------
 .../gnome-audio-profiles-profile-window.png        |  Bin 32967 -> 0 bytes
 .../sv/figures/gnome-audio-profiles-window.png     |  Bin 23047 -> 0 bytes
 profiles/help/sv/sv.po                             |  260 -----
 profiles/help/zh_CN/zh_CN.po                       |  375 -------
 51 files changed, 3 insertions(+), 9159 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a8f8347..88854ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,6 @@ NULL =
 
 SUBDIRS = po
 
-if HAVE_GMP
-SUBDIRS += profiles
-endif
-
 if HAVE_GRECORD
 SUBDIRS += grecord
 endif
@@ -33,7 +29,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 DIST_SUBDIRS = \
 	po 			\
-	profiles		\
 	gnome-volume-control	\
 	grecord			\
 	gst-mixer		\
@@ -49,7 +44,6 @@ EXTRA_DIST = \
 	COPYING-DOCS		\
 	COPYING.grecord		\
 	COPYING.gst-mixer	\
-	COPYING.profiles	\
 	MAINTAINERS		\
         build-aux/git-version-gen \
 	build-aux/gnome-doc-utils.make	\
diff --git a/configure.ac b/configure.ac
index 10052fb..20081ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,43 +145,6 @@ PANELS_DIR="${libdir}/control-center-1/panels"
 AC_SUBST(PANELS_DIR)
 
 dnl=======================================================================
-dnl profiles
-dnl=======================================================================
-
-have_profiles=no
-
-AC_ARG_ENABLE([profiles],
-  AS_HELP_STRING([--enable-profiles], [enable gnome media profiles]),
-  ,enable_profiles=yes)
-
-if test "x$enable_profiles" = "xyes"; then
-  PKG_CHECK_MODULES(GMP, [
-    gtk+-3.0 >= $GTK_REQUIRED_VERSION
-    gstreamer-0.10
-    gconf-2.0
-    gio-2.0],
-    have_profiles=yes)
-fi
-AC_SUBST(GMP_CFLAGS)
-AC_SUBST(GMP_LIBS)
-AM_CONDITIONAL(HAVE_GMP, [test x$have_profiles = xyes])
-
-dnl Profiles glade ui: needed to edit .ui files with glade3
-have_gladeui=no
-
-# gladeui-3.0 is hypothetical
-PKG_CHECK_MODULES(GLADEUI, [gladeui-3.0], have_gladeui=yes, have_gladeui=no)
-AC_SUBST(GLADEUI_CFLAGS)
-AC_SUBST(GLADEUI_LIBS)
-AM_CONDITIONAL(HAVE_GLADEUI, [test x$have_gladeui = xyes])
-
-GLADEUI_CATALOG_DIR="`$PKG_CONFIG --variable=catalogdir gladeui-3.0`"
-AC_SUBST(GLADEUI_CATALOG_DIR)
-
-GLADEUI_MODULE_DIR="`$PKG_CONFIG --variable=moduledir gladeui-3.0`"
-AC_SUBST(GLADEUI_MODULE_DIR)
-
-dnl=======================================================================
 dnl Check for GStreamer and GSR deps
 dnl=======================================================================
 
@@ -199,6 +162,7 @@ have_gst=no
 PKG_CHECK_MODULES(GSR, [
   gstreamer-$GST_MAJORMINOR >= $GST_REQ
   gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ
+  libgnome-media-profiles-3.0
   gtk+-3.0 >= 2.6.0
   gio-2.0
   gconf-2.0],
@@ -216,13 +180,6 @@ AC_ARG_ENABLE([grecord],
   AS_HELP_STRING([--enable-grecord], [enable gnome sound recorder]),
   ,enable_grecord=yes)
 
-if test "x$have_profiles" = "xno" ; then
-  AC_MSG_WARN([Grecord will be disabled because of disabled profiles])
-  enable_grecord=no
-  have_grecord=no
-  grecord_reason=", gnome media profiles is disabled"
-fi
-
 if test "x$have_gst" = "xyes" && test "x$enable_grecord" = "xyes"; then
   have_grecord=yes
 else
@@ -442,11 +399,6 @@ gst-mixer/icons/16x16/status/Makefile
 gst-mixer/src/Makefile
 gst-mixer/pixmaps/Makefile
 gst-mixer/doc/Makefile
-profiles/Makefile
-profiles/gnome-audio-profiles.schemas.in
-profiles/gnome-media-profiles-3.0.pc
-profiles/glade/Makefile
-profiles/help/Makefile
 grecord/gnome-sound-recorder.desktop.in
 gst-mixer/gnome-volume-control.desktop.in
 gstreamer-properties/gstreamer-properties.desktop.in
@@ -467,7 +419,6 @@ echo "
 
         Volume Control          $have_pulseaudio
         GStreamer properties:   $have_gstprops
-        GStreamer profiles:     $have_profiles (GladeUI: $have_gladeui)
         Sound recorder:         $have_grecord$grecord_reason
 
   *Deprecated*:
diff --git a/grecord/src/Makefile.am b/grecord/src/Makefile.am
index 19e7d1b..70ec190 100644
--- a/grecord/src/Makefile.am
+++ b/grecord/src/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = $(ui_DATA)
 
 gnome_sound_recorder_LDADD =					\
 	-lm							\
-	$(GSR_LIBS) -lgstinterfaces- GST_MAJORMINOR@		\
-	$(top_builddir)/profiles/libgnome-media-profiles-3.0.la
+	$(GSR_LIBS) -lgstinterfaces- GST_MAJORMINOR@
 
 -include $(top_srcdir)/git.mk
diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
index 4e6804f..a2fdee7 100644
--- a/grecord/src/gsr-window.c
+++ b/grecord/src/gsr-window.c
@@ -44,7 +44,7 @@
 #include <gst/gst.h>
 #include <gst/interfaces/mixer.h>
 
-#include <profiles/gnome-media-profiles.h>
+#include <libgnome-media-profiles/gnome-media-profiles.h>
 
 #include "gsr-window.h"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]