diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | src/video_out/vidix/drivers/Makefile.am | 18 |
3 files changed, 14 insertions, 26 deletions
@@ -30,8 +30,6 @@ xine-lib (1.1.4) [bug #1445746] * Make the libFLAC-based decoder and demuxer for FLAC files work with recent FLAC release 1.1.3. - * On platforms where it's possible, use "-Wl,-z,defs" option so that the linker - reports undefined symbols at buildtime, rather than aborting at runtime. * Replace --enable-flac configure option with --with-libflac, as the FLAC support is always built-in through the audio demuxer plugin and the FFmpeg decoder plugin, the option only controls the extra FLAC plugin that uses diff --git a/configure.ac b/configure.ac index 268d01124..c1dc0f07f 100644 --- a/configure.ac +++ b/configure.ac @@ -2562,15 +2562,17 @@ AC_TRY_CFLAGS("-Wstrict-aliasing", wsa="-Wstrict-aliasing") AC_TRY_CFLAGS("-Wstrict-aliasing=2", wsa="-Wstrict-aliasing=2") CFLAGS="$CFLAGS $wsa" -case $host_or_hostalias in - dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads - dnl are requested, as different implementations are present; to avoid problems - dnl use -Wl,-z,defs only for those platform not behaving this way. - *-freebsd*) ;; - *) - AC_TRY_LDFLAGS([-Wl,-z,defs], [LDFLAGS="$LDFLAGS -Wl,-z,defs"]) - ;; -esac +dnl disabled "-Wl,-z,defs": it breaks compilation for vidix drivers. +dnl note: no, linking twice to libdha.a is not an acceptable solution. +dnl case $host_or_hostalias in +dnl dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads +dnl dnl are requested, as different implementations are present; to avoid problems +dnl dnl use -Wl,-z,defs only for those platform not behaving this way. +dnl *-freebsd*) ;; +dnl *) +dnl AC_TRY_LDFLAGS([-Wl,-z,defs], [LDFLAGS="$LDFLAGS -Wl,-z,defs"]) +dnl ;; +dnl esac dnl Common cflags for all platforms CFLAGS="-DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE \$(MULTIPASS_CFLAGS) $CFLAGS" diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index ad270bca9..3c0369af7 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -23,54 +23,42 @@ endif lib_LTLIBRARIES = $(vidix_drivers) radeon_vid_la_SOURCES = radeon_vid.c -radeon_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la radeon_vid_la_LDFLAGS = -avoid-version -module -lm rage128_vid_la_SOURCES = radeon_vid.c -rage128_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la rage128_vid_la_LDFLAGS = -avoid-version -module -lm rage128_vid_la_CFLAGS = -DRAGE128 $(AM_CFLAGS) pm2_vid_la_SOURCES = pm2_vid.c -pm2_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la pm2_vid_la_LDFLAGS = -avoid-version -module pm3_vid_la_SOURCES = pm3_vid.c -pm3_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la pm3_vid_la_LDFLAGS = -avoid-version -module mach64_vid_la_SOURCES = mach64_vid.c -mach64_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la mach64_vid_la_LDFLAGS = -avoid-version -module mga_vid_la_SOURCES = mga_vid.c -mga_vid_la_LIBADD = -lm $(top_builddir)/src/video_out/libdha/libdha.la -mga_vid_la_LDFLAGS = -avoid-version -module +mga_vid_la_LDFLAGS = -avoid-version -module -lm mga_crtc2_vid_la_SOURCES = mga_vid.c -mga_crtc2_vid_la_LIBADD = -lm $(top_builddir)/src/video_out/libdha/libdha.la -mga_crtc2_vid_la_LDFLAGS = -avoid-version -module +mga_crtc2_vid_la_LDFLAGS = -avoid-version -module -lm mga_crtc2_vid_la_CFLAGS = -DCRTC2 $(AM_CFLAGS) cyberblade_vid_la_SOURCES = cyberblade_vid.c -cyberblade_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la cyberblade_vid_la_LDFLAGS = -avoid-version -module unichrome_vid_la_SOURCES = unichrome_vid.c -unichrome_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la unichrome_vid_la_LDFLAGS = -avoid-version -module nvidia_vid_la_SOURCES = nvidia_vid.c -nvidia_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la nvidia_vid_la_LDFLAGS = -avoid-version -module sis_vid_la_SOURCES = sis_vid.c sis_bridge.c -sis_vid_la_LIBADD = $(top_builddir)/src/video_out/libdha/libdha.la sis_vid_la_LDFLAGS = -avoid-version -module savage_vid_la_SOURCES = savage_vid.c -savage_vid_la_LIBADD = -lm $(top_builddir)/src/video_out/libdha/libdha.la -savage_vid_la_LDFLAGS = -avoid-version -module +savage_vid_la_LDFLAGS = -avoid-version -module -lm noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \ cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h |