mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-15 12:30:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

commiting Leifs registry to /var/cache patch, works well for me :)

Browse source 
Original commit message from CVS:
commiting Leifs registry to /var/cache patch, works well for me :)
This commit is contained in:
Christian Schaller 2002-11-28 13:29:52 +00:00
parent af236bd270
commit 2d9c2e484b
6 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/rules vendored
View file

@ -36,6 +36,8 @@ configure-stamp:
--with-html-dir=\$${prefix}/share/doc/gstreamer-doc \ --with-html-dir=\$${prefix}/share/doc/gstreamer-doc \
--sysconfdir=/etc \ --sysconfdir=/etc \
--with-configdir=/etc/gstreamer \ --with-configdir=/etc/gstreamer \
--localstatedir=/var \
--with-cachedir=/var/cache/gstreamer \
--disable-plugin-builddir \ --disable-plugin-builddir \
--disable-tests \ --disable-tests \
--disable-examples \ --disable-examples \

6
gst/Makefile.am
View file

@ -183,11 +183,11 @@ dist-hook:
distclean-local: distclean-local:
rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h
libgstreamer_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ libgstreamer_la_CFLAGS = -D_GNU_SOURCE \
$(LIBGST_CFLAGS) \ $(LIBGST_CFLAGS) \
-D_GNU_SOURCE \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \ -DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
# the compiler shoots cothreads.c in the head at -O6 # the compiler shoots cothreads.c in the head at -O6
libcothreads_la_CFLAGS = $(libgstreamer_la_CFLAGS) -O2 libcothreads_la_CFLAGS = $(libgstreamer_la_CFLAGS) -O2

2
gst/gstregistry.h
View file

@ -26,7 +26,7 @@
#include <gst/gstplugin.h> #include <gst/gstplugin.h>
#define GLOBAL_REGISTRY_DIR GST_CONFIG_DIR #define GLOBAL_REGISTRY_DIR GST_CACHE_DIR
#define GLOBAL_REGISTRY_FILE GLOBAL_REGISTRY_DIR"/registry.xml" #define GLOBAL_REGISTRY_FILE GLOBAL_REGISTRY_DIR"/registry.xml"
#define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp" #define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp"

21
tools/Makefile.am
View file

@ -23,29 +23,36 @@ man_MANS = gst-launch.1 gst-md5sum.1 gst-register.1 gst-inspect.1 \
gst-feedback.1 gst-feedback.1
gst_launch_LDADD = $(GST_LIBS) #-lefence gst_launch_LDADD = $(GST_LIBS) #-lefence
gst_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" gst_launch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
gst_md5sum_LDADD = $(GST_LIBS) #-lefence gst_md5sum_LDADD = $(GST_LIBS) #-lefence
gst_md5sum_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" gst_md5sum_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
if !GST_DISABLE_REGISTRY if !GST_DISABLE_REGISTRY
gst_register_LDADD = $(GST_LIBS) gst_register_LDADD = $(GST_LIBS)
gst_register_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" gst_register_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
endif endif
gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol.la gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol.la
gst_inspect_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" gst_inspect_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
gst_complete_LDADD = $(GST_LIBS) gst_complete_LDADD = $(GST_LIBS)
gst_complete_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" gst_complete_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
if !GST_DISABLE_LOADSAVE if !GST_DISABLE_LOADSAVE
gst_compprep_LDADD = $(GST_LIBS) gst_compprep_LDADD = $(GST_LIBS)
gst_compprep_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" gst_compprep_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
gst_xmllaunch_SOURCES = gst-launch.c gst_xmllaunch_SOURCES = gst-launch.c
gst_xmllaunch_LDADD = $(GST_LIBS) gst_xmllaunch_LDADD = $(GST_LIBS)
gst_xmllaunch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" gst_xmllaunch_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
endif endif
EXTRA_DIST = $(man_MANS) gst-feedback EXTRA_DIST = $(man_MANS) gst-feedback

4
tools/gst-complete.c
View file

@ -81,8 +81,8 @@ int main(int argc,char *argv[]) {
/***** Loading the completion information from the registry *****/ /***** Loading the completion information from the registry *****/
if (stat (GST_CONFIG_DIR"/compreg.xml", &stat_buf) == 0) { if (stat (GST_CACHE_DIR"/compreg.xml", &stat_buf) == 0) {
doc = xmlParseFile (GST_CONFIG_DIR"/compreg.xml"); doc = xmlParseFile (GST_CACHE_DIR"/compreg.xml");
} else { } else {
exit (1); exit (1);
} }

4
tools/gst-compprep.c
View file

@ -99,9 +99,9 @@ int main(int argc,char *argv[]) {
} }
#ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML2
xmlSaveFormatFile(GST_CONFIG_DIR "/compreg.xml",doc,1); xmlSaveFormatFile(GST_CACHE_DIR "/compreg.xml",doc,1);
#else #else
xmlSaveFile(GST_CONFIG_DIR "/compreg.xml",doc); xmlSaveFile(GST_CACHE_DIR "/compreg.xml",doc);
#endif #endif
return 0; return 0;