From 2991d5cd331c857861888813faf4a7d2d802d54d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Mon, 8 Jan 2007 16:23:03 +0000
Subject: [PATCH] gst/gstregistry.c: Plugin extension on HP-UX is .sl, add that
 to the list of approved plugin extensions (see #393796).

Original commit message from CVS:
* gst/gstregistry.c: (gst_registry_scan_path_level):
Plugin extension on HP-UX is .sl, add that to the list of approved
plugin extensions (see #393796).
* tests/check/gst/gstpad.c: (GST_START_TEST):
ulong => gulong. Fixes compilation with HP-UX compiler.
* tests/check/pipelines/parse-launch.c: (GST_START_TEST):
Fix compilation if valgrind headers are not available.
---
 ChangeLog                            | 12 ++++++++++++
 common                               |  2 +-
 gst/gstregistry.c                    |  1 +
 tests/check/gst/gstpad.c             |  2 +-
 tests/check/pipelines/parse-launch.c |  8 ++++++--
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 608900b..63e0ec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-01-08  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstregistry.c: (gst_registry_scan_path_level):
+	  Plugin extension on HP-UX is .sl, add that to the list of approved
+	  plugin extensions (see #393796).
+
+	* tests/check/gst/gstpad.c: (GST_START_TEST):
+	  ulong => gulong. Fixes compilation with HP-UX compiler.
+
+	* tests/check/pipelines/parse-launch.c: (GST_START_TEST):
+	  Fix compilation if valgrind headers are not available.
+
 2007-01-07  Sébastien Moutte  <sebastien@moutte.net>
 
 	* win32/common/libgstreamer.def: 
diff --git a/common b/common
index 64f924f..8ba5dff 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 64f924f6f2ff6275b06facb4c2adbc7c05f70641
+Subproject commit 8ba5dffb5ee7e7daea1030f6b34bfef10f9801a3
diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index cc62ee6..4aa0bdb 100644
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -811,6 +811,7 @@ gst_registry_scan_path_level (GstRegistry * registry, const gchar * path,
       continue;
     }
     if (!g_str_has_suffix (filename, ".so") &&
+        !g_str_has_suffix (filename, ".sl") &&
         !g_str_has_suffix (filename, ".dll") &&
         !g_str_has_suffix (filename, ".dynlib")) {
       GST_LOG_OBJECT (registry,
diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c
index 15bc8a8..4e1231a 100644
--- a/tests/check/gst/gstpad.c
+++ b/tests/check/gst/gstpad.c
@@ -310,7 +310,7 @@ GST_START_TEST (test_push_linked)
   GstPadLinkReturn plr;
   GstCaps *caps;
   GstBuffer *buffer;
-  ulong id;
+  gulong id;
 
   /* setup */
   sink = gst_pad_new ("sink", GST_PAD_SINK);
diff --git a/tests/check/pipelines/parse-launch.c b/tests/check/pipelines/parse-launch.c
index e65a9ca..4f1a19e 100644
--- a/tests/check/pipelines/parse-launch.c
+++ b/tests/check/pipelines/parse-launch.c
@@ -23,8 +23,10 @@
 #  include "config.h"
 #endif
 
-#include <valgrind/valgrind.h>
-#include <valgrind/memcheck.h>
+#ifdef HAVE_VALGRIND
+# include <valgrind/valgrind.h>
+# include <valgrind/memcheck.h>
+#endif
 
 #include <gst/check/gstcheck.h>
 
@@ -329,7 +331,9 @@ GST_START_TEST (leaking_fail_pipes)
     g_print ("Trying pipe: %s\n", *s);
     expected_fail_pipe (*s);
 #endif
+#ifdef HAVE_VALGRIND
     VALGRIND_DO_LEAK_CHECK;
+#endif
   }
 }
 
-- 
2.7.4