diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | gst-libs/gst/Makefile.am | 5 | ||||
| -rwxr-xr-x | gst-libs/gst/audio/make_filter | 12 | ||||
| -rw-r--r-- | gst-libs/gst/play/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/gst/xwindowlistener/xwindowlistener.c | 6 | ||||
| -rw-r--r-- | gst/ffmpegcolorspace/gstffmpegcodecmap.c | 4 | ||||
| -rw-r--r-- | gst/ffmpegcolorspace/gstffmpegcolorspace.c | 2 | ||||
| -rw-r--r-- | pkgconfig/Makefile.am | 4 |
8 files changed, 39 insertions, 13 deletions
@@ -1,3 +1,20 @@ +2004-04-19 David Schleef <ds@schleef.org> + + * gconf/Makefile.am: Fix for non-GNU make + * gst-libs/gst/Makefile.am: Change directory order to handle + GstPlay linking with gstinterfaces + * gst-libs/gst/audio/make_filter: make use of tr portable + * gst-libs/gst/play/Makefile.am: Add intended \ + * gst-libs/gst/xwindowlistener/xwindowlistener.c: + (gst_xwin_set_clips): Switch to ISO variadic macro. Use a + function prototype instead of void *. + * gst/ffmpegcolorspace/gstffmpegcodecmap.c: Switch to ISO variadic + macro. + * gst/ffmpegcolorspace/gstffmpegcolorspace.c: + (gst_ffmpegcolorspace_chain): wrap NULL in GST_ELEMENT_ERROR call + * gst/videofilter/make_filter: make use of tr portable + * pkgconfig/Makefile.am: Remove GNU extension in Makefile target + 2004-04-19 Thomas Vander Stichele <thomas at apestaart dot org> * po/LINGUAS: diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index e62f4b19c..ac8f5952f 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -19,7 +19,6 @@ SUBDIRS = \ media-info \ mixer \ navigation \ - play \ propertyprobe \ resample \ riff \ @@ -27,7 +26,9 @@ SUBDIRS = \ tuner \ video \ xoverlay \ - $(X_DIR) + $(X_DIR) \ + . \ + play DIST_SUBDIRS = \ audio \ diff --git a/gst-libs/gst/audio/make_filter b/gst-libs/gst/audio/make_filter index 58b954347..eaeaa0601 100755 --- a/gst-libs/gst/audio/make_filter +++ b/gst-libs/gst/audio/make_filter @@ -1,5 +1,10 @@ #!/bin/sh +LANG=C +LC_COLLATE=C +export LANG +export LC_COLLATE + Template=$1; srcfile=$2; @@ -18,8 +23,11 @@ id=`echo '$Id$' | sed \ -e 's/\$I[d]: \([^$]*\)\$/\1/g'` echo $id -TEMPLATE=`echo $Template | tr a-z A-Z` -template=`echo $Template | tr A-Z a-z` +TEMPLATE=`echo $Template | tr [:lower:] [:upper:]` +template=`echo $Template | tr [:upper:] [:lower:]` + +echo TEMPLATE $TEMPLATE +echo template $template # remember to break up the Id: in the line below sed \ diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am index 44743b090..ad2ca4580 100644 --- a/gst-libs/gst/play/Makefile.am +++ b/gst-libs/gst/play/Makefile.am @@ -19,7 +19,7 @@ libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@ libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers) libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) -libgstplay_@GST_MAJORMINOR@_la_LIBADD = +libgstplay_@GST_MAJORMINOR@_la_LIBADD = \ $(GST_LIBS) $(GST_PLUGINS_LIBS) \ $(GST_CONTROL_LIBS) \ $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la diff --git a/gst-libs/gst/xwindowlistener/xwindowlistener.c b/gst-libs/gst/xwindowlistener/xwindowlistener.c index 63cfdd2d9..9963535c2 100644 --- a/gst-libs/gst/xwindowlistener/xwindowlistener.c +++ b/gst-libs/gst/xwindowlistener/xwindowlistener.c @@ -153,8 +153,8 @@ gst_x_window_listener_set_xid (GstXWindowListener * xwin, XID id) * <kraxel@bytesex.org>, it was relicensed to LGPL. */ -#define DEBUG(format, args...) \ - GST_DEBUG ("XWL: " format, ##args) +#define DEBUG(...) \ + GST_DEBUG ("XWL: " __VA_ARGS__) static void gst_xwin_set_overlay (GstXWindowListener * xwin, gboolean on) @@ -232,7 +232,7 @@ gst_xwin_set_clips (GstXWindowListener * xwin) guint numkids; gint i; gint x1, y1, w1, h1; - void *old_handler; + XErrorHandler old_handler; old_handler = XSetErrorHandler (x11_error_dev_null); diff --git a/gst/ffmpegcolorspace/gstffmpegcodecmap.c b/gst/ffmpegcolorspace/gstffmpegcodecmap.c index 3f1cf9901..9e0d1d5c8 100644 --- a/gst/ffmpegcolorspace/gstffmpegcodecmap.c +++ b/gst/ffmpegcolorspace/gstffmpegcodecmap.c @@ -34,12 +34,12 @@ * See below for why we use this. */ -#define GST_FF_VID_CAPS_NEW(mimetype, props...) \ +#define GST_FF_VID_CAPS_NEW(mimetype, ...) \ gst_caps_new_simple (mimetype, \ "width", GST_TYPE_INT_RANGE, 16, 4096, \ "height", GST_TYPE_INT_RANGE, 16, 4096, \ "framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE, \ - ##props, NULL) + __VA_ARGS__) /* Convert a FFMPEG Pixel Format and optional AVCodecContext * to a GstCaps. If the context is ommitted, no fixed values diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index fc4d5df17..1960081df 100644 --- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c +++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c @@ -306,7 +306,7 @@ gst_ffmpegcolorspace_chain (GstPad * pad, GstData * data) g_return_if_fail (GST_IS_FFMPEGCOLORSPACE (space)); if (space->from_pixfmt == PIX_FMT_NB || space->to_pixfmt == PIX_FMT_NB) { - GST_ELEMENT_ERROR (space, CORE, NOT_IMPLEMENTED, NULL, + GST_ELEMENT_ERROR (space, CORE, NOT_IMPLEMENTED, (NULL), ("attempting to convert colorspaces between unknown formats")); gst_buffer_unref (inbuf); return; diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 893aca0d3..49cd45fe2 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -26,9 +26,9 @@ pcverfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED) all-local: $(pcverfiles) $(pcverfiles_uninstalled) ### how to generate versioned .pc files from .pc files in this dir -$(pcverfiles): %-@GST_MAJORMINOR@.pc: %.pc +%-@GST_MAJORMINOR@.pc: %.pc cp $< $@ -$(pcverfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc +%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig |