From: <tho...@ke...> - 2006-04-01 09:41:56
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Sat Apr 01 2006 09:41:55 UTC Log message: * configure.ac: use new AS_VERSION and AS_NANO macros * gst/gst-i18n-lib.h: * gst/gst.c: * gst/gsterror.c: * gst/gstversion.h.in: * win32/common/config.h: * win32/common/config.h.in: update accordingly Modified files: . : ChangeLog configure.ac gst : gst-i18n-lib.h gst.c gsterror.c gstversion.h.in win32/common : config.h config.h.in Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2406&r2=1.2407 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/configure.ac.diff?r1=1.454&r2=1.455 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst-i18n-lib.h.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.197&r2=1.198 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gsterror.c.diff?r1=1.25&r2=1.26 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstversion.h.in.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/common/config.h.diff?r1=1.41&r2=1.42 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/common/config.h.in.diff?r1=1.14&r2=1.15 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2406 retrieving revision 1.2407 diff -u -d -r1.2406 -r1.2407 --- ChangeLog 31 Mar 2006 15:26:04 -0000 1.2406 +++ ChangeLog 1 Apr 2006 09:41:43 -0000 1.2407 @@ -1,3 +1,15 @@ +2006-04-01 Thomas Vander Stichele <thomas at apestaart dot org> + + * configure.ac: + use new AS_VERSION and AS_NANO macros + * gst/gst-i18n-lib.h: + * gst/gst.c: + * gst/gsterror.c: + * gst/gstversion.h.in: + * win32/common/config.h: + * win32/common/config.h.in: + update accordingly 2006-03-31 Michael Smith <ms...@fl...> * plugins/elements/gsttypefindelement.c: Index: configure.ac RCS file: /cvs/gstreamer/gstreamer/configure.ac,v retrieving revision 1.454 retrieving revision 1.455 diff -u -d -r1.454 -r1.455 --- configure.ac 21 Mar 2006 19:27:15 -0000 1.454 +++ configure.ac 1 Apr 2006 09:41:43 -0000 1.455 @@ -1,13 +1,20 @@ AC_PREREQ(2.52) dnl initialize autoconf -dnl we don't specify PACKAGE and VERSION because AS_VERSION puts it together -AC_INIT - dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gstreamer, GST_VERSION, 0, 10, 4, 1, - GST_CVS="no", GST_CVS="yes") +AC_INIT(GStreamer, 0.10.4.1, + http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, + gstreamer) +dnl initialize automake +AM_INIT_AUTOMAKE +dnl define PACKAGE_VERSION_* variables +AS_VERSION +dnl check if this is a release version +AS_NANO(GST_CVS="no", GST_CVS="yes") dnl can autoconf find the source ? AC_CONFIG_SRCDIR([gst/gst.c]) @@ -21,13 +28,8 @@ dnl sets host_* variables AC_CANONICAL_HOST -dnl initialize automake -dnl FIXME: this is deprecated use, we should move PACKAGE and VERSION to -dnl AC_INIT, but then we need to parse the version to pass to AS_VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) dnl our libraries and install dirs use major.minor as a version -GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR +GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR dnl we override it here for release candidates for a new series GST_MAJORMINOR=0.10 AC_SUBST(GST_MAJORMINOR) @@ -111,7 +113,7 @@ GST_ARG_EXAMPLES GST_ARG_WITH_PKG_CONFIG_PATH -GST_ARG_WITH_PACKAGE_NAME([GStreamer]) +GST_ARG_WITH_PACKAGE_NAME GST_ARG_WITH_PACKAGE_ORIGIN dnl use a cache dir for storing element registry info. Index: gst-i18n-lib.h RCS file: /cvs/gstreamer/gstreamer/gst/gst-i18n-lib.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gst-i18n-lib.h 11 Oct 2005 16:05:16 -0000 1.7 +++ gst-i18n-lib.h 1 Apr 2006 09:41:43 -0000 1.8 @@ -23,7 +23,7 @@ #ifndef __GST_I18N_LIB_H__ #define __GST_I18N_LIB_H__ -#ifndef GST_VERSION +#ifndef PACKAGE_NAME #error You must include config.h before including this header. #endif Index: gst.c RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v retrieving revision 1.197 retrieving revision 1.198 diff -u -d -r1.197 -r1.198 --- gst.c 3 Mar 2006 16:58:51 -0000 1.197 +++ gst.c 1 Apr 2006 09:41:43 -0000 1.198 @@ -756,7 +756,7 @@ { switch (opt) { case ARG_VERSION: - g_print ("GStreamer Core Library version %s\n", GST_VERSION); + g_print ("GStreamer Core Library version %s\n", PACKAGE_VERSION); exit (0); case ARG_FATAL_WARNINGS:{ GLogLevelFlags fatal_mask; Index: gsterror.c RCS file: /cvs/gstreamer/gstreamer/gst/gsterror.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- gsterror.c 4 Mar 2006 13:54:26 -0000 1.25 +++ gsterror.c 1 Apr 2006 09:41:43 -0000 1.26 @@ -117,8 +117,7 @@ return type; } -#define FILE_A_BUG " Please file a bug at "\ - "http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer." +#define FILE_A_BUG " Please file a bug at " PACKAGE_BUGREPORT " ." /* initialize the dynamic table of translated core errors */ static gchar ** Index: gstversion.h.in RCS file: /cvs/gstreamer/gstreamer/gst/gstversion.h.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gstversion.h.in 16 Oct 2005 14:32:57 -0000 1.9 +++ gstversion.h.in 1 Apr 2006 09:41:43 -0000 1.10 @@ -45,26 +45,26 @@ * * The major version of GStreamer at compile time: */ -#define GST_VERSION_MAJOR (@GST_VERSION_MAJOR@) +#define GST_VERSION_MAJOR (@PACKAGE_VERSION_MAJOR@) /** * GST_VERSION_MINOR: * The minor version of GStreamer at compile time: -#define GST_VERSION_MINOR (@GST_VERSION_MINOR@) +#define GST_VERSION_MINOR (@PACKAGE_VERSION_MINOR@) * GST_VERSION_MICRO: * The micro version of GStreamer at compile time: -#define GST_VERSION_MICRO (@GST_VERSION_MICRO@) +#define GST_VERSION_MICRO (@PACKAGE_VERSION_MICRO@) * GST_VERSION_NANO: * The nano version of GStreamer at compile time: * Actual releases have 0, CVS versions have 1, prerelease versions have 2-... -#define GST_VERSION_NANO (@GST_VERSION_NANO@) +#define GST_VERSION_NANO (@PACKAGE_VERSION_NANO@) G_END_DECLS Index: config.h RCS file: /cvs/gstreamer/gstreamer/win32/common/config.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- config.h 12 Mar 2006 20:40:19 -0000 1.41 +++ config.h 1 Apr 2006 09:41:43 -0000 1.42 @@ -14,11 +14,14 @@ /* Location of registry */ #define GST_CACHE_DIR PREFIX "\\var\\cache" +/* Define if pipeline parsing code is disabled */ +/* #undef GST_DISABLE_PARSE */ /* macro to use to show function name */ #define GST_FUNCTION "(function)" /* Defined if gcov is enabled to force a rebuild due to config.h changing */ -#undef GST_GCOV_ENABLED +/* #undef GST_GCOV_ENABLED */ /* Default errorlevel to use */ #define GST_LEVEL_DEFAULT GST_LEVEL_ERROR @@ -26,20 +29,11 @@ /* GStreamer license */ #define GST_LICENSE "LGPL" -/* package origin */ -#define GST_PACKAGE_ORIGIN "Unknown package origin" /* package name in plugins */ #define GST_PACKAGE_NAME "GStreamer CVS/prerelease" -/* Define the version */ -#define GST_VERSION "0.10.4.1" -/* Define the MAJOR.MINOR version */ -#define GST_MAJORMINOR "0.10" -/* Define host CPU */ -#define HOST_CPU "i686" +/* package origin */ +#define GST_PACKAGE_ORIGIN "Unknown package origin" /* Define if the host CPU is an Alpha */ #undef HAVE_CPU_ALPHA @@ -174,6 +168,9 @@ /* Defined if compiling for Windows */ #define HAVE_WIN32 1 +/* Define host CPU */ +#define HOST_CPU "i686" /* library dir */ #ifdef _DEBUG # define LIBDIR PREFIX "\\debug\\lib" @@ -188,19 +185,19 @@ #define PACKAGE "gstreamer" /* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer" /* Define to the full name of this package. */ -#undef PACKAGE_NAME +#define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#undef PACKAGE_STRING +#undef PACKAGE_STRING "GStreamer 0.10.4.1" /* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME +#undef PACKAGE_TARNAME "gstreamer" /* Define to the version of this package. */ -#undef PACKAGE_VERSION +#undef PACKAGE_VERSION "0.10.4.1" /* Define the plugin directory */ Index: config.h.in RCS file: /cvs/gstreamer/gstreamer/win32/common/config.h.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- config.h.in 14 Jan 2006 11:20:40 -0000 1.14 +++ config.h.in 1 Apr 2006 09:41:43 -0000 1.15 #define GST_LEVEL_DEFAULT @GST_LEVEL_DEFAULT@ #define GST_LICENSE "@GST_LICENSE@" -#define GST_PACKAGE_ORIGIN "@GST_PACKAGE_ORIGIN@" #define GST_PACKAGE_NAME "@GST_PACKAGE_NAME@" -#define GST_VERSION "@GST_VERSION@" -#define GST_MAJORMINOR "@GST_MAJORMINOR@" -#define HOST_CPU "@HOST_CPU@" +#define GST_PACKAGE_ORIGIN "@GST_PACKAGE_ORIGIN@" +#define HOST_CPU "@HOST_CPU@" #define PACKAGE "@PACKAGE@" +#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" +#define PACKAGE_NAME "@PACKAGE_NAME@" +#define PACKAGE_STRING "@PACKAGE_STRING@" +#define PACKAGE_TARNAME "@PACKAGE_TARNAME@" +#define PACKAGE_VERSION "@PACKAGE_VERSION@" |