From 10287a9c81aaa434ee4687ee44d6eec2edf75360 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 26 Jan 2010 19:35:52 +0000 Subject: [PATCH] win32: update windows headers to latest version --- win32/common/config.h | 62 ++++++++++++++++++++++++++++++++++++++++----- win32/common/gstenumtypes.c | 3 +++ win32/common/gstversion.h | 4 +-- 3 files changed, 60 insertions(+), 9 deletions(-) diff --git a/win32/common/config.h b/win32/common/config.h index 89c8d39..fc28858 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -6,10 +6,16 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* poll doesn't work on devices */ +#undef BROKEN_POLL + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS +/* Subunit protocol result output */ +#undef ENABLE_SUBUNIT + /* gettext package name */ #define GETTEXT_PACKAGE "gstreamer-0.10" @@ -44,11 +50,14 @@ #define GST_MAJORMINOR "0.10" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer git/prerelease" +#define GST_PACKAGE_NAME "GStreamer prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" +/* location of the installed gst-plugin-scanner */ +#undef GST_PLUGIN_SCANNER_INSTALLED + /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT @@ -115,9 +124,6 @@ /* Define to 1 if you have the `fgetpos' function. */ #define HAVE_FGETPOS 1 -/* Define to 1 if you have the `fork' function. */ -#undef HAVE_FORK - /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO @@ -139,6 +145,12 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT +/* Have GMP library */ +#undef HAVE_GMP + +/* Have GSL library */ +#undef HAVE_GSL + /* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV @@ -157,6 +169,9 @@ /* Define if libxml2 is available */ #define HAVE_LIBXML2 1 +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -166,6 +181,9 @@ /* Have a monotonic clock */ #undef HAVE_MONOTONIC_CLOCK +/* Defined if compiling for OSX */ +#undef HAVE_OSX + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL @@ -217,6 +235,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H @@ -226,15 +247,24 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIMES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ #undef HAVE_SYS_UTSNAME_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_WAIT_H + /* Define to 1 if you have the header file. */ #undef HAVE_UCONTEXT_H +/* Have __uint128_t type */ +#undef HAVE_UINT128_T + /* defined if unaligned memory access works correctly */ #undef HAVE_UNALIGNED_ACCESS @@ -286,13 +316,16 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 0.10.23.3" +#define PACKAGE_STRING "GStreamer 0.10.25.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.23.3" +#define PACKAGE_VERSION "0.10.25.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -301,6 +334,21 @@ # define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" #endif +/* The size of `char', as computed by sizeof. */ +#undef SIZEOF_CHAR + +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of `short', as computed by sizeof. */ +#undef SIZEOF_SHORT + +/* The size of `void*', as computed by sizeof. */ +#undef SIZEOF_VOIDP + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -308,7 +356,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.23.3" +#define VERSION "0.10.25.2" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index f2df5b1..1b34f2b 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -535,6 +535,7 @@ gst_event_type_get_type (void) {C_ENUM (GST_EVENT_NEWSEGMENT), "GST_EVENT_NEWSEGMENT", "newsegment"}, {C_ENUM (GST_EVENT_TAG), "GST_EVENT_TAG", "tag"}, {C_ENUM (GST_EVENT_BUFFERSIZE), "GST_EVENT_BUFFERSIZE", "buffersize"}, + {C_ENUM (GST_EVENT_SINK_MESSAGE), "GST_EVENT_SINK_MESSAGE", "sink-message"}, {C_ENUM (GST_EVENT_QOS), "GST_EVENT_QOS", "qos"}, {C_ENUM (GST_EVENT_SEEK), "GST_EVENT_SEEK", "seek"}, {C_ENUM (GST_EVENT_NAVIGATION), "GST_EVENT_NAVIGATION", "navigation"}, @@ -1170,6 +1171,8 @@ gst_plugin_flags_get_type (void) static gsize id = 0; static const GFlagsValue values[] = { {C_FLAGS (GST_PLUGIN_FLAG_CACHED), "GST_PLUGIN_FLAG_CACHED", "cached"}, + {C_FLAGS (GST_PLUGIN_FLAG_BLACKLISTED), "GST_PLUGIN_FLAG_BLACKLISTED", + "blacklisted"}, {0, NULL, NULL} }; diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 65e0fd2..50bd91d 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -57,14 +57,14 @@ G_BEGIN_DECLS * * The micro version of GStreamer at compile time: */ -#define GST_VERSION_MICRO (23) +#define GST_VERSION_MICRO (25) /** * GST_VERSION_NANO: * * The nano version of GStreamer at compile time: * Actual releases have 0, GIT versions have 1, prerelease versions have 2-... */ -#define GST_VERSION_NANO (3) +#define GST_VERSION_NANO (2) /** * GST_CHECK_VERSION: -- 2.7.4