Ported dataprotol to 0.9.

Original commit message from CVS:
* configure.ac:
* libs/gst/dataprotocol/Makefile.am:
* libs/gst/dataprotocol/dataprotocol.c: (gst_dp_validate_packet):
* libs/gst/dataprotocol/dataprotocol.h:
* pkgconfig/Makefile.am:
* pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in:
* pkgconfig/gstreamer-dataprotocol.pc.in:
Ported dataprotol to 0.9.
Added pkgconfig files.

diff --git a/ChangeLog b/ChangeLog
index ed4091c..80fc3fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-05  Wim Taymans  <wim@fluendo.com>
+
+       * configure.ac:
+       * libs/gst/dataprotocol/Makefile.am:
+       * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_validate_packet):
+       * libs/gst/dataprotocol/dataprotocol.h:
+       * pkgconfig/Makefile.am:
+       * pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in:
+       * pkgconfig/gstreamer-dataprotocol.pc.in:
+       Ported dataprotol to 0.9. 
+       Added pkgconfig files.
+
 2005-07-05  Andy Wingo  <wingo@pobox.com>
 
        * gst/base/gstbasetransform.c (gst_base_transform_setcaps):

diff --git a/configure.ac b/configure.ac
index 2891b86..be45c99 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -731,6 +731,8 @@ pkgconfig/gstreamer-base.pc
 pkgconfig/gstreamer-base-uninstalled.pc
 pkgconfig/gstreamer-control.pc
 pkgconfig/gstreamer-control-uninstalled.pc
+pkgconfig/gstreamer-dataprotocol.pc
+pkgconfig/gstreamer-dataprotocol-uninstalled.pc
 gstreamer.spec,
 echo "$infomessages", infomessages="$infomessages"
 )

diff --git a/libs/gst/dataprotocol/Makefile.am b/libs/gst/dataprotocol/Makefile.am
index c718690..cbb403d 100644 (file)
--- a/libs/gst/dataprotocol/Makefile.am
+++ b/libs/gst/dataprotocol/Makefile.am
@@ -1,15 +1,15 @@
-plugin_LTLIBRARIES = libgstdataprotocol.la
+lib_LTLIBRARIES = libgstdataprotocol-@GST_MAJORMINOR@.la
 
-libgstdataprotocol_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dataprotocol
-libgstdataprotocol_include_HEADERS = \
+libgstdataprotocol_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dataprotocol
+libgstdataprotocol_@GST_MAJORMINOR@_include_HEADERS = \
     dataprotocol.h
 noinst_HEADERS = dp-private.h
 
-libgstdataprotocol_la_SOURCES = \
+libgstdataprotocol_@GST_MAJORMINOR@_la_SOURCES = \
     dataprotocol.c
 
 # remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
-libgstdataprotocol_la_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_srcdir)/libs -DGST_ENABLE_NEW
-libgstdataprotocol_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdataprotocol_la_LIBADD = $(GST_OBJ_LIBS)
+libgstdataprotocol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_srcdir)/libs -DGST_ENABLE_NEW
+libgstdataprotocol_@GST_MAJORMINOR@_la_LDFLAGS =  @GST_LIB_LDFLAGS@
+libgstdataprotocol_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
 

diff --git a/libs/gst/dataprotocol/dataprotocol.c b/libs/gst/dataprotocol/dataprotocol.c
index dabcb20..d83e649 100644 (file)
--- a/libs/gst/dataprotocol/dataprotocol.c
+++ b/libs/gst/dataprotocol/dataprotocol.c
@@ -103,8 +103,8 @@ gst_dp_dump_byte_array (guint8 * array, guint length)
  *
  * Initialize GStreamer Data Protocol library.
  *
- * Should be called before using these functions; either from source linking
- * to this source file or from plugin_init.
+ * Should be called before using these functions from source linking
+ * to this source file.
  */
 void
 gst_dp_init (void)
@@ -586,18 +586,3 @@ gst_dp_validate_packet (guint header_length, const guint8 * header,
 
   return TRUE;
 }
