summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2007-11-20 11:41:13 +0000
committerJulien Moutte <julien@moutte.net>2007-11-20 11:41:13 +0000
commit1f0a03d3201080e2834d7d61dd5572e464d9450c (patch)
treee36127f71e560869c3bea926d806f56a3e6d3090
parenta7591577462e9d8d9dbad9712b08b1a78c077405 (diff)
Fix build on Mac OS X 10.5
Original commit message from CVS: 2007-11-20 Julien MOUTTE <julien@moutte.net> * ext/taglib/gsttaglibmux.c: (gst_tag_lib_mux_render_tag), (gst_tag_lib_mux_adjust_event_offsets): * gst/qtdemux/qtdemux.c: (qtdemux_parse_theora_extension): * sys/osxaudio/Makefile.am: * sys/osxvideo/cocoawindow.h: * sys/osxvideo/cocoawindow.m: Fix build on Mac OS X 10.5
-rw-r--r--ChangeLog9
-rw-r--r--ext/taglib/gsttaglibmux.c4
-rw-r--r--gst/qtdemux/qtdemux.c3
-rw-r--r--sys/osxaudio/Makefile.am3
-rw-r--r--sys/osxvideo/cocoawindow.h2
-rw-r--r--sys/osxvideo/cocoawindow.m2
6 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e1d6c347..535b67ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-20 Julien MOUTTE <julien@moutte.net>
+
+ * ext/taglib/gsttaglibmux.c: (gst_tag_lib_mux_render_tag),
+ (gst_tag_lib_mux_adjust_event_offsets):
+ * gst/qtdemux/qtdemux.c: (qtdemux_parse_theora_extension):
+ * sys/osxaudio/Makefile.am:
+ * sys/osxvideo/cocoawindow.h:
+ * sys/osxvideo/cocoawindow.m: Fix build on Mac OS X 10.5
+
2007-11-15 David Schleef <ds@schleef.org>
* ext/cairo/gsttextoverlay.c:
diff --git a/ext/taglib/gsttaglibmux.c b/ext/taglib/gsttaglibmux.c
index a20e18cc..21cdb77a 100644
--- a/ext/taglib/gsttaglibmux.c
+++ b/ext/taglib/gsttaglibmux.c
@@ -166,7 +166,7 @@ gst_tag_lib_mux_render_tag (GstTagLibMux * mux)
goto render_error;
mux->tag_size = GST_BUFFER_SIZE (buffer);
- GST_LOG_OBJECT (mux, "tag size = %d bytes", mux->tag_size);
+ GST_LOG_OBJECT (mux, "tag size = %" G_GSIZE_FORMAT " bytes", mux->tag_size);
/* Send newsegment event from byte position 0, so the tag really gets
* written to the start of the file, independent of the upstream segment */
@@ -218,7 +218,7 @@ gst_tag_lib_mux_adjust_event_offsets (GstTagLibMux * mux,
GST_DEBUG_OBJECT (mux, "adjusting newsegment event offsets to start=%"
G_GINT64_FORMAT ", stop=%" G_GINT64_FORMAT ", cur=%" G_GINT64_FORMAT
- " (delta = +%u)", start, stop, cur, mux->tag_size);
+ " (delta = +%" G_GSIZE_FORMAT ")", start, stop, cur, mux->tag_size);
return gst_event_new_new_segment (TRUE, 1.0, format, start, stop, cur);
}
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 99f52e68..9a246f1e 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2197,7 +2197,8 @@ qtdemux_parse_theora_extension (GstQTDemux * qtdemux, QtDemuxStream * stream,
break;
default:
GST_WARNING_OBJECT (qtdemux,
- "unknown theora cookie %" GST_FOURCC_FORMAT, type);
+ "unknown theora cookie %" GST_FOURCC_FORMAT,
+ GST_FOURCC_ARGS (type));
break;
}
buf += size;
diff --git a/sys/osxaudio/Makefile.am b/sys/osxaudio/Makefile.am
index 4ea2114c..1b0e4875 100644
--- a/sys/osxaudio/Makefile.am
+++ b/sys/osxaudio/Makefile.am
@@ -5,7 +5,8 @@ libgstosxaudio_la_SOURCES = gstosxringbuffer.c \
gstosxaudiosink.c \
gstosxaudiosrc.c
-libgstosxaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstosxaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
+ -Wno-deprecated-declarations
libgstosxaudio_la_LIBADD = \
-lgstinterfaces-@GST_MAJORMINOR@ \
-lgstaudio-@GST_MAJORMINOR@ \
diff --git a/sys/osxvideo/cocoawindow.h b/sys/osxvideo/cocoawindow.h
index 340bd160..a0a4a9a0 100644
--- a/sys/osxvideo/cocoawindow.h
+++ b/sys/osxvideo/cocoawindow.h
@@ -35,7 +35,7 @@ struct _GstOSXImage;
@interface GstGLView : NSOpenGLView
{
int i_effect;
- unsigned long pi_texture;
+ unsigned int pi_texture;
float f_x;
float f_y;
int initDone;
diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m
index 9b5e7b31..c90dc604 100644
--- a/sys/osxvideo/cocoawindow.m
+++ b/sys/osxvideo/cocoawindow.m
@@ -262,7 +262,7 @@
}
- (void) drawRect:(NSRect) rect {
- long params[] = { 1 };
+ int params[] = { 1 };
[actualContext makeCurrentContext];