From d282f08209d44419037b9bd7fafad616ebd05ed7 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 8 Jun 2005 13:42:52 +0000 Subject: [PATCH] add a 'plugins' dir to the PLUGIN_PATH in the uninstalled script to drop random other plugin-having projects in Original commit message from CVS: add a 'plugins' dir to the PLUGIN_PATH in the uninstalled script to drop random other plugin-having projects in --- check/Makefile.am | 22 ++++++++++++---------- docs/faq/gst-uninstalled | 2 +- gst/gstminiobject.h | 3 +++ tests/check/Makefile.am | 22 ++++++++++++---------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/check/Makefile.am b/check/Makefile.am index 6fb53659fc..592308b88d 100644 --- a/check/Makefile.am +++ b/check/Makefile.am @@ -22,16 +22,18 @@ clean-local: rm -rf $$i; \ done -TESTS = $(top_builddir)/tools/gst-register \ - gst/gstbin \ - gst/gstbus \ - gst/gstcaps \ - gst/gstiterator \ - gst/gstmessage \ - gst/gstobject \ - gst/gstpad \ - gst/gstsystemclock \ - pipelines/simple_launch_lines \ +TESTS = $(top_builddir)/tools/gst-register \ + gst/gstbin \ + gst/gstbuffer \ + gst/gstbus \ + gst/gstcaps \ + gst/gstiterator \ + gst/gstmessage \ + gst/gstobject \ + gst/gstpad \ + gst/gstsystemclock \ + pipelines/simple_launch_lines \ + pipelines/cleanup \ gst-libs/gdp check_PROGRAMS = $(TESTS) diff --git a/docs/faq/gst-uninstalled b/docs/faq/gst-uninstalled index d525bb48cb..f5c33b1a48 100755 --- a/docs/faq/gst-uninstalled +++ b/docs/faq/gst-uninstalled @@ -43,7 +43,7 @@ PATH=$GST/gstreamer/tools:$GST/gst-plugins/tools:$GST/gst-player/src:$GST/gst-ed # /some/path: makes the dynamic linker look in . too, so avoid this export LD_LIBRARY_PATH=$GST/prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export PKG_CONFIG_PATH=$GST/prefix/lib/pkgconfig:$GST/gstreamer/pkgconfig:$GST/gst-plugins/pkgconfig:$GST/gst-plugins-base/pkgconfig:$GST/gst-python/pkgconfig:$PKG_CONFIG_PATH -export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-ffmpeg:$GST/gst-monkeysaudio:$GST_PLUGIN_PATH +export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-ffmpeg:$GST/gst-monkeysaudio:$GST/plugins:$GST_PLUGIN_PATH export MANPATH=$GST/gstreamer/tools:$GST/prefix/share/man:$MANPATH pythonver=`python -c "import sys; print sys.version[:3]"` export PYTHONPATH=$GST/gst-python:$GST/prefix/lib/python$pythonver/site-packages:$PYTHONPATH diff --git a/gst/gstminiobject.h b/gst/gstminiobject.h index 27766b0c25..7e38a0f7c6 100644 --- a/gst/gstminiobject.h +++ b/gst/gstminiobject.h @@ -34,6 +34,7 @@ G_BEGIN_DECLS #define GST_MINI_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_MINI_OBJECT, GstMiniObjectClass)) #define GST_MINI_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MINI_OBJECT, GstMiniObject)) #define GST_MINI_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_MINI_OBJECT, GstMiniObjectClass)) +#define GST_MINI_OBJECT_CAST(obj) ((GstMiniObject*)(obj)) typedef struct _GstMiniObject GstMiniObject; typedef struct _GstMiniObjectClass GstMiniObjectClass; @@ -55,6 +56,8 @@ typedef enum GST_MINI_OBJECT_FLAG_LAST = (1<<4) } GstMiniObjectFlags; +#define GST_MINI_OBJECT_REFCOUNT(obj) ((GST_MINI_OBJECT_CAST(obj))->refcount) +#define GST_MINI_OBJECT_REFCOUNT_VALUE(obj) (g_atomic_int_get (&(GST_MINI_OBJECT_CAST(obj))->refcount)) struct _GstMiniObject { GTypeInstance instance; diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 6fb53659fc..592308b88d 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -22,16 +22,18 @@ clean-local: rm -rf $$i; \ done -TESTS = $(top_builddir)/tools/gst-register \ - gst/gstbin \ - gst/gstbus \ - gst/gstcaps \ - gst/gstiterator \ - gst/gstmessage \ - gst/gstobject \ - gst/gstpad \ - gst/gstsystemclock \ - pipelines/simple_launch_lines \ +TESTS = $(top_builddir)/tools/gst-register \ + gst/gstbin \ + gst/gstbuffer \ + gst/gstbus \ + gst/gstcaps \ + gst/gstiterator \ + gst/gstmessage \ + gst/gstobject \ + gst/gstpad \ + gst/gstsystemclock \ + pipelines/simple_launch_lines \ + pipelines/cleanup \ gst-libs/gdp check_PROGRAMS = $(TESTS)