From 5143b835cc58a0353f0f47623b53c1c835efa618 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 12 Mar 2015 13:29:35 +0000 Subject: [PATCH] win32: update --- win32/common/config.h | 92 ++++++++++++++++++++++++++++++++++++++++++--- win32/common/gstenumtypes.c | 15 ++++++++ win32/common/gstversion.h | 4 +- 3 files changed, 104 insertions(+), 7 deletions(-) diff --git a/win32/common/config.h b/win32/common/config.h index 56cf9cc..6833ff5 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -56,13 +56,13 @@ #define GST_LICENSE "LGPL" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer source release" +#define GST_PACKAGE_NAME "GStreamer git" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2014-07-19" +#define GST_PACKAGE_RELEASE_DATETIME "2015-03-12T12:48Z" /* Define if static plugins should be built */ #undef GST_PLUGIN_BUILD_STATIC @@ -70,6 +70,9 @@ /* location of the installed gst-plugin-scanner */ #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner" +/* Define to 1 if you have the `alarm' function. */ +#undef HAVE_ALARM + /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT @@ -81,9 +84,15 @@ /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME +/* Define if the target CPU is AARCH64 */ +#undef HAVE_CPU_AARCH64 + /* Define if the target CPU is an Alpha */ #undef HAVE_CPU_ALPHA +/* Define if the target CPU is an ARC */ +#undef HAVE_CPU_ARC + /* Define if the target CPU is an ARM */ #undef HAVE_CPU_ARM @@ -127,6 +136,22 @@ */ #undef HAVE_DCGETTEXT +/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't. + */ +#undef HAVE_DECL_ALARM + +/* Define to 1 if you have the declaration of `localtime_r', and to 0 if you + don't. */ +#undef HAVE_DECL_LOCALTIME_R + +/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't. + */ +#undef HAVE_DECL_STRDUP + +/* Define to 1 if you have the declaration of `strsignal', and to 0 if you + don't. */ +#undef HAVE_DECL_STRSIGNAL + /* Defined if we have dladdr () */ #undef HAVE_DLADDR @@ -136,6 +161,9 @@ /* 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 @@ -154,6 +182,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE +/* Define to 1 if you have the `getpid' function. */ +#undef HAVE_GETPID + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -179,6 +210,9 @@ declares uintmax_t. */ #undef HAVE_INTTYPES_H_WITH_UINTMAX +/* Define to 1 if you have the `rt' library (-lrt). */ +#undef HAVE_LIBRT + /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R @@ -230,12 +264,18 @@ /* Have PTHREAD_PRIO_INHERIT. */ #undef HAVE_PTHREAD_PRIO_INHERIT +/* Have function pthread_setname_np(const char*) */ +#undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID + /* Define to 1 if the system has the type `ptrdiff_t'. */ #undef HAVE_PTRDIFF_T /* Define if RDTSC is available */ #undef HAVE_RDTSC +/* Define to 1 if you have the `setitimer' function. */ +#undef HAVE_SETITIMER + /* Define to 1 if you have the `sigaction' function. */ #undef HAVE_SIGACTION @@ -252,12 +292,30 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 +/* Define to 1 if you have the `strcasestr' function. */ +#undef HAVE_STRCASESTR + /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strsignal' function. */ +#undef HAVE_STRSIGNAL + +/* Define to 1 if `it_interval' is a member of `struct itimerspec'. */ +#undef HAVE_STRUCT_ITIMERSPEC_IT_INTERVAL + +/* Define to 1 if `it_value' is a member of `struct itimerspec'. */ +#undef HAVE_STRUCT_ITIMERSPEC_IT_VALUE + +/* Define to 1 if `tv_nsec' is a member of `struct timespec'. */ +#undef HAVE_STRUCT_TIMESPEC_TV_NSEC + +/* Define to 1 if `tv_sec' is a member of `struct timespec'. */ +#undef HAVE_STRUCT_TIMESPEC_TV_SEC + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H @@ -282,12 +340,18 @@ /* 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_UIO_H + /* 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_TIME_H + /* Have tm_gmtoff field in struct tm */ #undef HAVE_TM_GMTOFF @@ -318,6 +382,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_WINSOCK2_H 1 +/* Define to 1 if you have the `_getpid' function. */ +#undef HAVE__GETPID + +/* Define to 1 if you have the `_strdup' function. */ +#undef HAVE__STRDUP + /* the host CPU */ #define HOST_CPU "i686" @@ -354,7 +424,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 1.4.0" +#define PACKAGE_STRING "GStreamer 1.5.0.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -363,7 +433,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.0" +#define PACKAGE_VERSION "1.5.0.1" /* directory where plugins are located */ #ifdef _DEBUG @@ -394,6 +464,12 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Need to define the itimerspec structure */ +#undef STRUCT_ITIMERSPEC_DEFINITION_MISSING + +/* Need to define the timespec structure */ +#undef STRUCT_TIMESPEC_DEFINITION_MISSING + /* the target CPU */ #undef TARGET_CPU @@ -401,7 +477,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "1.4.0" +#define VERSION "1.5.0.1" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -432,9 +508,15 @@ /* We need at least WinXP SP2 for __stat64 */ #undef __MSVCRT_VERSION__ +/* clockid_t */ +#undef clockid_t + /* Define to the widest signed integer type if and do not define. */ #undef intmax_t /* Define to `unsigned int' if does not define. */ #undef size_t + +/* timer_t */ +#undef timer_t diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index 0527074..ebba963 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -310,7 +310,11 @@ gst_debug_graph_details_get_type (void) "GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS", "non-default-params"}, {C_FLAGS (GST_DEBUG_GRAPH_SHOW_STATES), "GST_DEBUG_GRAPH_SHOW_STATES", "states"}, + {C_FLAGS (GST_DEBUG_GRAPH_SHOW_FULL_PARAMS), + "GST_DEBUG_GRAPH_SHOW_FULL_PARAMS", "full-params"}, {C_FLAGS (GST_DEBUG_GRAPH_SHOW_ALL), "GST_DEBUG_GRAPH_SHOW_ALL", "all"}, + {C_FLAGS (GST_DEBUG_GRAPH_SHOW_VERBOSE), "GST_DEBUG_GRAPH_SHOW_VERBOSE", + "verbose"}, {0, NULL, NULL} }; @@ -1586,6 +1590,7 @@ gst_seek_flags_get_type (void) {C_FLAGS (GST_SEEK_FLAG_ACCURATE), "GST_SEEK_FLAG_ACCURATE", "accurate"}, {C_FLAGS (GST_SEEK_FLAG_KEY_UNIT), "GST_SEEK_FLAG_KEY_UNIT", "key-unit"}, {C_FLAGS (GST_SEEK_FLAG_SEGMENT), "GST_SEEK_FLAG_SEGMENT", "segment"}, + {C_FLAGS (GST_SEEK_FLAG_TRICKMODE), "GST_SEEK_FLAG_TRICKMODE", "trickmode"}, {C_FLAGS (GST_SEEK_FLAG_SKIP), "GST_SEEK_FLAG_SKIP", "skip"}, {C_FLAGS (GST_SEEK_FLAG_SNAP_BEFORE), "GST_SEEK_FLAG_SNAP_BEFORE", "snap-before"}, @@ -1593,6 +1598,10 @@ gst_seek_flags_get_type (void) "snap-after"}, {C_FLAGS (GST_SEEK_FLAG_SNAP_NEAREST), "GST_SEEK_FLAG_SNAP_NEAREST", "snap-nearest"}, + {C_FLAGS (GST_SEEK_FLAG_TRICKMODE_KEY_UNITS), + "GST_SEEK_FLAG_TRICKMODE_KEY_UNITS", "trickmode-key-units"}, + {C_FLAGS (GST_SEEK_FLAG_TRICKMODE_NO_AUDIO), + "GST_SEEK_FLAG_TRICKMODE_NO_AUDIO", "trickmode-no-audio"}, {0, NULL, NULL} }; @@ -1611,8 +1620,14 @@ gst_segment_flags_get_type (void) static const GFlagsValue values[] = { {C_FLAGS (GST_SEGMENT_FLAG_NONE), "GST_SEGMENT_FLAG_NONE", "none"}, {C_FLAGS (GST_SEGMENT_FLAG_RESET), "GST_SEGMENT_FLAG_RESET", "reset"}, + {C_FLAGS (GST_SEGMENT_FLAG_TRICKMODE), "GST_SEGMENT_FLAG_TRICKMODE", + "trickmode"}, {C_FLAGS (GST_SEGMENT_FLAG_SKIP), "GST_SEGMENT_FLAG_SKIP", "skip"}, {C_FLAGS (GST_SEGMENT_FLAG_SEGMENT), "GST_SEGMENT_FLAG_SEGMENT", "segment"}, + {C_FLAGS (GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS), + "GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS", "trickmode-key-units"}, + {C_FLAGS (GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO), + "GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO", "trickmode-no-audio"}, {0, NULL, NULL} }; diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 2a2e614..a595e27 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -51,7 +51,7 @@ G_BEGIN_DECLS * * The minor version of GStreamer at compile time: */ -#define GST_VERSION_MINOR (4) +#define GST_VERSION_MINOR (5) /** * GST_VERSION_MICRO: * @@ -64,7 +64,7 @@ G_BEGIN_DECLS * The nano version of GStreamer at compile time: * Actual releases have 0, GIT versions have 1, prerelease versions have 2-... */ -#define GST_VERSION_NANO (0) +#define GST_VERSION_NANO (1) /** * GST_CHECK_VERSION: -- 2.7.4