gnomemm r1817 - in gstreamermm/trunk: . build_shared gstreamer/gstreamermm gstreamer/gstreamermm/private gstreamer/src

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Sun Nov 30 06:31:39 2008
New Revision: 1817
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1817&view=rev

Log:
2008-11-30  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/src/Makefile_list_of_hg.am_fragment:
	* build_shared/Makefile_gensrc.am_fragment:
	* gstreamer/gstreamermm/Makefile.am: Modified build process so that
	taglist.hg can be included in list of .hg files to generate, but also
	to patch the generated .h file to remove the "typedef _GstTagList ..."
	section because the C API defines GstTagList as a GstStructure (so
	there's a conflict).
	* gstreamer/gstreamermm/taglist.h.patch: Added this patch so build
	process can use it to patch taglist.h.

	* gstreamer/gstreamermm/private/taglist_p.h:
	* gstreamer/gstreamermm/taglist.cc:
	* gstreamer/gstreamermm/taglist.h: Removed these because now they are
	generated.

Added:
   gstreamermm/trunk/gstreamer/gstreamermm/taglist.h.patch
Removed:
   gstreamermm/trunk/gstreamer/gstreamermm/private/taglist_p.h
   gstreamermm/trunk/gstreamer/gstreamermm/taglist.cc
   gstreamermm/trunk/gstreamer/gstreamermm/taglist.h
Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment
   gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
   gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment

Modified: gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment
==============================================================================
--- gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment	(original)
+++ gstreamermm/trunk/build_shared/Makefile_gensrc.am_fragment	Sun Nov 30 06:31:39 2008
@@ -19,6 +19,7 @@
 gensrc_destdir = $(srcdir)/../$(sublib_name)
 stamp_dir = $(srcdir)/.stamps
 stamp_plugin_dir = $(builddir)/.stamps
+destdir_stamp_dir = $(gensrc_destdir)/.stamps
 
 include $(tools_dir)/Makefile_list_of_sources.am_fragment
 tools_m4	= $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4)
@@ -29,6 +30,7 @@
 files_h		= $(files_all_hg:%.hg=$(gensrc_destdir)/%.h)
 files_stamp	= $(files_all_hg:%.hg=$(stamp_dir)/stamp-%)
 files_plugin_stamp = $(files_plugin_hg:%.hg=$(stamp_plugin_dir)/stamp-%-plugin)
+destdir_files_stamp = $(files_patched_hg:%.hg=$(destdir_stamp_dir)/stamp-%)
 
 #Installed gmmproc stuff, from glibmm:
 gmmproc_path = $(GMMPROC)
@@ -89,6 +91,11 @@
 $(stamp_plugin_dir):
 	@(test -d $(stamp_plugin_dir) || mkdir $(stamp_plugin_dir))
 
+$(destdir_stamp_dir)/stamp-%: $(gensrc_destdir)/%.h
+	patch -Ns $(gensrc_destdir)/$*.h $(gensrc_destdir)/$*.h.patch || true
+	rm -f $(gensrc_destdir)/$*.h.rej
+	touch $@
+
 files_hg_with_path	= $(patsubst %.hg,$(srcdir)/%.hg,$(files_all_hg))
 
 $(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_path) $(files_hg_with_path) \
@@ -103,14 +110,16 @@
 
 create-stamp-dir: $(stamp_plugin_dir)
 	@(test -d $(stamp_dir) || mkdir $(stamp_dir))
+	@(test -d $(destdir_stamp_dir) || mkdir $(destdir_stamp_dir))
 
 if MAINTAINER_MODE
 all-local: create-stamp-dir $(files_stamp) $(files_plugin_stamp) \
-	$(gensrc_destdir)/wrap_init.cc $(gensrc_destdir)/gst_wrap_init.cc
+	$(gensrc_destdir)/wrap_init.cc $(gensrc_destdir)/gst_wrap_init.cc \
+	$(destdir_files_stamp)
 else
 BUILT_SOURCES = $(foreach plugin,$(files_plugin_hg:.hg=),\
 		$(stamp_plugin_dir)/stamp-$(plugin)-plugin)
 endif
 
 maintainer-clean-local:
-	rm -rf $(stamp_dir) $(stamp_plugin_dir)
+	rm -rf $(stamp_dir) $(stamp_plugin_dir) $(destdir_stamp_dir)

Modified: gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/Makefile.am	Sun Nov 30 06:31:39 2008
@@ -13,12 +13,12 @@
 
 sublib_files_extra_posix_cc = 
 sublib_files_extra_win32_cc =
-sublib_files_extra_general_cc = init.cc miniobject.cc object.cc version.cc wrap.cc gst_wrap_init.cc taglist.cc
+sublib_files_extra_general_cc = init.cc miniobject.cc object.cc version.cc wrap.cc gst_wrap_init.cc
 sublib_files_extra_general_deprecated_cc = 
 
 sublib_files_extra_posix_h = 
 sublib_files_extra_win32_h =
-sublib_files_extra_general_h = init.h miniobject.h object.h version.h wrap.h gst_wrap_init.h taglist.h
+sublib_files_extra_general_h = init.h miniobject.h object.h version.h wrap.h gst_wrap_init.h
 sublib_files_extra_general_deprecated_h = 
 
 include $(top_srcdir)/build_shared/Makefile_build.am_fragment

Added: gstreamermm/trunk/gstreamer/gstreamermm/taglist.h.patch
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/gstreamermm/taglist.h.patch	Sun Nov 30 06:31:39 2008
@@ -0,0 +1,14 @@
+--- taglist.h.gen	2008-11-09 16:23:59.000000000 -0500
++++ taglist.h	2008-11-09 16:26:29.000000000 -0500
+@@ -30,11 +30,6 @@
+ #include <gst/gsttaglist.h>
+ #include <gstreamermm/structure.h>
+ 
+-
+-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+-extern "C" { typedef struct _GstTagList GstTagList; }
+-#endif
+-
+ namespace Gst
+ {
+ 

Modified: gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	(original)
+++ gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	Sun Nov 30 06:31:39 2008
@@ -9,8 +9,8 @@
 	format.hg index.hg indexfactory.hg interface.hg iterator.hg \
 	message.hg pad.hg padtemplate.hg parse.hg pipeline.hg \
 	plugin.hg pluginfeature.hg query.hg registry.hg segment.hg \
-	structure.hg systemclock.hg tagsetter.hg task.hg urihandler.hg \
-	value.hg xml.hg \
+	structure.hg systemclock.hg taglist.hg tagsetter.hg task.hg \
+	urihandler.hg value.hg xml.hg \
 	basesrc.hg basesink.hg basetransform.hg pushsrc.hg
 
 #TODO: Add ghostpad.hg when bug #539108 is fixed (and patch in bug is applied)
@@ -19,4 +19,6 @@
 
 files_plugin_hg = filesrc.hg
 
+files_patched_hg = taglist.hg
+
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment