diff -Nurd xine-lib-1.1.19/configure xine-lib-1.1.19-new/configure --- xine-lib-1.1.19/configure 2010-07-25 10:40:24.000000000 -0400 +++ xine-lib-1.1.19-new/configure 2010-10-03 18:15:19.000000000 -0400 @@ -20772,7 +20772,7 @@ -host_or_hostalias="$host" +host_or_hostalias="$target" if test "$host_or_hostalias" = ""; then host_or_hostalias="$host_alias" fi diff -Nurd xine-lib-1.1.19/src/audio_out/Makefile.in xine-lib-1.1.19-new/src/audio_out/Makefile.in --- xine-lib-1.1.19/src/audio_out/Makefile.in 2010-07-25 10:40:01.000000000 -0400 +++ xine-lib-1.1.19-new/src/audio_out/Makefile.in 2010-10-03 18:38:36.000000000 -0400 @@ -689,9 +689,9 @@ # The "-Wl,-framework -Wl,..." is needed for libtool versions before # 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) xineplug_ao_out_coreaudio_la_LDFLAGS = $(AM_LDFLAGS) \ - -Wl,-framework -Wl,Cocoa -framework CoreAudio \ - -Wl,-framework -Wl,AudioUnit -framework AudioUnit \ -xineplug_ao_out_coreaudio_la_CFLAGS = -framework CoreAudio -framework AudioUnit $(VISIBILITY_FLAG) + -Wl,-framework,Cocoa -Wl,-framework,CoreAudio \ + -Wl,-framework,AudioUnit \ +xineplug_ao_out_coreaudio_la_CFLAGS = -Wl,-framework,CoreAudio -Wl,-framework,AudioUnit $(VISIBILITY_FLAG) xineplug_ao_out_pulseaudio_la_SOURCES = audio_pulse_out.c xineplug_ao_out_pulseaudio_la_LIBADD = $(XINE_LIB) $(PULSEAUDIO_LIBS) $(LTLIBINTL) diff -Nurd xine-lib-1.1.19/src/audio_out/audio_coreaudio_out.c xine-lib-1.1.19-new/src/audio_out/audio_coreaudio_out.c --- xine-lib-1.1.19/src/audio_out/audio_coreaudio_out.c 2010-03-09 17:17:05.000000000 -0500 +++ xine-lib-1.1.19-new/src/audio_out/audio_coreaudio_out.c 2011-06-07 11:33:04.000000000 -0400 @@ -51,6 +51,7 @@ #include #include #include +#include #define AO_OUT_COREAUDIO_IFACE_VERSION 8 diff -Nurd xine-lib-1.1.19/src/libxinevdec/Makefile.in xine-lib-1.1.19-new/src/libxinevdec/Makefile.in --- xine-lib-1.1.19/src/libxinevdec/Makefile.in 2010-07-25 10:40:16.000000000 -0400 +++ xine-lib-1.1.19-new/src/libxinevdec/Makefile.in 2010-10-03 18:18:03.000000000 -0400 @@ -490,7 +490,7 @@ xinepostdir = $(XINE_PLUGINDIR)/post vidixdir = $(XINE_PLUGINDIR)/vidix AM_CFLAGS = $(VISIBILITY_FLAG) -AM_LDFLAGS = $(xineplug_ldflags) +AM_LDFLAGS = $(xineplug_ldflags) $(X_LIBS) EXTRA_DIST = foovideo.c @HAVE_WAND_TRUE@image_module = xineplug_decode_image.la @HAVE_GDK_PIXBUF_TRUE@gdkpixbuf_module = xineplug_decode_gdk_pixbuf.la diff -Nurd xine-lib-1.1.19/src/post/deinterlace/plugins/Makefile.in xine-lib-1.1.19-new/src/post/deinterlace/plugins/Makefile.in --- xine-lib-1.1.19/src/post/deinterlace/plugins/Makefile.in 2010-07-25 10:40:17.000000000 -0400 +++ xine-lib-1.1.19-new/src/post/deinterlace/plugins/Makefile.in 2010-10-03 18:18:47.000000000 -0400 @@ -72,9 +72,7 @@ libdeinterlaceplugins_la-linearblend.lo \ libdeinterlaceplugins_la-vfir.lo \ libdeinterlaceplugins_la-weave.lo \ - libdeinterlaceplugins_la-greedy2frame.lo \ libdeinterlaceplugins_la-scalerbob.lo \ - libdeinterlaceplugins_la-kdetv_greedyh.lo \ libdeinterlaceplugins_la-kdetv_tomsmocomp.lo libdeinterlaceplugins_la_OBJECTS = \ $(am_libdeinterlaceplugins_la_OBJECTS) @@ -470,9 +468,7 @@ linearblend.c \ vfir.c \ weave.c \ - greedy2frame.c \ scalerbob.c \ - kdetv_greedyh.c \ kdetv_tomsmocomp.c libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) @@ -532,8 +528,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-double.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-greedy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-greedy2frame.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_greedyh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_tomsmocomp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-linear.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-linearblend.Plo@am__quote@ diff -Nurd xine-lib-1.1.19/src/xine-engine/Makefile.in xine-lib-1.1.19-new/src/xine-engine/Makefile.in --- xine-lib-1.1.19/src/xine-engine/Makefile.in 2010-07-25 10:40:20.000000000 -0400 +++ xine-lib-1.1.19-new/src/xine-engine/Makefile.in 2010-10-03 21:22:15.000000000 -0400 @@ -448,7 +448,7 @@ vidixdir = $(XINE_PLUGINDIR)/vidix LIBXINEPOSIX = $(top_builddir)/lib/libxineposix.la AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE +AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) lib_LTLIBRARIES = libxine.la XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la DEF_FILE = libxine-$(XINE_MAJOR).def diff -Nurd xine-lib-1.1.19/src/xine-engine/demux.c xine-lib-1.1.19-new/src/xine-engine/demux.c --- xine-lib-1.1.19/src/xine-engine/demux.c 2010-07-21 15:10:49.000000000 -0400 +++ xine-lib-1.1.19-new/src/xine-engine/demux.c 2010-10-03 18:19:08.000000000 -0400 @@ -50,6 +50,27 @@ #include #endif +#ifndef CLOCK_REALTIME +#include + +#define CLOCK_REALTIME 0 +static int clock_gettime(int clk_id /*ignored*/, struct timespec *tp) +{ + struct timeval now; + + int rv = gettimeofday(&now, NULL); + + if (rv != 0) { + return rv; + } + + tp->tv_sec = now.tv_sec; + tp->tv_nsec = now.tv_usec * 1000; + + return 0; +} +#endif + /* * Flush audio and video buffers. It is called from demuxers on * seek/stop, and may be useful when user input changes a stream and --- a/src/demuxers/demux_qt.c 2011-10-04 18:40:59.000000000 -0400 +++ b/src/demuxers/demux_qt.c 2012-04-19 19:18:44.000000000 -0400 @@ -129,7 +129,7 @@ #define QTIM_ATOM QT_ATOM('q', 't', 'i', 'm') /* placeholder for cutting and pasting */ -#define _ATOM QT_ATOM('', '', '', '') +/* #define _ATOM QT_ATOM('', '', '', '') */ #define ATOM_PREAMBLE_SIZE 8 #define PALETTE_COUNT 256 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.h @@ -377,7 +377,7 @@ static xine_post_api_parameter_t temp_p[ #define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \ { param_type, #var, sizeof(temp_s.var), \ - (char*)&temp_s.var-(char*)&temp_s, enumv, min, max, readonly, descr }, + offsetof(__typeof__(temp_s), var), enumv, min, max, readonly, descr }, #define END_PARAM_DESCR( name ) \ { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \