From 406f1b0fc83ed4a7f2fbf03b35b24f4a71a2380b Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 18 Jul 2006 15:33:41 +0000
Subject: [PATCH] Add new ignore for 0.10.10 API additions

Original commit message from CVS:
* configure.ac:
* gst/Makefile.am:
* gst/gst-0.10.10.ignore:
* gst/gstversion.override.in:
Add new ignore for 0.10.10 API additions
* gst/gst.defs:
Added definitions for new segtrap functions
---
 ChangeLog                  | 11 +++++++++++
 common                     |  2 +-
 configure.ac               | 14 ++++++++++++++
 gst/Makefile.am            |  3 ++-
 gst/gst-0.10.10.ignore     |  5 +++++
 gst/gst.defs               | 12 ++++++++++++
 gst/gstversion.override.in |  1 +
 7 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 gst/gst-0.10.10.ignore

diff --git a/ChangeLog b/ChangeLog
index 5061a79171..e987ee54eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-18  Edward Hervey  <edward@fluendo.com>
+
+	* configure.ac:
+	* gst/Makefile.am:
+	* gst/gst-0.10.10.ignore:
+	* gst/gstversion.override.in:
+	Add new ignore for 0.10.10 API additions
+	* gst/gst.defs:
+	Added definitions for new segtrap functions
+	
+
 2006-07-05  Edward Hervey  <edward@fluendo.com>
 
 	* gst/gstmodule.c: (init_gst): 
diff --git a/common b/common
index dd173e2720..53ecdc0c97 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit dd173e2720ac21e4a47c97705d7ff32271a0ee66
+Subproject commit 53ecdc0c97a2992e5abeddd41d514bc142401e5d
diff --git a/configure.ac b/configure.ac
index 22526d8edf..52ca20b2aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,24 +115,38 @@ then
     IGNORE_GST_0_10_6=""
   fi
 
+  dnl 0.10.8 was a brown paperbag release
+
   if test $GST_MINOR_VERSION -lt "8"
   then
     IGNORE_GST_0_10_7="gst-0.10.7.ignore"
   else
     IGNORE_GST_0_10_7=""
   fi
+
+  dnl 0.10.9 didn't bring any new wrappable API
+
+  if test $GST_MINOR_VERSION -lt "10"
+  then
+    IGNORE_GST_0_10_10="gst-0.10.10.ignore"
+  else
+    IGNORE_GST_0_10_10=""
+  fi
+
 else
   IGNORE_GST_0_10_3=""
   IGNORE_GST_0_10_4=""
   IGNORE_GST_0_10_5=""
   IGNORE_GST_0_10_6=""
   IGNORE_GST_0_10_7=""
+  IGNORE_GST_0_10_10=""
 fi
 AC_SUBST(IGNORE_GST_0_10_3)
 AC_SUBST(IGNORE_GST_0_10_4)
 AC_SUBST(IGNORE_GST_0_10_5)
 AC_SUBST(IGNORE_GST_0_10_6)
 AC_SUBST(IGNORE_GST_0_10_7)
+AC_SUBST(IGNORE_GST_0_10_10)
 
 dnl check for gstreamer-base; uninstalled is selected preferentially
 PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQ,
diff --git a/gst/Makefile.am b/gst/Makefile.am
index e2b8bfd1cb..12d26c39a8 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -27,7 +27,8 @@ versioned_overrides = \
 	gst-0.10.4.ignore	\
 	gst-0.10.5.ignore	\
 	gst-0.10.6.ignore	\
-	gst-0.10.7.ignore
+	gst-0.10.7.ignore	\
+	gst-0.10.10.ignore
 
 INCLUDES = $(PYTHON_INCLUDES)
 EXTRA_DIST = $(defs_DATA) $(versioned_overrides) common.h arg-types.py
diff --git a/gst/gst-0.10.10.ignore b/gst/gst-0.10.10.ignore
new file mode 100644
index 0000000000..9861f6533a
--- /dev/null
+++ b/gst/gst-0.10.10.ignore
@@ -0,0 +1,5 @@
+%%
+ignore
+   gst_segtrap_is_enabled
+   gst_segtrap_set_enabled
+%%
diff --git a/gst/gst.defs b/gst/gst.defs
index 03bef64991..2d88c42ebd 100644
--- a/gst/gst.defs
+++ b/gst/gst.defs
@@ -52,6 +52,18 @@
   (return-type "gchar*")
 )
 
+(define-function segtrap_is_enabled
+  (c-name "gst_segtrap_is_enabled")
+  (return-type "gboolean")
+)
+
+(define-function segtrap_set_enabled
+  (c-name "gst_segtrap_set_enabled")
+  (return-type "none")
+  (parameters
+    '("gboolean" "enabled")
+  )
+)
 (define-function get_gst_version
   (c-name "gst_get_gst_version")
   (return-type "none")
diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in
index 168f4a09bb..e102fb60dc 100644
--- a/gst/gstversion.override.in
+++ b/gst/gstversion.override.in
@@ -5,4 +5,5 @@ include
 @IGNORE_GST_0_10_5@
 @IGNORE_GST_0_10_6@
 @IGNORE_GST_0_10_7@
+@IGNORE_GST_0_10_10@
 %%