-
-/*** PLUGIN STUFF ***/
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  gst_dp_init ();
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "gstdataprotocol",
-    "a data protocol to serialize buffers, caps and events",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)

diff --git a/libs/gst/dataprotocol/dataprotocol.h b/libs/gst/dataprotocol/dataprotocol.h
index da3c2b9..cb1c826 100644 (file)
--- a/libs/gst/dataprotocol/dataprotocol.h
+++ b/libs/gst/dataprotocol/dataprotocol.h
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef GST_ENABLE_NEW
 #ifndef __GST_DATA_PROTOCOL_H__
 #define __GST_DATA_PROTOCOL_H__
 
@@ -53,6 +52,8 @@ typedef enum {
   GST_DP_PAYLOAD_EVENT_NONE      = 64,
 } GstDPPayloadType;
 
+void           gst_dp_init                     (void);
+
 /* payload information from header */
 guint32                gst_dp_header_payload_length    (const guint8 * header);
 GstDPPayloadType
@@ -98,5 +99,4 @@ gboolean      gst_dp_validate_packet          (guint header_length,
 G_END_DECLS
 
 #endif /* __GST_DATA_PROTOCOL_H__ */
-#endif /* GST_ENABLE_NEW */
 

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 22c7066..0179a98 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -2,12 +2,14 @@
 pcfiles =                                                      \
        gstreamer-@GST_MAJORMINOR@.pc                           \
        gstreamer-base-@GST_MAJORMINOR@.pc                      \
-       gstreamer-control-@GST_MAJORMINOR@.pc
+       gstreamer-control-@GST_MAJORMINOR@.pc                   \
+       gstreamer-dataprotocol-@GST_MAJORMINOR@.pc
 
 pcfiles_uninstalled =                                          \
        gstreamer-@GST_MAJORMINOR@-uninstalled.pc               \
        gstreamer-base-@GST_MAJORMINOR@-uninstalled.pc          \
-       gstreamer-control-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-control-@GST_MAJORMINOR@-uninstalled.pc       \
+       gstreamer-dataprotocol-@GST_MAJORMINOR@-uninstalled.pc
 
 all-local: $(pcfiles) $(pcfiles_uninstalled)
 
@@ -26,6 +28,8 @@ EXTRA_DIST =                                                  \
        gstreamer-base.pc.in                                    \
        gstreamer-base-uninstalled.pc.in                        \
        gstreamer-control.pc.in                                 \
-       gstreamer-control-uninstalled.pc.in
+       gstreamer-control-uninstalled.pc.in                     \
+       gstreamer-dataprotocol.pc.in                            \
+       gstreamer-dataprotocol-uninstalled.pc.in
 
 CLEANFILES = $(pcfiles) $(pcfiles_uninstalled)

diff --git a/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in b/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in
new file mode 100644 (file)
index 0000000..d6131d4
--- /dev/null
+++ b/pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in
@@ -0,0 +1,14 @@
+# the standard variables don't make sense for an uninstalled copy
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/../libs
+includedir=${pcfiledir}/..
+gstdataprotocol_libs=-lgstdataprotocol-@GST_MAJORMINOR@
+
+Name: GStreamer dataprotocol library, uninstalled
+Description: Dataprotocol for plug-ins
+Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
+Version: @VERSION@
+
+Libs: ${libdir}/gst/dataprotocol/libgstdataprotocol-@GST_MAJORMINOR@.la
+Cflags: -I${includedir} -I${includedir}/libs @GST_PKG_CFLAGS@

diff --git a/pkgconfig/gstreamer-dataprotocol.pc.in b/pkgconfig/gstreamer-dataprotocol.pc.in
new file mode 100644 (file)
index 0000000..878edeb
--- /dev/null
+++ b/pkgconfig/gstreamer-dataprotocol.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+
+Name: GStreamer dataprotocol library
+Description: Dataprotocol for plug-ins
+Requires: gstreamer-@GST_MAJORMINOR@
+Version: @VERSION@
+Libs: -L${libdir} -lgstdataprotocol-@GST_MAJORMINOR@
+Cflags: -I${includedir} @GST_PKG_CFLAGS@