[cheese] Depend on gstreamer-1.0
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] Depend on gstreamer-1.0
- Date: Mon, 3 Sep 2012 19:59:11 +0000 (UTC)
commit 4177d238d295036edbdfcc017ddcdd7e1337cd53
Author: Thiago Santos <thiago sousa santos collabora com>
Date: Tue Aug 28 19:30:11 2012 -0300
Depend on gstreamer-1.0
Makefile.am | 2 +-
configure.ac | 11 +++++------
src/vapi/cheese-common.deps | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4f270c1..92e5ae7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ VALAFLAGS = \
--pkg gee-1.0 \
--pkg clutter-1.0 \
--pkg clutter-gtk-1.0 \
- --pkg gstreamer-0.10 \
+ --pkg gstreamer-1.0 \
--pkg libcanberra-gtk \
--pkg libcanberra \
--pkg eogthumbnav \
diff --git a/configure.ac b/configure.ac
index 6177ddb..8431967 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,10 +63,10 @@ GTK_REQUIRED="gtk+-3.0 >= 3.4.4"
GDK_REQUIRED="gdk-3.0 >= 3.3.6"
GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0"
LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6"
-GSTREAMER_VERSION=0.10.32
-GSTREAMER_REQUIRED="gstreamer-plugins-base-0.10 >= $GSTREAMER_VERSION gstreamer-0.10 >= $GSTREAMER_VERSION gstreamer-pbutils-0.10 >= $GSTREAMER_VERSION"
-GSTREAMER_PLUGINS_BAD_VERSION=0.10.22
-GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-0.10 >= $GSTREAMER_PLUGINS_BAD_VERSION"
+GSTREAMER_VERSION=0.11.0
+GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION"
+GSTREAMER_PLUGINS_BAD_VERSION=0.11.0
+GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-1.0 >= $GSTREAMER_PLUGINS_BAD_VERSION"
CAIRO_REQUIRED="cairo >= 1.10.0"
PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0"
LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0"
@@ -115,7 +115,6 @@ PKG_CHECK_MODULES([CHEESE],
$CLUTTER_REQUIRED
$CLUTTERGST_REQUIRED
$UDEV_REQUIRED])
-CHEESE_LIBS="$CHEESE_LIBS -lgstinterfaces-0.10"
PKG_CHECK_MODULES([CHEESE_GTK],
[$GIO_REQUIRED
@@ -130,7 +129,7 @@ PKG_CHECK_MODULES([CHEESE_GTK],
$GNOME_VIDEO_EFFECTS_REQUIRED])
# Recommend some runtime GStreamer plugins.
-AC_PATH_PROGS([GST_INSPECT], [gst-inspect-0.10 gst-inspect], [notfound])
+AC_PATH_PROGS([GST_INSPECT], [gst-inspect-1.0], [notfound])
AS_IF([test "x$GST_INSPECT" = "xnotfound"],
[AC_MSG_WARN([unable to check for runtime GStreamer plugin dependencies])],
[GST_RUNTIME_PLUGINS="camerabin2 vp8enc webmmux"
diff --git a/src/vapi/cheese-common.deps b/src/vapi/cheese-common.deps
index e1da2ea..d7bf1de 100644
--- a/src/vapi/cheese-common.deps
+++ b/src/vapi/cheese-common.deps
@@ -1,2 +1,2 @@
-gstreamer-0.10
+gstreamer-1.0
clutter-1.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]