mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-05 14:02:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

gconf/Makefile.am: Fix for non-GNU make

Browse source 
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:
David Schleef 2004-04-19 22:51:57 +00:00
parent 575790a918
commit 3e84dfa539
8 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -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> 2004-04-19 Thomas Vander Stichele <thomas at apestaart dot org>
* po/LINGUAS: * po/LINGUAS:

5
gst-libs/gst/Makefile.am
View file

@ -19,7 +19,6 @@ SUBDIRS = \
media-info \ media-info \
mixer \ mixer \
navigation \ navigation \
play \
propertyprobe \ propertyprobe \
resample \ resample \
riff \ riff \
@ -27,7 +26,9 @@ SUBDIRS = \
tuner \ tuner \
video \ video \
xoverlay \ xoverlay \
$(X_DIR) $(X_DIR) \
. \
play
DIST_SUBDIRS = \ DIST_SUBDIRS = \
audio \ audio \

12
gst-libs/gst/audio/make_filter
View file

@ -1,5 +1,10 @@
#!/bin/sh #!/bin/sh
LANG=C
LC_COLLATE=C
export LANG
export LC_COLLATE
Template=$1; Template=$1;
srcfile=$2; srcfile=$2;
@ -18,8 +23,11 @@ id=`echo '$Id$' | sed \
-e 's/\$I[d]: \([^$]*\)\$/\1/g'` -e 's/\$I[d]: \([^$]*\)\$/\1/g'`
echo $id echo $id
TEMPLATE=`echo $Template | tr a-z A-Z` TEMPLATE=`echo $Template | tr [:lower:] [:upper:]`
template=`echo $Template | tr A-Z a-z` template=`echo $Template | tr [:upper:] [:lower:]`
echo TEMPLATE $TEMPLATE
echo template $template
# remember to break up the Id: in the line below # remember to break up the Id: in the line below
sed \ sed \

2
gst-libs/gst/play/Makefile.am
View file

@ -19,7 +19,7 @@ libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@
libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers) libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers)
libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) 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_LIBS) $(GST_PLUGINS_LIBS) \
$(GST_CONTROL_LIBS) \ $(GST_CONTROL_LIBS) \
$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la

6
gst-libs/gst/xwindowlistener/xwindowlistener.c
View file

@ -153,8 +153,8 @@ gst_x_window_listener_set_xid (GstXWindowListener * xwin, XID id)
* <kraxel@bytesex.org>, it was relicensed to LGPL. * <kraxel@bytesex.org>, it was relicensed to LGPL.
*/ */
#define DEBUG(format, args...) \ #define DEBUG(...) \
GST_DEBUG ("XWL: " format, ##args) GST_DEBUG ("XWL: " __VA_ARGS__)
static void static void
gst_xwin_set_overlay (GstXWindowListener * xwin, gboolean on) gst_xwin_set_overlay (GstXWindowListener * xwin, gboolean on)
@ -232,7 +232,7 @@ gst_xwin_set_clips (GstXWindowListener * xwin)
guint numkids; guint numkids;
gint i; gint i;
gint x1, y1, w1, h1; gint x1, y1, w1, h1;
void *old_handler; XErrorHandler old_handler;
old_handler = XSetErrorHandler (x11_error_dev_null); old_handler = XSetErrorHandler (x11_error_dev_null);

4
gst/ffmpegcolorspace/gstffmpegcodecmap.c
View file

@ -34,12 +34,12 @@
* See below for why we use this. * 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, \ gst_caps_new_simple (mimetype, \
"width", GST_TYPE_INT_RANGE, 16, 4096, \ "width", GST_TYPE_INT_RANGE, 16, 4096, \
"height", GST_TYPE_INT_RANGE, 16, 4096, \ "height", GST_TYPE_INT_RANGE, 16, 4096, \
"framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE, \ "framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE, \
##props, NULL) __VA_ARGS__)
/* Convert a FFMPEG Pixel Format and optional AVCodecContext /* Convert a FFMPEG Pixel Format and optional AVCodecContext
* to a GstCaps. If the context is ommitted, no fixed values * to a GstCaps. If the context is ommitted, no fixed values

2
gst/ffmpegcolorspace/gstffmpegcolorspace.c
View file

@ -306,7 +306,7 @@ gst_ffmpegcolorspace_chain (GstPad * pad, GstData * data)
g_return_if_fail (GST_IS_FFMPEGCOLORSPACE (space)); g_return_if_fail (GST_IS_FFMPEGCOLORSPACE (space));
if (space->from_pixfmt == PIX_FMT_NB || space->to_pixfmt == PIX_FMT_NB) { 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")); ("attempting to convert colorspaces between unknown formats"));
gst_buffer_unref (inbuf); gst_buffer_unref (inbuf);
return; return;

4
pkgconfig/Makefile.am
View file

@ -26,9 +26,9 @@ pcverfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
all-local: $(pcverfiles) $(pcverfiles_uninstalled) all-local: $(pcverfiles) $(pcverfiles_uninstalled)
### how to generate versioned .pc files from .pc files in this dir ### how to generate versioned .pc files from .pc files in this dir
$(pcverfiles): %-@GST_MAJORMINOR@.pc: %.pc %-@GST_MAJORMINOR@.pc: %.pc
cp $< $@ cp $< $@
$(pcverfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
cp $< $@ cp $< $@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig