Hello community, here is the log from the commit of package xine-lib checked in at Mon Dec 11 01:48:20 CET 2006. -------- --- xine-lib/xine-lib.changes 2006-11-30 12:13:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/xine-lib/xine-lib.changes 2006-12-08 17:39:43.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 8 16:06:45 CET 2006 - mhopf@suse.de + +- Update to xine-lib 1.1.3 +- Fixed several strncat() and dubious postincrements. + +------------------------------------------------------------------- Old: ---- vdr-xine-lib-0.7.9-adapted-1.1.2.diff xine-lib-1.1.2.tar.bz2 xine-lib-AUTOMAKE.diff xine-lib-buildfixed-COMMITTED.diff xine-lib-configure.diff xine-lib-cve-2006-4799.diff xine-lib-makefile-cflags.diff xine-lib-mms-fixes-COMMITTED.diff xine-lib-sf-1603458-COMMITTED.diff New: ---- vdr-xine-lib-0.7.9-adapted-1.1.3.diff xine-lib-1.1.3.tar.gz xine-lib-cflags-AUTOMAKE.diff xine-lib-fix-postinc-COMMITTED.diff xine-lib-fix-strncat-COMMITTED.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.2f9x7I/_old 2006-12-11 01:48:03.000000000 +0100 +++ /var/tmp/diff_new_pack.2f9x7I/_new 2006-12-11 01:48:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.2) +# spec file for package xine-lib (Version 1.1.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,32 +14,25 @@ BuildRequires: ImageMagick-devel SDL-devel arts-devel cdparanoia curl-devel esound-devel flac-devel giflib-devel glib2-devel gnome-common gnome-mime-data gnome-vfs2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel libdrm-devel libmng-devel libsmbclient libsmbclient-devel libtheora-devel libvorbis-devel lirc mad-devel readline-devel speex-devel update-desktop-files vcdimager-devel %define DISTRIBUTABLE 1 Summary: Video Player with Plug-Ins -Version: 1.1.2 -Release: 39 +Version: 1.1.3 +Release: 1 License: GNU General Public License (GPL), Other License(s), see package Group: Productivity/Multimedia/Video/Players URL: http://xine.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: xine-lib-%version.tar.bz2 +Source: xine-lib-%version.tar.gz Source10: README.SuSE Source11: caramel.tar.bz2 Source12: CelomaChrome.tar.bz2 Source13: lcd.tar.bz2 # *** xine-lib: Bugfixes Patch: xine-lib-various.diff -Patch1: xine-lib-makefile-cflags.diff -# nuke socklen_t autoconf, because it breaks e.g. on 10.1 ppc64 -Patch4: xine-lib-configure.diff -#Patch19: xine-lib-used-constants.diff -Patch22: xine-lib-cve-2006-4799.diff -Patch23: xine-lib-sf-1603458-COMMITTED.diff -Patch24: xine-lib-mms-fixes-COMMITTED.diff -Patch25: xine-lib-buildfixed-COMMITTED.diff +Patch20: xine-lib-fix-postinc-COMMITTED.diff +Patch21: xine-lib-fix-strncat-COMMITTED.diff Patch26: xine-lib-doc-fix-X11R6.diff -Patch40: xine-lib-AUTOMAKE.diff +Patch40: xine-lib-cflags-AUTOMAKE.diff # *** Addons -# changes mutexes all over the place, could be broken ... #? -Patch50: vdr-xine-lib-0.7.9-adapted-1.1.2.diff +Patch50: vdr-xine-lib-0.7.9-adapted-1.1.3.diff Patch51: vdr-xine-fifodir.diff Patch60: vdr-xine-AUTOMAKE.diff # *** SUSE only changes @@ -140,12 +133,8 @@ %prep %setup -q %patch -%patch1 -%patch4 -%patch22 -%patch23 -p1 -%patch24 -%patch25 +%patch20 +%patch21 %patch26 %patch40 %patch50 @@ -177,10 +166,10 @@ # these plugins do not have legal problems # xineplug_ao_out_alsa -xineplug_ao_out_oss +xineplug_ao_out_file xineplug_ao_out_none +xineplug_ao_out_oss xineplug_vo_out_fb -xineplug_ao_out_file xineplug_vo_out_none xineplug_vo_out_opengl xineplug_vo_out_xshm @@ -302,9 +291,11 @@ # xineplug_ao_out_arts xineplug_ao_out_esd -xineplug_inp_gnome_vfs -xineplug_vo_out_sdl +xineplug_ao_out_jack xineplug_vo_out_aa +xineplug_vo_out_sdl +xineplug_vo_out_syncfb +xineplug_inp_gnome_vfs # requires ImageMagick xineplug_decode_image # @@ -394,6 +385,9 @@ /usr/include/xine.h %changelog -n xine-lib +* Fri Dec 08 2006 - mhopf@suse.de +- Update to xine-lib 1.1.3 +- Fixed several strncat() and dubious postincrements. * Thu Nov 30 2006 - mhopf@suse.de - Security fix for #224813: Potential buffer overflow for real media. SF tracker #1603458: ++++++ vdr-xine-AUTOMAKE.diff ++++++ --- /var/tmp/diff_new_pack.2f9x7I/_old 2006-12-11 01:48:04.000000000 +0100 +++ /var/tmp/diff_new_pack.2f9x7I/_new 2006-12-11 01:48:04.000000000 +0100 @@ -1,7 +1,24 @@ -diff -urpN ../xine-lib-1.1.2-orig/configure ./configure ---- ../xine-lib-1.1.2-orig/configure 2006-10-12 18:16:22.000000000 +0200 -+++ ./configure 2006-10-12 18:43:30.000000000 +0200 -@@ -51641,7 +51642,7 @@ echo " - file - net" +diff -urpwN ../xine-lib-1.1.3-orig/configure ./configure +--- ../xine-lib-1.1.3-orig/configure 2006-12-03 20:41:27.000000000 +0100 ++++ ./configure 2006-12-08 15:05:46.000000000 +0100 +@@ -48388,7 +52921,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6 + CFLAGS="$CFLAGS $wsa" + + +- ac_config_files="$ac_config_files Make file doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libavcodec/i386/Makefile src/libffmpeg/libav codec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/post/visualizations/Makefile src/post/a udio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile win32/Makefile win32/include/Makefile" ++ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libav codec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/ post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile src/vdr/Makefile win32/Makefile win32/include/Makefile" + + ac_config_commands="$ac_config_commands default" + +@@ -49546,6 +54093,7 @@ do + "src/video_out/vidix/drivers/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video_out/vidix/drivers/Makefile" ;; + "src/xine-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xine-utils/Makefile" ;; + "src/xine-engine/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xine-engine/Makefile" ;; ++ "src/vdr/Makefile") CONFIG_FILES="$CONFIG_FILES src/vdr/Makefile" ;; + "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; + "win32/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/include/Makefile" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +@@ -50874,7 +55467,7 @@ echo " - file - net" echo " - stdin_fifo - rtp" echo " - http - mms" echo " - pnm - rtsp" @@ -10,7 +27,7 @@ if test x"$external_dvdnav" = "xyes"; then echo " - dvd (external libs)" else -@@ -51819,6 +51820,7 @@ echo " - invert - expand" +@@ -51052,6 +55645,7 @@ echo " - invert - expand" echo " - eq - eq2" echo " - boxblur - denoise3d" echo " - unsharp - tvtime" @@ -18,10 +35,10 @@ echo " * SFX:" echo " - goom - oscope" echo " - fftscope - mosaico" -diff -urpN ../xine-lib-1.1.2-orig/src/Makefile.in ./src/Makefile.in ---- ../xine-lib-1.1.2-orig/src/Makefile.in 2006-10-12 18:15:52.000000000 +0200 -+++ ./src/Makefile.in 2006-10-12 18:43:00.000000000 +0200 -@@ -545,7 +545,8 @@ SUBDIRS = \ +diff -urpwN ../xine-lib-1.1.3-orig/src/Makefile.in ./src/Makefile.in +--- ../xine-lib-1.1.3-orig/src/Makefile.in 2006-12-03 20:40:25.000000000 +0100 ++++ ./src/Makefile.in 2006-12-08 14:20:55.000000000 +0100 +@@ -524,7 +521,8 @@ SUBDIRS = \ libfaad \ libflac \ libmusepack \ @@ -31,10 +48,10 @@ all: all-recursive -diff -urpN ../xine-lib-1.1.2-orig/src/vdr/Makefile.in ./src/vdr/Makefile.in ---- ../xine-lib-1.1.2-orig/src/vdr/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/Makefile.in 2006-10-12 18:43:23.000000000 +0200 -@@ -0,0 +1,940 @@ +diff -urpwN ../xine-lib-1.1.3-orig/src/vdr/Makefile.in ./src/vdr/Makefile.in +--- ../xine-lib-1.1.3-orig/src/vdr/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/Makefile.in 2006-12-08 14:21:19.000000000 +0100 +@@ -0,0 +1,916 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + @@ -74,29 +91,24 @@ +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ -+target_triplet = @target@ +DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/misc/Makefile.common +subdir = src/vdr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \ -+ $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \ -+ $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \ -+ $(top_srcdir)/m4/directx.m4 $(top_srcdir)/m4/dl.m4 \ -+ $(top_srcdir)/m4/dvdnav.m4 $(top_srcdir)/m4/esd.m4 \ -+ $(top_srcdir)/m4/ffmpeg.m4 $(top_srcdir)/m4/freetype2.m4 \ ++ $(top_srcdir)/m4/arts.m4 $(top_srcdir)/m4/as.m4 \ ++ $(top_srcdir)/m4/attributes.m4 $(top_srcdir)/m4/directx.m4 \ ++ $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ -+ $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lib-ld.m4 \ -+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -+ $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \ -+ $(top_srcdir)/m4/libtool15.m4 $(top_srcdir)/m4/nls.m4 \ -+ $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \ ++ $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/isc-posix.m4 \ ++ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ++ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libFLAC.m4 \ ++ $(top_srcdir)/m4/libfame.m4 $(top_srcdir)/m4/libtool15.m4 \ ++ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/opengl.m4 \ + $(top_srcdir)/m4/optimizations.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -+ $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/theora.m4 \ -+ $(top_srcdir)/m4/vorbis.m4 $(top_srcdir)/m4/xv.m4 \ -+ $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d @@ -151,7 +163,6 @@ +ACLOCAL_DIR = @ACLOCAL_DIR@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ -+ALSA_STATIC_LIB = @ALSA_STATIC_LIB@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ @@ -174,7 +185,6 @@ +BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@ +BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@ +CACA_CFLAGS = @CACA_CFLAGS@ -+CACA_CONFIG = @CACA_CONFIG@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCAS = @CCAS@ @@ -216,7 +226,6 @@ +ENABLE_VIS_FALSE = @ENABLE_VIS_FALSE@ +ENABLE_VIS_TRUE = @ENABLE_VIS_TRUE@ +ESD_CFLAGS = @ESD_CFLAGS@ -+ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +EXTERNAL_A52DEC_FALSE = @EXTERNAL_A52DEC_FALSE@ @@ -227,14 +236,13 @@ +EXTERNAL_LIBMAD_TRUE = @EXTERNAL_LIBMAD_TRUE@ +EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@ +EXTRA_X_LIBS = @EXTRA_X_LIBS@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@ -+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@ ++FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ +FFMPEG_LIBS = @FFMPEG_LIBS@ ++FFMPEG_POSTPROC_CFLAGS = @FFMPEG_POSTPROC_CFLAGS@ +FFMPEG_POSTPROC_LIBS = @FFMPEG_POSTPROC_LIBS@ +FIG2DEV = @FIG2DEV@ -+FREETYPE_CONFIG = @FREETYPE_CONFIG@ ++FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ ++FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +FUSIONSOUND_CFLAGS = @FUSIONSOUND_CFLAGS@ @@ -248,10 +256,9 @@ +GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ +GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ +GOOM_LIBS = @GOOM_LIBS@ ++GREP = @GREP@ +HAVE_AA_FALSE = @HAVE_AA_FALSE@ +HAVE_AA_TRUE = @HAVE_AA_TRUE@ -+HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@ -+HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@ +HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@ +HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@ +HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@ @@ -295,6 +302,9 @@ +HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ +HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@ +HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@ ++HAVE_JACK = @HAVE_JACK@ ++HAVE_JACK_FALSE = @HAVE_JACK_FALSE@ ++HAVE_JACK_TRUE = @HAVE_JACK_TRUE@ +HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@ +HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@ +HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@ @@ -314,8 +324,8 @@ +HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@ +HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ +HAVE_OSS_TRUE = @HAVE_OSS_TRUE@ -+HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@ -+HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@ ++HAVE_PULSEAUDIO_FALSE = @HAVE_PULSEAUDIO_FALSE@ ++HAVE_PULSEAUDIO_TRUE = @HAVE_PULSEAUDIO_TRUE@ +HAVE_SDL_FALSE = @HAVE_SDL_FALSE@ +HAVE_SDL_TRUE = @HAVE_SDL_TRUE@ +HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@ @@ -373,6 +383,8 @@ +IRIXAL_CFLAGS = @IRIXAL_CFLAGS@ +IRIXAL_LIBS = @IRIXAL_LIBS@ +IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@ ++JACK_CFLAGS = @JACK_CFLAGS@ ++JACK_LIBS = @JACK_LIBS@ +KSTAT_LIBS = @KSTAT_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@ @@ -399,7 +411,7 @@ +LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@ +LIBSTK_CFLAGS = @LIBSTK_CFLAGS@ +LIBSTK_LIBS = @LIBSTK_LIBS@ -+LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic ++LIBTOOL = $(SHELL) $(top_builddir)/libtool +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@ +LIBVCD_CFLAGS = @LIBVCD_CFLAGS@ @@ -427,8 +439,6 @@ +OBJCFLAGS = @OBJCFLAGS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ -+OGG_CFLAGS = @OGG_CFLAGS@ -+OGG_LIBS = @OGG_LIBS@ +OPENGL_CFLAGS = @OPENGL_CFLAGS@ +OPENGL_LIBS = @OPENGL_LIBS@ +PACKAGE = @PACKAGE@ @@ -441,15 +451,14 @@ +PASS2_CFLAGS = @PASS2_CFLAGS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ -+POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@ -+POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@ +POSUB = @POSUB@ +PPC_ARCH_FALSE = @PPC_ARCH_FALSE@ +PPC_ARCH_TRUE = @PPC_ARCH_TRUE@ ++PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ ++PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +RANLIB = @RANLIB@ +RT_LIBS = @RT_LIBS@ +SDL_CFLAGS = @SDL_CFLAGS@ -+SDL_CONFIG = @SDL_CONFIG@ +SDL_LIBS = @SDL_LIBS@ +SET_MAKE = @SET_MAKE@ +SGMLTOOLS = @SGMLTOOLS@ @@ -462,29 +471,27 @@ +SUNDGA_CFLAGS = @SUNDGA_CFLAGS@ +SUNDGA_LIBS = @SUNDGA_LIBS@ +TAR_NAME = @TAR_NAME@ -+THEORAENC_LIBS = @THEORAENC_LIBS@ -+THEORAFILE_LIBS = @THEORAFILE_LIBS@ +THEORA_CFLAGS = @THEORA_CFLAGS@ +THEORA_LIBS = @THEORA_LIBS@ +THREAD_CPPFLAGS = @THREAD_CPPFLAGS@ +THREAD_LIBS = @THREAD_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ -+VORBISENC_LIBS = @VORBISENC_LIBS@ -+VORBISFILE_LIBS = @VORBISFILE_LIBS@ ++VISIBILITY_FLAG = @VISIBILITY_FLAG@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ +W32DLL_DEP = @W32DLL_DEP@ +W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ +WAND_CFLAGS = @WAND_CFLAGS@ -+WAND_CONFIG = @WAND_CONFIG@ -+WAND_CPPFLAGS = @WAND_CPPFLAGS@ -+WAND_LDFLAGS = @WAND_LDFLAGS@ +WAND_LIBS = @WAND_LIBS@ +WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ +WIN32_FALSE = @WIN32_FALSE@ +WIN32_TRUE = @WIN32_TRUE@ ++X11_CFLAGS = @X11_CFLAGS@ ++X11_LIBS = @X11_LIBS@ +XGETTEXT = @XGETTEXT@ ++XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ ++XINERAMA_LIBS = @XINERAMA_LIBS@ +XINE_ACFLAGS = @XINE_ACFLAGS@ +XINE_BIN_AGE = @XINE_BIN_AGE@ +XINE_BUILD_CC = @XINE_BUILD_CC@ @@ -504,38 +511,21 @@ +XINE_MINOR = @XINE_MINOR@ +XINE_PLUGINDIR = @XINE_PLUGINDIR@ +XINE_PLUGINPATH = @XINE_PLUGINPATH@ -+XINE_PLUGIN_MIN_SYMS = @XINE_PLUGIN_MIN_SYMS@ +XINE_SCRIPTPATH = @XINE_SCRIPTPATH@ +XINE_SUB = @XINE_SUB@ -+XVMC_LIB = @XVMC_LIB@ -+XV_LIB = @XV_LIB@ -+XXMC_LIB = @XXMC_LIB@ ++XMKMF = @XMKMF@ ++XVMC_LIBS = @XVMC_LIBS@ ++XV_CFLAGS = @XV_CFLAGS@ ++XV_LIBS = @XV_LIBS@ ++XXMC_LIBS = @XXMC_LIBS@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_AS = @ac_ct_AS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+ac_pt_AAINFO = @ac_pt_AAINFO@ -+ac_pt_AALIB_CONFIG = @ac_pt_AALIB_CONFIG@ -+ac_pt_ARTS_CONFIG = @ac_pt_ARTS_CONFIG@ -+ac_pt_CACA_CONFIG = @ac_pt_CACA_CONFIG@ -+ac_pt_DVDNAV_CONFIG = @ac_pt_DVDNAV_CONFIG@ -+ac_pt_ESD_CONFIG = @ac_pt_ESD_CONFIG@ -+ac_pt_FREETYPE_CONFIG = @ac_pt_FREETYPE_CONFIG@ -+ac_pt_LIBFAME_CONFIG = @ac_pt_LIBFAME_CONFIG@ -+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -+ac_pt_SDL_CONFIG = @ac_pt_SDL_CONFIG@ -+ac_pt_WAND_CONFIG = @ac_pt_WAND_CONFIG@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -554,31 +544,34 @@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ ++htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = $(XINE_PLUGINDIR) +libexecdir = @libexecdir@ ++localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ ++psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ -+target = @target@ +target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ +w32_path = @w32_path@ +XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +AM_CFLAGS = -D_LARGEFILE64_SOURCE @@ -975,23 +968,3 @@ +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -urpN ../xine-lib-1.1.2-orig/configure ./configure ---- ../xine-lib-1.1.2-orig/configure 2006-07-09 16:51:14.000000000 +0200 -+++ ./configure 2006-10-12 19:39:46.000000000 +0200 -@@ -54193,7 +54193,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6 - CFLAGS="$CFLAGS $wsa" - - --ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libav codec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/ post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile win32/Makefile win32/include/Makefile" -+ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libav codec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/ post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/vdr/Makefile src/xine-utils/Makefile src/xine-engine/Makefile win32/Makefile win32/include/Makefile" - - ac_config_commands="$ac_config_commands default" - -@@ -55366,6 +55366,7 @@ do - "src/video_out/macosx/Makefile") CONFIG_FILES="$CONFIG_FILES src/video_out/macosx/Makefile" ;; - "src/video_out/vidix/Makefile") CONFIG_FILES="$CONFIG_FILES src/video_out/vidix/Makefile" ;; - "src/video_out/vidix/drivers/Makefile") CONFIG_FILES="$CONFIG_FILES src/video_out/vidix/drivers/Makefile" ;; -+ "src/vdr/Makefile") CONFIG_FILES="$CONFIG_FILES src/vdr/Makefile" ;; - "src/xine-utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/xine-utils/Makefile" ;; - "src/xine-engine/Makefile") CONFIG_FILES="$CONFIG_FILES src/xine-engine/Makefile" ;; - "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; ++++++ vdr-xine-lib-0.7.9-adapted-1.1.2.diff -> vdr-xine-lib-0.7.9-adapted-1.1.3.diff ++++++ --- xine-lib/vdr-xine-lib-0.7.9-adapted-1.1.2.diff 2006-08-11 16:59:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/xine-lib/vdr-xine-lib-0.7.9-adapted-1.1.3.diff 2006-12-08 15:47:33.000000000 +0100 @@ -1,7 +1,7 @@ -diff -Nurp ../xine-lib-1.1.2.orig/configure.ac ./configure.ac ---- ../xine-lib-1.1.2.orig/configure.ac 2006-07-09 16:36:29.000000000 +0200 -+++ ./configure.ac 2006-07-12 19:53:34.000000000 +0200 -@@ -2420,6 +2420,7 @@ src/video_out/vidix/Makefile +diff -urpN ../xine-lib-1.1.3-orig/configure.ac ./configure.ac +--- ../xine-lib-1.1.3-orig/configure.ac 2006-11-05 16:16:56.000000000 +0100 ++++ ./configure.ac 2006-12-08 14:10:11.000000000 +0100 +@@ -2491,6 +2491,7 @@ src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile @@ -9,7 +9,7 @@ win32/Makefile win32/include/Makefile]) AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]]) -@@ -2475,7 +2476,7 @@ echo " - file - net" +@@ -2526,7 +2527,7 @@ echo " - file - net" echo " - stdin_fifo - rtp" echo " - http - mms" echo " - pnm - rtsp" @@ -18,7 +18,7 @@ if test x"$external_dvdnav" = "xyes"; then echo " - dvd (external libs)" else -@@ -2658,6 +2659,7 @@ echo " - invert - expand" +@@ -2709,6 +2710,7 @@ echo " - invert - expand" echo " - eq - eq2" echo " - boxblur - denoise3d" echo " - unsharp - tvtime" @@ -26,9 +26,9 @@ echo " * SFX:" echo " - goom - oscope" echo " - fftscope - mosaico" -diff -Nurp ../xine-lib-1.1.2.orig/src/Makefile.am ./src/Makefile.am ---- ../xine-lib-1.1.2.orig/src/Makefile.am 2006-07-09 16:37:12.000000000 +0200 -+++ ./src/Makefile.am 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/Makefile.am ./src/Makefile.am +--- ../xine-lib-1.1.3-orig/src/Makefile.am 2005-01-14 16:24:08.000000000 +0100 ++++ ./src/Makefile.am 2006-12-08 14:10:11.000000000 +0100 @@ -30,4 +30,5 @@ SUBDIRS = \ libfaad \ libflac \ @@ -36,9 +36,9 @@ - post + post \ + vdr -diff -Nurp ../xine-lib-1.1.2.orig/src/libmpeg2/decode.c ./src/libmpeg2/decode.c ---- ../xine-lib-1.1.2.orig/src/libmpeg2/decode.c 2006-07-09 16:39:11.000000000 +0200 -+++ ./src/libmpeg2/decode.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/libmpeg2/decode.c ./src/libmpeg2/decode.c +--- ../xine-lib-1.1.3-orig/src/libmpeg2/decode.c 2006-06-23 20:22:19.000000000 +0200 ++++ ./src/libmpeg2/decode.c 2006-12-08 14:10:11.000000000 +0100 @@ -236,7 +236,7 @@ static void remember_metainfo (mpeg2dec_ } @@ -265,9 +265,9 @@ if (mpeg2dec->force_aspect) picture->aspect_ratio_information = mpeg2dec->force_aspect; if (mpeg2dec->is_sequence_needed) { -diff -Nurp ../xine-lib-1.1.2.orig/src/post/planar/expand.c ./src/post/planar/expand.c ---- ../xine-lib-1.1.2.orig/src/post/planar/expand.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/post/planar/expand.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/post/planar/expand.c ./src/post/planar/expand.c +--- ../xine-lib-1.1.3-orig/src/post/planar/expand.c 2006-08-27 18:27:52.000000000 +0200 ++++ ./src/post/planar/expand.c 2006-12-08 14:12:04.000000000 +0100 @@ -21,7 +21,8 @@ * * expand video filter by James Stembridge 24/05/2003 @@ -316,17 +316,7 @@ } post_expand_t; /* plugin class functions */ -@@ -107,6 +118,9 @@ static vo_frame_t *expand_get_frame(x - uint32_t height, double ratio, - int format, int flags); - -+/* replaced vo_frame functions */ -+static int expand_draw(vo_frame_t *frame, xine_stream_t *stream); -+ - /* overlay manager intercept check */ - static int expand_intercept_ovl(post_video_port_t *port); - -@@ -152,11 +166,14 @@ static post_plugin_t *expand_open_plugin +@@ -153,6 +167,8 @@ static post_plugin_t *expand_open_plugin this->enable_automatic_shift = 0; this->overlay_y_offset = 0; this->aspect = 4.0 / 3.0; @@ -335,13 +325,7 @@ port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output); port->new_port.get_frame = expand_get_frame; - port->intercept_ovl = expand_intercept_ovl; - port->new_manager->add_event = expand_overlay_add_event; -+ port->new_frame->draw = expand_draw; - - input_param = &this->parameter_input; - input_param->name = "parameters"; -@@ -164,8 +181,8 @@ static post_plugin_t *expand_open_plugin +@@ -166,8 +182,8 @@ static post_plugin_t *expand_open_plugin input_param->data = &post_api; xine_list_push_back(this->post.input, input_param); @@ -352,7 +336,7 @@ this->post.xine_post.video_input[0] = &port->new_port; -@@ -212,6 +229,8 @@ static int expand_set_parameters(xine_po +@@ -214,6 +230,8 @@ static int expand_set_parameters(xine_po this->enable_automatic_shift = param->enable_automatic_shift; this->overlay_y_offset = param->overlay_y_offset; this->aspect = param->aspect; @@ -361,7 +345,7 @@ return 1; } -@@ -223,6 +242,8 @@ static int expand_get_parameters(xine_po +@@ -225,6 +243,8 @@ static int expand_get_parameters(xine_po param->enable_automatic_shift = this->enable_automatic_shift; param->overlay_y_offset = this->overlay_y_offset; param->aspect = this->aspect; @@ -370,7 +354,7 @@ return 1; } -@@ -236,6 +257,7 @@ static char *expand_get_help(void) { +@@ -238,25 +258,12 @@ static char *expand_get_help(void) { " Enable_automatic_shift: Enable automatic overlay shifting\n" " Overlay_y_offset: Manually shift the overlay vertically\n" " aspect: The target aspect ratio (default 4:3)\n" @@ -378,7 +362,26 @@ "\n" ); } -@@ -322,6 +344,10 @@ static vo_frame_t *expand_get_frame(xine + + +-static int expand_draw(vo_frame_t *frame, xine_stream_t *stream) +-{ +- post_video_port_t *port = (post_video_port_t *)frame->port; +- post_expand_t *this = (post_expand_t *)port->post; +- int skip; +- +- frame->ratio = this->aspect; +- _x_post_frame_copy_down(frame, frame->next); +- skip = frame->next->draw(frame->next, stream); +- _x_post_frame_copy_up(frame, frame->next); +- return skip; +-} +- +- + static vo_frame_t *expand_get_frame(xine_video_port_t *port_gen, uint32_t width, + uint32_t height, double ratio, + int format, int flags) +@@ -338,6 +359,10 @@ static vo_frame_t *expand_get_frame(xine static int expand_intercept_ovl(post_video_port_t *port) { @@ -389,7 +392,7 @@ /* we always intercept overlay manager */ return 1; } -@@ -350,3 +376,79 @@ static int32_t expand_overlay_add_event( +@@ -366,3 +377,80 @@ static int32_t expand_overlay_add_event( return port->original_manager->add_event(port->original_manager, event_gen); } @@ -430,6 +433,7 @@ + post_expand_t *this = (post_expand_t *)port->post; + int skip; + ++ frame->ratio = this->aspect; + if (this->centre_cut_out_mode && !frame->bad_frame) + { + /* expected area of inner 4:3 image */ @@ -469,9 +473,9 @@ + + return skip; +} -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/Makefile.am ./src/vdr/Makefile.am ---- ../xine-lib-1.1.2.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/Makefile.am 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/Makefile.am ./src/vdr/Makefile.am +--- ../xine-lib-1.1.3-orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/Makefile.am 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,30 @@ +include $(top_srcdir)/misc/Makefile.common + @@ -503,9 +507,9 @@ + +noinst_HEADERS = post_vdr.h + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/input_vdr.c ./src/vdr/input_vdr.c ---- ../xine-lib-1.1.2.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/input_vdr.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/input_vdr.c ./src/vdr/input_vdr.c +--- ../xine-lib-1.1.3-orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/input_vdr.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,2480 @@ +/* + * Copyright (C) 2003-2004 the xine project @@ -2987,9 +2991,9 @@ + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/input_vdr.h ./src/vdr/input_vdr.h ---- ../xine-lib-1.1.2.orig/src/vdr/input_vdr.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/input_vdr.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/input_vdr.h ./src/vdr/input_vdr.h +--- ../xine-lib-1.1.3-orig/src/vdr/input_vdr.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/input_vdr.h 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,585 @@ + +#ifndef __INPUT_VDR_H @@ -3576,9 +3580,9 @@ + +#endif /* __INPUT_VDR_H */ + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr.c ./src/vdr/post_vdr.c ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr.c ./src/vdr/post_vdr.c +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -3624,9 +3628,9 @@ + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr.h ./src/vdr/post_vdr.h ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr.h ./src/vdr/post_vdr.h +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr.h 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,71 @@ + +#ifndef __POST_VDR_H @@ -3699,9 +3703,9 @@ + +#endif /* __POST_VDR_H */ + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr_audio.c ./src/vdr/post_vdr_audio.c ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr_audio.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr_audio.c ./src/vdr/post_vdr_audio.c +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr_audio.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,287 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -3990,9 +3994,9 @@ + + return; +} -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr_video.c ./src/vdr/post_vdr_video.c ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr_video.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr_video.c ./src/vdr/post_vdr_video.c +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr_video.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,485 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -4479,10 +4483,10 @@ + + return skip; +} -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/audio_out.c ./src/xine-engine/audio_out.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/audio_out.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/audio_out.c 2006-07-12 19:53:34.000000000 +0200 -@@ -1040,6 +1040,10 @@ static void *ao_loop (void *this_gen) { +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/audio_out.c ./src/xine-engine/audio_out.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/audio_out.c 2006-11-05 00:30:14.000000000 +0100 ++++ ./src/xine-engine/audio_out.c 2006-12-08 14:10:11.000000000 +0100 +@@ -1026,6 +1026,10 @@ static void *ao_loop (void *this_gen) { in_buf->vpts, cur_time); } @@ -4493,117 +4497,9 @@ lprintf ("loop:pause: I feel sleepy (%d buffers).\n", this->out_fifo->num_buffers); xine_usec_sleep (10000); lprintf ("loop:pause: I wake up.\n"); -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/demux.c ./src/xine-engine/demux.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/demux.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/demux.c 2006-07-12 19:53:34.000000000 +0200 -@@ -85,6 +85,8 @@ void _x_demux_flush_engine (xine_stream_ - stream->video_fifo->clear(stream->video_fifo); - stream->audio_fifo->clear(stream->audio_fifo); - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_RESET_DECODER; - stream->video_fifo->put (stream->video_fifo, buf); -@@ -93,6 +95,8 @@ void _x_demux_flush_engine (xine_stream_ - buf->type = BUF_CONTROL_RESET_DECODER; - stream->audio_fifo->put (stream->audio_fifo, buf); - -+ pthread_mutex_unlock(&stream->demux_mutex); -+ - /* on seeking we must wait decoder fifos to process before doing flush. - * otherwise we flush too early (before the old data has left decoders) - */ -@@ -124,6 +128,8 @@ void _x_demux_control_newpts( xine_strea - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_NEWPTS; - buf->decoder_flags = flags; -@@ -135,6 +141,8 @@ void _x_demux_control_newpts( xine_strea - buf->decoder_flags = flags; - buf->disc_off = pts; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - /* sync with decoder fifos, making sure everything gets processed */ -@@ -165,12 +173,16 @@ void _x_demux_control_headers_done (xine - header_count_audio = 0; - } - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf_video->type = BUF_CONTROL_HEADERS_DONE; - stream->video_fifo->put (stream->video_fifo, buf_video); - - buf_audio->type = BUF_CONTROL_HEADERS_DONE; - stream->audio_fifo->put (stream->audio_fifo, buf_audio); - -+ pthread_mutex_unlock(&stream->demux_mutex); -+ - while ((stream->header_count_audio < header_count_audio) || - (stream->header_count_video < header_count_video)) { - struct timeval tv; -@@ -198,6 +210,8 @@ void _x_demux_control_start( xine_stream - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_START; - stream->video_fifo->put (stream->video_fifo, buf); -@@ -205,12 +219,16 @@ void _x_demux_control_start( xine_stream - buf = stream->audio_fifo->buffer_pool_alloc (stream->audio_fifo); - buf->type = BUF_CONTROL_START; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - void _x_demux_control_end( xine_stream_t *stream, uint32_t flags ) { - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_END; - buf->decoder_flags = flags; -@@ -220,12 +238,16 @@ void _x_demux_control_end( xine_stream_t - buf->type = BUF_CONTROL_END; - buf->decoder_flags = flags; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - void _x_demux_control_nop( xine_stream_t *stream, uint32_t flags ) { - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_NOP; - buf->decoder_flags = flags; -@@ -235,6 +257,8 @@ void _x_demux_control_nop( xine_stream_t - buf->type = BUF_CONTROL_NOP; - buf->decoder_flags = flags; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - static void *demux_loop (void *stream_gen) { -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/post.c ./src/xine-engine/post.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/post.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/post.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/post.c ./src/xine-engine/post.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/post.c 2006-01-27 08:46:15.000000000 +0100 ++++ ./src/xine-engine/post.c 2006-12-08 14:10:20.000000000 +0100 @@ -149,6 +149,14 @@ static void post_video_flush(xine_video_ if (port->port_lock) pthread_mutex_unlock(port->port_lock); } @@ -4627,9 +4523,9 @@ port->new_port.status = post_video_status; port->new_port.get_property = post_video_get_property; port->new_port.set_property = post_video_set_property; -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/video_out.c ./src/xine-engine/video_out.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/video_out.c 2006-03-25 02:26:34.000000000 +0100 -+++ ./src/xine-engine/video_out.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/video_out.c ./src/xine-engine/video_out.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/video_out.c 2006-03-25 02:26:34.000000000 +0100 ++++ ./src/xine-engine/video_out.c 2006-12-08 14:10:20.000000000 +0100 @@ -127,6 +127,9 @@ typedef struct { int frame_drop_limit; int frame_drop_cpt; @@ -4755,9 +4651,9 @@ this->frame_drop_limit = 3; this->frame_drop_cpt = 0; -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/video_out.h ./src/xine-engine/video_out.h ---- ../xine-lib-1.1.2.orig/src/xine-engine/video_out.h 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/video_out.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/video_out.h ./src/xine-engine/video_out.h +--- ../xine-lib-1.1.3-orig/src/xine-engine/video_out.h 2006-09-26 07:19:49.000000000 +0200 ++++ ./src/xine-engine/video_out.h 2006-12-08 14:10:20.000000000 +0100 @@ -205,6 +205,9 @@ struct xine_video_port_s { /* flush video_out fifo */ void (*flush) (xine_video_port_t *self); @@ -4768,9 +4664,9 @@ /* Get/Set video property * * See VO_PROP_* bellow -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/video_overlay.h ./src/xine-engine/video_overlay.h ---- ../xine-lib-1.1.2.orig/src/xine-engine/video_overlay.h 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/video_overlay.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/video_overlay.h ./src/xine-engine/video_overlay.h +--- ../xine-lib-1.1.3-orig/src/xine-engine/video_overlay.h 2006-09-26 07:19:49.000000000 +0200 ++++ ./src/xine-engine/video_overlay.h 2006-12-08 14:10:20.000000000 +0100 @@ -38,7 +38,7 @@ #define MAX_OBJECTS 50 @@ -4780,26 +4676,10 @@ #define OVERLAY_EVENT_NULL 0 #define OVERLAY_EVENT_SHOW 1 -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/xine.c ./src/xine-engine/xine.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/xine.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/xine.c 2006-07-12 19:53:34.000000000 +0200 -@@ -533,6 +533,7 @@ xine_stream_t *xine_stream_new (xine_t * - pthread_mutex_init (&stream->info_mutex, NULL); - pthread_mutex_init (&stream->meta_mutex, NULL); - pthread_mutex_init (&stream->demux_lock, NULL); -+ pthread_mutex_init (&stream->demux_mutex, NULL); - pthread_mutex_init (&stream->event_queues_lock, NULL); - pthread_mutex_init (&stream->counter_lock, NULL); - pthread_cond_init (&stream->counter_changed, NULL); -@@ -1270,6 +1271,7 @@ void xine_dispose_internal (xine_stream_ - pthread_mutex_destroy (&stream->event_queues_lock); - pthread_mutex_destroy (&stream->current_extra_info_lock); - pthread_cond_destroy (&stream->counter_changed); -+ pthread_mutex_destroy (&stream->demux_mutex); - pthread_mutex_destroy (&stream->demux_lock); - pthread_mutex_destroy (&stream->first_frame_lock); - pthread_cond_destroy (&stream->first_frame_reached); -@@ -1961,3 +1963,89 @@ int xine_stream_master_slave(xine_stream +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/xine.c ./src/xine-engine/xine.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/xine.c 2006-10-17 00:18:24.000000000 +0200 ++++ ./src/xine-engine/xine.c 2006-12-08 14:10:25.000000000 +0100 +@@ -2016,3 +2016,89 @@ int xine_stream_master_slave(xine_stream slave->master = master->master; return 1; } @@ -4889,18 +4769,10 @@ +{ + pthread_mutex_unlock(&stream->frontend_lock); +} -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/xine_internal.h ./src/xine-engine/xine_internal.h ---- ../xine-lib-1.1.2.orig/src/xine-engine/xine_internal.h 2006-04-22 00:46:33.000000000 +0200 -+++ ./src/xine-engine/xine_internal.h 2006-07-12 19:53:34.000000000 +0200 -@@ -320,6 +320,7 @@ struct xine_stream_s { - int demux_thread_running; - pthread_mutex_t demux_lock; - int demux_action_pending; -+ pthread_mutex_t demux_mutex; /* used in _x_demux_... functions to synchronize order of pairwise A/V buffer operations */ - - extra_info_t *current_extra_info; - pthread_mutex_t current_extra_info_lock; -@@ -354,6 +355,15 @@ struct xine_stream_s { +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/xine_internal.h ./src/xine-engine/xine_internal.h +--- ../xine-lib-1.1.3-orig/src/xine-engine/xine_internal.h 2006-10-02 17:56:06.000000000 +0200 ++++ ./src/xine-engine/xine_internal.h 2006-12-08 14:14:06.000000000 +0100 +@@ -356,6 +356,15 @@ struct xine_stream_s { * private function prototypes: */ @@ -4913,6 +4785,6 @@ +int _x_lock_frontend(xine_stream_t *stream, int ms_to_time_out); +void _x_unlock_frontend(xine_stream_t *stream); + - void _x_handle_stream_end (xine_stream_t *stream, int non_user); + void _x_handle_stream_end (xine_stream_t *stream, int non_user) XINE_PROTECTED; /* report message to UI. usually these are async errors */ ++++++ xine-lib-cflags-AUTOMAKE.diff ++++++ diff -urp ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.am ./src/libffmpeg/libavcodec/i386/Makefile.am --- ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.am 2006-07-09 16:39:01.000000000 +0200 +++ ./src/libffmpeg/libavcodec/i386/Makefile.am 2006-07-12 18:44:33.000000000 +0200 @@ -2,10 +2,9 @@ include $(top_srcdir)/misc/Makefile.comm # -fomit-frame-pointer is always needed. it might cause debug to not # work, but at least it compiles. -AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing -# CFLAGS is here to filter out -funroll-loops because it causes bad +# -funroll-loops of @CFLAGS@ are filtered out here because it causes bad # behavior of libavcodec -CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` +AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil # Avoid "can't find register" failures with -O1 and higher diff -urp ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.am ./src/libw32dll/wine/Makefile.am --- ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.am 2003-10-02 21:30:30.000000000 +0200 +++ ./src/libw32dll/wine/Makefile.am 2006-07-12 18:54:37.000000000 +0200 @@ -6,15 +6,13 @@ EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) +# filter out -fomit-frame-pointer, -finline-functions, and -frename-registers +# from @CFLAGS@ here, because they cause bad behavior of wine AM_CFLAGS = $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ - -Ddbg_printf=__vprintf -DTRACE=__vprintf - -# CFLAGS is here to filter out -fomit-frame-pointer, -# -finline-functions and -frename-registers because they cause bad -# behavior of wine -CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` + -Ddbg_printf=__vprintf -DTRACE=__vprintf \ + `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` if HAVE_W32DLL wine_lib = libwine.la diff -urp ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.in ./src/libffmpeg/libavcodec/i386/Makefile.in --- ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.in 2006-07-09 16:51:15.000000000 +0200 +++ ./src/libffmpeg/libavcodec/i386/Makefile.in 2006-10-11 12:26:58.000000000 +0200 @@ -135,9 +135,7 @@ CCAS = @CCAS@ CCASCOMPILE = @CCASCOMPILE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ -# CFLAGS is here to filter out -funroll-loops because it causes bad -# behavior of libavcodec -CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` +CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -532,7 +538,9 @@ XINE_LIB = $(top_builddir)/src/xine-engi # -fomit-frame-pointer is always needed. it might cause debug to not # work, but at least it compiles. -AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing +# -funroll-loops of @CFLAGS@ are filtered out here because it causes bad +# behavior of libavcodec +AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil noinst_LTLIBRARIES = libavcodec_mmx.la libavcodec_mmx_src = \ diff -urp ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.in ./src/libw32dll/wine/Makefile.in --- ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.in 2006-07-09 16:51:15.000000000 +0200 +++ ./src/libw32dll/wine/Makefile.in 2006-10-11 12:27:08.000000000 +0200 @@ -130,11 +130,7 @@ CCAS = @CCAS@ CCASCOMPILE = @CCASCOMPILE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ - -# CFLAGS is here to filter out -fomit-frame-pointer, -# -finline-functions and -frename-registers because they cause bad -# behavior of wine -CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` +CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -528,10 +532,14 @@ w32_path = @w32_path@ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) + +# filter out -fomit-frame-pointer, -finline-functions, and -frename-registers +# from @CFLAGS@ here, because they cause bad behavior of wine AM_CFLAGS = $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ - -Ddbg_printf=__vprintf -DTRACE=__vprintf + -Ddbg_printf=__vprintf -DTRACE=__vprintf \ + `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` @HAVE_W32DLL_TRUE@wine_lib = libwine.la libwine_la_SOURCES = \ ++++++ xine-lib-fix-postinc-COMMITTED.diff ++++++ Index: src/demuxers/demux_iff.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_iff.c,v retrieving revision 1.17 diff -u -p -r1.17 demux_iff.c --- src/demuxers/demux_iff.c 10 Jul 2006 22:08:13 -0000 1.17 +++ src/demuxers/demux_iff.c 8 Dec 2006 15:25:40 -0000 @@ -827,7 +827,8 @@ static int demux_iff_send_chunk(demux_pl } } else { for (j = 0, k = (interleave_index / 2); j < (buf->size / 2); j += this->audio_channels) { - zw_16 = BE_16(&pointer16_from[k++]); + zw_16 = BE_16(&pointer16_from[k]); + k++; zw_rescale = zw_16; zw_rescale *= this->audio_volume_left; zw_rescale /= max_volume; @@ -856,7 +857,8 @@ static int demux_iff_send_chunk(demux_pl } } else { for (j = 1; j < (buf->size / 2); j += this->audio_channels) { - zw_16 = BE_16(&pointer16_from[k++]); + zw_16 = BE_16(&pointer16_from[k]); + k++; zw_rescale = zw_16; zw_rescale *= this->audio_volume_left; zw_rescale /= max_volume; ++++++ xine-lib-fix-strncat-COMMITTED.diff ++++++ Index: src/input/input_http.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_http.c,v retrieving revision 1.124 diff -u -p -r1.124 input_http.c --- src/input/input_http.c 30 Nov 2006 10:54:18 -0000 1.124 +++ src/input/input_http.c 8 Dec 2006 15:59:38 -0000 @@ -335,12 +335,9 @@ static int http_plugin_read_metainf (htt /* prepares the event */ radio = _x_meta_info_get(this->stream, XINE_META_INFO_ALBUM); if (radio) { - int len = strlen(radio); - strncpy(data.str, radio, sizeof(data.str)); - strncat(data.str, " - ", sizeof(data.str) - len); - strncat(data.str, songtitle, sizeof(data.str) - len - 3); + snprintf (data.str, sizeof(data.str), "%s - %s", radio, songtitle); } else { - strncpy(data.str, songtitle, sizeof(data.str)); + strncpy(data.str, songtitle, sizeof(data.str)-1); } data.str[sizeof(data.str) - 1] = '\0'; data.str_len = strlen(data.str) + 1; @@ -766,13 +763,11 @@ static int http_plugin_open (input_plugi } snprintf(this->buf + buflen, BUFSIZE - buflen, - "User-Agent: xine/%s\015\012", VERSION); - buflen = strlen(this->buf); - strncat (this->buf, "Accept: */*\015\012", BUFSIZE - buflen); - buflen = strlen(this->buf); - strncat (this->buf, "Icy-MetaData: 1\015\012", BUFSIZE - buflen); - buflen = strlen(this->buf); - strncat (this->buf, "\015\012", BUFSIZE - buflen); + "User-Agent: xine/%s\015\012" + "Accept: */*\015\012" + "Icy-MetaData: 1\015\012" + "\015\012", + VERSION); buflen = strlen(this->buf); if (_x_io_tcp_write (this->stream, this->fh, this->buf, buflen) != buflen) { _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL); Index: src/input/libdvdnav/remap.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/remap.c,v retrieving revision 1.5 diff -u -p -r1.5 remap.c --- src/input/libdvdnav/remap.c 17 Sep 2006 13:01:08 -0000 1.5 +++ src/input/libdvdnav/remap.c 8 Dec 2006 15:59:38 -0000 @@ -193,10 +193,7 @@ remap_t* remap_loadmap( char *title) { /* Build the map filename */ home = getenv("HOME"); assert(home); - strncpy(fname, home, sizeof(fname)); - strncat(fname, "/.dvdnav/", sizeof(fname)); - strncat(fname, title, sizeof(fname)); - strncat(fname, ".map", sizeof(fname)); + snprintf (fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title); /* Open the map file */ fp = fopen( fname, "r"); Index: src/input/vcd/libcdio/iso9660_fs.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/vcd/libcdio/iso9660_fs.c,v retrieving revision 1.6 diff -u -p -r1.6 iso9660_fs.c --- src/input/vcd/libcdio/iso9660_fs.c 28 Sep 2006 08:19:14 -0000 1.6 +++ src/input/vcd/libcdio/iso9660_fs.c 8 Dec 2006 15:59:38 -0000 @@ -1200,9 +1200,7 @@ find_fs_lsn_recurse (CdIo *p_cdio, const char _fullname[4096] = { 0, }; char *filename = (char *) statbuf->filename; - snprintf (_fullname, sizeof (_fullname), "%s%s", pathname, filename); - - strncat (_fullname, "/", sizeof (_fullname)); + snprintf (_fullname, sizeof (_fullname), "%s%s/", pathname, filename); if (statbuf->type == _STAT_DIR && strcmp ((char *) statbuf->filename, ".") Index: src/input/vcd/libvcd/vcd.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/vcd/libvcd/vcd.c,v retrieving revision 1.3 diff -u -p -r1.3 vcd.c --- src/input/vcd/libvcd/vcd.c 1 Jan 2005 02:43:59 -0000 1.3 +++ src/input/vcd/libvcd/vcd.c 8 Dec 2006 15:59:38 -0000 @@ -1664,7 +1664,7 @@ _write_sequence (VcdObj *obj, int track_ track->info->ahdr[i].bitrate / 1024, _mode_str[track->info->ahdr[i].mode]); - strncat (buf2, buf, sizeof(buf)); + strncat (buf2, buf, sizeof(buf2) - strlen(buf2) - 1); } vcd_info ("writing track %d, %s, %s, %s...", track_idx + 2, Index: src/libsputext/demux_sputext.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libsputext/demux_sputext.c,v retrieving revision 1.49 diff -u -p -r1.49 demux_sputext.c --- src/libsputext/demux_sputext.c 10 Jul 2006 22:08:30 -0000 1.49 +++ src/libsputext/demux_sputext.c 8 Dec 2006 15:59:38 -0000 @@ -915,7 +915,8 @@ static subtitle_t *sub_read_line_jacobsu return NULL; trail_space(directive); strncat(line2, directive, - (LINE_LEN > 511) ? LINE_LEN : 511); + ((LINE_LEN > 511) ? LINE_LEN-1 : 511) + - strlen(line2)); break; } default: Index: src/libw32dll/wine/module.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/module.c,v retrieving revision 1.18 diff -u -p -r1.18 module.c --- src/libw32dll/wine/module.c 11 Jun 2006 15:09:47 -0000 1.18 +++ src/libw32dll/wine/module.c 8 Dec 2006 15:59:39 -0000 @@ -389,9 +389,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib strncpy(path, libname, sizeof(path) - 1); } else { /* check default user path */ - strncpy(path, win32_def_path, sizeof(path) - 2); - strcat(path, "/"); - strncat(path, libname, sizeof(path) - strlen(libname)); + snprintf(path, sizeof(path), "%s/%s", win32_def_path, libname); } wm = MODULE_LoadLibraryExA( path, hfile, flags ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de