Menu
▾
▴
[gst-cvs] thomasvs gstreamer: gstreamer/ gstreamer/gst/ gstreamer/win32/common/
|
From: <tho...@fr...> - 2005-10-16 12:28:40
|
CVS Root: /cvs/gstreamer
Module: gstreamer
Changes by: thomasvs
Date: Sun Oct 16 2005 05:28:32 PDT
Log message:
* configure.ac:
clean up further
* gst/gst.c: (init_post):
* win32/common/config.h.in:
it's PLUGINDIR now
* gst/gstcaps.c: (gst_caps_intersect):
use gint64, the range could be bigger than a guint
Modified files:
. : ChangeLog configure.ac
gst : gst.c gstcaps.c
win32/common : config.h.in
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1748&r2=1.1749
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/configure.ac.diff?r1=1.404&r2=1.405
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.184&r2=1.185
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstcaps.c.diff?r1=1.148&r2=1.149
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/win32/common/config.h.in.diff?r1=1.8&r2=1.9
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -d -r1.1748 -r1.1749
--- ChangeLog 16 Oct 2005 11:48:08 -0000 1.1748
+++ ChangeLog 16 Oct 2005 12:28:18 -0000 1.1749
@@ -1,5 +1,15 @@
2005-10-16 Thomas Vander Stichele <thomas at apestaart dot org>
+ * configure.ac:
+ clean up further
+ * gst/gst.c: (init_post):
+ * win32/common/config.h.in:
+ it's PLUGINDIR now
+ * gst/gstcaps.c: (gst_caps_intersect):
+ use gint64, the range could be bigger than a guint
+
+2005-10-16 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gstclock.h:
document potential problem in 2038
Index: configure.ac
RCS file: /cvs/gstreamer/gstreamer/configure.ac,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -d -r1.404 -r1.405
--- configure.ac 16 Oct 2005 10:38:01 -0000 1.404
+++ configure.ac 16 Oct 2005 12:28:19 -0000 1.405
@@ -18,6 +18,9 @@
dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
AM_MAINTAINER_MODE
+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
@@ -46,6 +49,12 @@
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4")
+dnl set up gettext
+dnl the version check needs to stay here because autopoint greps for it
+AM_GNU_GETTEXT_VERSION([0.11.5])
+AM_GNU_GETTEXT([external])
+GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
dnl *** check for arguments to configure ***
dnl subsystems - can influence other decisions so needs to be high up
@@ -76,6 +85,8 @@
GST_ARG_VALGRIND
GST_ARG_GCOV
+GST_ARG_EXAMPLES
GST_ARG_WITH_PKG_CONFIG_PATH
GST_ARG_WITH_PACKAGE_NAME([GStreamer])
GST_ARG_WITH_PACKAGE_ORIGIN
@@ -131,18 +142,6 @@
AC_MSG_WARN([Sissy ! By asking to not build the tests known to fail, you hereby waive your right to customer support. If you do not agree with this EULA, please press Ctrl-C before the next line is printed. By allowing the next line to be printed, you expressly acknowledge your acceptance of this EULA.])
fi
-AC_ARG_ENABLE(examples,
- AC_HELP_STRING([--disable-examples], [disable building examples]),
- [
- case "${enableval}" in
- yes) BUILD_EXAMPLES=yes ;;
- no) BUILD_EXAMPLES=no ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-examples) ;;
- esac
- ],
- [BUILD_EXAMPLES=yes]) dnl Default value
-AM_CONDITIONAL(BUILD_EXAMPLES, test "x$BUILD_EXAMPLES" = "xyes")
-
dnl poison destroyed objects
AC_ARG_ENABLE(poisoning,
AC_HELP_STRING([--enable-poisoning],
@@ -160,7 +159,7 @@
[Define if we should poison deallocated memory])
-dnl *** platform checks ***
+dnl *** checks for platform ***
dnl * hardware/architecture *
@@ -179,7 +178,6 @@
AC_SUBST(GST_HAVE_UNALIGNED_ACCESS_DEFINE)
dnl * software *
dnl check for large file support
@@ -262,6 +260,30 @@
AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes")
AC_CHECK_HEADERS([process.h])
+dnl *** checks for types/defines ***
+dnl *** checks for structures ***
+dnl *** checks for compiler characteristics ***
+dnl make sure we can use "inline" from C code
+AC_C_INLINE
+OPT_CFLAGS=
+dnl Check for some compiler flags that optimize our code.
+if test "x$GCC" = xyes; then
+ AS_COMPILER_FLAG(-fno-common, OPT_CFLAGS="$OPT_CFLAGS -fno-common")
+fi
+dnl FIXME: decide what kind of flag this is, maybe it's not an optimization
+dnl flag
+dnl check if we should use -Wa,-mregnames on PowerPC, so we can use
+dnl symbolic register names in inline asm
+if test x$HAVE_CPU_PPC = xyes ; then
+ AS_COMPILER_FLAG(["-Wa,-mregnames"],
+ [OPT_CFLAGS="$OPT_CFLAGS -Wa,-mregnames"])
dnl *** checks for library functions ***
AC_CHECK_FUNCS([sigaction])
@@ -308,50 +330,11 @@
[Defined if we have dladdr ()]))
CFLAGS="$save_cflags"
-dnl *** checks for compiler characteristics ***
-dnl make sure we can use "inline" from C code
-AC_C_INLINE
-dnl *** TODO: decide where to put ***
-dnl set up gettext
-GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
-dnl define an ERROR_CFLAGS Makefile variable
-GST_SET_ERROR_CFLAGS($GST_CVS)
-dnl define correct errorlevel for debugging messages. We want to have GST_ERROR
-dnl messages printed when running cvs builds
-if test "x$GST_CVS" = "xyes"; then
- GST_LEVEL_DEFAULT=GST_LEVEL_ERROR
-else
- GST_LEVEL_DEFAULT=GST_LEVEL_NONE
-fi
-AC_DEFINE_UNQUOTED(GST_LEVEL_DEFAULT, $GST_LEVEL_DEFAULT,
- [Default errorlevel to use])
-AC_SUBST(GST_LEVEL_DEFAULT)
-dnl *** checks for dependency libraries ***
+dnl *** checks for dependancy libraries ***
dnl GLib
-dnl Minimum required version of GLib
-GLIB_REQ="2.6"
-AC_SUBST(GLIB_REQ)
-dnl Check for glib2 with sugar on top
-PKG_CHECK_MODULES(GLIB,
- glib-2.0 >= $GLIB_REQ gobject-2.0 gthread-2.0 gmodule-2.0,
- HAVE_GLIB=yes,
- HAVE_GLIB=no)
-if test "x$HAVE_GLIB" = "xno"; then
- AC_MSG_ERROR([GStreamer requires GLib >= $GLIB_REQ to compile.])
-dnl for the poor souls who for example have glib in /usr/local
-AS_SCRUB_INCLUDE(GLIB_CFLAGS)
+GST_GLIB_CHECK([2.6])
dnl GLib 2.8 has some bug fixes that we like, so make sure our code knows
AC_MSG_CHECKING([glib version >= 2.8])
@@ -387,22 +370,7 @@
HAVE_CHECK=no)
AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
-OPT_CFLAGS=
-dnl Check for some compiler flags that optimize our code.
-if test "x$GCC" = xyes; then
- AS_COMPILER_FLAG(-fno-common, OPT_CFLAGS="$OPT_CFLAGS -fno-common")
-dnl FIXME: decide what kind of flag this is, maybe it's not an optimization
-dnl flag
-dnl check if we should use -Wa,-mregnames on PowerPC, so we can use
-dnl symbolic register names in inline asm
-if test x$HAVE_CPU_PPC = xyes ; then
- AS_COMPILER_FLAG(["-Wa,-mregnames"],
- [OPT_CFLAGS="$OPT_CFLAGS -Wa,-mregnames"])
-dnl *** FIXME: name this part
+dnl *** set variables based on configure arguments
dnl set license and copyright notice
GST_LICENSE="LGPL"
@@ -414,19 +382,18 @@
AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR", [library dir])
dnl set location of plugin directory
-AS_AC_EXPAND(PLUGINS_DIR, ${libdir}/gstreamer-$GST_MAJORMINOR)
-AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$PLUGINS_DIR", [Define the plugin directory])
-AC_SUBST(PLUGINS_DIR)
-AC_MSG_NOTICE([Using $PLUGINS_DIR as the plugin install location])
-dnl plugin directory configure-time variable for use in Makefile.am
-plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
-AC_SUBST(plugindir)
+GST_SET_PLUGINDIR
dnl FIXME: add LIBXML_PKG here
GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0"
AC_SUBST(GST_PKG_DEPS)
+dnl define an ERROR_CFLAGS Makefile variable
+GST_SET_ERROR_CFLAGS($GST_CVS)
+dnl define correct level for debugging messages
+GST_SET_LEVEL_DEFAULT($GST_CVS)
dnl *** finalize CFLAGS, LDFLAGS, LIBS
dnl Overview:
Index: gst.c
RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- gst.c 16 Oct 2005 09:20:51 -0000 1.184
+++ gst.c 16 Oct 2005 12:28:19 -0000 1.185
@@ -619,7 +619,7 @@
g_free (home_plugins);
/* add the main (installed) library path */
- gst_registry_scan_path (default_registry, PLUGINS_DIR);
+ gst_registry_scan_path (default_registry, PLUGINDIR);
} else {
char **list;
int i;
Index: gstcaps.c
RCS file: /cvs/gstreamer/gstreamer/gst/gstcaps.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- gstcaps.c 16 Oct 2005 10:58:41 -0000 1.148
+++ gstcaps.c 16 Oct 2005 12:28:19 -0000 1.149
@@ -955,7 +955,8 @@
GstCaps *
gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2)
{
- guint i, j, k;
+ gint64 i, j, k; /* indexes can be up to 2 * sizeof (guint) */
GstStructure *struct1;
GstStructure *struct2;
GstCaps *dest;
@@ -1008,8 +1009,6 @@
gst_caps_append_structure (dest, istruct);
/* move down left */
k++;
- if (j == 0)
- break; /* we use a guint for j */
j--;
}
}
Index: config.h.in
RCS file: /cvs/gstreamer/gstreamer/win32/common/config.h.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config.h.in 16 Oct 2005 10:38:02 -0000 1.8
+++ config.h.in 16 Oct 2005 12:28:20 -0000 1.9
@@ -196,7 +196,7 @@
#undef PACKAGE_VERSION
/* Define the plugin directory */
-#define PLUGINS_DIR PREFIX "\\lib\\gstreamer-0.9"
+#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.9"
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
|