mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-08 17:19:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

fixes for --disable-loadsave --disable-registry

Browse source 
Original commit message from CVS:
fixes for --disable-loadsave --disable-registry
This commit is contained in:
Thomas Vander Stichele 2004-02-12 16:49:16 +00:00
parent 4d114d44f5
commit 509fa3874c
9 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
2004-02-12 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gstinfo.c:
* gst/gstregistrypool.c: (gst_registry_pool_plugin_filter),
(gst_registry_pool_feature_filter):
* gst/gstthread.c: (gst_thread_class_init):
* gst/gstvalue.c:
add includes exposed by building without libxml
* gst/indexers/Makefile.am:
do not build fileindex when LOADSAVE disabled; we should have
a better libxml check later since fileindex depends on xml, not
LOADSAVE or REGISTRY
* libs/gst/control/Makefile.am:
link with m
* tools/Makefile.am:
fix wrong source code for gst-xmlinspect
2004-02-12 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:

1
gst/gstinfo.c
View file

@ -33,6 +33,7 @@
#ifdef HAVE_PRINTF_EXTENSION
#include <printf.h>
#endif
#include <stdio.h> /* fprintf */
#include <unistd.h>
#include <string.h> /* G_VA_COPY */
#include "gstinfo.h"

7
gst/gstregistrypool.c
View file

@ -152,9 +152,11 @@ GList*
gst_registry_pool_plugin_filter (GstPluginFilter filter, gboolean first, gpointer user_data)
{
GList *result = NULL;
GList *walk, *temp;
GList *temp;
#ifndef GST_DISABLE_REGISTRY
GList *walk;
walk = _gst_registry_pool;
while (walk) {
@ -216,9 +218,10 @@ GList*
gst_registry_pool_feature_filter (GstPluginFeatureFilter filter, gboolean first, gpointer user_data)
{
GList *result = NULL;
GList *walk, *temp;
GList *temp;
#ifndef GST_DISABLE_REGISTRY
GList *walk;
walk = _gst_registry_pool;
while (walk) {

2
gst/gstthread.c
View file

@ -143,7 +143,9 @@ static void
gst_thread_class_init (gpointer g_class, gpointer class_data)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (g_class);
#ifndef GST_DISABLE_LOADSAVE
GstObjectClass *gstobject_class = GST_OBJECT_CLASS (g_class);
#endif
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
GstBinClass *gstbin_class = GST_BIN_CLASS (g_class);
GstThreadClass *klass = GST_THREAD_CLASS (g_class);

1
gst/gstvalue.c
View file

@ -20,6 +20,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <string.h>
#include <gst/gst.h>

9
gst/indexers/Makefile.am
View file

@ -2,7 +2,14 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstindexers.la
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c gstfileindex.c
# file index uses xml
if GST_DISABLE_LOADSAVE
GST_LOADSAVE_SRC =
else
GST_LOADSAVE_SRC = gstfileindex.c
endif
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
libgstindexers_la_CFLAGS = $(GST_CFLAGS)
libgstindexers_la_LIBADD =
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

3
libs/gst/control/Makefile.am
View file

@ -22,5 +22,6 @@ libgstcontrol_@GST_MAJORMINOR@_la_SOURCES = \
libgstcontrol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstcontrol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
libgstcontrol_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
# control uses log and exp, so we need -lm if xml is disabled
libgstcontrol_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -lm

9
plugins/indexers/Makefile.am
View file

@ -2,7 +2,14 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstindexers.la
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c gstfileindex.c
# file index uses xml
if GST_DISABLE_LOADSAVE
GST_LOADSAVE_SRC =
else
GST_LOADSAVE_SRC = gstfileindex.c
endif
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
libgstindexers_la_CFLAGS = $(GST_CFLAGS)
libgstindexers_la_LIBADD =
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

2
tools/Makefile.am
View file

@ -52,7 +52,7 @@ gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c
gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c
gst_md5sum_@GST_MAJORMINOR@_SOURCES = gst-md5sum.c
gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c
gst_xmlinspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c
gst_xmlinspect_@GST_MAJORMINOR@_SOURCES = gst-xmlinspect.c
# make sure each unversioned tool comes from gst-run.c
if !GST_DISABLE_REGISTRY