summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2008-12-31 13:01:30 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-12-31 13:01:30 +0000
commit98ad43fcdd277ed81bfb54c991e3fc03859deda4 (patch)
tree0d4ff41c28e72f6942513c2664476b048b9ec0b0
parente2fcc71650b9cac604704f29143fa744f39cb299 (diff)
gst-libs/gst/video/: Add glib-mkenum for GstVideoFormat enum GTYPE auto-generation.
Original commit message from CVS: * gst-libs/gst/video/Makefile.am: * gst-libs/gst/video/video.h: Add glib-mkenum for GstVideoFormat enum GTYPE auto-generation. This will help bindings to use it.
-rw-r--r--ChangeLog7
-rw-r--r--gst-libs/gst/video/Makefile.am16
-rw-r--r--gst-libs/gst/video/video.h2
3 files changed, 25 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d4fa6079..cb14332a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-12-31 Edward Hervey <edward.hervey@collabora.co.uk>
+ * gst-libs/gst/video/Makefile.am:
+ * gst-libs/gst/video/video.h:
+ Add glib-mkenum for GstVideoFormat enum GTYPE auto-generation.
+ This will help bindings to use it.
+
+2008-12-31 Edward Hervey <edward.hervey@collabora.co.uk>
+
* gst-libs/gst/audio/Makefile.am:
* gst-libs/gst/audio/audio.c:
* gst-libs/gst/audio/multichannel.h:
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 780d0ddc..86f8c10c 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -1,10 +1,26 @@
+# variables used for enum/marshal generation
+glib_enum_headers= video.h
+
+glib_enum_define=GST_VIDEO
+glib_enum_prefix=gst_video
+
+built_sources = video-enumtypes.c
+built_headers = video-enumtypes.h
+BUILT_SOURCES = $(built_sources) $(built_headers)
+
lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
+CLEANFILES = $(BUILT_SOURCES)
+
libgstvideo_@GST_MAJORMINOR@_la_SOURCES = video.c gstvideosink.c gstvideofilter.c
+nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES = $(BUILT_SOURCES)
libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
libgstvideoinclude_HEADERS = video.h gstvideosink.h gstvideofilter.h
+nodist_libgstvideoinclude_HEADERS = $(built_headers)
libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+
+include $(top_srcdir)/common/glib-gen.mak
diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h
index ef185b52..cbdac973 100644
--- a/gst-libs/gst/video/video.h
+++ b/gst-libs/gst/video/video.h
@@ -25,6 +25,8 @@
G_BEGIN_DECLS
+#include "video-enumtypes.h"
+
/**
* GstVideoFormat:
* @GST_VIDEO_FORMAT_UNKNOWN: Unknown or unset video format id