diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-12-18 09:26:42 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-12-18 09:26:42 +0000 |
| commit | 892ee3299e62ca117d3f26575218eb2a723542d6 (patch) | |
| tree | 8c274d832ae32af354ab1e82e84c6332eadb235c | |
| parent | 4625e68226117c9e57939d66fafd26c3fba7470c (diff) | |
| download | gst-plugins-bad-892ee3299e62ca117d3f26575218eb2a723542d6.tar.gz gst-plugins-bad-892ee3299e62ca117d3f26575218eb2a723542d6.tar.bz2 gst-plugins-bad-892ee3299e62ca117d3f26575218eb2a723542d6.zip | |
Makefile.am: Include common/win32.mak for CRLF check of win32 project files (see #393626).
Original commit message from CVS:
* Makefile.am:
Include common/win32.mak for CRLF check of win32 project
files (see #393626).
* configure.ac:
Bump requirements to -base CVS for libgstvideo additions in
glimagesink. Disable glimagesink until the missing files get
checked in.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 17 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2007-12-18 Tim-Philipp Müller <tim at centricular dot net> + + * Makefile.am: + Include common/win32.mak for CRLF check of win32 project + files (see #393626). + + * configure.ac: + Bump requirements to -base CVS for libgstvideo additions in + glimagesink. Disable glimagesink until the missing files get + checked in. + 2007-12-17 David Schleef <ds@schleef.org> * sys/glsink/Makefile.am: diff --git a/Makefile.am b/Makefile.am index 53772847..8b2e3f6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,10 +16,8 @@ DIST_SUBDIRS = \ m4 common docs tests po \ examples -win32 = $(shell cat $(top_srcdir)/win32/MANIFEST) - -debug: - echo $(win32) +# include before EXTRA_DIST for win32 assignment +include $(top_srcdir)/common/win32.mak EXTRA_DIST = \ gst-plugins-bad.spec depcomp \ diff --git a/configure.ac b/configure.ac index 695a7779..bea69902 100644 --- a/configure.ac +++ b/configure.ac @@ -45,8 +45,8 @@ AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** dnl *** remove rtpmanager/equalizer stuff below when this is updated -GST_REQ=0.10.14.1 -GSTPB_REQ=0.10.14.1 +GST_REQ=0.10.15.1 +GSTPB_REQ=0.10.15.1 dnl *** autotools stuff **** @@ -294,6 +294,8 @@ LIBS="$LIBS $X_LIBS" AG_GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [ AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no") + dnl disable until the build gets fixed + HAVE_OPENGL="no" ]) CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" |