From 24f67f76bf359fee3bf32699541c8784ad175bd6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 14 Apr 2010 12:20:13 +0100 Subject: [PATCH] 0.10.28.2 pre-release --- configure.ac | 5 +++-- win32/common/config.h | 23 +++++++++++++++++++---- win32/common/gstenumtypes.c | 1 + win32/common/gstversion.h | 2 +- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 902cbc6..b7e2ce1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, git and prerelease does Werror too -AC_INIT(GStreamer, 0.10.28.1, +AC_INIT(GStreamer, 0.10.28.2, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gstreamer) AG_GST_INIT @@ -48,7 +48,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 dnl sets GST_LT_LDFLAGS -AS_LIBTOOL(GST, 24, 1, 24) +AS_LIBTOOL(GST, 25, 0, 25) dnl FIXME: this macro doesn't actually work; dnl the generated libtool script has no support for the listed tags. @@ -769,6 +769,7 @@ sed \ -e 's/.* HAVE_WIN32$/#define HAVE_WIN32 1/' \ -e 's/.* HAVE_WINSOCK2_H$/#define HAVE_WINSOCK2_H 1/' \ -e 's/.* HOST_CPU$/#define HOST_CPU "i686"/' \ + -e 's/.* BUFFER_ALIGNMENT_MALLOC/#define BUFFER_ALIGNMENT_MALLOC 1/' \ -e 's/.* LIBDIR$/#ifdef _DEBUG\n# define LIBDIR PREFIX "\\\\debug\\\\lib"\n#else\n# define LIBDIR PREFIX "\\\\lib"\n#endif/' \ -e 's/.* LOCALEDIR$/#define LOCALEDIR PREFIX "\\\\share\\\\locale"/' \ -e 's/.* PACKAGE$/#define PACKAGE "gstreamer"/' \ diff --git a/win32/common/config.h b/win32/common/config.h index 5d46aa6..2af6370 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -9,6 +9,15 @@ /* poll doesn't work on devices */ #undef BROKEN_POLL +/* Buffer alignment to use */ +#undef BUFFER_ALIGNMENT + +/* Buffer alignment by malloc default */ +#define BUFFER_ALIGNMENT_MALLOC 1 + +/* Buffer alignment by pagesize */ +#undef BUFFER_ALIGNMENT_PAGESIZE + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -50,7 +59,7 @@ #define GST_MAJORMINOR "0.10" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer git" +#define GST_PACKAGE_NAME "GStreamer prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -187,6 +196,9 @@ /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL +/* Define to 1 if you have the `posix_memalign' function. */ +#undef HAVE_POSIX_MEMALIGN + /* Have posix timers */ #undef HAVE_POSIX_TIMERS @@ -238,6 +250,9 @@ /* 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_PRCTL_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H @@ -316,7 +331,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 0.10.28.1" +#define PACKAGE_STRING "GStreamer 0.10.28.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -325,7 +340,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.28.1" +#define PACKAGE_VERSION "0.10.28.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -356,7 +371,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.28.1" +#define VERSION "0.10.28.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 1b34f2b..e42fd88 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -887,6 +887,7 @@ gst_message_type_get_type (void) {C_FLAGS (GST_MESSAGE_REQUEST_STATE), "GST_MESSAGE_REQUEST_STATE", "request-state"}, {C_FLAGS (GST_MESSAGE_STEP_START), "GST_MESSAGE_STEP_START", "step-start"}, + {C_FLAGS (GST_MESSAGE_QOS), "GST_MESSAGE_QOS", "qos"}, {C_FLAGS (GST_MESSAGE_ANY), "GST_MESSAGE_ANY", "any"}, {0, NULL, NULL} }; diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 5528abf..4061b0b 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -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 (1) +#define GST_VERSION_NANO (2) /** * GST_CHECK_VERSION: -- 2.7.4