From 4c712824b94b2ffe8351c4577233fd198d53ac35 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 6 Apr 2005 11:08:07 +0000 Subject: [PATCH] pkgconfig/: New files. Original commit message from CVS: 2005-04-06 Andy Wingo * pkgconfig/gstreamer-base.pc.in: * pkgconfig/gstreamer-base-uninstalled.pc.in: New files. * pkgconfig/Makefile.am: * configure.ac (AC_OUTPUT): Add gstreamer-base pkgconfig files. --- ChangeLog | 8 ++++++++ configure.ac | 2 ++ docs/gst/tmpl/gstevent.sgml | 22 ++++++++++------------ gst/gstmemchunk.c | 1 - pkgconfig/Makefile.am | 4 ++++ pkgconfig/gstreamer-base-uninstalled.pc.in | 13 +++++++++++++ pkgconfig/gstreamer-base.pc.in | 11 +++++++++++ 7 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 pkgconfig/gstreamer-base-uninstalled.pc.in create mode 100644 pkgconfig/gstreamer-base.pc.in diff --git a/ChangeLog b/ChangeLog index b24208e..77a383a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-04-06 Andy Wingo + + * pkgconfig/gstreamer-base.pc.in: + * pkgconfig/gstreamer-base-uninstalled.pc.in: New files. + + * pkgconfig/Makefile.am: + * configure.ac (AC_OUTPUT): Add gstreamer-base pkgconfig files. + 2005-04-04 Wim Taymans * gst/base/Makefile.am: diff --git a/configure.ac b/configure.ac index 7855bbd..f708728 100644 --- a/configure.ac +++ b/configure.ac @@ -731,6 +731,8 @@ pkgconfig/Makefile stamp.h pkgconfig/gstreamer.pc pkgconfig/gstreamer-uninstalled.pc +pkgconfig/gstreamer-base.pc +pkgconfig/gstreamer-base-uninstalled.pc pkgconfig/gstreamer-control.pc pkgconfig/gstreamer-control-uninstalled.pc gstreamer.spec, diff --git a/docs/gst/tmpl/gstevent.sgml b/docs/gst/tmpl/gstevent.sgml index 0ef4f62..7528aca 100644 --- a/docs/gst/tmpl/gstevent.sgml +++ b/docs/gst/tmpl/gstevent.sgml @@ -260,15 +260,6 @@ Indicates how accurate the event was performed. @event: The event to query - - -Flag that indicates the discont event was because of a new media -type. - - -@event: The event to operate on - - The offset of the discont event. A discont event can hold up to 8 different @@ -400,10 +391,12 @@ Copy the event using the event specific copy function -@new_media: +@rate: @format1: @Varargs: @Returns: + +@new_media: @@ -411,10 +404,12 @@ Copy the event using the event specific copy function -@new_media: +@rate: @format1: @var_args: @Returns: + +@new_media: @@ -424,8 +419,11 @@ Copy the event using the event specific copy function @event: @format: -@value: +@start_value: +@end_value: @Returns: + +@value: diff --git a/gst/gstmemchunk.c b/gst/gstmemchunk.c index d9cf017..9d0d3d1 100644 --- a/gst/gstmemchunk.c +++ b/gst/gstmemchunk.c @@ -24,7 +24,6 @@ #include /* memset */ -#include "gstutils.h" #include "gstmemchunk.h" #include "gsttrashstack.h" #ifdef HAVE_VALGRIND diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 70bd96a..22c7066 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -1,10 +1,12 @@ ### all of the standard pc files we need to generate pcfiles = \ gstreamer-@GST_MAJORMINOR@.pc \ + gstreamer-base-@GST_MAJORMINOR@.pc \ gstreamer-control-@GST_MAJORMINOR@.pc pcfiles_uninstalled = \ gstreamer-@GST_MAJORMINOR@-uninstalled.pc \ + gstreamer-base-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-control-@GST_MAJORMINOR@-uninstalled.pc all-local: $(pcfiles) $(pcfiles_uninstalled) @@ -21,6 +23,8 @@ pkgconfig_DATA = $(pcfiles) EXTRA_DIST = \ gstreamer.pc.in \ gstreamer-uninstalled.pc.in \ + gstreamer-base.pc.in \ + gstreamer-base-uninstalled.pc.in \ gstreamer-control.pc.in \ gstreamer-control-uninstalled.pc.in diff --git a/pkgconfig/gstreamer-base-uninstalled.pc.in b/pkgconfig/gstreamer-base-uninstalled.pc.in new file mode 100644 index 0000000..b3cc8b6 --- /dev/null +++ b/pkgconfig/gstreamer-base-uninstalled.pc.in @@ -0,0 +1,13 @@ +# the standard variables don't make sense for an uninstalled copy +prefix= +exec_prefix= +libdir=${pcfiledir}/../gst/base +includedir=${pcfiledir}/.. + +Name: GStreamer base classes, uninstalled +Description: Base classes for GStreamer elements +Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ +Version: @VERSION@ + +Libs: ${libdir}/libgstbase-@GST_MAJORMINOR@.la +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-base.pc.in b/pkgconfig/gstreamer-base.pc.in new file mode 100644 index 0000000..2b8aaf4 --- /dev/null +++ b/pkgconfig/gstreamer-base.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ + +Name: GStreamer base classes +Description: Base classes for GStreamer elements +Requires: gstreamer-@GST_MAJORMINOR@ +Version: @VERSION@ +Libs: -L${libdir} -lgstbase-@GST_MAJORMINOR@ +Cflags: -I${includedir} -- 2.7.4