Hello community, here is the log from the commit of package xine-lib checked in at Fri Feb 2 15:59:19 CET 2007. -------- --- xine-lib/xine-lib.changes 2007-01-18 13:09:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/xine-lib/xine-lib.changes 2007-01-31 16:01:10.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 31 15:59:59 CET 2007 - mhopf@suse.de + +- Update to xine-lib-1.1.4 +- Update to vdr-xine-0.7.10 +- Fixed some new(?) installation failures +- xineplug_flac has to be triggered on configure manually now. + +------------------------------------------------------------------- Old: ---- vdr-xine-lib-0.7.9-adapted-1.1.3.diff xine-lib-1.1.3.tar.gz xine-lib-fix-postinc-COMMITTED.diff xine-lib-fix-strncat-COMMITTED.diff xine-lib-strcmp-COMMITTED.diff New: ---- vdr-xine-lib-0.7.10-adapted-1.1.4.diff xine-lib-1.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.IE4905/_old 2007-02-02 15:58:23.000000000 +0100 +++ /var/tmp/diff_new_pack.IE4905/_new 2007-02-02 15:58:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.3) +# spec file for package xine-lib (Version 1.1.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,26 +14,23 @@ 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.3 -Release: 14 +Version: 1.1.4 +Release: 1 License: GNU General Public License (GPL), Public Domain, Freeware Group: Productivity/Multimedia/Video/Players URL: http://xine.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: xine-lib-%version.tar.gz +Source: xine-lib-%version.tar.bz2 Source10: README.SuSE Source11: caramel.tar.bz2 Source12: CelomaChrome.tar.bz2 Source13: lcd.tar.bz2 # *** xine-lib: Bugfixes Patch: xine-lib-various.diff -Patch20: xine-lib-fix-postinc-COMMITTED.diff -Patch21: xine-lib-fix-strncat-COMMITTED.diff -Patch22: xine-lib-strcmp-COMMITTED.diff Patch26: xine-lib-doc-fix-X11R6.diff Patch40: xine-lib-cflags-AUTOMAKE.diff # *** Addons -Patch50: vdr-xine-lib-0.7.9-adapted-1.1.3.diff +Patch50: vdr-xine-lib-0.7.10-adapted-1.1.4.diff Patch51: vdr-xine-fifodir.diff Patch60: vdr-xine-AUTOMAKE.diff # *** SUSE only changes @@ -134,12 +131,9 @@ %prep %setup -q %patch -%patch20 -%patch21 -%patch22 %patch26 %patch40 -%patch50 +%patch50 -p1 %patch51 %patch60 %patch70 @@ -153,7 +147,9 @@ ./configure --prefix=/usr \ --libdir=%_libdir \ --mandir=%_mandir \ + --docdir=%_defaultdocdir/xine \ --enable-fpic \ + --with-libflac \ --with-w32-path=/usr/lib/win32 make %{?jobs:-j%jobs} @@ -226,11 +222,8 @@ xineplug_decode_qt xineplug_decode_w32dll %endif -#Seems to be fixed... -#%%ifnarch ppc64 s390 s390x xineplug_vo_out_xxmc xineplug_vo_out_xvmc -#%%endif .mad # # libmad and MPEG related plugins @@ -245,6 +238,7 @@ xineplug_dmx_mpeg_elem xineplug_dmx_mpeg_pes xineplug_dmx_yuv4mpeg2 +# .internal # # I am not sure about these plugins, they need to be checked @@ -257,22 +251,16 @@ # # not yet checked # -# -# # NES Music File Format. free ?? -# xineplug_decode_nsf # # I have been told this is maybe legal as long it is not labeled as AC3 -# xineplug_decode_a52 # # Philips claimed intellectual property on GSM 06.10 -# xineplug_decode_gsm610 # # these plugins do have legal problems most likely -# xineplug_decode_faad xineplug_decode_ff xineplug_decode_dvaudio @@ -282,15 +270,13 @@ # TODO: not checked yet # %ifarch %ix86 -# # needs dha ... -# xineplug_vo_out_vidix %endif +# .extra # # we do not want the depending stuff installed by default -# xineplug_ao_out_arts xineplug_ao_out_esd xineplug_ao_out_jack @@ -302,11 +288,11 @@ xineplug_decode_image # # dxr3 plugin is noisy on console and only a few people have the hardware -# xineplug_decode_dxr3_video xineplug_vo_out_dxr3 xineplug_decode_dxr3_spu EOF +# OUT_FILE="" grep -v ^# plugins | while read i; do [ "${i:0:1}" = "." ] && OUT_FILE=$i && continue @@ -316,7 +302,6 @@ # install documentation # mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} - mv $RPM_BUILD_ROOT/usr/share/doc/xine $RPM_BUILD_ROOT%{_defaultdocdir}/xine install -m 0644 %SOURCE10 COPYING AUTHORS \ $RPM_BUILD_ROOT%{_defaultdocdir}/xine/ %ifarch %ix86 @@ -387,6 +372,11 @@ /usr/include/xine.h %changelog -n xine-lib +* Wed Jan 31 2007 - mhopf@suse.de +- Update to xine-lib-1.1.4 +- Update to vdr-xine-0.7.10 +- Fixed some new(?) installation failures +- xineplug_flac has to be triggered on configure manually now. * Thu Jan 18 2007 - mhopf@suse.de - Fix comparing char* pointer with a string literal. * Fri Dec 08 2006 - mhopf@suse.de ++++++ vdr-xine-AUTOMAKE.diff ++++++ --- /var/tmp/diff_new_pack.IE4905/_old 2007-02-02 15:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.IE4905/_new 2007-02-02 15:58:24.000000000 +0100 @@ -1,33 +1,33 @@ -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" +diff -urpN ../xine-lib-1.1.4.orig/configure ./configure +--- ../xine-lib-1.1.4.orig/configure 2007-01-28 19:57:56.000000000 +0100 ++++ ./configure 2007-01-30 18:54:47.000000000 +0100 +@@ -53873,7 +53873,7 @@ CFLAGS="-DNDEBUG -D_REENTRANT -D_FILE_OF + DEBUG_CFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE $DEBUG_CFLAGS" -- 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/libavcodec/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/libavcodec/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_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/combined/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/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/combined/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/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" + 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" ;; +@@ -55077,6 +55077,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" + "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; + "win32/include/Makefile") CONFIG_FILES="$CONFIG_FILES win32/include/Makefile" ;; + "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; +@@ -56455,7 +56456,7 @@ echo " - file - net" echo " - stdin_fifo - rtp" echo " - http - mms" echo " - pnm - rtsp" -echo " - dvb" +echo " - dvb - vdr" - if test x"$external_dvdnav" = "xyes"; then + if test "x$external_dvdnav" = "xyes"; then echo " - dvd (external libs)" else -@@ -51052,6 +55645,7 @@ echo " - invert - expand" +@@ -56653,6 +56654,7 @@ echo " - invert - expand" echo " - eq - eq2" echo " - boxblur - denoise3d" echo " - unsharp - tvtime" @@ -35,23 +35,23 @@ echo " * SFX:" echo " - goom - oscope" echo " - fftscope - mosaico" -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 \ +diff -urpN ../xine-lib-1.1.4.orig/src/Makefile.in ./src/Makefile.in +--- ../xine-lib-1.1.4.orig/src/Makefile.in 2007-01-28 23:57:17.000000000 +0100 ++++ ./src/Makefile.in 2007-01-30 18:54:16.000000000 +0100 +@@ -530,7 +530,8 @@ SUBDIRS = \ libflac \ libmusepack \ -- post -+ post \ + post \ +- combined ++ combined \ + vdr all: all-recursive -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 @@ +diff -urpN ../xine-lib-1.1.4.orig/src/vdr/Makefile.in ./src/vdr/Makefile.in +--- ../xine-lib-1.1.4.orig/src/vdr/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/Makefile.in 2007-01-30 18:54:40.000000000 +0100 +@@ -0,0 +1,924 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + @@ -97,18 +97,18 @@ +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/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/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/xv.m4 $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/arts.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/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/xv.m4 \ ++ $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d @@ -167,6 +167,8 @@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ ++ARCH_X86_FALSE = @ARCH_X86_FALSE@ ++ARCH_X86_TRUE = @ARCH_X86_TRUE@ +ARTS_CFLAGS = @ARTS_CFLAGS@ +ARTS_CONFIG = @ARTS_CONFIG@ +ARTS_LIBS = @ARTS_LIBS@ @@ -188,7 +190,6 @@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCAS = @CCAS@ -+CCASCOMPILE = @CCASCOMPILE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ @@ -234,6 +235,8 @@ +EXTERNAL_LIBDTS_TRUE = @EXTERNAL_LIBDTS_TRUE@ +EXTERNAL_LIBMAD_FALSE = @EXTERNAL_LIBMAD_FALSE@ +EXTERNAL_LIBMAD_TRUE = @EXTERNAL_LIBMAD_TRUE@ ++EXTERNAL_MPCDEC_FALSE = @EXTERNAL_MPCDEC_FALSE@ ++EXTERNAL_MPCDEC_TRUE = @EXTERNAL_MPCDEC_TRUE@ +EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@ +EXTRA_X_LIBS = @EXTRA_X_LIBS@ +FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ @@ -285,14 +288,10 @@ +HAVE_ESD_TRUE = @HAVE_ESD_TRUE@ +HAVE_FB_FALSE = @HAVE_FB_FALSE@ +HAVE_FB_TRUE = @HAVE_FB_TRUE@ -+HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@ -+HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@ +HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@ +HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@ +HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@ +HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@ -+HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@ -+HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@ +HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@ +HAVE_FUSIONSOUND_FALSE = @HAVE_FUSIONSOUND_FALSE@ +HAVE_FUSIONSOUND_TRUE = @HAVE_FUSIONSOUND_TRUE@ @@ -307,6 +306,8 @@ +HAVE_JACK_TRUE = @HAVE_JACK_TRUE@ +HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@ +HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@ ++HAVE_LIBFLAC_FALSE = @HAVE_LIBFLAC_FALSE@ ++HAVE_LIBFLAC_TRUE = @HAVE_LIBFLAC_TRUE@ +HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@ +HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@ +HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@ @@ -320,6 +321,8 @@ +HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@ +HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@ +HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@ ++HAVE_MMX_FALSE = @HAVE_MMX_FALSE@ ++HAVE_MMX_TRUE = @HAVE_MMX_TRUE@ +HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@ +HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@ +HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -359,6 +362,8 @@ +HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@ +HAVE_WAND_FALSE = @HAVE_WAND_FALSE@ +HAVE_WAND_TRUE = @HAVE_WAND_TRUE@ ++HAVE_WAVPACK_FALSE = @HAVE_WAVPACK_FALSE@ ++HAVE_WAVPACK_TRUE = @HAVE_WAVPACK_TRUE@ +HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@ +HAVE_X11_FALSE = @HAVE_X11_FALSE@ +HAVE_X11_TRUE = @HAVE_X11_TRUE@ @@ -411,7 +416,7 @@ +LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@ +LIBSTK_CFLAGS = @LIBSTK_CFLAGS@ +LIBSTK_LIBS = @LIBSTK_LIBS@ -+LIBTOOL = $(SHELL) $(top_builddir)/libtool ++LIBTOOL = @LIBTOOL@ +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@ +LIBVCD_CFLAGS = @LIBVCD_CFLAGS@ @@ -433,6 +438,8 @@ +MNG_LIBS = @MNG_LIBS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ ++MUSEPACK_FALSE = @MUSEPACK_FALSE@ ++MUSEPACK_TRUE = @MUSEPACK_TRUE@ +NET_LIBS = @NET_LIBS@ +OBJC = @OBJC@ +OBJCDEPMODE = @OBJCDEPMODE@ @@ -484,11 +491,11 @@ +W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ +WAND_CFLAGS = @WAND_CFLAGS@ +WAND_LIBS = @WAND_LIBS@ ++WAVPACK_CFLAGS = @WAVPACK_CFLAGS@ ++WAVPACK_LIBS = @WAVPACK_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@ @@ -574,13 +581,14 @@ +target_alias = @target_alias@ +w32_path = @w32_path@ +XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la ++xineplugdir = $(XINE_PLUGINDIR) +AM_CFLAGS = -D_LARGEFILE64_SOURCE +lib_LTLIBRARIES = \ + xineplug_inp_vdr.la + +xineplug_inp_vdr_la_SOURCES = input_vdr.c +xineplug_inp_vdr_la_LIBADD = $(XINE_LIB) -+xineplug_inp_vdr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ ++xineplug_inp_vdr_la_LDFLAGS = -avoid-version -module @IMPURE_TEXT_LDFLAGS@ +include_HEADERS = input_vdr.h +postlibdir = $(XINE_PLUGINDIR)/post +postlib_LTLIBRARIES = \ @@ -588,7 +596,7 @@ + +xineplug_post_vdr_la_SOURCES = post_vdr.c post_vdr_video.c post_vdr_audio.c +xineplug_post_vdr_la_LIBADD = $(XINE_LIB) -+xineplug_post_vdr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ ++xineplug_post_vdr_la_LDFLAGS = -avoid-version -module @IMPURE_TEXT_LDFLAGS@ +noinst_HEADERS = post_vdr.h +all: all-am + ++++++ vdr-xine-lib-0.7.9-adapted-1.1.3.diff -> vdr-xine-lib-0.7.10-adapted-1.1.4.diff ++++++ ++++ 1262 lines (skipped) ++++ between xine-lib/vdr-xine-lib-0.7.9-adapted-1.1.3.diff ++++ and /mounts/work_src_done/STABLE/xine-lib/vdr-xine-lib-0.7.10-adapted-1.1.4.diff ++++++ xine-lib-cflags-AUTOMAKE.diff ++++++ --- /var/tmp/diff_new_pack.IE4905/_old 2007-02-02 15:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.IE4905/_new 2007-02-02 15:58:24.000000000 +0100 @@ -1,6 +1,6 @@ -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 +diff -urp ../xine-lib-1.1.4.orig/src/libffmpeg/libavcodec/i386/Makefile.am ./src/libffmpeg/libavcodec/i386/Makefile.am +--- ../xine-lib-1.1.4.orig/src/libffmpeg/libavcodec/i386/Makefile.am 2007-01-25 19:44:55.000000000 +0100 ++++ ./src/libffmpeg/libavcodec/i386/Makefile.am 2007-01-30 17:59:47.000000000 +0100 @@ -2,10 +2,9 @@ include $(top_srcdir)/misc/Makefile.comm # -fomit-frame-pointer is always needed. it might cause debug to not @@ -11,12 +11,35 @@ # 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 + AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil -I$(top_srcdir)/src/libffmpeg -I$(top_builddir)/src/libffmpeg # 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 +diff -urp ../xine-lib-1.1.4.orig/src/libffmpeg/libavcodec/i386/Makefile.in ./src/libffmpeg/libavcodec/i386/Makefile.in +--- ../xine-lib-1.1.4.orig/src/libffmpeg/libavcodec/i386/Makefile.in 2007-01-28 23:57:33.000000000 +0100 ++++ ./src/libffmpeg/libavcodec/i386/Makefile.in 2007-01-30 18:00:40.000000000 +0100 +@@ -130,9 +130,7 @@ CC = @CC@ + CCAS = @CCAS@ + 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@ +@@ -525,7 +523,7 @@ xineplugdir = $(XINE_PLUGINDIR) + + # -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 ++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 -I$(top_srcdir)/src/libffmpeg -I$(top_builddir)/src/libffmpeg + noinst_LTLIBRARIES = libavcodec_mmx.la + libavcodec_mmx_src = \ +diff -urp ../xine-lib-1.1.4.orig/src/libw32dll/wine/Makefile.am ./src/libw32dll/wine/Makefile.am +--- ../xine-lib-1.1.4.orig/src/libw32dll/wine/Makefile.am 2003-10-02 21:30:30.000000000 +0200 ++++ ./src/libw32dll/wine/Makefile.am 2007-01-30 17:57:21.000000000 +0100 @@ -6,15 +6,13 @@ EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) @@ -37,36 +60,11 @@ 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@ +diff -urp ../xine-lib-1.1.4.orig/src/libw32dll/wine/Makefile.in ./src/libw32dll/wine/Makefile.in +--- ../xine-lib-1.1.4.orig/src/libw32dll/wine/Makefile.in 2007-01-28 23:57:46.000000000 +0100 ++++ ./src/libw32dll/wine/Makefile.in 2007-01-30 17:57:21.000000000 +0100 +@@ -125,11 +125,7 @@ CC = @CC@ + CCAS = @CCAS@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ - @@ -78,8 +76,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ -@@ -528,10 +532,14 @@ w32_path = @w32_path@ - XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +@@ -521,10 +517,14 @@ XINE_LIB = $(top_builddir)/src/xine-engi + xineplugdir = $(XINE_PLUGINDIR) EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) + ++++++ xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff ++++++ --- /var/tmp/diff_new_pack.IE4905/_old 2007-02-02 15:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.IE4905/_new 2007-02-02 15:58:24.000000000 +0100 @@ -1,7 +1,7 @@ -diff -urp ../xine-lib-1.1.2.orig/src/xine-engine/load_plugins.c ./src/xine-engine/load_plugins.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/load_plugins.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/load_plugins.c 2006-07-12 19:14:06.000000000 +0200 -@@ -2309,9 +2309,19 @@ char *xine_get_file_extensions (xine_t * +diff -urp ../xine-lib-1.1.4.orig/src/xine-engine/load_plugins.c ./src/xine-engine/load_plugins.c +--- ../xine-lib-1.1.4.orig/src/xine-engine/load_plugins.c 2007-01-19 00:30:18.000000000 +0100 ++++ ./src/xine-engine/load_plugins.c 2007-01-30 19:04:56.000000000 +0100 +@@ -2366,9 +2366,19 @@ char *xine_get_file_extensions (xine_t * plugin_node_t *node; char *str; int list_id, list_size; @@ -21,23 +21,23 @@ /* calc length of output */ len = 0; -@@ -2325,7 +2335,8 @@ char *xine_get_file_extensions (xine_t * +@@ -2382,7 +2392,8 @@ char *xine_get_file_extensions (xine_t * cls = (demux_class_t *)node->plugin_class; -- if((exts = cls->get_extensions(cls)) && strlen(exts)) -+ if((exts = cls->get_extensions(cls)) && strlen(exts) && -+ (havempgdecoder || !strstr (exts, "mp3"))) +- if((exts = cls->get_extensions(cls)) && *exts) ++ if((exts = cls->get_extensions(cls)) && *exts && ++ (havempgdecoder || !strstr (exts, "mp3"))) len += strlen(exts) + 1; } } -@@ -2345,7 +2356,8 @@ char *xine_get_file_extensions (xine_t * +@@ -2402,7 +2413,8 @@ char *xine_get_file_extensions (xine_t * cls = (demux_class_t *)node->plugin_class; -- if((e = cls->get_extensions (cls)) && strlen(e)) { -+ if((e = cls->get_extensions (cls)) && strlen(e) && -+ (havempgdecoder || !strstr (e, "mp3"))) { +- if((e = cls->get_extensions (cls)) && *e) { ++ if((e = cls->get_extensions (cls)) && *e && ++ (havempgdecoder || !strstr (e, "mp3"))) { l = strlen(e); memcpy (&str[pos], e, l); ++++++ xine-lib-doc-fix-X11R6.diff ++++++ --- /var/tmp/diff_new_pack.IE4905/_old 2007-02-02 15:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.IE4905/_new 2007-02-02 15:58:24.000000000 +0100 @@ -30,23 +30,3 @@ </para> <para> Alternatively you need to have libtool 1.4 or newer installed, then -diff -urp ../xine-lib-1.1.2-orig/doc/faq/faq.txt ./doc/faq/faq.txt ---- ../xine-lib-1.1.2-orig/doc/faq/faq.txt 2006-08-11 16:22:08.000000000 +0200 -+++ ./doc/faq/faq.txt 2006-08-11 16:25:14.000000000 +0200 -@@ -413,12 +413,12 @@ mailing list, make sure you include thes - The Xv video-out plugin fails to compile! - - If you want to have Xv support compiled in, make sure you either have a shared --Xv library on your system, e.g. ls /usr/X11R6/lib/libXv* should give you some -+Xv library on your system, e.g. ls /usr/lib/libXv* should give you some - .so libs, like this: - -- /usr/X11R6/lib/libXv.a -- /usr/X11R6/lib/libXv.so -- /usr/X11R6/lib/libXv.so.1 -+ /usr/lib/libXv.a -+ /usr/lib/libXv.so -+ /usr/lib/libXv.so.1 - - Alternatively you need to have libtool 1.4 or newer installed, then libXv.a is - sufficient. Otherwise you can create the shared versions yourself: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org