From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Sat, 23 Feb 2008 15:02:15 +0000 (+0000)
Subject: gst/goom2k1/: Rename the installed library, and don't register the same
X-Git-Tag: RELEASE-0_10_8~97
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a681a56b1d4a8b9f6bb30b6ce855a97fa0ba526f;p=platform%2Fupstream%2Fgst-plugins-good.git

gst/goom2k1/: Rename the installed library, and don't register the same

Original commit message from CVS:
* gst/goom2k1/Makefile.am:
* gst/goom2k1/gstgoom.c:
Rename the installed library, and don't register the same
GType name as the new goom.
---

diff --git a/ChangeLog b/ChangeLog
index fc697b0..d746135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-23  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* gst/goom2k1/Makefile.am:
+	* gst/goom2k1/gstgoom.c:
+
+	Rename the installed library, and don't register the same 
+	GType name as the new goom.
+
 2008-02-23  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/gst/goom2k1/Makefile.am b/gst/goom2k1/Makefile.am
index 4f4abb7..4db8d00 100644
--- a/gst/goom2k1/Makefile.am
+++ b/gst/goom2k1/Makefile.am
@@ -1,14 +1,14 @@
-plugin_LTLIBRARIES = libgstgoom.la
+plugin_LTLIBRARIES = libgstgoom2k1.la
 
 GOOM_FILTER_FILES = filters.c
 GOOM_FILTER_CFLAGS = -UMMX -UUSE_ASM
 
 noinst_HEADERS = gstgoom.h filters.h goom_core.h goom_tools.h graphic.h lines.h 
 
-libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c
+libgstgoom2k1_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c
 
-libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS)
-libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
-libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstgoom2k1_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS)
+libgstgoom2k1_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
+libgstgoom2k1_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 EXTRA_DIST = filters.c
diff --git a/gst/goom2k1/gstgoom.c b/gst/goom2k1/gstgoom.c
index 812d423..933badc 100644
--- a/gst/goom2k1/gstgoom.c
+++ b/gst/goom2k1/gstgoom.c
@@ -51,7 +51,7 @@ GST_DEBUG_CATEGORY_STATIC (goom_debug);
 
 /* elementfactory information */
 static const GstElementDetails gst_goom_details =
-GST_ELEMENT_DETAILS ("GOOM: what a GOOM! 2k1",
+GST_ELEMENT_DETAILS ("GOOM: what a GOOM! 2k1 edition",
     "Visualization",
     "Takes frames of data and outputs video frames using the GOOM 2k1 filter",
     "Wim Taymans <wim@fluendo.com>");
@@ -122,7 +122,7 @@ gst_goom_get_type (void)
       (GInstanceInitFunc) gst_goom_init,
     };
 
-    type = g_type_register_static (GST_TYPE_ELEMENT, "GstGoom", &info, 0);
+    type = g_type_register_static (GST_TYPE_ELEMENT, "GstGoom2k1", &info, 0);
   }
   return type;
 }