[gnome-contacts] Port to gstreamer 1.0



commit 66f864b9bdec2efa2d043de8abdc3bcd0eaff83c
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Sep 5 11:31:18 2012 +0200

    Port to gstreamer 1.0
    
    This depends on the latest cheese which is now gst 1.0 based.

 configure.ac    |    5 +----
 src/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 127ff8a..d468e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_ARG_WITH([cheese],
             with_cheese=auto)
 
 if test x"$with_cheese" != x"no" ; then
-   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 gstreamer-interfaces-0.10 cheese-gtk >= 3.3.5 cheese, [have_cheese=yes], [have_cheese=no])
+   PKG_CHECK_MODULES(CHEESE, cheese-gtk >= 3.3.91 cheese, [have_cheese=yes], [have_cheese=no])
    if test x${have_cheese} = xyes; then
      AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
    fi
@@ -69,9 +69,6 @@ else
 fi
 AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
-CONTACTS_CHEESE_PACKAGES="--pkg gdk-x11-3.0 --pkg gstreamer-0.10 --pkg gstreamer-interfaces-0.10"
-AC_SUBST(CONTACTS_CHEESE_PACKAGES)
-
 #############
 # Resources #
 #############
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f6ed3e..69c15fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ AM_VALAFLAGS = \
 	$(NULL)
 
 if BUILD_CHEESE
-AM_VALAFLAGS += -D HAVE_CHEESE @CONTACTS_CHEESE_PACKAGES@
+AM_VALAFLAGS += -D HAVE_CHEESE
 AM_CPPFLAGS += $(CHEESE_CFLAGS)
 endif
 



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