From fc625b517fdd26f2deccc4693197b4d26b86d3cd Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 8 Jun 2007 14:55:35 +0100 Subject: Add two missing alloca.h includes and clean up one other. --- src/demuxers/demux_ac3.c | 3 +++ src/demuxers/demux_dts.c | 3 +++ 2 files changed, 6 insertions(+) (limited to 'src/demuxers') diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 279da6336..bb4bc8b4e 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -36,6 +36,9 @@ #include #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif #define LOG_MODULE "demux_ac3" #define LOG_VERBOSE diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index a9541b6f7..8f6f9c66e 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -32,6 +32,9 @@ #include #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif #define LOG_MODULE "demux_dts" #define LOG_VERBOSE -- cgit v1.2.3 From 89af20ee5fcefa96ac7eaf8ca36c3be72e38ea4f Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 9 Jun 2007 17:59:03 +0100 Subject: Add $(LTLIBINTL) wherever objdump -R shows a dependency on gettext functions. Some plugins may have been missed due to them not being built here. --- src/demuxers/Makefile.am | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/demuxers') diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 8a931c2d6..780094007 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -47,14 +47,14 @@ xineplug_LTLIBRARIES = $(ogg_module) $(asf_module) $(mng_module) $(image_module) xineplug_dmx_flv.la xineplug_dmx_ogg_la_SOURCES = demux_ogg.c -xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB) +xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_ogg_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(THEORA_CFLAGS) $(OGG_CFLAGS) xineplug_dmx_avi_la_SOURCES = demux_avi.c -xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) +xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c -xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) +xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c xineplug_dmx_mpeg_la_LIBADD = $(XINE_LIB) @@ -63,7 +63,7 @@ xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c xineplug_dmx_mpeg_elem_la_LIBADD = $(XINE_LIB) xineplug_dmx_mpeg_pes_la_SOURCES = demux_mpeg_pes.c -xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) +xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB) @@ -73,7 +73,7 @@ xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS) xineplug_dmx_qt_la_CPPFLAGS = $(ZLIB_CPPFLAGS) xineplug_dmx_asf_la_SOURCES = demux_asf.c asfheader.c -xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) +xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing xineplug_dmx_fli_la_SOURCES = demux_fli.c @@ -100,7 +100,7 @@ xineplug_dmx_games_la_SOURCES = group_games.c demux_eawve.c \ demux_vqa.c demux_wc3movie.c demux_str.c \ demux_film.c demux_smjpeg.c demux_4xm.c \ demux_vmd.c -xineplug_dmx_games_la_LIBADD = $(XINE_LIB) +xineplug_dmx_games_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_games_la_LDFLAGS = -avoid-version -module xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \ @@ -110,7 +110,7 @@ xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \ demux_aac.c demux_mod.c demux_flac.c \ demux_mpc.c demux_dts.c demux_shn.c \ demux_tta.c -xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS) +xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBMODPLUG_LIBS) xineplug_dmx_audio_la_CFLAGS = $(AM_CFLAGS) $(LIBMODPLUG_CFLAGS) xineplug_dmx_yuv_frames_la_SOURCES = demux_yuv_frames.c @@ -131,10 +131,10 @@ xineplug_dmx_matroska_la_CPPFLAGS = $(ZLIB_CPPFLAGS) xineplug_dmx_matroska_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing xineplug_dmx_iff_la_SOURCES = demux_iff.c -xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) +xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineplug_dmx_flv_la_SOURCES = demux_flv.c -xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) +xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) xineinclude_HEADERS = demux.h noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h -- cgit v1.2.3 From 40b6260d4350a6b9c65d4f5dea77c681d86926ab Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 9 Jun 2007 18:14:42 +0100 Subject: Add $(LTLIBICONV) wherever objdump -R shows a dependency on iconv functions. Some plugins may have been missed due to them not being built here. --- src/demuxers/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/demuxers') diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 780094007..83c29f4e3 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -73,7 +73,7 @@ xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS) xineplug_dmx_qt_la_CPPFLAGS = $(ZLIB_CPPFLAGS) xineplug_dmx_asf_la_SOURCES = demux_asf.c asfheader.c -xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) +xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LTLIBICONV) xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing xineplug_dmx_fli_la_SOURCES = demux_fli.c -- cgit v1.2.3