[cheese/wip/meson: 2/3] Remove camera service

[David King <davidk src gnome org>]

commit 74dbdd7a6cf5aff56fb2b38ca9ddae38a5ef2eeb
Author: David King <amigadave amigadave com>
Date:   Mon Jul 31 12:40:30 2017 +0100

    Remove camera service
    
    It was an experiment, but in future PipeWire will be used instead, so it
    is no longer needed.

 .gitignore                       |    6 -
 COPYING.GPL3                     |  674 --------------------------------------
 Makefile.am                      |   61 +----
 configure.ac                     |    1 -
 data/org.gnome.Camera.service.in |    3 -
 data/org.gnome.Camera.xml        |   50 ---
 service/gc-application.c         |  116 -------
 service/gc-application.h         |   45 ---
 service/gc-camera-client.c       |  297 -----------------
 service/gc-camera-client.h       |   46 ---
 service/gc-camera-manager.c      |  295 -----------------
 service/gc-camera-manager.h      |   45 ---
 service/gc-client-monitor.c      |  311 ------------------
 service/gc-client-monitor.h      |   48 ---
 service/gc-main.c                |   45 ---
 15 files changed, 2 insertions(+), 2041 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9281cb4..3a91f67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,13 +19,11 @@ Makefile.in*
 /cheese-lcov.info
 /data/cheese-gtk.pc
 /data/cheese.pc
-/data/org.gnome.Camera.service
 /data/org.gnome.Cheese.appdata.xml
 /data/org.gnome.Cheese.appdata.valid
 /data/org.gnome.Cheese.desktop
 /data/org.gnome.Cheese.desktop.in
 /data/org.gnome.Cheese.gschema.valid
-/data/org.gnome.Cheese.service
 /docs/reference/html/
 /docs/reference/xml/
 /docs/reference/*.stamp
@@ -54,8 +52,6 @@ Makefile.in*
 /po/POTFILES
 /po/cheese.pot
 /po/stamp-it
-/service/camera.c
-/service/camera.h
 /src/*.c
 /src/cheese-resource.h
 /????-report.html
@@ -67,7 +63,6 @@ Makefile.in*
 /tests/cheese-test-flash
 /tests/test-libcheese
 /tests/test-libcheese-gtk
-/tests/test-service-client
 /tests/test-webcam-button
 /aclocal.m4
 /Cheese-*.gir
@@ -75,7 +70,6 @@ Makefile.in*
 /cheese
 /config.*
 /configure
-/gnome-camera-service
 /gtk-doc.make
 /INSTALL
 /intltool*.in
diff --git a/Makefile.am b/Makefile.am
index 3103a0e..ee72891 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -243,56 +243,12 @@ cheese_LDADD = \
        $(CHEESE_LIBS) \
        $(CHEESE_GTK_LIBS)
 
-libexec_PROGRAMS = \
-       gnome-camera-service
-
-service/camera.c: service/camera.h
-service/camera.h: Makefile data/org.gnome.Camera.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --interface-prefix org.gnome.Camera. \
-               --generate-c-code service/camera \
-               --c-namespace Gc $(srcdir)/data/org.gnome.Camera.xml
-
-BUILT_SOURCES = \
-       $(nodist_gnome_camera_service_SOURCES)
-
-gnome_camera_service_SOURCES = \
-       service/gc-application.c \
-       service/gc-camera-client.c \
-       service/gc-camera-manager.c \
-       service/gc-client-monitor.c \
-       service/gc-main.c
-
-noinst_gnome_camera_service_headers = \
-       service/gc-application.h \
-       service/gc-camera-client.h \
-       service/gc-camera-manager.h \
-       service/gc-client-monitor.h
-
-nodist_gnome_camera_service_headers = \
-       service/camera.h
-
-nodist_gnome_camera_service_SOURCES = \
-       service/camera.c
-
-gnome_camera_service_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_builddir)/service \
-       -I$(top_srcdir)/libcheese
-
-gnome_camera_service_CFLAGS = \
-       $(CHEESE_GTK_CFLAGS)
-
-gnome_camera_service_LDADD = \
-       libcheese-gtk.la \
-       $(CHEESE_GTK_LIBS)
-
 EXAMPLES = \
        tests/cheese-test-camera \
        tests/cheese-test-chooser \
        tests/cheese-test-flash \
        tests/cheese-test-monitor \
-       tests/cheese-test-widget \
-       tests/test-service-client
+       tests/cheese-test-widget
 
 if HAVE_XTEST
 noinst_PROGRAMS = \
@@ -312,8 +268,6 @@ tests_cheese_test_chooser_SOURCES = tests/cheese-test-chooser.c
 tests_cheese_test_flash_SOURCES = tests/cheese-test-flash.c
 tests_cheese_test_monitor_SOURCES = tests/cheese-test-monitor.c
 tests_cheese_test_widget_SOURCES = tests/cheese-test-widget.c
-tests_test_service_client_SOURCES = tests/test-service-client.c
-nodist_tests_test_service_client_SOURCES = service/camera.c
 tests_test_webcam_button_SOURCES = tests/test-webcam-button.c
 
 tests_cheese_test_camera_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
@@ -321,8 +275,6 @@ tests_cheese_test_chooser_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 tests_cheese_test_flash_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 tests_cheese_test_monitor_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 tests_cheese_test_widget_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_test_service_client_CPPFLAGS = \
-       $(EXAMPLES_CPPFLAGS) -I$(top_builddir)/service
 tests_test_webcam_button_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 
 tests_cheese_test_camera_LDADD = \
@@ -349,7 +301,6 @@ tests_cheese_test_widget_LDADD = \
        $(CHEESE_GTK_LIBS) \
        libcheese.la \
        libcheese-gtk.la
-tests_test_service_client_LDADD = $(CHEESE_GTK_LIBS)
 tests_test_webcam_button_LDADD = $(XTEST_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
@@ -365,13 +316,9 @@ appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
 data/org.gnome.Cheese.service: data/org.gnome.Cheese.service.in
        $(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
 
-data/org.gnome.Camera.service: data/org.gnome.Camera.service.in
-       $(AM_V_GEN)$(SED) -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
-
 servicedir = $(datadir)/dbus-1/services
 service_in_files = \
-       data/org.gnome.Camera.service.in \
-       data/org.gnome.Cheese.service.in
+       data/org.gnome.Cheese.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 @GSETTINGS_RULES@
@@ -537,11 +484,9 @@ dist-hook: git-changelog-hook
 
 dist_noinst_DATA = \
        ChangeLog.pre-git \
-       COPYING.GPL3 \
        $(appstream_in_files) \
        $(desktop_in_files) \
        $(gsettings_SCHEMAS) \
-       $(noinst_gnome_camera_service_headers) \
        $(noinst_resource_files) \
        $(service_in_files) \
        data/org.gnome.Cheese.gresource.xml \
@@ -573,8 +518,6 @@ CLEANFILES = \
        $(gir_DATA) \
        $(service_DATA) \
        $(typelib_DATA) \
-       $(nodist_gnome_camera_service_headers) \
-       $(nodist_gnome_camera_service_SOURCES) \
        src/cheese-resource.c \
        src/cheese-resource.h
 
diff --git a/configure.ac b/configure.ac
index ded588a..7f1d1fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,6 @@ PKG_CHECK_EXISTS([$GNOME_VIDEO_EFFECTS_REQUIRED],
 
 # GLib programs.
 AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`])
-AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`])
 
 # Recommend some runtime GStreamer plugins.
 AC_PATH_PROGS([GST_INSPECT], [gst-inspect-1.0], [notfound])