# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1181683946 -3600
# Node ID 60c6926e626c9152f9951a36c97efaa060f6228d
# Parent 580424b9d3bd0fc073c686ed7ddb00e3755b2626
# Parent 9311da9e65bbfbd9dc786be8fc5321be6c57777f
A nice simple merge from 1.1.
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 ChangeLog
--- a/ChangeLog Tue Jun 12 22:32:26 2007 +0100
+++ b/ChangeLog Sun Jun 10 16:51:33 2007 +0200
@@ -34,6 +34,8 @@ xine-lib (1.1.90) (Unreleased)
will not be present in KDE 4.
* Convert the FAQ and the Hacker's Guide from DocBook SGML to DocBook 4.4
XML, and the figures from fig files to SVG files.
+
+xine-lib (1.1.8) (Unreleased)
* Send a channel changed event to the frontend when receiving the SYNC
string from last.fm streaming server.
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 contrib/vidix/Makefile.am
--- a/contrib/vidix/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/contrib/vidix/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -16,4 +16,3 @@ noinst_LTLIBRARIES = libvidix.la
libvidix_la_SOURCES = vidixlib.c
libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS)
$(top_builddir)/contrib/libdha/libdha.la
-
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 debian/control
--- a/debian/control Tue Jun 12 22:32:26 2007 +0100
+++ b/debian/control Sun Jun 10 16:51:33 2007 +0200
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5.0.1), bin
zlib1g-dev, libartsc0-dev,
liblircclient-dev, libjack0.100.0-dev | libjack-dev,
libdirectfb-dev, libgtk2.0-dev,
- libflac-dev, libpulse-dev, libsdl1.2-dev,
+ libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-dev,
libsmbclient-dev, libspeex-dev, libmng-dev,
libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1),
w3m, transfig, gs, sgmltools-lite
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 debian/rules
--- a/debian/rules Tue Jun 12 22:32:26 2007 +0100
+++ b/debian/rules Sun Jun 10 16:51:33 2007 +0200
@@ -67,6 +67,8 @@ CONFIGURE_FLAGS := --prefix=/usr \
CONFIGURE_FLAGS := --prefix=/usr \
--with-external-libmad \
--with-external-a52dec \
+ --with-external-libdts \
+ --with-wavpack \
$(DEB_BUILD_CONFIG_OPTIONS) \
CFLAGS="$(CFLAGS)"
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 m4/pthreads.m4
--- a/m4/pthreads.m4 Tue Jun 12 22:32:26 2007 +0100
+++ b/m4/pthreads.m4 Sun Jun 10 16:51:33 2007 +0200
@@ -20,6 +20,9 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
case $host in
*-hpux11*) PTHREAD_CFLAGS="" ;;
*-darwin*) PTHREAD_CFLAGS="" ;;
+ *-solaris*)
+ # Handle Studio compiler
+ CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt -D_REENTRANT"],
[PTHREAD_CFLAGS="-D_REENTRANT"]);;
*) PTHREAD_CFLAGS="-pthread" ;;
esac
fi
@@ -27,6 +30,9 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
case $host in
*-hpux11*) PTHREAD_LIBS="-lpthread" ;;
*-darwin*) PTHREAD_LIBS="" ;;
+ *-solaris*)
+ # Handle Studio compiler
+ CC_CHECK_CFLAGS([-mt], [PTHREAD_LIBS="-lpthread -lposix4
-lrt"], [PTHREAD_LIBS="-lpthread -lposix4 -lrt"]);;
*) PTHREAD_LIBS="-pthread" ;;
esac
fi
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/audio_out/Makefile.am
--- a/src/audio_out/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/audio_out/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -68,20 +68,20 @@ xineplug_LTLIBRARIES = \
$(jack_module)
xineplug_ao_out_none_la_SOURCES = audio_none_out.c
-xineplug_ao_out_none_la_LIBADD = $(XINE_LIB)
+xineplug_ao_out_none_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_ao_out_file_la_SOURCES = audio_file_out.c
-xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
+xineplug_ao_out_file_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
-xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB)
+xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
-xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_ao_out_alsa_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c
-xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) $(XINE_LIB)
+xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) $(XINE_LIB) $(LTLIBINTL)
xineplug_ao_out_esd_la_CFLAGS = $(AM_CFLAGS) $(ESD_CFLAGS)
xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c
@@ -100,7 +100,7 @@ xineplug_ao_out_coreaudio_la_LDFLAGS = $
xineplug_ao_out_coreaudio_la_LDFLAGS = $(AM_LDFLAGS) -framework CoreAudio
-framework AudioUnit
xineplug_ao_out_pulseaudio_la_SOURCES = audio_pulse_out.c
-xineplug_ao_out_pulseaudio_la_LIBADD = $(PULSEAUDIO_LIBS) $(XINE_LIB)
+xineplug_ao_out_pulseaudio_la_LIBADD = $(PULSEAUDIO_LIBS) $(XINE_LIB)
$(LTLIBINTL)
xineplug_ao_out_pulseaudio_la_CFLAGS = $(AM_CFLAGS) $(PULSEAUDIO_CFLAGS)
xineplug_ao_out_directx2_la_SOURCES = audio_directx2_out.c
@@ -112,5 +112,5 @@ xineplug_ao_out_fusionsound_la_CFLAGS =
xineplug_ao_out_fusionsound_la_CFLAGS = $(AM_CFLAGS) $(FUSIONSOUND_CFLAGS)
xineplug_ao_out_jack_la_SOURCES = audio_jack_out.c
-xineplug_ao_out_jack_la_LIBADD = $(JACK_LIBS) $(XINE_LIB)
+xineplug_ao_out_jack_la_LIBADD = $(JACK_LIBS) $(XINE_LIB) $(LTLIBINTL)
xineplug_ao_out_jack_la_CFLAGS = $(AM_FLAGS) $(JACK_CFLAGS)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/audio_out/audio_alsa_out.c
--- a/src/audio_out/audio_alsa_out.c Tue Jun 12 22:32:26 2007 +0100
+++ b/src/audio_out/audio_alsa_out.c Sun Jun 10 16:51:33 2007 +0200
@@ -41,7 +41,9 @@
#include <stdlib.h>
#include <fcntl.h>
#include <math.h>
+#ifdef HAVE_ALLOCA_H
#include <alloca.h>
+#endif
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/combined/Makefile.am
--- a/src/combined/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/combined/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -34,7 +34,7 @@ xineplug_nsf_la_CPPFLAGS = $(AM_CPPFLAGS
xineplug_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER
-I$(top_srcdir)/contrib/nosefart -I$(top_srcdir)/src/demuxers
xineplug_xiph_la_SOURCES = xine_ogg_demuxer.c
-xineplug_xiph_la_LIBADD = $(XINE_LIB)
+xineplug_xiph_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_xiph_la_CFLAGS = $(AM_CFLAGS)
xineplug_xiph_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/demuxers/Makefile.am
--- a/src/demuxers/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/demuxers/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -55,10 +55,10 @@ xineplug_LTLIBRARIES = \
xineplug_dmx_flv.la
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)
@@ -67,7 +67,7 @@ xineplug_dmx_mpeg_elem_la_LIBADD = $(XIN
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)
@@ -77,7 +77,7 @@ xineplug_dmx_qt_la_CPPFLAGS = $(AM_CPPFL
xineplug_dmx_qt_la_CPPFLAGS = $(AM_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) $(LTLIBICONV)
xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
xineplug_dmx_fli_la_SOURCES = demux_fli.c
@@ -104,7 +104,7 @@ xineplug_dmx_games_la_SOURCES = group_ga
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_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \
demux_cdda.c demux_mpgaudio.c \
@@ -137,7 +137,7 @@ xineplug_dmx_matroska_la_CPPFLAGS = $(AM
xineplug_dmx_matroska_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
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)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/demuxers/demux_ac3.c
--- a/src/demuxers/demux_ac3.c Tue Jun 12 22:32:26 2007 +0100
+++ b/src/demuxers/demux_ac3.c Sun Jun 10 16:51:33 2007 +0200
@@ -36,6 +36,9 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
#define LOG_MODULE "demux_ac3"
#define LOG_VERBOSE
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/demuxers/demux_dts.c
--- a/src/demuxers/demux_dts.c Tue Jun 12 22:32:26 2007 +0100
+++ b/src/demuxers/demux_dts.c Sun Jun 10 16:51:33 2007 +0200
@@ -32,6 +32,9 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
#define LOG_MODULE "demux_dts"
#define LOG_VERBOSE
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/dxr3/Makefile.am
--- a/src/dxr3/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/dxr3/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -25,15 +25,15 @@ endif
endif
xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c
-xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB)
+xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
if WITH_EXTERNAL_DVDNAV
xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c
-xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
+xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(DVDNAV_LIBS)
xineplug_decode_dxr3_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
else
xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c
-xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB)
+xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_decode_dxr3_spu_la_CPPFLAGS = $(AM_CPPFLAGS)
-I$(top_srcdir)/src/input/libdvdnav
endif
@@ -43,4 +43,4 @@ xineplug_vo_out_dxr3_la_SOURCES = \
dxr3_scr.c \
video_out_dxr3.c
-xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs)
$(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm
+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs)
$(XINE_LIB) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/input/Makefile.am
--- a/src/input/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/input/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -78,56 +78,56 @@ xineplug_LTLIBRARIES = \
xineplug_inp_file_la_SOURCES = input_file.c
-xineplug_inp_file_la_LIBADD = $(XINE_LIB)
+xineplug_inp_file_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c
xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav) $(PTHREAD_LIBS)
$(DYNAMIC_LD_LIBS)
xineplug_inp_dvd_la_CFLAGS = $(AM_CFLAGS) $(DVD_CFLAGS)
xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
-xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS)
+xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c mmsh.c
http_helper.c ../demuxers/asfheader.c
-xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@ $(PTHREAD_LIBS)
+xineplug_inp_mms_la_LIBADD = $(XINE_LIB) $(LTLIBICONV) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
-xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB)
+xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
-xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_inp_rtp_la_SOURCES = input_rtp.c net_buf_ctrl.c
-xineplug_inp_rtp_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS)
+xineplug_inp_rtp_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c http_helper.c
-xineplug_inp_http_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS)
+xineplug_inp_http_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_inp_pnm_la_SOURCES = input_pnm.c net_buf_ctrl.c pnm.c
-xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c
xineplug_inp_dvb_la_DEPS = $(XDG_BASEDIR_DEPS)
-xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(XDG_BASEDIR_LIBS)
+xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
$(XDG_BASEDIR_LIBS)
xineplug_inp_dvb_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c
-xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) libreal/libreal.la
librtsp/librtsp.la
+xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
libreal/libreal.la librtsp/librtsp.la
xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h
base64.c base64.h
xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS)
-xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(XDG_BASEDIR_LIBS)
+xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(XDG_BASEDIR_LIBS)
xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
xineplug_inp_v4l_la_SOURCES = input_v4l.c
-xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
+xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) $(LTLIBINTL)
xineplug_inp_v4l_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c
-xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS)
+xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_inp_gnome_vfs_la_CFLAGS = $(AM_CFLAGS) $(GNOME_VFS_CFLAGS)
xineplug_inp_smb_la_SOURCES = input_smb.c
-xineplug_inp_smb_la_LIBADD = $(LIBSMBCLIENT_LIBS) $(XINE_LIB)
+xineplug_inp_smb_la_LIBADD = $(LIBSMBCLIENT_LIBS) $(XINE_LIB) $(LTLIBINTL)
xineplug_inp_pvr_la_SOURCES = input_pvr.c
-xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/input/vcd/Makefile.am
--- a/src/input/vcd/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/input/vcd/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -20,6 +20,6 @@ xineplug_LTLIBRARIES = xineplug_inp_vcd.
xineplug_LTLIBRARIES = xineplug_inp_vcd.la
xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c
xine-extra.c
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBCDIO_LIBS) $(LIBVCD_LIBS)
$(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
+xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS)
$(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
xineplug_inp_vcd_la_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBVCD_DEPS)
$(LIBVCDINFO_DEPS) $(LIBISO9660_DEPS)
xineplug_inp_vcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libffmpeg/Makefile.am
--- a/src/libffmpeg/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libffmpeg/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -54,9 +54,9 @@ nodist_xineplug_decode_ff_la_SOURCES = f
nodist_xineplug_decode_ff_la_SOURCES = ffmpeg_config.h
xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
- $(link_ffmpeg) $(PTHREAD_LIBS)
+ $(link_ffmpeg) $(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS)
xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
-xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB)
+xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS)
-I$(top_srcdir)/contrib/ffmpeg/libavcodec
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libreal/Makefile.am
--- a/src/libreal/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libreal/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -10,4 +10,4 @@ endif
endif
xineplug_decode_real_la_SOURCES = xine_real_video_decoder.c real_common.c
xine_real_audio_decoder.c
-xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
+xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(LTLIBINTL)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libspucmml/Makefile.am
--- a/src/libspucmml/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libspucmml/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -6,4 +6,4 @@ xineplug_LTLIBRARIES = xineplug_decode_s
xineplug_LTLIBRARIES = xineplug_decode_spucmml.la
xineplug_decode_spucmml_la_SOURCES = xine_cmml_decoder.c
-xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB)
+xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libspudvb/Makefile.am
--- a/src/libspudvb/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libspudvb/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -6,4 +6,4 @@ xineplug_LTLIBRARIES = xineplug_decode_s
xineplug_LTLIBRARIES = xineplug_decode_spudvb.la
xineplug_decode_spudvb_la_SOURCES = xine_spudvb_decoder.c
-xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libsputext/Makefile.am
--- a/src/libsputext/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libsputext/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -6,7 +6,7 @@ xineplug_LTLIBRARIES = xineplug_decode_s
xineplug_LTLIBRARIES = xineplug_decode_sputext.la xineplug_dmx_sputext.la
xineplug_dmx_sputext_la_SOURCES = demux_sputext.c
-xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB)
+xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_decode_sputext_la_SOURCES = xine_sputext_decoder.c
-xineplug_decode_sputext_la_LIBADD = $(XINE_LIB)
+xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libw32dll/Makefile.am
--- a/src/libw32dll/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libw32dll/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -23,10 +23,10 @@ xineplug_decode_w32dll_la_LIBADD = \
$(top_builddir)/src/libw32dll/wine/libwine.la \
$(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \
$(top_builddir)/src/libw32dll/dmo/libdmo_filter.la \
- $(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS) $(XDG_BASEDIR_LIBS)
+ $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) -lm $(KSTAT_LIBS)
$(XDG_BASEDIR_LIBS)
xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
xineplug_decode_qt_la_SOURCES = qt_decoder.c
xineplug_decode_qt_la_LIBADD = \
$(top_builddir)/src/libw32dll/wine/libwine.la \
- $(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS)
+ $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) -lm $(KSTAT_LIBS)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libxineadec/Makefile.am
--- a/src/libxineadec/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libxineadec/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -61,12 +61,12 @@ xineplug_decode_lpcm_la_LIBADD = $(XINE_
xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c
xineplug_decode_mpc_la_DEPENDENCIES = $(MPCDEC_DEPS)
-xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(MPCDEC_LIBS)
+xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(MPCDEC_LIBS)
xineplug_decode_mpc_la_CFLAGS = $(AM_CFLAGS) $(MPCDEC_CFLAGS)
xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c
xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS)
-xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS)
+xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBDTS_LIBS)
xineplug_decode_dts_la_CFLAGS = $(AM_CFLAGS) $(LIBDTS_CFLAGS)
xineplug_decode_mad_la_SOURCES = xine_mad_decoder.c
@@ -76,9 +76,9 @@ xineplug_decode_mad_la_CFLAGS = $(AM_CFL
xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c
xineplug_decode_a52_la_DEPENDENCIES = $(A52DEC_DEPS)
-xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(A52DEC_LIBS) -lm
+xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(A52DEC_LIBS) -lm
xineplug_decode_a52_la_CFLAGS = $(AM_CFLAGS) $(A52DEC_CFLAGS)
xineplug_decode_faad_la_SOURCES = xine_faad_decoder.c
-xineplug_decode_faad_la_LIBADD = $(XINE_LIB)
$(top_builddir)/contrib/libfaad/libfaad.la -lm
+xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
$(top_builddir)/contrib/libfaad/libfaad.la -lm
xineplug_decode_faad_la_CPPFLAGS = -I$(top_srcdir)/contrib/libfaad
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/libxinevdec/Makefile.am
--- a/src/libxinevdec/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/libxinevdec/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -21,7 +21,7 @@ xineplug_LTLIBRARIES = $(image_module) \
xineplug_decode_yuv.la
xineplug_decode_bitplane_la_SOURCES = bitplane.c
-xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB)
+xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
xineplug_decode_rgb_la_SOURCES = rgb.c
xineplug_decode_rgb_la_LIBADD = $(XINE_LIB)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/post/audio/Makefile.am
--- a/src/post/audio/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/post/audio/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -10,4 +10,3 @@ xineplug_post_audio_filters_la_SOURCES =
xineplug_post_audio_filters_la_SOURCES = \
upmix.c upmix_mono.c filter.c window.c stretch.c volnorm.c
audio_filters.c
xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -lm
-
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/post/deinterlace/Makefile.am
--- a/src/post/deinterlace/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/post/deinterlace/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -9,7 +9,7 @@ xinepost_LTLIBRARIES = xineplug_post_tvt
xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
deinterlace.c pulldown.c speedy.c tvtime.c
-xineplug_post_tvtime_la_LIBADD = $(XINE_LIB) \
+xineplug_post_tvtime_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) \
$(top_builddir)/src/post/deinterlace/plugins/libdeinterlaceplugins.la
noinst_HEADERS = deinterlace.h pulldown.h speedtools.h speedy.h tvtime.h
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/post/goom/Makefile.am
--- a/src/post/goom/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/post/goom/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -32,6 +32,6 @@ xineplug_post_goom_la_SOURCES = mmx.c xi
gfontlib.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c
goomsl_heap.c \
goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c \
plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c
-xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(PTHREAD_LIBS) -lm
$(noinst_LTLIBRARIES)
+xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(PTHREAD_LIBS)
$(LTLIBINTL) -lm $(noinst_LTLIBRARIES)
xineplug_post_goom_la_CFLAGS = $(DEFAULT_OCFLAGS) $(AM_CFLAGS)
xineplug_post_goom_la_LDFLAGS = $(AM_LDFLAGS) $(xineplug_ldflags)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/post/mosaico/Makefile.am
--- a/src/post/mosaico/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/post/mosaico/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -6,7 +6,7 @@ xinepost_LTLIBRARIES = xineplug_post_mos
xinepost_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
xineplug_post_mosaico_la_SOURCES = mosaico.c
-xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_post_switch_la_SOURCES = switch.c
-xineplug_post_switch_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_post_switch_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/post/planar/Makefile.am
--- a/src/post/planar/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/post/planar/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -25,6 +25,6 @@ xinepost_LTLIBRARIES = xineplug_post_pla
xinepost_LTLIBRARIES = xineplug_post_planar.la
xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \
denoise3d.c unsharp.c pp.c
-xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm
$(PTHREAD_LIBS) $(noinst_LTLIBRARIES)
+xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm
$(PTHREAD_LIBS) $(LTLIBINTL) $(noinst_LTLIBRARIES)
xineplug_post_planar_la_CFLAGS = $(DEFAULT_OCFLAGS) $(AM_CFLAGS)
xineplug_post_planar_la_LDFLAGS = $(AM_LDFLAGS) $(xineplug_ldflags)
$(IMPURE_TEXT_LDFLAGS)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/video_out/Makefile.am
--- a/src/video_out/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/video_out/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -109,82 +109,82 @@ xineplug_LTLIBRARIES = $(xshm_module) $(
xineplug_vo_out_none.la
xineplug_vo_out_xcbshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c
video_out_xcbshm.c $(XCBOSD)
-xineplug_vo_out_xcbshm_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
$(XCB_LIBS) $(XCBSHM_LIBS)
+xineplug_vo_out_xcbshm_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
$(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL)
xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) $(XCB_CFLAGS)
$(XCBSHM_CFLAGS)
xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
-xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(XCBXV_LIBS)
$(XCB_LIBS)
+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
$(XCBXV_LIBS) $(XCB_LIBS)
xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
video_out_xshm.c $(X11OSD)
-xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS)
+xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_xshm_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS)
-fno-strict-aliasing
xineplug_vo_out_xv_la_SOURCES = $(X11OSD) video_out_xv.c
-xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_xv_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS)
-fno-strict-aliasing
xineplug_vo_out_xvmc_la_SOURCES = video_out_xvmc.c
-xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS)
+xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_xvmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS)
xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) video_out_xxmc.c\
xvmc_mocomp.c xvmc_vld.c xxmc.h
-xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS)
+xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_xxmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS)
-fno-strict-aliasing
xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
video_out_opengl.c myglext.h $(X11OSD)
xineplug_vo_out_opengl_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
- $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS)
+ $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS)
$(LTLIBINTL)
xineplug_vo_out_opengl_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS)
-fno-strict-aliasing
xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c
-xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_vo_out_pgx64_la_SOURCES = video_out_pgx64.c
-xineplug_vo_out_pgx64_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(SUNDGA_LIBS)
$(PTHREAD_LIBS)
+xineplug_vo_out_pgx64_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(SUNDGA_LIBS)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_pgx64_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
xineplug_vo_out_pgx64_la_CPPFLAGS = $(AM_CPPFLAGS) $(SUNDGA_CPPFLAGS)
xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c
-xineplug_vo_out_pgx32_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(SUNDGA_LIBS)
$(PTHREAD_LIBS)
+xineplug_vo_out_pgx32_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(SUNDGA_LIBS)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_pgx32_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
xineplug_vo_out_pgx32_la_CPPFLAGS = $(AM_CPPFLAGS) $(SUNDGA_CPPFLAGS)
xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD)
xineplug_vo_out_vidix_la_LIBADD = $(XINE_LIB) $(X_LIBS) \
- $(top_builddir)/contrib/vidix/libvidix.la $(PTHREAD_LIBS)
+ $(top_builddir)/contrib/vidix/libvidix.la $(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_vidix_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing
xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS)
-I$(top_builddir)/contrib/vidix \
-I$(top_srcdir)/contrib/vidix
xineplug_vo_out_aa_la_SOURCES = video_out_aa.c
-xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_vo_out_aa_la_CFLAGS = $(AM_CFLAGS) $(AALIB_CFLAGS)
xineplug_vo_out_caca_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
video_out_caca.c
-xineplug_vo_out_caca_la_LIBADD = $(CACA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_caca_la_LIBADD = $(CACA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_vo_out_caca_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
video_out_fb.c
-xineplug_vo_out_fb_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_fb_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
$(LTLIBINTL)
xineplug_vo_out_fb_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS)
xineplug_vo_out_directfb_la_SOURCES = video_out_directfb_fb.c
-xineplug_vo_out_directfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS)
$(PTHREAD_LIBS)
+xineplug_vo_out_directfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_directfb_la_CFLAGS = $(AM_CFLAGS) $(DIRECTFB_CFLAGS)
-fno-strict-aliasing
xineplug_vo_out_xdirectfb_la_SOURCES = video_out_directfb_x.c $(X11OSD)
-xineplug_vo_out_xdirectfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(X_LIBS)
$(PTHREAD_LIBS)
+xineplug_vo_out_xdirectfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(X_LIBS)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_xdirectfb_la_CFLAGS = $(AM_CFLAGS) $(DIRECTFB_CFLAGS)
-fno-strict-aliasing
xineplug_vo_out_sdl_la_SOURCES = video_out_sdl.c
-xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS)
+xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(X_LIBS) $(XINE_LIB)
$(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_sdl_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(SDL_CFLAGS)
xineplug_vo_out_stk_la_SOURCES = video_out_stk.c
@@ -196,7 +196,7 @@ xineplug_vo_out_directx_la_CPPFLAGS = $(
xineplug_vo_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS)
xineplug_vo_out_none_la_SOURCES = video_out_none.c
-xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/xine-engine/Makefile.am
--- a/src/xine-engine/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/xine-engine/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -35,7 +35,7 @@ libxine_la_DEPENDENCIES = $(XINEUTILS_LI
libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \
$(pthread_dep) $(LIBXINEPOSIX)
libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL)
$(ZLIB_LIBS) \
- -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS)
$(FONTCONFIG_LIBS) \
+ -lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS)
$(FONTCONFIG_LIBS) \
$(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(XDG_BASEDIR_LIBS)
libxine_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) \
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/xine-utils/Makefile.am
--- a/src/xine-utils/Makefile.am Tue Jun 12 22:32:26 2007 +0100
+++ b/src/xine-utils/Makefile.am Sun Jun 10 16:51:33 2007 +0200
@@ -45,4 +45,3 @@ libxineutils_la_SOURCES = $(pppc_files)
sorted_array.c \
pool.c \
ring_buffer.c
-
diff -r 60c6926e626c9152f9951a36c97efaa060f6228d -r
580424b9d3bd0fc073c686ed7ddb00e3755b2626 src/xine-utils/attributes.h
--- a/src/xine-utils/attributes.h Tue Jun 12 22:32:26 2007 +0100
+++ b/src/xine-utils/attributes.h Sun Jun 10 16:51:33 2007 +0200
@@ -38,22 +38,22 @@
/* Export protected only for libxine functions */
#if defined(XINE_LIBRARY_COMPILE) &&
defined(SUPPORT_ATTRIBUTE_VISIBILITY_PROTECTED)
-# define XINE_PROTECTED __attribute__((visibility("protected")))
+# define XINE_PROTECTED __attribute__((__visibility__("protected")))
#elif defined(XINE_LIBRARY_COMPILE) &&
defined(SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT)
-# define XINE_PROTECTED __attribute__((visibility("default")))
+# define XINE_PROTECTED __attribute__((__visibility__("default")))
#else
# define XINE_PROTECTED
#endif
#ifdef SUPPORT_ATTRIBUTE_SENTINEL
-# define XINE_SENTINEL __attribute__((sentinel))
+# define XINE_SENTINEL __attribute__((__sentinel__))
#else
# define XINE_SENTINEL
#endif
#ifndef __attr_unused
# ifdef SUPPORT_ATTRIBUTE_UNUSED
-# define __attr_unused __attribute__((unused))
+# define __attr_unused __attribute__((__unused__))
# else
# define __attr_unused
# endif
@@ -61,12 +61,12 @@
/* Format attributes */
#ifdef SUPPORT_ATTRIBUTE_FORMAT
-# define XINE_FORMAT_PRINTF(fmt,var) __attribute__((format(printf, fmt, var)))
+# define XINE_FORMAT_PRINTF(fmt,var) __attribute__((__format__(__printf__,
fmt, var)))
#else
# define XINE_FORMAT_PRINTF(fmt,var)
#endif
#ifdef SUPPORT_ATTRIBUTE_FORMAT_ARG
-# define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((format_arg(fmt)))
+# define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((__format_arg__(fmt)))
#else
# define XINE_FORMAT_PRINTF_ARG(fmt)
#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
