mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-30 13:41:48 +00:00
gconf/Makefile.am: Fix for non-GNU make
Original commit message from CVS: * 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
This commit is contained in:
parent
99703a3404
commit
90d82810c0
5 changed files with 34 additions and 8 deletions
17
ChangeLog
17
ChangeLog
|
@ -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:
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue