--- xine-lib-1.1.11.1.orig/Makefile.in +++ xine-lib-1.1.11.1/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -552,8 +552,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -578,8 +578,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -589,12 +589,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -664,10 +665,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -694,8 +691,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -851,8 +846,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-libtool distclean-tags \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-libtool distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-data-hook install-dist_docDATA \ --- xine-lib-1.1.11.1.orig/include/Makefile.in +++ xine-lib-1.1.11.1/include/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -453,8 +453,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -466,8 +466,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -477,12 +477,13 @@ CTAGS: $(HEADERS) $(SOURCES) configure.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) configure.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/configure +++ xine-lib-1.1.11.1/configure @@ -53439,22 +53439,21 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. -_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $ac_file | $ac_file:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| . 2>/dev/null || +echo X$ac_file | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -53491,7 +53490,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ --- xine-lib-1.1.11.1.orig/m4/Makefile.in +++ xine-lib-1.1.11.1/m4/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/debian/libxine1-doc.manpages +++ xine-lib-1.1.11.1/debian/libxine1-doc.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man5/xine.5 --- xine-lib-1.1.11.1.orig/debian/copyright +++ xine-lib-1.1.11.1/debian/copyright @@ -0,0 +1,26 @@ +This package is maintained by Siggi Langauf . + +Current versions can be downloaded from http://xine.sf.net + +Upstream Authors: Günter Bartsch and lots of others (see AUTHORS file) + + +Copyright (C) 2000,2001 the xine project + +xine is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +xine is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the full text of the GPL can be found in +/usr/share/common-licenses/GPL + --- xine-lib-1.1.11.1.orig/debian/rules +++ xine-lib-1.1.11.1/debian/rules @@ -0,0 +1,224 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +# adapted for xine-lib 2001 by Siggi Langauf +# rewritten for new package structure December 2006 by Reinhard Tartler + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +BINARY_ANY_PACKAGES=$(shell dh_listpackages -a) +BINARY_ALL_PACKAGES=$(shell dh_listpackages -i) + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + $(error cross compiling is not supported by xine) +endif + +# predefine as empty +DEB_BUILD_CONFIG_OPTIONS := +CFLAGS += -g + +# add if we don't want optimisations +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + DEB_BUILD_CONFIG_OPTIONS += --disable-optimizations +endif + +ifneq (,$(findstring mips,$(DEB_HOST_GNU_TYPE))) + DEB_BUILD_CONFIG_OPTIONS += PTHREAD_LIBS="-lpthread" +endif + +# taken from the qemu package +# Support multiple makes at once +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else +NJOBS := 1 +endif + +# set configure flags here +CONFIGURE_FLAGS := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --with-external-libmad \ + --with-external-a52dec \ + --with-external-libdts \ + --with-external-ffmpeg \ + --with-external-libmpcdec \ + --enable-ipv6 \ + --without-jack \ + --with-pulseaudio \ + --with-libflac \ + --with-wavpack \ + --with-freetype \ + --disable-vidix \ + --enable-directfb \ + $(DEB_BUILD_CONFIG_OPTIONS) \ + $(DEB_EXTRA_CONFIG_FLAGS) \ + CFLAGS="$(CFLAGS)" + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure $(CONFIGURE_FLAGS) + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + $(MAKE) -j $(NJOBS) + touch build-stamp + +clean: + dh_testdir + dh_testroot + dh_clean build-stamp configure-stamp install-stamp po/*.gmo + dh_clean po/stamp-po binary-*-stamp all-files-stamp + dh_clean generate-arch-files-stamp + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean debian/libxine1-bin.install.i386 + dh_clean debian/libxine1*.install.kfreebsd* + dh_clean config.h config.log + dh_clean a.out # XXX fix the configure script to not create this + +install: build install-stamp +install-stamp: generate-arch-files-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \ + LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib + -(cd debian/tmp && find .) | sort -u | sed -e 's%doc/xine-lib%doc/libxine-dev%' > $@ + +binary-common: build install + @echo working on package $(DH_PACKAGE) + dh_testdir + dh_testroot + dh_install + test ! -f debian/overrides/$(DH_PACKAGE) || \ + install -Dm644 \ + debian/overrides/$(DH_PACKAGE) \ + debian/$(DH_PACKAGE)/usr/share/lintian/overrides/$(DH_PACKAGE) + # mostly, we symlink docs -> libxine1-bin + set -e; case "$(DH_PACKAGE)" in \ + libxine1-bin|libxine-dev$(subst lib,|lib,$(BINARY_ALL_PACKAGES))) \ + dh_installdocs; \ + dh_installchangelogs -k ChangeLog; \ + ;; \ + *) \ + mkdir -p debian/$(DH_PACKAGE)/usr/share/doc; \ + ln -fs libxine1-bin \ + debian/$(DH_PACKAGE)/usr/share/doc/$(DH_PACKAGE); \ + ;; \ + esac + dh_installman + dh_link + dh_strip --dbg-package=libxine1-dbg + dh_compress + dh_fixperms + dh_makeshlibs -V 'libxine1 (>= 1.1.8)' + dh_installdeb + dh_shlibdeps -ldebian/libxine1-bin/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +# special rules for the -dbg package. +binary-libxine1-dbg: build install + @echo working on $@ + dh_testdir -plibxine1-dbg + dh_testroot -plibxine1-dbg + dh_install -plibxine1-dbg + mkdir -p debian/libxine1-dbg/usr/share/doc + ln -fs libxine1-bin debian/libxine1-dbg/usr/share/doc/libxine1-dbg + dh_link -plibxine1-dbg + dh_compress -plibxine1-dbg + dh_fixperms -plibxine1-dbg + dh_installdeb -plibxine1-dbg + dh_shlibdeps -plibxine1-dbg + dh_gencontrol -plibxine1-dbg + dh_md5sums -plibxine1-dbg + dh_builddeb -plibxine1-dbg + +# Build architecture independant packages using the common target +binary-indep: build install + set -e; for i in `dh_listpackages -i`; do \ + $(MAKE) -f debian/rules \ + DH_OPTIONS=-p$$i DH_PACKAGE=$$i binary-common; \ + done +# -(cd debian/libxine-dev && find .) | grep -v DEBIAN > $@-stamp + +# Build architecture dependant packages using the common targets +binary-arch: build install binary-arch-stamp diff-installed-files +binary-arch-stamp: $(addprefix binary-, $(BINARY_ANY_PACKAGES)) + -cat binary-*-stamp | sort -u > $@ + +diff-installed-files: install-stamp binary-arch-stamp + @echo "Comparing installed files from xine-lib Makefiles" \ + "with files installed in packages:" + -diff -u $^ + +generate-arch-files-stamp: \ + debian/libxine1-bin.install.i386 \ + debian/libxine1-bin.install.kfreebsd-i386 \ + debian/libxine1-x.install.kfreebsd-i386 \ + debian/libxine1-x.install.kfreebsd-amd64 \ + debian/libxine1-misc-plugins.install.kfreebsd-i386 \ + debian/libxine1-misc-plugins.install.kfreebsd-amd64 \ + debian/libxine1-console.install.kfreebsd-i386 \ + debian/libxine1-console.install.kfreebsd-amd64 + touch generate-arch-files-stamp + +# i386 specific plugins are also available for kfreebsd-i386 +debian/libxine1-bin.install.i386: \ + debian/libxine1-bin.install \ + debian/libxine1-bin.install.i386.specific + cat $^ >$@ + +debian/libxine1-bin.install.kfreebsd-i386: debian/libxine1-bin.install.i386 + ln -f $^ $@ + +# create install files for Debian GNU/kFreeBSD i386/amd64 by dropping +# everything which is not available on those architectures. +debian/libxine1-x.install.kfreebsd-i386: debian/libxine1-x.install + grep -v -e dxr3 -e syncfb $^ >$@ + +debian/libxine1-misc-plugins.install.kfreebsd-i386: debian/libxine1-misc-plugins.install + grep -v -e dxr3 -e pvr -e v4l -e alsa $^ >$@ + +debian/libxine1-console.install.kfreebsd-i386: debian/libxine1-console.install + grep -v -e out_fb $^ >$@ + +debian/libxine1-%-amd64: debian/libxine1-%-i386 + ln -f $^ $@ + + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* DH_PACKAGE=$* + -(cd debian/$* && find .) | grep -v DEBIAN > $@-stamp + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary-common binary install configure diff-installed-files + + +#run only by hand! +ifneq (,$(wildcard /usr/share/misc/config.guess)) +config.guess: + @echo updateing config.guess + cp -f /usr/share/misc/config.guess config.guess +endif + +ifneq (,$(wildcard /usr/share/misc/config.guess)) +config.sub: /usr/share/misc/config.sub + @echo updateing config.sub and config.guess + cp -f /usr/share/misc/config.sub config.sub +endif + --- xine-lib-1.1.11.1.orig/debian/README.Debian +++ xine-lib-1.1.11.1/debian/README.Debian @@ -0,0 +1,37 @@ +Patching the Debian package +=========================== + +http://hg.debian.org/hg/xine-lib/pkg/xine-lib-$VERSION-deb (replace $VERSION +appropriately) is a Mercurial-format repository which contains the packaging +files and directly-applied patches. + + +The CSS plugin story... +======================= + +xine does support playing unencrypted and encrypted dvd using the library +libdvdread/libdvdcss. Due to legal reasons, it is not possible for debian +nor derivatives to ship a libdvdcss, which would be needed to play encrypted +dvds. + +For more information how to install the necessary plugin, please read +/usr/share/doc/libdvdread3/README.Debian + + +The Default audio plugin story... (#354437, et al) +================================================== + +The default audio plugin, unless set otherwise by the user, is 'auto', and not +e.g. 'arts'. The reasoning behind this is: If artsd is not running, xine-lib +will fall back to the next audio driver (should be esd, which also fails if esd +is not running), so it finally falls back to ALSA (or even OSS). This is the +only way to automatically use an audio driver that will work with every +conceivable setup. (Systems that run a sound daemon usually do so because +otherwise they would only have one sound channel. So in those cases the daemon +should be used, unless explicitly configured otherwise.) + +So, if you are experiencing instant crashes with the error message +'can't create mcop directory', please start xine (xine-ui or gxine) with parameter +"-A auto" + + --- xine-lib-1.1.11.1.orig/debian/libxine1-doc.docs +++ xine-lib-1.1.11.1/debian/libxine1-doc.docs @@ -0,0 +1,9 @@ +AUTHORS +debian/tmp/usr/share/doc/xine-lib/faq/* +debian/tmp/usr/share/doc/xine-lib/README_xxmc.html +debian/tmp/usr/share/doc/xine-lib/README +debian/tmp/usr/share/doc/xine-lib/faq.* +debian/tmp/usr/share/doc/xine-lib/README.syncfb* +debian/tmp/usr/share/doc/xine-lib/README.opengl* +debian/tmp/usr/share/doc/xine-lib/README.dxr3* +debian/tmp/usr/share/doc/xine-lib/README.dvb* --- xine-lib-1.1.11.1.orig/debian/control +++ xine-lib-1.1.11.1/debian/control @@ -0,0 +1,211 @@ +Source: xine-lib +Section: libs +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Reinhard Tartler +Uploaders: Darren Salt +Build-Depends: debhelper (>= 5.0.1), pkg-config, + libavcodec-dev (>= 0.cvs20070307-3), + libavformat-dev (>= 0.cvs20070307-3), + libpostproc-dev (>= 0.cvs20070307-3), + libxcb-xv0-dev, libxcb-shm0-dev, libxcb-shape0-dev, + libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, + libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libaa1-dev, libcaca-dev, libmodplug-dev, libpulse-dev, + libmagick9-dev | libmagick-dev, libpng12-dev, libfreetype6-dev, + libogg-dev, libvorbis-dev, libtheora-dev, + libesd0-dev, libgnomevfs2-dev, + liblircclient-dev, + libdirectfb-dev, libgtk2.0-dev, + libflac-dev, libsdl1.2-dev, libwavpack-dev, + libsmbclient-dev, libspeex-dev, libmng-dev, + libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), + zlib1g-dev, w3m, transfig, sgmltools-lite, gs-gpl | gs +XS-Vcs-hg: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb +XS-Vcs-Browser: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb +XS-DM-Upload-Allowed: yes +Homepage: http://xinehq.de/ +Standards-Version: 3.7.3 + +Package: libxine1-doc +Architecture: all +Section: doc +Replaces: libxine1 (<< 1.1.7-1) +Provides: libxine-doc +Conflicts: libxine2-doc, libxine1 (<< 1.1.7-1) +Description: the xine video player library, documentation files + This contains documentation for the xine library (libxine). It consists + of various textfiles and the xine(5) manpage. + . + Libxine provides the complete infrastructure for a video/media player. It + supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you + can use it to play DVDs, (S)VCDs and most video files out there. It + supports network streams, subtitles and even MP3 or Ogg files. It's + extensible to your heart's content via plugins for audio and video output, + input media, demuxers (stream types), audio/video and subtitle codecs. + +Package: libxine1 +Architecture: any +Depends: libxine1-plugins (= ${source:Version}) | libxine1-misc-plugins (= ${binary:Version}), + libxine1-x (= ${binary:Version}), libxine1-console (= ${binary:Version}) +Recommends: libxine1-ffmpeg +Suggests: gxine | xine-ui, libxine1-doc | libxine-doc +Description: the xine video/media player library, meta-package + This is the xine media player library (libxine). + . + Libxine provides the complete infrastructure for a video/media player. It + supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you + can use it to play DVDs, (S)VCDs and most video files out there. It + supports network streams, subtitles and even MP3 or Ogg files. It's + extensible to your heart's content via plugins for audio and video output, + input media, demuxers (stream types), audio/video and subtitle codecs. + . + While this package does not provide a GUI, building a user-interface + frontend around this should be quite easy. The xine-ui and gxine + packages each provide one for your convenience. + +Package: libxine1-bin +Architecture: any +Depends: ${shlibs:Depends} +Recommends: ${shlibs:Recommends} +Suggests: ${shlibs:Suggests} +Conflicts: libxine1 (<< 1.1.8-4) +Replaces: libxine1 (<< 1.1.8-4), libxine-main1 (<< 1.1.2+repacked1-0ubuntu1) +Description: the xine video/media player library, binary files + This package contains the core library of the xine video/media player + engine. + +Package: libxine-dev +Architecture: any +Section: libdevel +Conflicts: libxine2-dev +Replaces: libxine2-dev +Depends: libxine1-bin (>= ${source:Version}), libc6-dev, zlib1g-dev, + libslang2-dev, libfreetype6-dev, pkg-config +Description: the xine video player library, development packages + This contains development files (headers, documentation and the like) + and additional documentation for developers for the xine library + (libxine). + . + Libxine provides the complete infrastructure for a video/media player. It + supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you + can use it to play DVDs, (S)VCDs and most video files out there. It + supports network streams, subtitles and even MP3 or Ogg files. It's + extensible to your heart's content via plugins for audio and video output, + input media, demuxers (stream types), audio/video and subtitle codecs. + +Package: libxine1-ffmpeg +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libxine-extracodecs (<< 1.1.3-1) +Conflicts: libxine-extracodecs (<< 1.1.3-1) +Description: MPEG-related plugins for libxine1 + This package contains plugins for the xine video/media player engine, + which are necessary to decode MPEG-based codecs. Among them, this package + includes the the ffmpeg input plugin for xine, which enables xine-based + players a large variety of modern audio and video codecs. + . + You most probably want to install this package. It is required if you want + to watch DVDs or digital TV using any xine-based player. + +Package: libxine1-gnome +Architecture: any +Depends: ${shlibs:Depends} +Description: GNOME-related plugins for libxine1 + This package contains plugins for the xine video/media player engine, + which are commonly used in the GNOME desktop environment. In detail + this package contains the ESD output plugin and the GnomeVFS Plugin. + . + If you are running GNOME, you most probably want to install this package. + +Package: libxine1-console +Architecture: any +Priority: extra +Depends: ${shlibs:Depends} +Replaces: libxine1 (<< 1.1.8-2) +Conflicts: libxine1 (<< 1.1.8-2) +Description: libaa/libcaca/framebuffer/directfb related plugins for libxine1 + This package contains plugins for the xine video/media player engine, + which are commonly used on the command line. In detail, this package + contains the framebuffer (fb), directfb, libaa and libcaca output plugins. + . + If you want to view your videos in an xterm, you want to install this + package. + +Package: libxine1-x +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libxine1 (<< 1.1.8-2) +Conflicts: libxine1 (<< 1.1.8-2) +Description: X desktop video output plugins for libxine1 + This package contains plugins for the xine video/media player engine + which are used for video display on the X desktop. + . + You most probably want to install this package if you are using a + graphical frontend like gxine, kaffeine or xine-ui. It contains xine output + plugins necessary for drawing on X11 Displays. + +Package: libxine1-misc-plugins +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libxine1 (<< 1.1.8-2) +Conflicts: libxine1 (<< 1.1.8-2) +Description: Input, audio output and post plugins for libxine1 + This package contains plugins for the xine video/media player engine + which are used for input, audio output and post-processing. + . + You most probably want to install this package. It contains various + plugins you generally would expect to find on a xine installation. + +Package: libxine1-dbg +Architecture: any +Priority: extra +Recommends: libxine1-ffmpeg, libxine1-gnome, libxine1-console +Depends: libxine1-bin (= ${binary:Version}) +Description: debug symbols for libxine1 + This is the xine media player library (libxine). + . + This package contains debug data for the shared libraries. Its purpose is + to allow debuggers to produce backtraces with names, making it easier to + interpret core dumps. The data is installed in /usr/lib/debug. + . + Most people will not need this package. Please install it to produce useful + stacktraces to help debugging the xine library. + +Package: libxine1-plugins +Architecture: all +Priority: extra +Depends: libxine1-ffmpeg (>= ${source:Version}), libxine1-misc-plugins (>= ${source:Version}) +Suggests: libxine1-gnome (>= ${source:Version}) +Description: the xine video/media player library, meta package + This is the xine media player library (libxine). + . + Libxine provides the complete infrastructure for a video/media player. It + supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you + can use it to play DVDs, (S)VCDs and most video files out there. It + supports network streams, subtitles and even MP3 or Ogg files. It's + extensible to your heart's content via plugins for audio and video output, + input media, demuxers (stream types), audio/video and subtitle codecs. + . + This empty package is just for your convenience and depends on + commonly-used xine plugin packages. + +Package: libxine1-all-plugins +Architecture: all +Priority: extra +Depends: libxine1-ffmpeg (>= ${source:Version}), libxine1-misc-plugins (>= ${source:Version}), + libxine1-gnome (>= ${source:Version}), libxine1-x (>= ${source:Version}), + libxine1-console (>= ${source:Version}), +Description: the xine video/media player library, meta package + This is the xine media player library (libxine). + . + Libxine provides the complete infrastructure for a video/media player. It + supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you + can use it to play DVDs, (S)VCDs and most video files out there. It + supports network streams, subtitles and even MP3 or Ogg files. It's + extensible to your heart's content via plugins for audio and video output, + input media, demuxers (stream types), audio/video and subtitle codecs. + . + This empty package is just for your convenience and depends on all + available xine plugin packages. --- xine-lib-1.1.11.1.orig/debian/libxine1-dbg.postinst +++ xine-lib-1.1.11.1/debian/libxine1-dbg.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +DOCDIR=/usr/share/doc/libxine1-dbg +if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" && ln -s libxine1-bin "$DOCDIR" +fi + +##DEBHELPER## --- xine-lib-1.1.11.1.orig/debian/libxine1-ffmpeg.install +++ xine-lib-1.1.11.1/debian/libxine1-ffmpeg.install @@ -0,0 +1,14 @@ +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_ff.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_faad.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_mad.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_mpeg2.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_a52.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_dts.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_mpeg.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_mpeg_block.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_mpeg_elem.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_mpeg_pes.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_mpeg_ts.so + +# postprocess plugins +debian/tmp/usr/lib/xine/plugins/*/post/xineplug_post_planar.so --- xine-lib-1.1.11.1.orig/debian/libxine1-misc-plugins.postinst +++ xine-lib-1.1.11.1/debian/libxine1-misc-plugins.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +DOCDIR=/usr/share/doc/libxine1-misc-plugins +if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" && ln -s libxine1-bin "$DOCDIR" +fi + +##DEBHELPER## --- xine-lib-1.1.11.1.orig/debian/libxine1-console.install +++ xine-lib-1.1.11.1/debian/libxine1-console.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_aa.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_caca.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_directfb.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_fb.so --- xine-lib-1.1.11.1.orig/debian/libxine1-bin.docs +++ xine-lib-1.1.11.1/debian/libxine1-bin.docs @@ -0,0 +1 @@ +AUTHORS --- xine-lib-1.1.11.1.orig/debian/libxine1-ffmpeg.postinst +++ xine-lib-1.1.11.1/debian/libxine1-ffmpeg.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +DOCDIR=/usr/share/doc/libxine1-ffmpeg +if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" && ln -s libxine1-bin "$DOCDIR" +fi + +##DEBHELPER## --- xine-lib-1.1.11.1.orig/debian/libxine1-bin.install +++ xine-lib-1.1.11.1/debian/libxine1-bin.install @@ -0,0 +1,6 @@ +## Generic Files to install for ALL architectures +# + +debian/tmp/usr/lib/libxine.so.* +debian/tmp/usr/share/locale/* +debian/tmp/usr/share/xine/libxine1/fonts/* --- xine-lib-1.1.11.1.orig/debian/libxine-dev.install +++ xine-lib-1.1.11.1/debian/libxine-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin/xine-config +debian/tmp/usr/include +debian/tmp/usr/lib/libxine*.so +debian/tmp/usr/lib/pkgconfig/libxine.pc +debian/tmp/usr/share/aclocal/xine.m4 --- xine-lib-1.1.11.1.orig/debian/compat +++ xine-lib-1.1.11.1/debian/compat @@ -0,0 +1 @@ +5 --- xine-lib-1.1.11.1.orig/debian/shlibs.local.libxine1-bin +++ xine-lib-1.1.11.1/debian/shlibs.local.libxine1-bin @@ -0,0 +1 @@ +libxine 1 --- xine-lib-1.1.11.1.orig/debian/overrides/libxine1-bin +++ xine-lib-1.1.11.1/debian/overrides/libxine1-bin @@ -0,0 +1,6 @@ +# We need to have packages depend on libxine1 rather than libxine1-bin +# so that plugins are automatically pulled in. +# (Merging libxine1 & libxine1-bin -> libxine1 causes a circular dependency.) + +libxine1-bin: shlibs-declares-dependency-on-other-package libxine1 (>= 1.1.8) +libxine1-bin: package-name-doesnt-match-sonames libxine1 --- xine-lib-1.1.11.1.orig/debian/libxine1-x.postinst +++ xine-lib-1.1.11.1/debian/libxine1-x.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +DOCDIR=/usr/share/doc/libxine1-x +if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" && ln -s libxine1-bin "$DOCDIR" +fi + +##DEBHELPER## --- xine-lib-1.1.11.1.orig/debian/libxine-dev.docs +++ xine-lib-1.1.11.1/debian/libxine-dev.docs @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/xine-lib/hackersguide --- xine-lib-1.1.11.1.orig/debian/libxine1.postinst +++ xine-lib-1.1.11.1/debian/libxine1.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +DOCDIR=/usr/share/doc/libxine1 +if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" && ln -s libxine1-bin "$DOCDIR" +fi + +##DEBHELPER## --- xine-lib-1.1.11.1.orig/debian/watch +++ xine-lib-1.1.11.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/xine/xine-lib-(.+)\.tar\.gz --- xine-lib-1.1.11.1.orig/debian/libxine1-misc-plugins.install +++ xine-lib-1.1.11.1/debian/libxine1-misc-plugins.install @@ -0,0 +1,84 @@ +# input plugins +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_cdda.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_dvb.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_dvd.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_file.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_http.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_mms.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_net.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_pnm.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_pvr.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_rtp.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_rtsp.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_smb.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_stdin_fifo.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_v4l.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_vcd.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_vcdo.so + +# audio output plugins +debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_alsa.so +#debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_jack.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_file.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_none.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_oss.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_pulseaudio.so + +# video output plugins which don't fit in elsewhere +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_none.so + +# decoder plugins +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_bitplane.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_dvaudio.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_dxr3_spu.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_dxr3_video.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_gsm610.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_image.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_lpcm.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_mpc.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_nsf.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_real.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_rgb.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_speex.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_spu.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_spucc.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_spucmml.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_spudvb.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_sputext.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_theora.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_vorbis.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_yuv.so + +# demuxer plugins +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_asf.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_audio.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_avi.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_fli.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_flv.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_games.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_iff.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_image.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_matroska.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_mng.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_nsv.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_ogg.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_pva.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_qt.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_rawdv.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_real.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_slave.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_sputext.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_yuv4mpeg2.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_dmx_yuv_frames.so + +# decoder/demuxer (combined) plugins +debian/tmp/usr/lib/xine/plugins/*/xineplug_flac.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_wavpack.so + +# postprocess plugins +debian/tmp/usr/lib/xine/plugins/*/post/xineplug_post_mosaico.so +debian/tmp/usr/lib/xine/plugins/*/post/xineplug_post_audio_filters.so +debian/tmp/usr/lib/xine/plugins/*/post/xineplug_post_visualizations.so +debian/tmp/usr/lib/xine/plugins/*/post/xineplug_post_goom.so +debian/tmp/usr/lib/xine/plugins/*/post/xineplug_post_switch.so +debian/tmp/usr/lib/xine/plugins/*/post/xineplug_post_tvtime.so --- xine-lib-1.1.11.1.orig/debian/shlibs.local +++ xine-lib-1.1.11.1/debian/shlibs.local @@ -0,0 +1 @@ +libxine 1 libxine1-bin (= ${binary:Version}) --- xine-lib-1.1.11.1.orig/debian/libxine-dev.manpages +++ xine-lib-1.1.11.1/debian/libxine-dev.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/xine-config.1 --- xine-lib-1.1.11.1.orig/debian/libxine1-gnome.install +++ xine-lib-1.1.11.1/debian/libxine1-gnome.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_esd.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_gnome_vfs.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_gdk_pixbuf.so --- xine-lib-1.1.11.1.orig/debian/libxine1-bin.install.i386.specific +++ xine-lib-1.1.11.1/debian/libxine1-bin.install.i386.specific @@ -0,0 +1,8 @@ +## Files, which only get installed on i386 +# +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_qt.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_decode_w32dll.so + +### disable vidix for now - uncomment here and activate in debian/rules! +# debian/tmp/usr/lib/xine/plugins/*/vidix/*.so +# debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_vidix.so --- xine-lib-1.1.11.1.orig/debian/changelog +++ xine-lib-1.1.11.1/debian/changelog @@ -0,0 +1,1536 @@ +xine-lib (1.1.11.1-1ubuntu3) hardy; urgency=low + + [ Darren Salt ] + * Fixes from upstream hg: + - Matroska demuxer regression. (Closes: #474316) + - PulseAudio plugin backported & re-enabled. + This takes precedence over ALSA, but falls back cleanly. + + [ Reinhard Tartler ] + * Cherrypick the above changes to the ubuntu package (LP: #176332, #131914) + + -- Reinhard Tartler Sat, 12 Apr 2008 23:13:24 +0200 + +xine-lib (1.1.11.1-1ubuntu2) hardy; urgency=low + + [ Darren Salt ] + * Fixes from upstream hg: + - Quicktime demuxer regression. (Closes: #473499, #473631) + - Wavpack MIME type information. + + [ Reinhard Tartler ] + - merge changes from debian packaging hg to fetch fix for + LP: #210510 + + -- Reinhard Tartler Wed, 02 Apr 2008 11:07:04 +0200 + +xine-lib (1.1.11.1-1ubuntu1) hardy; urgency=low + + * New upstream Version, merge from debian/unstable. + - Freeze exception Granted in LP: #204557 + - Inclused Security fixes: LP: #195700 + * Remaining Changes: + - add Replaces: libxine-main1 (<< 1.1.2+repacked1-0ubuntu1) + in libxine1-bin to make dapper->hardy upgrades work (LP #203605) + - Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Reinhard Tartler Tue, 01 Apr 2008 09:33:39 +0200 + +xine-lib (1.1.11.1-1) unstable; urgency=high + + * New upstream release. + - CVE-2008-1482: integer overflows in FLV, Qt, Real, WC3Movie, Matroska + and FILM demuxers, allowing remote attackers to trigger heap overflows + and possibly execute arbitrary code. (Closes: #472639) + + -- Darren Salt Sun, 30 Mar 2008 15:15:04 +0100 + +xine-lib (1.1.11-1) unstable; urgency=high + + * New upstream release. + - CVE-2008-0073: Array index vulnerability which may allow remote + attackers to execute arbitrary code via a crafted SDP parameter in an + RTSP stream. + - DVD reader code no longer uses UDF-provided file sizes as + authoritative. (Closes: #463177) + + [Darren Salt] + * Remove the versioning from the libmagick9-dev build-dep. + * Disable the pulseaudio plugin (don't build, don't install) and remove + the build-dep on libpulse-dev for now due to instability: xine-lib has + been observed closing the stream due to audio problems. + (Closes: #471676) + + [ Reinhard Tartler ] + * add support for 'parallel' keyword in DEB_BUILD_OPTIONS + + -- Darren Salt Thu, 20 Mar 2008 22:39:24 +0000 + +xine-lib (1.1.10.1-2ubuntu1) hardy; urgency=low + + * debian/control: + - add Replaces: libxine-main1 (<< 1.1.2+repacked1-0ubuntu1) + in libxine1-bin to make dapper->hardy upgrades work (LP: #203605) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Michael Vogt Tue, 18 Mar 2008 17:22:33 +0100 + +xine-lib (1.1.10.1-2) unstable; urgency=low + + [Darren Salt] + * libxine-dev: backport an m4 version-parsing fix from hg. + * Fixed an off-by-one (introduced in the security fix) which breaks + playback of some FLAC files. (Closes: #466746) + * Versioned build-dep on libmagick9-dev (for libmagick10). (Closes: #466681) + Add libmagick-dev as an alternative, with the same version requirement. + + -- Darren Salt Wed, 20 Feb 2008 23:43:05 +0000 + +xine-lib (1.1.10.1-1) unstable; urgency=high + + * New upstream release. + - CVE-2008-0486: Array index vulnerability which may allow remote + attackers to execute arbitrary code via a crafted FLAC tag, which + triggers a buffer overflow. (Closes: #464696) + - Real codec detection was looking in the wrong places. (Closes: #462964) + + [Darren Salt] + * Add pkg-config dependency to libxine-dev, fixing xine-plugin FTBFS. + (Closes: #464178, #464321) + * Put libxine1-doc back into section doc until somewhere better is created + for it. (Closes: #462710) + * No longer build-conflict with libxine-dev from xine-lib-1.2. This is no + longer needed due to link order changes. + + -- Darren Salt Fri, 08 Feb 2008 17:25:21 +0000 + +xine-lib (1.1.10-1) unstable; urgency=high + + * New upstream release (Closes: #459836)... + * ... fixing some security bugs: + - CVE-2008-0225: Heap-based buffer overflow in rmff_dump_cont function + which allows remote attacker to execute arbitrary code via a crafted + SDP Abstract attribute (Closes: #460551). + This also acks 1.1.8-3+lenny1 (NMU by the security team). + - Related to CVE-2006-1664: Buffer overflow which allows a remote + attacker to execute arbitrary code or crash the client program via a + crafted ASF header. + * ... and fixing some other bugs, including: + - Disappearing audio. (Closes: #461970) + + [ Darren Salt ] + * Build-depend on gs-gpl | gs. Avoids FTBFS where recommended packages + aren't automatically installed. + * Put libxine1-doc in section libdevel. + * Move libxine1-doc | libxine-doc to Suggests: in libxine1. (Closes: #458103) + * Add postinst scripts to ensure that the documentation symlinks are + properly created. (This is really dpkg bugginess.) (Closes: #458865) + * Standards version 3.7.3; no changes needed. + + [ Reinhard Tartler ] + * Actually install xineplug_decode_w32dll.so and xineplug_decode_qt.so + on i386. debian/rules accidentally used $< where it should have been + $^. Thanks to Gert Kulyk for reporting! LP: #182400 + * Fix XS-Hg-VCS headers in debian/control LP: #183886 + + -- Darren Salt Sat, 26 Jan 2008 22:16:28 +0000 + +xine-lib (1.1.9-1) unstable; urgency=low + + * New upstream release. + + [Darren Salt] + * Re-enable the pulseaudio plugin. + + [Reinhard Tartler] + * Remove really unnecessary versioned build depends on binutils. Even + oldstable (sarge) has a newer version available. + * Bug fix: "unable to handle ipv6 MRLs", thanks to Mau (Closes: + #448801). + + -- Darren Salt Thu, 10 Jan 2008 21:57:10 +0000 + +xine-lib (1.1.8-5) unstable; urgency=low + + [Darren Salt] + * Build fix: avoid lots of "make install" invocations (introduced in -4). + * Fix dependency issues with respect to documentation symlinks. + The problem was an incorrect debian/shlibs.local. (Closes: #457328) + * Use a symlink for libxine1-dbg's documentation (this got missed in -4). + * libxine1-bin (-4) should have contained AUTHORS. This is fixed. + + -- Darren Salt Sat, 22 Dec 2007 17:49:54 +0000 + +xine-lib (1.1.8-4) unstable; urgency=low + + [Darren Salt] + * libxine1-dbg was missing some debug symbols. Fixed by building it after + xine-lib's other arch:any packages. + * Introduce a new package, libxine1-bin, which contains the binaries + formerly in libxine1. Dependencies are moved and updated accordingly. + thanks to Bill Allombert. (Closes: #454267) + * Except for libxine1-doc, libxine1-bin and libxine-dev, symlink to + libxine1-bin's documentation. (AUTHORS is now in libxine1-bin.) + * Backported patches from upstream 1.1 branch: + - Fix compilation of DXR3 support with external ffmpeg. + This is currently only needed for compilation against libavcodeccvs-dev + (from debian-multimedia). Untested with actual DXR3 hardware since I + have none. (cset e55bc398cc7c) + - Fix a problem with non-seekable Flash video (cset de8c671a419c) + - Fix "missing" channels.conf with ATSC (cset fd875c4a15bc) + - Fix a possible crash when changing channels (DVB) (cset bf1ec833d87a) + - Don't stop reading Ogg streams early (cset e4c8ac4a6b49) + - Fix a possible crash when a video output is closed (cset 06494c094761) + - Fix a possible crash when video playback is finished (cset 293845e465cc) + + [ Reinhard Tartler ] + * Bug fix: "FTBFS with GCC 4.3: missing #includes", thanks to Martin + Michlmayr and Daniel Schepler (Closes: #455438, #455322). + * Bug fix: "libxine1-plugins: should not depend on libxine1-gnome", + thanks to Hermogenes Hebert Pereira Oliveira. (Closes: #454162). + Instead, a new package is introduced: libxine1-all-plugins, which + additionally depends on the gnome plugin. + * remove the jack plugin. According to upstream it is unfinished and of + poor quality. A rewrite is available in the 1.2 branch. + * adjust dependencies on libxine1-dev and libxine1-dbg + * add XS-DM-Upload-Allowed: yes field to debian/control + * Bug fix: "xine-lib: FTBFS on GNU/kFreeBSD (debian specific part)", + thanks to Petr Salinger (Closes: #449531). Patch applied with some + (minor) modifications. + * Bug fix: "libxine1: FTBFS on GNU/kFreeBSD", thanks to Uwe Hermann + (Closes: #438849). Patch taken from upstream hg repo, cset + 1db8870cd7c9 + * Bug fix: "typo "A various plugins" in package description", + thanks to Philippe Cloutier (Closes: #455067). + + -- Reinhard Tartler Mon, 17 Dec 2007 17:07:48 +0100 + +xine-lib (1.1.8-3+lenny1) testing-security; urgency=high + + * Non-maintainer upload by security team. + * This update addresses the following security issue: + - CVE-2008-0225: Heap-based buffer overflow in rmff_dump_cont function + which allows remote attacker to execute arbitrary code via a crafted + SDP Abstract attribute (Closes: #460551). + + -- Nico Golde Sun, 13 Jan 2008 16:12:48 +0100 + +xine-lib (1.1.8-3) unstable; urgency=low + + [Darren Salt] + * Patches from the 1.1.9 dev tree: + - Silence "lacing: N" messages from the matroska demuxer. + - Extra identifier for MPEG video (in AVIs etc.). + * Tighten the dependencies of libxine1 and libxine1-plugins on libxine1-* + packages. + * Move deps on libxine1-{x,console} from libxine1-plugins to libxine1 to + avoid further problems such as bug 448077. + + [ Reinhard Tartler ] + * remove gs from build-deps + * don't build the pulseaudio plugin. (Closes: #452211, #427991) + + -- Reinhard Tartler Sun, 25 Nov 2007 23:20:54 +0100 + +xine-lib (1.1.8-2) unstable; urgency=low + + [Reinhard Tartler] + * use dh_listpackages instead of hardcoded list for determining the + provided binary packages. + * Bug fix: "Depends->Recommends dependency change breaking other + packages", thanks to Christoph Pfister and Sune Vuorela + (Closes: #439389) + - introduce new package libxine1-misc-plugins, which contains + (nearly) all plugins formerly found in the package libxine1. + - promote all dependencies of libxine1-misc-plugins to Depends. + - Make libxine1 depend on libxine1-plugins | libxine1-misc-plugins. + Apt will prefer the first alternative, which results many + plugins installed by default. Caveat: If one plugin package has + unsatisfiable dependencies, the user will end up with only + libxine1-misc-plugins installed. + - Make libxine1-plugins depend on libxine1-misc-plugins. + - Make libxine1-plugins not depend on libxine1-console. + - NB: From now on, frontends need to explicitly depend on either + libxine1-x or libxine1-console, depending on whether they are + console based (like cacaxine or fbxine) or X11 based (like gxine). + libxine1-plugins will not depend on libxine1-x or libxine1-console. + * Make libxine1-dev Arch:any. Being arch:all makes a lot of trouble + building frontends on architectures that are out of sync. + * Remove alternative depends on libz-dev (not found even in oldstable) + and slang1-dev (not found in stable, only oldstable) from libxine1-dev. + * Add Homepage field to debian/control + + [Darren Salt] + * Add patches from upstream: + - DVD MRL title.chapter fix + * Move libxine1-doc into section "doc". + * Improve package descriptions a bit; in particular, a grammatical + correction for libxine1-console, and an extra sentence describing common + uses of libxine1-ffmpeg. + * New package libxine1-x, which contains the X-based video output plugins. + These were previously in libxine1. + * Move the fb video output plugin into libxine1-console. + + -- Darren Salt Sat, 20 Oct 2007 18:01:27 +0100 + +xine-lib (1.1.8-1) unstable; urgency=low + + * New upstream release. (Closes: #440248) + + [Darren Salt] + * Remove config.log when cleaning the build tree. + + [Reinhard Tartler] + * Bug fix: "libxine1: copyright file references non-existent AUTHORS + file", thanks to Felipe Sateler (Closes: #438677). + + -- Darren Salt Mon, 27 Aug 2007 20:59:37 +0100 + +xine-lib (1.1.7-3) unstable; urgency=low + + * promote dependencies of xineplug_dmx_audio.so from Suggests to + Recommends. This is necesarry for e.g. mp3 files or streams + (Closes: #437906, #437693), thanks to François Valenduc and + Paulo Marcel Coelho Aragão. + + -- Reinhard Tartler Wed, 15 Aug 2007 09:51:53 +0200 + +xine-lib (1.1.7-2) unstable; urgency=low + + [Darren Salt] + * Enable the wavpack plugin. (Closes: #437331) + * Correct the description of libxine-doc. (Closes: #432919, #435590) + * Build-depend on libjack-dev. + * Enable freetype support. (Closes: #416077) + * Add patches from upstream: + - allow using ffmpegvideo w/o direct rendering to play mpeg2 ts; + - handle escaped characters in DVD MRLs; + - fix attempted free of static data, e.g. when using "dvd:/"; + - rename mrl_unescape & export it (needed by the previous fix). + These are csets acc7197f7cca, 2e301bc2cce8, 09e652c8188f & 82bc4a5c2b4c. + + [ Reinhard Tartler ] + * libxine1: demote all dependencies of the plugins to Recommends. + This includes the directfb plugin and therefore Closes: #427982. + * introduce debian/shlibs.local.libxine1 to avoid self-dependency of + libxine1. Fixes a lintian warning. + * some small changes to package descriptions. + * debian/rules: Don't ignore potential failiures in clean when running + $(MAKE) distclean. Check for presence instead (thanks lintian). + + -- Reinhard Tartler Sun, 12 Aug 2007 00:38:45 +0200 + +xine-lib (1.1.7-1) unstable; urgency=low + + * New upstream release. + - Built against new FLAC. (Closes: #426677) + - The arts plugin is no longer built by default. + (Closes: #257368, #354437, #396219) + - RealPlayer codec detection works properly now. (Closes: #416245) + - vcd playback has been fixed upstream (Closes: #364837) + + [Darren Salt] + * Added libxine1-doc. This will be needed once 1.2 is released to avoid + problems with xine(5), and is useful now for development purposes. + * Made libxine-dev conflict with & replace libxine2-dev for similar reasons. + * Since the arts plugin is no longer built: + - removed libxine1-kde and the associated build-dep on libartsc0-dev; + - made libxine-plugins conflict with and replace libxine1-kde. + * Minor package description fixes. + + [Reinhard Tartler] + * move the gdk plugin to the libxine-gnome package + * make watch file using the qa.debian.org sf redirector + * add -lpthread to PTHREAD_LIBS on mipsen + + -- Reinhard Tartler Thu, 07 Jun 2007 16:05:20 +0200 + +xine-lib (1.1.6-2) unstable; urgency=low + + * upload to unstable since we finally have now all needed dependencies + available. + * restore a lot of the lost changelogs from + http://changelog.debian.net/xine-lib + + -- Reinhard Tartler Thu, 31 May 2007 10:47:34 +0200 + +xine-lib (1.1.6-1) experimental; urgency=low + + [ Reinhard Tartler] + * add libxcb-xv0-dev, libxcb-shm0-dev, libxcb-shape0-dev to build + dependencies and enable xcb support + * make libxine1 an arch: all package, no architecture dependent part + inside there. + * make xine-lib binNMU safe + * fetch po/de.po from upstream hg repo, which was updated shortly after + the 1.1.6 release + * Darren added himself as comaintainer + + [ Darren Salt] + * New upstream release. + - Patches dropped, since they all came from upstream. + - More debug compilation failures fixed. (Closes: #339523) + * Patches imported from upstream since 1.1.6 release: + - limit common-case buffer copying optimisation to i386 & amd64 + + -- Reinhard Tartler Thu, 19 Apr 2007 16:47:23 +0200 + +xine-lib (1.1.5-2) experimental; urgency=low + + * add libjack0.100.0-dev to build depends, fixes FTBFS + + -- Reinhard Tartler Thu, 12 Apr 2007 14:40:33 +0200 + +xine-lib (1.1.5-1) experimental; urgency=low + + * new upstream release! + * whitespace-cleanup in debian/control + * Builds again on sparc (Closes: #410538) + * build again against externel ffmpeg found in experimental + * cleanup/clarify the package descriptions, mentioning the included plugins + (Closes: #410426) + * remove xineplug_decode_real_audio.so from debian/libxine1.install; + it has been dropped upstream. + * add libdirectfb-dev to build depends, enabling directfb support + * use external musepack libs + * import manpage fix from upstream + * add XS-Vcs headers pointing to alioth + + [Darren Salt] + * Enabled the gdkpixbuf plugin. + * Split up the DirectFB code, building separate plugins for X11 and + console. (Applied upstream.) + * Added a note about the packaging repository to README.Debian. + + -- Reinhard Tartler Sun, 8 Apr 2007 19:21:08 +0200 + +xine-lib (1.1.4-2) experimental; urgency=low + + * merge changes from ubuntu + * make build deps multiline + + -- Reinhard Tartler Sun, 4 Feb 2007 12:06:25 +0100 + +xine-lib (1.1.4-1ubuntu2) feisty; urgency=low + + * install shlibs.local file to tighten dependency on libxine1 + * add build dependency on libmagick9-dev to build to + dmx_image and decoder_image plugin. Also add them to libxine1.install + * install the xine(5) manpage to package libxine1 + * Bumb shlibs file (forgotten in 1.1.4-1) + + -- Reinhard Tartler Sun, 4 Feb 2007 09:05:58 +0100 + +xine-lib (1.1.4-1ubuntu1) feisty; urgency=low + + * merge new upstream release from debian + + -- Reinhard Tartler Mon, 29 Jan 2007 15:48:31 +0100 + +xine-lib (1.1.4-1) experimental; urgency=low + + * New upstream release! + * Tons of bugfixes, see /usr/share/doc/libxine1/changelog.gz + * Now playes sound in *.flv files (Closes: #396161) + * use internal ffmpeg copy for now, since debian's copy is too old :( + Will reenable building against debian's ffmpeg ASAP. + * add libpulse-dev to build depends, enable pulseaudio support + + -- Reinhard Tartler Sat, 27 Jan 2007 18:26:09 +0100 + +xine-lib (1.1.3-1ubuntu2) feisty; urgency=low + + * debian/control: Add libpulse-dev to build dependencies to enable + PulseAudio output support. + * debian/libxine1.install: Add xineplug_ao_out_pulseaudio.so to + list of installed plugins. + + -- Daniel T Chen Wed, 24 Jan 2007 23:31:42 -0500 + +xine-lib (1.1.3-1ubuntu1) feisty; urgency=low + + * Introduce new package libxine-extracodecs to faciliate upgrades + * merge from 1.1.3 branch for debian/experimental. + * additional patch: fix ftbfs on kFreeBSD + + * ubuntu specific changes: + + - libxine-main1 and libxine1-ffmpeg dummy package for upgrades from + dapper. Keep this package until (and including) the next LTS + release of ubuntu! + + -- Reinhard Tartler Wed, 3 Jan 2007 22:12:20 +0100 + +xine-lib (1.1.3-1) experimental; urgency=low + + * New upstream fixes: "support for xvid files", thanks to + \[ATR\]Dj-Death (Closes: #319805). + * New upstream fixes: "libxine1: Jack output plugin missing", thanks to Tanu + Kaskinen (Closes: #392619). + * plays vorbis files again (Closes: #400274) + * Introduce new packages: libxine1-ffmpeg and libxine1-gnome to tighten + dependencies. + - splitting out libxine1-gnome works around Bug: "libxine1: remote + streams do not work without non-dependency libgnomevfs2-0", thanks to + Michael Marsh (adresses: #309040). + - splitting out libxine-kde works around bugs #257368, #354437 + * Bump to debhelper compat 5 + * disable gdk (fixing ftbfs) and vidix (as being unmaintained) for + now. Please contact me if you are willing and able to test it + extensively + * apply textrel patch from gentoo + * add transfig, gs, sgmltools-lite to build deps to build developer + documentation as well + * apply patch for freebsd support. Thanks to Aurelien Jarno . + (Closes: #325489) + + [Darren Salt] + * Updated the watch file - should work regardless of changes at Souceforge. + + -- Reinhard Tartler Wed, 3 Jan 2007 19:57:43 +0100 + +xine-lib (1.1.3-0ubuntu1) feisty; urgency=low + + * disable jack output plugin because jack is not in main + * merge from unreleased 1.1.3 branch targeted for debian. ubuntu + specific changes: + + - libxine-main1 dummy package for upgrades from dapper. Keep this + package until (and including) the next LTS release of ubuntu! + + -- Reinhard Tartler Tue, 2 Jan 2007 23:05:20 +0100 + +xine-lib (1.1.3-0) UNRELEASED; urgency=low + + * New upstream fixes: "support for xvid files", thanks to + \[ATR\]Dj-Death (Closes: #319805). + * plays vorbis files again (Closes: #400274) + * Introduce new packages: libxine1-ffmpeg and libxine1-gnome to tighten + dependencies. + - splitting out libxine1-gnome works around Bug: "libxine1: remote + streams do not work without non-dependency libgnomevfs2-0", thanks to + Michael Marsh (adresses: #309040). + - splitting out libxine-kde works around bugs #257368, #354437 + * built against internal ffmpeg + * Bump to debhelper compat 5 + * disable gdk (fixing ftbfs) and vidix (as being unmaintained) for + now. Please contact me if you are willing and able to test it + extensively + * apply textrel patch from gentoo + * add transfig, gs, sgmltools-lite to build deps to build developer + documentation as well + * make libxine1 recommend libxine1-ffmpeg so it gets installed by default + * apply patch for freebsd support. Thanks to Aurelien Jarno . + (Closes: #325489) + + [Darren Salt] + * Updated the watch file - should work regardless of changes at Souceforge. + + -- Reinhard Tartler Tue, 2 Jan 2007 22:14:14 +0100 + +xine-lib (1.1.2+repacked1-0ubuntu2) edgy; urgency=low + + * undo backport of this commit because of FTBFS on powerpc, ia64 and sparc: + - [xine-lib @ 2006-07-12 21:08:46 by dsalt] + Tidy up the formatting of tvtime method help texts to allow better wrapping + by the front end. + * add recommends on libxine-extracodecs (recloses Malone #56699) + + -- Reinhard Tartler Fri, 22 Sep 2006 20:10:04 +0200 + +xine-lib (1.1.2+repacked1-0ubuntu1) edgy; urgency=low + + * repacked the orig tarball. We can get rid of most diff by enabling + --enable-external-ffmpeg + * revert the caca related backport from upstream, we will keep the + old libcaca for edgy + * -dbg package is Priority: extra + * remerged with debian. Changes: + - ripped of plugins from the sources (see xine-extracodecs): + + ffmpeg + + faad + + libmad (mp3 plugin) + - fix FTBFS in src/post/deinterlace/plugins/greedy2frame_template.c by + adding src/post/deinterlace/plugins/mangle.h from + src/libffmpeg/libpostproc. + - libxine-main1 dummy package for upgrades from dapper. Keep this + package until (and including) the next LTS release of ubuntu! + - tighten build dependency on binutils according to dh_strip manpage + - insert a copy of libpostproc (from upstream source tarball) at + src/libpostproc. Actually, this is how it was in the previous ubuntu + package. Note that this is only for the planar postprocessing plugin, + which should be moved to the xine-extracodecs package in an later + upload. + - Adjust configure.ac, src/Makefile.am and src/post/planar/Makefile.am + for the new location of libpostproc + + -- Reinhard Tartler Tue, 12 Sep 2006 22:28:12 +0200 + +xine-lib (1.1.2+dfsg-4) unstable; urgency=low + + * Very focused patches from upstream: + * src/input/net_buf_ctrl.c: Fix a div-by-zero crash + * xine-lib/src/input/input_http.c: http parsing fix + * don't disable alignment of stack variables. Patch applied upstream, + got extensive testing in ubuntu, upstream and experimental. Does avoid + a confusing warning in the ffmpeg plugin. + + -- Reinhard Tartler Sun, 18 Mar 2007 00:49:32 +0100 + +xine-lib (1.1.2+dfsg-3) unstable; urgency=high + + * [CVE-2007-1246]: DMO decoder heap allocation overflow. Thanks for the + patch, Kees Cook and A Mennucc! (Closes: #414072) + + -- Reinhard Tartler Fri, 9 Mar 2007 09:37:43 +0100 + +xine-lib (1.1.2+dfsg-2) unstable; urgency=medium + + * Bug fix: "CVE-2006-6172: xine-lib libreal Buffer Overflow + Vulnerabilities", thanks to Stefan Fritsch (Closes: #401740). + + -- Reinhard Tartler Wed, 6 Dec 2006 22:15:11 +0100 + +xine-lib (1.1.2+dfsg-1) unstable; urgency=medium + + * Urgency medium for fixing release critical bug + * replace cetus.ttf with a new one based on FreeSans.ttf. Many thanks go + to Sune Vuorela for creating this! (Closes: #393677) + * apply patch from http://bugzilla.gnome.org/show_bug.cgi?id=344592 to + fix title menu if there is no DVD menu. (Closes: #369319) + * rename to XS-X-Vcs-Bzr field + + -- Reinhard Tartler Thu, 26 Oct 2006 23:16:12 +0200 + +xine-lib (1.1.2-6) unstable; urgency=low + + * change override for -dbg package to extra + * added X-Vcs-Bzr tag to the source package + * revert the following commit from upstream, because it causes FTBFS on + many arches: + - [xine-lib @ 2006-07-12 21:08:46 by dsalt] + Tidy up the formatting of tvtime method help texts to allow better wrapping + by the front end. + + -- Reinhard Tartler Fri, 22 Sep 2006 21:49:56 +0200 + +xine-lib (1.1.2-5) unstable; urgency=low + + * Urgency kept low despite RC bug. (only FTBFS bug, does not affect testing) + * fetched patches from 1.1.3 branch: + - [xine-lib @ 2006-07-12 21:08:46 by dsalt] + Tidy up the formatting of tvtime method help texts to allow better wrapping + by the front end. + - [xine-lib @ 2006-07-21 03:31:42 by dgp85] + Fix building with LOG enabled. + - [xine-lib @ 2006-07-21 04:47:17 by dgp85] + When trying to get the langinfo code, first of all, set the locale, + or you'll always get ANSI/ASCII. + - [xine-lib @ 2006-08-05 13:31:13 by hadess] + use the gdkpixbuf loader to handle JPEG stills in Quicktime movies, as + the ffmpeg MJPEG decoder isn't appropriate + - [xine-lib @ 2006-08-05 13:34:42 by hadess] + avoid crashing when the FLAC file is broken + - [xine-lib @ 2006-08-08 03:15:02 by miguelfreitas] + patch by Chris Brien + 1) Return the stream length correctly. This fixes a FIXME. + 2) Set the width and height metadata. + 3) Reset the demuxer status to DEMUX_OK on seek. + (in src/demuxers/demux_rawdv.c) + - [xine-lib @ 2006-08-08 03:34:15 by miguelfreitas] + video/x-ms-wma -> audio/x-ms-wma + (in src/demuxers/demux_asf.c) + Update API for libcaca 0.99. Patch by cjacker huang. + Update libcaca check to use the pkg-config file shipped with libcaca + 0.99, and change --disable-caca to --without-caca (to conform with + other external libraries). + Remove reference to removed caca.m4 (libcaca 0.99 will use + pkg-config). + Removed m4/caca.m4 (Closes: #386745) + * Dropped Replaces on xine-dvdnav (only in woody) and xine (only in + potato!) + * Dropping Conflicts on sinek and xine-ui (<< 0.9.10) (all only woody) + * cleaning m4/caca.m4, no longer used + * removing doc/faq/faq.html doc/faq/faq.txt doc/hackersguide/hackersguide.html + on clean, missed by build system + * include some targets to build 'orig' tarballs from the current branch. + This mainly for my convinience for bootstrapping cvs versions of xine and + preparing tarballs for the 'main' section of ubuntu, which I carry here in + order to minimize divergence + + -- Reinhard Tartler Thu, 14 Sep 2006 21:27:27 +0200 + +xine-lib (1.1.2-4) unstable; urgency=low + + * build against external liba52 + * Bug fix: "libxine1: Please use the Debian ffmpeg version", thanks to + Josselin Mouette. Please note that the ffmpeg version used has WMV3 + support. Unfortunately, this version of xine cannot use that support + yet. This is 1.1.3 stuff. (Closes: #367095). + * Bug fix: "libxine1: Please support m4b files", thanks to Johannes + Adams. Bugfix by copying src/demuxers/demux_qt.c from CVS + version. (Closes: #384435). + * Build against internal libvcdinfo for now and add libvcdinfo-dev to + build-conflicts. This is a workaround for Bug: #364837, using internal + libvcdinfo makes the segfault go away. + * install a note for reportbug users + * cleanup (actually remove) confusing and unnecessary documentation. + * fetch bug from upstream cvs to fix bug where incorrect aspect ratio was + being passed to post plugins up (src/post/planar/expand.c, rev 1.16) + * add build dependency on sgmltools-lite to build faq + * add build dependencies transfig and gs to correctly build the + hackersguide + * bump shlibs to this revision because of changes in libcaca output plugin + + -- Reinhard Tartler Sun, 27 Aug 2006 21:41:58 +0200 + +xine-lib (1.1.2-3) unstable; urgency=low + + * backport fix for cdda:/ MRL from upstream (Closes: #276728) + * add note from darren to xine(5) as well + * fix totem-xine crashing when started with no argument (closes: #370283) + (patch taken from upstream) + + -- Reinhard Tartler Sat, 12 Aug 2006 00:27:15 +0200 + +xine-lib (1.1.2-2) unstable; urgency=high + + Urgency high because of security related upload + + * readd debian/watch file + * update debian/rules from CVS. more complete handling of noauto flag + to prevent running auto* tools. + * disable AC_C_ALWAYS_INLINE from configure.ac. Should fix FTBFS on a + number of architectures. (Closes: #378043) + * added patch from Darren Salt to fix build with -O0 on at least amd64 + in src/libffmpeg/libavcodec/i386/Makefile.am + * Imported further fixes from upstream CVS: + + src/input/input_dvb.c + + src/xine-utils/xine_mutex.c + * Imported security fix for included copy of libmms from upstream CVS, + (e.g. USN-315-1) + + -- Reinhard Tartler Thu, 13 Jul 2006 21:51:46 +0200 + +xine-lib (1.1.2-1) unstable; urgency=low + + * New upstream release: 1.1.2 + * use internal ffmpeg for upload to unstable, we will reinvestigate again + in experimental later.. + * [sparc] Upstream fixed '--enable-vis'. So if compiling with vis, we are + using -mcpu=v9. This creates binaries, which probably segfault on 'true' + sparc32, but these poor old machines are not going to have much fun with + xine anyway... If there is an increasing demand for non-vis sparc + binaries, please contact me + * updated README.Debian + * use AM_MAINTAINER_MODE in configure.ac again + + [Darren Salt] + * Option to prevent autogen.sh from being run on package build. + Use DEB_BUILD_OPTIONS='noauto'. + + -- Reinhard Tartler Wed, 12 Jul 2006 09:53:38 +0200 + +xine-lib (1.1.1+cvs20060702-1) experimental; urgency=low + + * new CVS snapshot, including fix for FTBFS on arm + * compiling with -mcpu=ultrasparc to avoid FTBFS + * updated cvs snapshot + + -- Reinhard Tartler Fri, 30 Jun 2006 22:35:06 +0200 + +xine-lib (1.1.1+cvs20060624-1) experimental; urgency=low + + * new upstream snapshot, featuring (from upstream ChangeLog) + + Security fixes: + - CVE-2005-4048: possible buffer overflow in libavcodec (crafted PNGs). + - CVE-2006-2802: possible buffer overflow in the HTTP plugin. + - possible buffer overflow via bad indexes in specially-crafted AVI files + + Also look for Xv support in /usr/lib for X.org's new location + + Support for Vorbis-style comments in FLAC files (Closes: #354188) + + Add ATSC support to the DVB plugin (Closes: #287875) + + Fix up health check to find libX11 and libXv shared objects even if + devel packages aren't installed (where appropriate). (Ubuntu 47357) + + Fix install problems in case configure was generated by autoconf >= 2.59c. + (already included in older debian upload) + + Add support for RealPlayer 10 codecs (from SUSE) (Closes: #274180) + * add w3m to build-depends + * New upstream fixes implicit pointer conversion. Thanks David Mosberger for + testing (Closes: #360003) + * cleanups in debian/rules + * use external (debian) ffmpeg + * run autohell on build time (read: on the buildds) + + -- Reinhard Tartler Sat, 24 Jun 2006 13:22:26 +0000 + +xine-lib (1.1.1-3) UNRELEASED; urgency=low + + * (re)introduce libxine1-dbg package. (Closes: #373135) + + -- Reinhard Tartler Wed, 14 Jun 2006 11:27:35 +0200 + +xine-lib (1.1.1-2) unstable; urgency=medium + + [ Reinhard Tartler ] + + * Use external libmad, acknowledging NMU (Closes: #336437) + * enable support for libxvmc1, now that we have xorg in debian + (Closes: #281572) + * Conflict/Replaces obsolete package 'xine' (Closes: #300852) + * Incorporated Darren's changes into a new maintainer upload. + * medium urgency, although security fixes a lot of other functionality + changes + * Some more fixages to inline usage in internal copy of ffmpeg, continuing + the patch from Darren Salt. + * Verified that this upload fixes build on mips, and other build failiures + look pretty similar. Therefore (Closes: #354436) + * Verified that /usr/share/doc/libxine1/faq/faq.{html,txt} is now installed + correctly (Closes: #369658) + * fix gnome-vfs plugin to allow play back of http URLs again. Patch from + upstream CVS, thank you for pointing this out, Sam Morris (Closes: #369974) + + [ Darren Salt ] + + * SECURITY FIXES (closes: #369876): + - Possible buffer overflow in the AVI demuxer, caused by + specially-crafted files or streams; + - Possible buffer overflow in the HTTP header-fetching code. + (CVE-2006-2802) + + * Tidy up the FAQ list and README installation to quieten dh_install. + * Re-update the FSF address in debian/copyright. It got lost in 1.1.1-1. + * Add build-dep alternatives for those of us who do backports to sarge. + * Tidy up the package descriptions a little. + * Bump shlibs to >= 1.1.0 due to new functions. (Closes: #358429, #368247) + * Empty config file no longer prevents the config from being saved. + (Fixed in upstream 1.1.1) (Closes: #320164) + * Pulled in some patches from CVS: + - the above security fixes; + - fix ALSA resume-from-suspend; + - fix incorrect size calculation in interlaced Matroska demuxing; + - various uninitialised variables, some of which should be non-zero; + - HTTP MRLs requiring authentication would only work when using a proxy; + - fix possibly-broken locale handling in the SMB input plugin; + - avoid problems where the ffmpeg audio decoder can't find a codec; + - avoid a couple of compiler warnings (libavutil); + - fix up some typecasting in the win32 codec interface; + - avoid problems with negative sizes (general demuxing); + - some plugin cache reading code should also be used on ia64; + - fix a couple of printf warnings on 64-bit; + - add some locking around playback speed change code; + - incorrect default CPU acceleration setting on powerpc; + - fix crash at startup if VO deinterlacing is enabled, onefield_xv is + selected and the image format is YV12; + - avoid possible segfault with 1x1 PNGs when handled by the ffmpeg plugin; + - wrong names used for libX11 and libXv in the health check code (we now + detect the correct names at build time); + - add a missing -I to src/libffmpeg/libavcodec/sparc/Makefile.am (should + fix an FTBFS on sparc); + - alter configure.ac to avoid FTBFS when configure is regenerated with + autoconf 2.59c or later. + * Add AM_MAINTAINER_MODE. + * Fix usage of inlined functions in libffmpeg before they're defined. This is + not implemented for all architectures in gcc 4.0.x and was causing FTBFS. + * Kill some pointer<->int casting warnings on 64-bit architectures. (Taken + from CVS HEAD) + + -- Reinhard Tartler Mon, 12 Jun 2006 18:16:30 +0200 + +xine-lib (1.1.1-1.1) unstable; urgency=low + + * NMU. + * Use external libmad, which fixes crashes on amd64 on apps loading both + libxine1 and libmad0. (Closes: #336437) + * Pass --with-xv-path=/usr/lib to configure, since otherwise Xv support was + lost when compiling against modular X. + + -- Adeodato Simó Sat, 15 Apr 2006 19:34:33 +0200 + +xine-lib (1.1.1-1) unstable; urgency=low + + * New upstream release! (Closes: #326936, #353150, #332919) + + [ Reinhard Tartler ] + - adding myself to uploaders + - Remove build dependencies on xlibs-dev, as well as alternatives on + xlibs-dev-static. Debian is on its way towards X11R7! + (Closes: #337997, #346488, #345499, #342208, #347162) + - Rechecking the long list of NMUs. Thanks to all submitters! + + [ Darren Salt ] + - Add debian/watch file for uscan. + - Convert debian/copyright to UTF-8. + - Add build-deps on libxv-dev and libvcdinfo-dev. + - Bump standards version to 3.6.2 + - Make "post-Sarge"-tagged changes to debian/rules and strip debian/tmp/ + from debian/*.install. + - Remove *.gmo on clean (Just In Case). (Closes: #338000) + - Do a little preparation for a possible -dbg package. + + * Acknowledge NMUs. + - Backports and gcc 4.0 fixes dropped since they're already in this version. + Closes: #288189, #318838 + - slang transition: Closes: #315986 + - aalib transition: Closes: #320317, #323276 + - flac transition: Closes: #325960 + - fix of dependency generation script debian/shlibdeps.sh: + Closes: #326935, #327203, #328168, #328184, #328265, #328454 + - fix bashism in debian/rules: Closes: #337996 + + -- Reinhard Tartler Sun, 19 Feb 2006 18:34:51 +0100 + +xine-lib (1.0.1-1.6) unstable; urgency=low + + * NMU - Brown paper bag release + * debian/control: + - make libxine-dev depend on the same -dev packages it build-depends on + instead of depending on xlibs-dev (Closes: #347162) + + -- Gustavo Noronha Silva Wed, 11 Jan 2006 17:32:43 -0200 + +xine-lib (1.0.1-1.5) unstable; urgency=high + + * Non-maintainer upload. + * debian/control: + - updated build-depends to no longer depend on the xlibs-dev package, + but on the split up packages it really needs + (Closes: #337997, #347162, #346488, #345499) + * debian/patches/heap-overflow-fix.diff: + - security fix for CVE-2005-4048 (Closes: #342208) + + urgency high because of this fix + * debian/copyright: + - updated FSF's address + + -- Gustavo Noronha Silva Wed, 11 Jan 2006 00:56:18 -0200 + +xine-lib (1.0.1-1.4) unstable; urgency=high + + * Non-maintainer upload for RC-(security-)bugs. + * Apply patch from Ulf Harnhammar fixing a format string vulnerability + in CDDB response parsing (CVE-2005-2967, Closes: #332919, #333682). + * Fix bashism in debian/rules causing a FTBFS (Closes: #337996). + + -- Thijs Kinkhorst Wed, 23 Nov 2005 09:42:39 +0100 + +xine-lib (1.0.1-1.3) unstable; urgency=low + * Non-maintainer upload. + + * Backport patch from 1.0.2 that fixes hard hang-ups when a plugin listed in + ~/.xine/catalog.cache becomes unloadable (closes: #328454). Plugins can + become unloadable if DT_NEEDED libraries get uninstalled, which is + possible because the package lists many of these libraries in the + Recommends or Suggests fields only. With this fix, amarok should not + freeze with the XINE engine anymore (closes: #327203), and totem either + (closes: #328265). + + Patch included in debian/patches/fix-hangs-at-load-time.diff, but since + there's no patch applying code in debian/rules, it's present in the + .diff.gz as well. + + * Fix the script that invokes dpkg-shlibdeps to split dependencies among + Depends, Recommends, and Suggests: it generated empty fields if one of the + expected plugins was not actually available. (Closes: #328184) + + This means that now the package now suggests libgnomevfs2-0 (closes: + #326935) and libflac7 (closes: #328168). Submitters may wish to reopen if + they want a discussion with the maintainer about the need of these being + strong Depends instead of Suggests. + + * xineplug_flac.so now links against libflac7 instead of libflac6, which + closes: #325960 (the FLAC transition bug). + + -- Adeodato Simó Thu, 15 Sep 2005 14:54:50 +0200 + +xine-lib (1.0.1-1.2) unstable; urgency=low + + * NMU. + * The -dev package should depends on libslang2-dev not + slang1-dev(Closes: #323276) + + -- Christian Marillat Tue, 16 Aug 2005 09:13:42 +0200 + +xine-lib (1.0.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Medium-urgency upload for RC bugfixes. + * Multiple fixes for compatibility with gcc 4.0 strictness + (closes: #288189, #318838) + * This rebuild also gets rid of the dependency on libslang1 + (closes: #315986); it only trades it for libslang2 unfortunately, + since libcaca is a static lib. + * Build-Depend on libaa1-dev instead of the removed aalib1-dev + (closes: #320317). + * Build-Depend on libxinerama-dev instead of on xlibs-static-dev, + which no longer provides this lib; it should be rolled back into + xlibs-dev as a dependency eventually, but build-depending on it + directly is sensible anyway. + * Disentangle xine from libraries it doesn't actually use directly, so + that the dependency tree is less brittle and requires fewer rebuilds + in the future (e.g., it currently has a dependency on libstdc++5 + that it shouldn't need at all); this is doubly important since some + plugins aren't mentioned at all in the dependencies, and so can be + left unusable by library changes: + - relibtoolize the package to use the Debian version of libtool, + with support for pruning indirect dependencies from the linker + commandline + - as part of the above, add AM_MAINTAINER_MODE to configure.ac to + avoid any need for autotools build-dependencies + - hard-code -lmodplug, -lartsc, and -lgnomevfs-2, because pkg-config, + artsc-config, etc. spit out lib dependencies that are spurious on + GNU/* systems. + + -- Steve Langasek Wed, 3 Aug 2005 04:21:06 -0700 + +xine-lib (1.0.1-1) unstable; urgency=high + + * new upstream release + * fixes MMST and RTSP vulnerabilities (CAN-2005-1195, closes: #305343) + * presumably fixes Ogg/Vorbis/Theora audio sync (closes: #301901) + * fixes typo in xine-check subsystem (closes: #292341) + * build-depends on libsdl1.2 (closes: #297435) + * allow installing libxine1-dev with slang1-utf8-dev (closes: #304865) + * moved documentation to policy compliant directories (closes: #303463) + * made Vorbis and Theora hard dependancies (workaround closes: #288331) + + -- Siggi Langauf Wed, 27 Apr 2005 12:41:46 +0200 + +xine-lib (1.0-1) unstable; urgency=high + + * new upstream release + * links libXv dynamically (closes: #287186) + * updated build dependancies: + * added libcaca (colored ASCII art) support + * added theora support + * added libsmbclient based SMB input plugin in addition to the gnomevfs one + * added libmodplug based support for various tracker formats + * added MNG support via libmng + * added vulnerability IDs in 1-rc8-1 changelog + + -- Siggi Langauf Sun, 26 Dec 2004 12:20:24 +0100 + +xine-lib (1-rc8-1) unstable; urgency=high + + * new upstream release (closes: #286030) + * fixes PNM and RTSP related security vulnerabilities (closes: #286077) + This has been assigned CAN-2004-1188. + * fixes DVB playback for fullfeatured cards (possibly closes: #281873) + * added patch to fix aiff vulnerability (CAN-2004-1300, closes: #285899) + + -- Siggi Langauf Wed, 22 Dec 2004 11:31:09 +0100 + +xine-lib (1-rc7-1) unstable; urgency=medium + + * New upstream release + * new DVB subsystem (closes: #223541, #223555, #223562) + * makes Win32 DLL loader work with 2.6 kernels (closes: #265455) + * added more explicit dependancy on libpng12-dev, so maybe + "apt-get build-dep xine-lib" will work again... + + -- Siggi Langauf Wed, 10 Nov 2004 09:26:46 +0100 + +xine-lib (1-rc6a-1) unstable; urgency=high + + * new upstream release (closes: #263418) + * fixes buffer overflow with vcd:// MRLs (closes: #265061) + * merged Frank and Steve's NMU patch (closes: 270884) + + -- Siggi Langauf Mon, 27 Sep 2004 00:22:28 +0200 + +xine-lib (1-rc5-1.1) unstable; urgency=high + + * Non-maintainer upload, prepared by Steve Langasek and me + * High-urgency upload for a sarge-targetted RC fix. + * Use --build, not --host, to specify the architecture; otherwise + autoconf thinks we're cross-compiling when we aren't. + * src/libffmpeg/libavcodec/sparc/dsputil_vis.c et al: make this code + conditional on ENABLE_VIS, since that's what that define is for; + fixes FTBFS on sparc when using a 32-bit target (closes: #270884). + * Add patch to fix overflows when handling vcd:// MRLs + (closes: #265061). + + -- Frank Lichtenheld Sun, 26 Sep 2004 02:22:51 +0200 + +xine-lib (1-rc5-1) unstable; urgency=medium + + * New upstream release (closes: #258274) + * fixes MPEG demuxer selection (closes: #249247) + * suppresses warning about skipped frames on fast-fwd (closes: #255125) + * re-processed autogen.sh, so Debian's libtool is used (closes: #251584) + * passing CFLAGS explicitly to make (closes: 251103) + + -- Siggi Langauf Sun, 11 Jul 2004 21:01:43 +0200 + +xine-lib (1-rc4a-1) unstable; urgency=high + + * new upstream version + - fixes display errors with popular (Matrox, ATI) graphics cards + + This version, as 1-rc4 before, contains a security fix for the RTSP + vulnerability (XSA-2004-3, Bug#247353) + + -- Siggi Langauf Thu, 13 May 2004 07:04:14 +0200 + +xine-lib (1-rc4-1) unstable; urgency=low + + * New upstream release + + -- Siggi Langauf Wed, 28 Apr 2004 20:28:02 +0200 + +xine-lib (1-rc3c-1) unstable; urgency=low + + * new upstream version + - includes workaround for XV_HUE bug on NVidia cards (closes: #238433) + * build-depends on libpng-dev for PNG support (closes: #240524) + * build-depends on libfreetype6-dev for TTF support (closes: #242031) + + -- Siggi Langauf Wed, 7 Apr 2004 23:58:08 +0200 + +xine-lib (1-rc3b-1) unstable; urgency=low + + * new upstream release + - lots of bug fixes (see upstream ChangeLog), including: + - allows devfs compatible DSP device names (closes: #193459) + - Michel's segfault patch (closes: #22875) + + -- Siggi Langauf Tue, 16 Mar 2004 22:43:36 +0100 + +xine-lib (1-rc3a-2) unstable; urgency=high + + * updated shlibs: 1-rc3(a) provides new OSD functions (will close: 225618) + * fixed OSS plugin initialization code (closes: 225275) + + -- Siggi Langauf Wed, 31 Dec 2003 15:41:17 +0100 + +xine-lib (1-rc3a-1) unstable; urgency=high + + * new upstream release + * fixes ABI compatibility (closes: 224931) + * audio demuxer group is loaded again (closes: 225158) + + -- Siggi Langauf Sun, 28 Dec 2003 11:56:16 +0100 + +xine-lib (1-rc3-2) unstable; urgency=low + + * merged some updates from upstream CVS: + * define SCSI_BLK_MAJOR macro for kernel 2.6 (closes: 224695) + * fix endianness for arts audio (closes: 190356) + + -- Siggi Langauf Tue, 23 Dec 2003 01:38:29 +0100 + +xine-lib (1-rc3-1) unstable; urgency=low + + * new upstream release + * builds libxine with -fPIC on all architectures (closes: #217140) + + -- Siggi Langauf Mon, 15 Dec 2003 11:49:25 +0100 + +xine-lib (1-rc2-1) unstable; urgency=low + + * new upstream release + * handles "#" and "%" characters in filenames gracefully (closes: #206890) + * includes enhanced VCD input plugin (closes: 130489) + + -- Siggi Langauf Mon, 27 Oct 2003 17:10:28 +0100 + +xine-lib (1-rc1-1) unstable; urgency=high + + * new upstream release + * doesn't link static libXv any more (closes: #210650) + * ALSA driver doesn't block on busy device any more (closes: #211304) + * suggesting libartsc0 (I have a bad feeling about this, closes: #203961) + + -- Siggi Langauf Sun, 5 Oct 2003 11:28:06 +0200 + +xine-lib (1-rc0a-1) unstable; urgency=low + + * new upstream release + * includes missing DXR3 support file (source only) + * keeps xine from aborting on broken MPEG streams + * added speex support + + -- Siggi Langauf Sat, 2 Aug 2003 15:40:13 +0200 + +xine-lib (1-rc0-1) unstable; urgency=low + + * new upstream release + * new versioning scheme should sort correctly (closes: #194063) + * includes liba52 fix (closes: #196327) + * resets decoder priorities if an old config file is found (closes: 193303) + * libxine-dev depends on libfreetype6-dev (closes: #195738) + + -- Siggi Langauf Fri, 1 Aug 2003 08:55:22 +0200 + +xine-lib (1-beta12-1) unstable; urgency=low + + * new upstream version + * ALSA plugin opens audio device in non-blocking mode (closes: #177877) + * (old?) QT DLL decoder fixes (closes: #179136) + + -- Siggi Langauf Mon, 12 May 2003 18:59:34 +0200 + +xine-lib (1-beta11-0) unstable; urgency=low + + * New Upstream release + + -- Siggi Langauf Sun, 27 Apr 2003 14:08:30 +0200 + +xine-lib (1-beta10-2) unstable; urgency=low + + * backported xine-lib configure check from upstream CVS + + -- Siggi Langauf Wed, 16 Apr 2003 12:46:26 +0200 + +xine-lib (1-beta10-1) unstable; urgency=low + + * new upstream release + * updated debhelper dependancy, avoid using --list-missing (closes: #187433) + * changed libxine-dev section to new "libdevel" + + -- Siggi Langauf Mon, 7 Apr 2003 19:31:03 +0200 + +xine-lib (1-beta9-1) unstable; urgency=low + + * New upstream release + * correct demuxer should be used since 1-beta8 (closes: #180011) + + -- Siggi Langauf Sun, 23 Mar 2003 21:15:42 +0100 + +xine-lib (1-beta8-1) unstable; urgency=low + + * Add pmhahn as Uploaders. + * New upstream release. + * Standards-Version 3.5.9: + - debhelper 4 + - Use 'noopt' instead of 'debug' + - Remove overrides for plugin shared libraries. + * Provide non-developer documentation in library package. + * Build with dxr3 support (closes: #117170) + + -- Philipp Matthias Hahn Fri, 14 Mar 2003 10:03:16 +0100 + +xine-lib (1-beta6-1) unstable; urgency=low + + * new upstream release + * updated artsc build dependancy (closes: #182137) + * removed obsolete dh_testversion call + + -- Siggi Langauf Sun, 23 Feb 2003 00:53:19 +0100 + +xine-lib (1-beta4-3) unstable; urgency=low + + * added version on FLAC dependancy (closes: #181399) + * fixed Replaces: xine-dvdnav, so apt should do the transition smoothly + (closes: #175790) + * downgraded GNOME recommendation to suggestion (closes: #179523) + + -- Siggi Langauf Wed, 19 Feb 2003 04:29:21 +0100 + +xine-lib (1-beta4-2) unstable; urgency=low + + * updated dependancies (closes: #179251): + - added gnome-vfs input and FLAC support + - made those dependancies "suggests:" + - made sdl optional as well + + -- Siggi Langauf Sun, 2 Feb 2003 22:09:02 +0100 + +xine-lib (1-beta4-1) unstable; urgency=low + + * new upstream release (fixes compilation on mmx capable ix86 machines) + + -- Siggi Langauf Wed, 29 Jan 2003 19:37:15 +0100 + +xine-lib (1-beta3-1) unstable; urgency=low + + * new upstream release + + -- Siggi Langauf Tue, 28 Jan 2003 21:41:05 +0100 + +xine-lib (1-beta2-4) unstable; urgency=low + + * removed HPPA compiler hacks (3.2 is now default, and it choked anyway...) + * removed DXR3 support (closes: #175392, reopens: #117170) + + -- Siggi Langauf Wed, 8 Jan 2003 21:49:25 +0100 + +xine-lib (1-beta2-3) unstable; urgency=high + + * A backslash got lost in the last upload. + gcc-3.2 should finally be used on HPPA now... + + -- Siggi Langauf Thu, 2 Jan 2003 20:39:51 +0100 + +xine-lib (1-beta2-2) unstable; urgency=low + + working around autobuilder bugs: + - actually using gcc-3.2 on HPPA + - uploading i386 binaries, since the i386 autobuilder dies from #165458 + + -- Siggi Langauf Thu, 2 Jan 2003 12:11:24 +0100 + +xine-lib (1-beta2-1) unstable; urgency=low + + * new upstream release + * on HPPA: working around a compiler bug by explicit build-depend on + gcc-3.2 (closes: #174813) + + -- Siggi Langauf Thu, 2 Jan 2003 00:43:42 +0100 + +xine-lib (1-beta1-1) unstable; urgency=low + + * new upstream release. + This is actually uploaded to unstable again, so let's check bugs: + * doesn't segfault with any of my VCDs (closes: #173424) + * supports WMV8 codecs (binary DLL only) (closes: #163363) + * should build with dxr3 support (closes: #117170) + + -- Siggi Langauf Tue, 24 Dec 2002 18:07:17 +0100 + +xine-lib (1-beta0-1) unstable; urgency=low + + * new upstream release (now labelled beta) + This one fixes the packaging issues, so it's a candidate for unstable. + + -- Siggi Langauf Wed, 11 Dec 2002 13:48:35 +0100 + +xine-lib (1-alpha2-0) experimental; urgency=low + + * yet another upstream alpha. This one is becoming usable, but has some + packaging issues which prevent a parallel installation of libxine0. + + -- Siggi Langauf Tue, 26 Nov 2002 00:34:35 +0100 + +xine-lib (1-alpha1-0) experimental; urgency=low + + * another upstream alpha. This is still not ready for prime time, but it will + build from source if you really want to give it a try... + + -- Siggi Langauf Sat, 9 Nov 2002 23:39:01 +0100 + +xine-lib (1-alpha0-0) unstable; urgency=low + + * new upstream (alpha!) release + (this is not suited for the Debian archives, yet.) + * NOTE: conflicts with libxine0, because of fonts and l18n + + -- Siggi Langauf Sun, 3 Nov 2002 03:00:41 +0100 + +xine-lib (0.9.13-1) unstable; urgency=low + + * new upstream release + - includes ALSA big-endian fix (closes: #154914) + - only shows frame stats if frames have been skipped (closes: #151610) + * removed control information concerning unreleased betas + * conflicts: packages compiled against incompatible libxine0 (closes: #150832) + -- Siggi Langauf Sat, 3 Aug 2002 22:47:56 +0200 + +xine-lib (0.9.12-1) unstable; urgency=low + + * new upstream release + (only small improvements, see upstream ChangeLog) + * moved locale files from libxine-dev to the libxine0 + + -- Siggi Langauf Sun, 23 Jun 2002 11:33:37 +0200 + +xine-lib (0.9.11-1) unstable; urgency=low + + * new upstream release + - pads Xv images, so width % 4 == 0 (closes: #134997) + + -- Siggi Langauf Thu, 20 Jun 2002 00:11:37 +0200 + +xine-lib (0.9.10-2) unstable; urgency=high + + * disabled machine specific optimizations, so autobuilders will + build packages than run on their whole processor family (closes: #148414) + + -- Siggi Langauf Wed, 29 May 2002 10:06:09 +0200 + +xine-lib (0.9.10-1) unstable; urgency=low + + * new upstream release + * uses new logo mechanism (closes: #145483) + * after long fights using sane SONAME (closes: #145668, #148099) + * safer check and bigger buffer in xine_get_homedir() (closes: #133550) + (see upstream ChangeLog for further highlights) + * build-depends on libz-dev (closes: #14562) + * libxine-dev depends on slang1-dev (closes: #140842) + * removed references to (never released, long obsolete) xine packages + + -- Siggi Langauf Sun, 26 May 2002 00:00:14 +0200 + +xine-lib (0.9.9-2) unstable; urgency=low + + * using LIBRARY_PATH to complete circular linking during install + (closes: #145348) + + -- Siggi Langauf Thu, 2 May 2002 05:06:06 +0200 + +xine-lib (0.9.9-1) unstable; urgency=low + + * new upstream release + * downgraded ogg/vorbis dependancies to recommendations (closes: #130492) + * made resetting volume an option, disabled by default (closes: #127485) + + -- Siggi Langauf Mon, 28 Jan 2002 10:54:14 +0100 + +xine-lib (0.9.8-2) unstable; urgency=high + + * including version in shlibs file, so shlibdeps will work + + -- Siggi Langauf Sat, 19 Jan 2002 16:20:32 +0100 + +xine-lib (0.9.8-1) unstable; urgency=high + + * new upstream release + + -- Siggi Langauf Mon, 14 Jan 2002 00:43:52 +0100 + +xine-lib (0.9.7-3) unstable; urgency=high + + * re-added check for HPPA (closes: #123036) + + -- Siggi Langauf Mon, 17 Dec 2001 11:44:24 +0100 + +xine-lib (0.9.7-2) unstable; urgency=low + + * this package is based on a recent CVS snapshot, fixes a few things: + * don't try to DirectShow support on non-i386 platforms + * officially support s390, thanks to Gerhard Tonn (closes: #123805) + * subtitles other than the first one re-enabled + * improved antialiasinf on OSD fonts + + -- Siggi Langauf Sun, 16 Dec 2001 13:00:14 +0100 + +xine-lib (0.9.7-1) unstable; urgency=low + + * new upstream release, introducing upstream feature freeze for 1.0 + * suggesting xine-dvdnav, so people find it more easily + * disabled Xv plugin on hppa (closes: #123036) + + -- Siggi Langauf Wed, 12 Dec 2001 19:32:43 +0100 + +xine-lib (0.9.6-1) unstable; urgency=high + + * new upstream release, fixes some nasty bugs + (the 0.9.5 package was never uploaded, sorry...) + + -- Siggi Langauf Sat, 1 Dec 2001 09:39:48 +0100 + +xine-lib (0.9.5-1) unstable; urgency=high + + * new upstream release + + -- Siggi Langauf Sun, 11 Nov 2001 12:01:00 +0100 + +xine-lib (0.9.4-1) unstable; urgency=medium + + * new upstream release, fixes libtool, so this actually compiles + new features include improved deinterlacing with syncfb and zoom support + + -- Siggi Langauf Sun, 4 Nov 2001 13:07:06 +0100 + +xine-lib (0.9.3-1) unstable; urgency=medium + + * new upstream release + * improved error handling in plugin loader (closes: #116572) + + -- Siggi Langauf Sat, 3 Nov 2001 11:24:03 +0100 + +xine-lib (0.9.2-3) unstable; urgency=high + + * removed build-dependancy on libasound (useful on i386 only) + * allow for architectures building only some of the plugins + * added build-dependancy on ogg and vorbis libraries + + -- Siggi Langauf Sat, 20 Oct 2001 17:58:53 +0200 + +xine-lib (0.9.2-2) unstable; urgency=high + + * added permission workaround for shlibdeps.sh (closes: #115881) + + -- Siggi Langauf Wed, 17 Oct 2001 00:41:51 +0200 + +xine-lib (0.9.2-1) unstable; urgency=high + + * now building alsa09 plugin (instead of alsa05, as you can't have + libasound{1,2}-dev at the same time...) + * build-Dependancy on liblircclient-dev => lirc support on non-i386 + * new upstream release + * deinterlace.c should compile everywhere (closes: #112748) + * including string.h in m4 test (closes: #115271) + * aclocal file is in /usr/share/aclocal (just as 0.9.1) (closes: #115033) + * enables -fPIC on all architectures except i386 (closes: #115006) + * many more fixes/features (see upstream changelog) + + -- Siggi Langauf Mon, 15 Oct 2001 21:14:12 +0200 + +xine-lib (0.9.1-1.1) unstable; urgency=low + + * NMU. + * Added ia64 support to configure.in. + * For performance reasons, the shared libs are not compiled with + -fPIC in the standard distribution, which is incorrect behavior. + As a compromise, I've added a "--disable-fpic" configure option + which will only do this on platforms where this is allowed. + Closes: #115006. + * m4/xine.m4: autoconf test uses strdup w/o including string.h. + Closes: #115271. + * Don't install aclocal files in /usr/local in libxine-dev. + Closes: #115033. + * Fixed typo in src/video_out/deinterlace.c. Closes: #112748. + + -- Jeff Licquia Tue, 9 Oct 2001 09:55:23 -0600 + +xine-lib (0.9.1-1) unstable; urgency=low + + * new upstream release (mostly bugfix release, new deinterlacer) + * re-added ALSA (0.5.x) plugin + * now ships with aRts audio plugin + + -- Siggi Langauf Tue, 18 Sep 2001 11:13:34 +0200 + +xine-lib (0.9.0-2) unstable; urgency=low + + * bugfix release of the package + * added build-depends for zlib1g-dev (closes: #112270) + * using default FPM routines on m68k, as nobody seems able to write native + ones. Performance will be poor and it might not even work, but should + compile... (closes: #112257) + + -- Siggi Langauf Sun, 16 Sep 2001 11:08:46 +0200 + +xine-lib (0.9.0-1) unstable; urgency=low + + * new upstream release features generic menu support, see ChangeLog for more + + -- Siggi Langauf Fri, 14 Sep 2001 11:31:10 +0200 + +xine-lib (0.5.3-1) unstable; urgency=low + + * added build-depends: lobesd0-dev (closes: Bug#111140) + * new upstream release (fixes many race conditions, etc.) + + -- Siggi Langauf Tue, 4 Sep 2001 19:14:01 +0200 + +xine-lib (0.5.2-1) unstable; urgency=low + + * new upstream release features major rewrites of timing and audio output + * added configure support for m68k (libmad still won't compile on m68k!) + + -- Siggi Langauf Sun, 2 Sep 2001 18:04:44 +0200 + +xine-lib (0.5.1-1) unstable; urgency=low + + * new upstream version + (0.5.0-1 never made it into the archive) + + -- Siggi Langauf Mon, 27 Aug 2001 10:04:17 +0200 + +xine-lib (0.5.0-1) unstable; urgency=low + + * Initial Release of the new xine-lib/xine-ui based xine. + + -- Siggi Langauf Sun, 5 Aug 2001 20:26:31 +0200 --- xine-lib-1.1.11.1.orig/debian/libxine1-console.postinst +++ xine-lib-1.1.11.1/debian/libxine1-console.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +DOCDIR=/usr/share/doc/libxine1-console +if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" && ln -s libxine1-bin "$DOCDIR" +fi + +##DEBHELPER## --- xine-lib-1.1.11.1.orig/debian/libxine1-x.install +++ xine-lib-1.1.11.1/debian/libxine1-x.install @@ -0,0 +1,13 @@ +# X-based video output plugins + +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_dxr3.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_opengl.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_sdl.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_syncfb.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_xcbshm.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_xcbxv.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_xdirectfb.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_xshm.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_xv.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_xvmc.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_vo_out_xxmc.so --- xine-lib-1.1.11.1.orig/debian/libxine1-gnome.postinst +++ xine-lib-1.1.11.1/debian/libxine1-gnome.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +DOCDIR=/usr/share/doc/libxine1-gnome +if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" && ln -s libxine1-bin "$DOCDIR" +fi + +##DEBHELPER## --- xine-lib-1.1.11.1.orig/misc/Makefile.in +++ xine-lib-1.1.11.1/misc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -568,8 +568,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -594,8 +594,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -605,12 +605,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/misc/fonts/Makefile.in +++ xine-lib-1.1.11.1/misc/fonts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/win32/Makefile.in +++ xine-lib-1.1.11.1/win32/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -499,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -525,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -536,12 +536,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/win32/include/Makefile.in +++ xine-lib-1.1.11.1/win32/include/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/doc/man/Makefile.in +++ xine-lib-1.1.11.1/doc/man/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -488,8 +488,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -514,8 +514,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -525,12 +525,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/doc/man/en/Makefile.in +++ xine-lib-1.1.11.1/doc/man/en/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/doc/Makefile.in +++ xine-lib-1.1.11.1/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -520,8 +520,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -546,8 +546,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -557,12 +557,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/doc/faq/Makefile.in +++ xine-lib-1.1.11.1/doc/faq/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/doc/hackersguide/Makefile.in +++ xine-lib-1.1.11.1/doc/hackersguide/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/lib/Makefile.in +++ xine-lib-1.1.11.1/lib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ libxineposix_la_DEPENDENCIES = @LTLIBOBJS@ am_libxineposix_la_OBJECTS = libxineposix_la_OBJECTS = $(am_libxineposix_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -513,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,12 +537,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/aclocal.m4 +++ xine-lib-1.1.11.1/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +31,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,10 +47,8 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # Figure out how to run the assembler. -*- Autoconf -*- @@ -347,7 +342,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -395,13 +390,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -506,17 +501,16 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -788,7 +782,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) --- xine-lib-1.1.11.1.orig/src/libw32dll/Makefile.in +++ xine-lib-1.1.11.1/src/libw32dll/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -91,7 +91,7 @@ $(LDFLAGS) -o $@ @HAVE_W32DLL_TRUE@am_xineplug_decode_w32dll_la_rpath = -rpath \ @HAVE_W32DLL_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -492,8 +492,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -501,8 +501,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -629,8 +629,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -655,8 +655,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -666,12 +666,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libw32dll/DirectShow/Makefile.in +++ xine-lib-1.1.11.1/src/libw32dll/DirectShow/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ DS_VideoDecoder.lo libds_filter_la_OBJECTS = $(am_libds_filter_la_OBJECTS) @HAVE_W32DLL_TRUE@am_libds_filter_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -506,8 +506,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -519,8 +519,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -530,12 +530,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libw32dll/qtx/Makefile.in +++ xine-lib-1.1.11.1/src/libw32dll/qtx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -488,8 +488,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -514,8 +514,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -525,12 +525,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libw32dll/qtx/qtxsdk/Makefile.in +++ xine-lib-1.1.11.1/src/libw32dll/qtx/qtxsdk/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -410,8 +410,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -423,8 +423,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -434,12 +434,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libw32dll/wine/Makefile.in +++ xine-lib-1.1.11.1/src/libw32dll/wine/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ registry.lo vfl.lo win32.lo stubs.lo wrapper.lo libwine_la_OBJECTS = $(am_libwine_la_OBJECTS) @HAVE_W32DLL_TRUE@am_libwine_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -587,8 +587,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -600,8 +600,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -611,12 +611,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libw32dll/dmo/Makefile.in +++ xine-lib-1.1.11.1/src/libw32dll/dmo/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ dmo_guids.lo DMO_VideoDecoder.lo libdmo_filter_la_OBJECTS = $(am_libdmo_filter_la_OBJECTS) @HAVE_W32DLL_TRUE@am_libdmo_filter_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -495,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -508,8 +508,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -519,12 +519,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/Makefile.in +++ xine-lib-1.1.11.1/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -516,8 +516,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -542,8 +542,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -553,12 +553,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/xine-engine/Makefile.in +++ xine-lib-1.1.11.1/src/xine-engine/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -79,7 +79,7 @@ libxine_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxine_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -476,8 +476,8 @@ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -485,8 +485,8 @@ @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -583,8 +583,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -596,8 +596,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -607,12 +607,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libmad/Makefile.in +++ xine-lib-1.1.11.1/src/libmad/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -92,7 +92,7 @@ $(xineplug_decode_mad_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_mad_la_LDFLAGS) $(LDFLAGS) -o $@ @MAD_TRUE@am_xineplug_decode_mad_la_rpath = -rpath $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -495,8 +495,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -504,8 +504,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -646,8 +646,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -659,8 +659,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -670,12 +670,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/xine-utils/Makefile.in +++ xine-lib-1.1.11.1/src/xine-utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -70,7 +70,7 @@ xine_mutex.lo xmllexer.lo xine_buffer.lo xmlparser.lo array.lo \ sorted_array.lo pool.lo ring_buffer.lo libxineutils_la_OBJECTS = $(am_libxineutils_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -580,8 +580,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -593,8 +593,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -604,12 +604,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/combined/Makefile.in +++ xine-lib-1.1.11.1/src/combined/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,7 +85,7 @@ $(xineplug_wavpack_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_WAVPACK_TRUE@am_xineplug_wavpack_la_rpath = -rpath \ @HAVE_WAVPACK_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -467,8 +467,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -476,8 +476,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -642,8 +642,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -668,8 +668,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -679,12 +679,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/combined/demux_wavpack.c +++ xine-lib-1.1.11.1/src/combined/demux_wavpack.c @@ -391,7 +391,7 @@ } static const char *get_mimetypes (demux_class_t *const this_gen) { - return "audio/x-wavpack"; + return "audio/x-wavpack: wv,wvp: WavPack audio;"; } static void class_dispose (demux_class_t *const this_gen) { --- xine-lib-1.1.11.1.orig/src/combined/ffmpeg/Makefile.in +++ xine-lib-1.1.11.1/src/combined/ffmpeg/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -499,8 +499,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -508,8 +508,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -612,8 +612,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -625,8 +625,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -636,12 +636,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/vidix/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/vidix/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ am_libvidix_la_OBJECTS = vidixlib.lo libvidix_la_OBJECTS = $(am_libvidix_la_OBJECTS) @HAVE_VIDIX_TRUE@am_libvidix_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -561,8 +561,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -587,8 +587,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -598,12 +598,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/vidix/drivers/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/vidix/drivers/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -150,7 +150,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(unichrome_vid_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_VIDIX_TRUE@am_unichrome_vid_la_rpath = -rpath $(vidixdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -569,8 +569,8 @@ @list='$(vidix_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(vidixLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(vidixdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(vidixLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(vidixdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(vidixLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(vidixdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(vidixLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(vidixdir)/$$f"; \ else :; fi; \ done @@ -578,8 +578,8 @@ @$(NORMAL_UNINSTALL) @list='$(vidix_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(vidixdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(vidixdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(vidixdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(vidixdir)/$$p"; \ done clean-vidixLTLIBRARIES: @@ -681,8 +681,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -694,8 +694,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -705,12 +705,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -380,7 +380,7 @@ $(LDFLAGS) -o $@ @HAVE_X11_TRUE@@HAVE_XXMC_TRUE@am_xineplug_vo_out_xxmc_la_rpath = \ @HAVE_X11_TRUE@@HAVE_XXMC_TRUE@ -rpath $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -934,8 +934,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -943,8 +943,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -1544,8 +1544,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1570,8 +1570,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1581,12 +1581,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/macosx/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/macosx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -77,7 +77,7 @@ $(OBJCFLAGS) $(libxineMacOSXVideo_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_MACOSX_VIDEO_TRUE@am_libxineMacOSXVideo_la_rpath = -rpath \ @HAVE_MACOSX_VIDEO_TRUE@ $(libdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -458,8 +458,8 @@ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -467,8 +467,8 @@ @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -540,8 +540,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -553,8 +553,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -564,12 +564,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/libdha/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/libdha/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -69,7 +69,7 @@ am_test_OBJECTS = test.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) test_DEPENDENCIES = $(top_builddir)/src/video_out/libdha/libdha.la -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -579,8 +579,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -605,8 +605,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -616,12 +616,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/libdha/sysdep/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/libdha/sysdep/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -443,8 +443,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -456,8 +456,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -467,12 +467,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/libdha/bin/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/libdha/bin/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/src/video_out/libdha/kernelhelper/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/libdha/kernelhelper/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,7 +60,7 @@ am_test_OBJECTS = test.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) test_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -466,8 +466,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -479,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -490,12 +490,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/video_out/libdha/oth/Makefile.in +++ xine-lib-1.1.11.1/src/video_out/libdha/oth/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/src/libspucmml/Makefile.in +++ xine-lib-1.1.11.1/src/libspucmml/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -76,7 +76,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_decode_spucmml_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_spucmml_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -440,8 +440,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -449,8 +449,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -511,8 +511,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -524,8 +524,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -535,12 +535,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libsputext/Makefile.in +++ xine-lib-1.1.11.1/src/libsputext/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,7 +86,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_dmx_sputext_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -455,8 +455,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -464,8 +464,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -536,8 +536,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -549,8 +549,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -560,12 +560,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/Makefile.in +++ xine-lib-1.1.11.1/src/post/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -490,8 +490,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -516,8 +516,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -527,12 +527,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/mosaico/Makefile.in +++ xine-lib-1.1.11.1/src/post/mosaico/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,7 +86,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_post_switch_la_CFLAGS) $(CFLAGS) \ $(xineplug_post_switch_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -456,8 +456,8 @@ @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ else :; fi; \ done @@ -465,8 +465,8 @@ @$(NORMAL_UNINSTALL) @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ done clean-xinepostLTLIBRARIES: @@ -537,8 +537,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -550,8 +550,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -561,12 +561,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/visualizations/Makefile.in +++ xine-lib-1.1.11.1/src/post/visualizations/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -81,7 +81,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_post_visualizations_la_CFLAGS) $(CFLAGS) \ $(xineplug_post_visualizations_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -450,8 +450,8 @@ @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ else :; fi; \ done @@ -459,8 +459,8 @@ @$(NORMAL_UNINSTALL) @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ done clean-xinepostLTLIBRARIES: @@ -553,8 +553,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -566,8 +566,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -577,12 +577,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/deinterlace/Makefile.in +++ xine-lib-1.1.11.1/src/post/deinterlace/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -82,7 +82,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_post_tvtime_la_CFLAGS) $(CFLAGS) \ $(xineplug_post_tvtime_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -466,8 +466,8 @@ @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ else :; fi; \ done @@ -475,8 +475,8 @@ @$(NORMAL_UNINSTALL) @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ done clean-xinepostLTLIBRARIES: @@ -639,8 +639,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -665,8 +665,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -676,12 +676,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/deinterlace/plugins/Makefile.in +++ xine-lib-1.1.11.1/src/post/deinterlace/plugins/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -76,7 +76,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libdeinterlaceplugins_la_CFLAGS) $(CFLAGS) \ $(libdeinterlaceplugins_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -610,8 +610,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -623,8 +623,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -634,12 +634,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/planar/Makefile.in +++ xine-lib-1.1.11.1/src/post/planar/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -84,7 +84,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_post_planar_la_CFLAGS) $(CFLAGS) \ $(xineplug_post_planar_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -463,8 +463,8 @@ @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ else :; fi; \ done @@ -472,8 +472,8 @@ @$(NORMAL_UNINSTALL) @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ done clean-xinepostLTLIBRARIES: @@ -614,8 +614,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -627,8 +627,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -638,12 +638,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/goom/Makefile.in +++ xine-lib-1.1.11.1/src/post/goom/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -105,7 +105,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_post_goom_la_CFLAGS) $(CFLAGS) \ $(xineplug_post_goom_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -493,8 +493,8 @@ @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ else :; fi; \ done @@ -502,8 +502,8 @@ @$(NORMAL_UNINSTALL) @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ done clean-xinepostLTLIBRARIES: @@ -756,8 +756,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -769,8 +769,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -780,12 +780,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/post/audio/Makefile.in +++ xine-lib-1.1.11.1/src/post/audio/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -83,7 +83,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_post_audio_filters_la_CFLAGS) $(CFLAGS) \ $(xineplug_post_audio_filters_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -451,8 +451,8 @@ @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xinepostdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xinepostLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xinepostdir)/$$f"; \ else :; fi; \ done @@ -460,8 +460,8 @@ @$(NORMAL_UNINSTALL) @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xinepostdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xinepostdir)/$$p"; \ done clean-xinepostLTLIBRARIES: @@ -570,8 +570,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -583,8 +583,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -594,12 +594,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libreal/Makefile.in +++ xine-lib-1.1.11.1/src/libreal/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -81,7 +81,7 @@ $(xineplug_decode_real_la_LDFLAGS) $(LDFLAGS) -o $@ @ENABLE_REAL_TRUE@am_xineplug_decode_real_la_rpath = -rpath \ @ENABLE_REAL_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -447,8 +447,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -456,8 +456,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -534,8 +534,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -547,8 +547,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -558,12 +558,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libxinevdec/Makefile.in +++ xine-lib-1.1.11.1/src/libxinevdec/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -113,7 +113,7 @@ xineplug_decode_yuv_la_DEPENDENCIES = $(XINE_LIB) am_xineplug_decode_yuv_la_OBJECTS = yuv.lo xineplug_decode_yuv_la_OBJECTS = $(am_xineplug_decode_yuv_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -510,8 +510,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -519,8 +519,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -610,8 +610,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -623,8 +623,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -634,12 +634,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libspucc/Makefile.in +++ xine-lib-1.1.11.1/src/libspucc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -78,7 +78,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_decode_spucc_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_spucc_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -444,8 +444,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -453,8 +453,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -523,8 +523,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -536,8 +536,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -547,12 +547,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libfaad/Makefile.in +++ xine-lib-1.1.11.1/src/libfaad/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -114,7 +114,7 @@ $(xineplug_decode_faad_la_LDFLAGS) $(LDFLAGS) -o $@ @BUILD_FAAD_TRUE@am_xineplug_decode_faad_la_rpath = -rpath \ @BUILD_FAAD_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -582,8 +582,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -591,8 +591,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -1027,8 +1027,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1053,8 +1053,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1064,12 +1064,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libfaad/codebook/Makefile.in +++ xine-lib-1.1.11.1/src/libfaad/codebook/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/src/demuxers/demux_qt.c +++ xine-lib-1.1.11.1/src/demuxers/demux_qt.c @@ -896,11 +896,6 @@ current_atom_size = _X_BE_32(&trak_atom[i - 4]); current_atom = _X_BE_32(&trak_atom[i]); - if (current_atom_size > trak_atom_size - i) { - last_error = QT_NOT_A_VALID_FILE; - goto free_trak; - } - if (current_atom == TKHD_ATOM) { trak->flags = _X_BE_16(&trak_atom[i + 6]); } else if (current_atom == ELST_ATOM) { --- xine-lib-1.1.11.1.orig/src/demuxers/Makefile.in +++ xine-lib-1.1.11.1/src/demuxers/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -212,7 +212,7 @@ am_xineplug_dmx_yuv_frames_la_OBJECTS = demux_yuv_frames.lo xineplug_dmx_yuv_frames_la_OBJECTS = \ $(am_xineplug_dmx_yuv_frames_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -714,8 +714,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -723,8 +723,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -1085,8 +1085,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1098,8 +1098,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1109,12 +1109,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/demuxers/ebml.c +++ xine-lib-1.1.11.1/src/demuxers/ebml.c @@ -327,7 +327,7 @@ if (text) { text[elem->len] = '\0'; - if (ebml_read_ascii (ebml, &elem, text)) + if (ebml_read_ascii (ebml, elem, text)) return text; free (text); } --- xine-lib-1.1.11.1.orig/src/libmpeg2/Makefile.in +++ xine-lib-1.1.11.1/src/libmpeg2/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,7 +94,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_decode_mpeg2_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_mpeg2_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -481,8 +481,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -490,8 +490,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -688,8 +688,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -701,8 +701,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -712,12 +712,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libdts/Makefile.in +++ xine-lib-1.1.11.1/src/libdts/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,7 +86,7 @@ $(xineplug_decode_dts_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_dts_la_LDFLAGS) $(LDFLAGS) -o $@ @DTS_TRUE@am_xineplug_decode_dts_la_rpath = -rpath $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -460,8 +460,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -469,8 +469,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -555,8 +555,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -568,8 +568,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -579,12 +579,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/dxr3/Makefile.in +++ xine-lib-1.1.11.1/src/dxr3/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -116,7 +116,7 @@ $(xineplug_vo_out_dxr3_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_DXR3_TRUE@am_xineplug_vo_out_dxr3_la_rpath = -rpath \ @HAVE_DXR3_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -516,8 +516,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -525,8 +525,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -639,8 +639,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -652,8 +652,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -663,12 +663,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libspudvb/Makefile.in +++ xine-lib-1.1.11.1/src/libspudvb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -76,7 +76,7 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_decode_spudvb_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_spudvb_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -440,8 +440,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -449,8 +449,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -511,8 +511,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -524,8 +524,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -535,12 +535,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libmusepack/Makefile.in +++ xine-lib-1.1.11.1/src/libmusepack/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -90,7 +90,7 @@ $(xineplug_decode_mpc_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_mpc_la_LDFLAGS) $(LDFLAGS) -o $@ @MUSEPACK_TRUE@am_xineplug_decode_mpc_la_rpath = -rpath $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -471,8 +471,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -480,8 +480,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -676,8 +676,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -702,8 +702,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -713,12 +713,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libmusepack/musepack/Makefile.in +++ xine-lib-1.1.11.1/src/libmusepack/musepack/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -412,8 +412,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -425,8 +425,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -436,12 +436,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libspudec/Makefile.in +++ xine-lib-1.1.11.1/src/libspudec/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,7 +85,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_decode_spu_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_spu_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -461,8 +461,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -470,8 +470,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -548,8 +548,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -561,8 +561,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -572,12 +572,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/vcd/Makefile.in +++ xine-lib-1.1.11.1/src/input/vcd/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,7 +86,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(xineplug_inp_vcd_la_LDFLAGS) $(LDFLAGS) -o $@ @ENABLE_VCD_TRUE@am_xineplug_inp_vcd_la_rpath = -rpath $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -466,8 +466,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -475,8 +475,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -603,8 +603,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -629,8 +629,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -640,12 +640,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/vcd/libcdio/Makefile.in +++ xine-lib-1.1.11.1/src/input/vcd/libcdio/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -93,7 +93,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libiso9660_la_LDFLAGS) $(LDFLAGS) -o $@ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libiso9660_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -730,8 +730,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -756,8 +756,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -767,12 +767,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/vcd/libcdio/cdio/Makefile.in +++ xine-lib-1.1.11.1/src/input/vcd/libcdio/cdio/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -427,8 +427,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -440,8 +440,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -451,12 +451,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/vcd/libcdio/image/Makefile.in +++ xine-lib-1.1.11.1/src/input/vcd/libcdio/image/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/src/input/vcd/libcdio/MSWindows/Makefile.in +++ xine-lib-1.1.11.1/src/input/vcd/libcdio/MSWindows/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/src/input/vcd/libvcd/Makefile.in +++ xine-lib-1.1.11.1/src/input/vcd/libvcd/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -88,7 +88,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libvcdinfo_la_LDFLAGS) $(LDFLAGS) -o $@ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libvcdinfo_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -652,8 +652,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -678,8 +678,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -689,12 +689,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/vcd/libvcd/libvcd/Makefile.in +++ xine-lib-1.1.11.1/src/input/vcd/libvcd/libvcd/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -410,8 +410,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -423,8 +423,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -434,12 +434,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/Makefile.in +++ xine-lib-1.1.11.1/src/input/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -227,7 +227,7 @@ $(xineplug_inp_vcdo_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_CDROM_IOCTLS_TRUE@am_xineplug_inp_vcdo_la_rpath = -rpath \ @HAVE_CDROM_IOCTLS_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -725,8 +725,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -734,8 +734,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -1179,8 +1179,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -1205,8 +1205,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1216,12 +1216,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/librtsp/Makefile.in +++ xine-lib-1.1.11.1/src/input/librtsp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ librtsp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(librtsp_la_CFLAGS) \ $(CFLAGS) $(librtsp_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -497,8 +497,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -510,8 +510,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -521,12 +521,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/libreal/Makefile.in +++ xine-lib-1.1.11.1/src/input/libreal/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,7 @@ libreal_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libreal_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -517,8 +517,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -530,8 +530,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -541,12 +541,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/libdvdnav/Makefile.in +++ xine-lib-1.1.11.1/src/input/libdvdnav/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -73,7 +73,7 @@ libdvdnav_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libdvdnav_la_CFLAGS) \ $(CFLAGS) $(libdvdnav_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -660,8 +660,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -673,8 +673,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -684,12 +684,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/input/dvb/Makefile.in +++ xine-lib-1.1.11.1/src/input/dvb/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -413,8 +413,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -426,8 +426,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -437,12 +437,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/audio_out/Makefile.in +++ xine-lib-1.1.11.1/src/audio_out/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -212,7 +212,7 @@ $(xineplug_ao_out_sun_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_SUNAUDIO_TRUE@am_xineplug_ao_out_sun_la_rpath = -rpath \ @HAVE_SUNAUDIO_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -696,8 +696,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -705,8 +705,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -887,8 +887,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -900,8 +900,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -911,12 +911,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/audio_out/audio_pulse_out.c +++ xine-lib-1.1.11.1/src/audio_out/audio_pulse_out.c @@ -1,28 +1,28 @@ -/* - * Copyright (C) 2000-2007 the xine project - * +/* -*- Mode: C; c-basic-offset: 2; indent-tabs-mode: nil -*- */ + +/* + * Copyright (C) 2000-2008 the xine project + * * This file is part of xine, a free video player. - * + * * xine is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * xine is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * - * ao plugin for pulseaudio (rename of polypaudio): + * ao plugin for PulseAudio: * http://0pointer.de/lennart/projects/pulsaudio/ * - * originally written for polypaudio simple api. Lennart then suggested - * using the async api for better control (such as volume), therefore, a lot - * of this code comes from Lennart's patch to mplayer. + * Diego Petteno, Lennart Poettering */ #ifdef HAVE_CONFIG_H @@ -48,15 +48,9 @@ #define GAP_TOLERANCE AO_MAX_GAP -/* CHECKME: should this be conditional on autotools? */ -extern const char *__progname; - typedef struct { audio_driver_class_t driver_class; xine_t *xine; - - struct pa_context *context; /*< Pulseaudio connection context */ - struct pa_threaded_mainloop *mainloop; /*< Main event loop object */ } pulse_class_t; typedef struct pulse_driver_s { @@ -67,11 +61,13 @@ char *host; /*< The host to connect to */ char *sink; /*< The sink to connect to */ - struct pa_stream *stream; /*< Pulseaudio playback stream object */ - pthread_mutex_t info_mutex; /**< Mutex for info callback signaling */ + pa_threaded_mainloop *mainloop; /*< Main event loop object */ + pa_context *context; /*< Pulseaudio connection context */ + pa_stream *stream; /*< Pulseaudio playback stream object */ pa_volume_t swvolume; + int muted; pa_cvolume cvolume; int capabilities; @@ -82,67 +78,117 @@ uint32_t bits_per_sample; uint32_t bytes_per_frame; - uint32_t frames_written; - } pulse_driver_t; /** - * @brief Callback function called when a stream operation succeed - * @param stream Stream which operation has succeeded - * @param success The success value for the operation (ignored) - * @param this_Gen pulse_driver_t pointer for the PulseAudio output - * instance. + * @brief Callback function called when the state of the context is changed + * @param c Context which changed status + * @param this_gen pulse_class_t pointer for the PulseAudio output class */ -static void __xine_pa_stream_success_callback(pa_stream *const stream, const int success, - void *const mutex_gen) +static void __xine_pa_context_state_callback(pa_context *c, void *this_gen) { - pthread_mutex_t *const completion_mutex = (pthread_mutex_t*)mutex_gen; + pulse_driver_t * this = (pulse_driver_t*) this_gen; + + switch (pa_context_get_state(c)) { + + case PA_CONTEXT_READY: + case PA_CONTEXT_TERMINATED: + case PA_CONTEXT_FAILED: + pa_threaded_mainloop_signal(this->mainloop, 0); + break; - pthread_mutex_unlock(completion_mutex); + case PA_CONTEXT_CONNECTING: + case PA_CONTEXT_UNCONNECTED: + case PA_CONTEXT_AUTHORIZING: + case PA_CONTEXT_SETTING_NAME: + break; + } } /** - * @brief Callback function called when the state of the context is changed - * @param ctx Context which operation has succeeded + * @brief Callback function called when the state of the stream is changed + * @param s Stream that changed status * @param this_gen pulse_driver_t pointer for the PulseAudio output * instance. */ -static void __xine_pa_context_status_callback(pa_context *const ctx, void *const this_gen) +static void __xine_pa_stream_state_callback(pa_stream *s, void *this_gen) { - pulse_driver_t *const this = (pulse_driver_t*)this_gen; + pulse_driver_t * this = (pulse_driver_t*) this_gen; + + switch (pa_stream_get_state(s)) { + + case PA_STREAM_READY: + case PA_STREAM_TERMINATED: + case PA_STREAM_FAILED: + pa_threaded_mainloop_signal(this->mainloop, 0); + break; - switch (pa_context_get_state(ctx)) { - case PA_CONTEXT_READY: - case PA_CONTEXT_TERMINATED: - case PA_CONTEXT_FAILED: - pa_threaded_mainloop_signal(this->pa_class->mainloop, 0); - break; - - case PA_CONTEXT_CONNECTING: - case PA_CONTEXT_UNCONNECTED: - case PA_CONTEXT_AUTHORIZING: - case PA_CONTEXT_SETTING_NAME: - break; + case PA_STREAM_UNCONNECTED: + case PA_STREAM_CREATING: + break; } } /** - * @brief Callback function called when a context operation succeed + * @brief Callback function called when PA asks for more audio data. + * @param s Stream on which data is requested + * @param nbytes the number of bytes PA requested + * @param this_gen pulse_driver_t pointer for the PulseAudio output + * instance. + */ +static void __xine_pa_stream_request_callback(pa_stream *s, size_t nbytes, void *this_gen) +{ + pulse_driver_t * this = (pulse_driver_t*) this_gen; + + pa_threaded_mainloop_signal(this->mainloop, 0); +} + +/** + * @brief Callback function called when PA notifies about something + * @param s Stream on which the notification happened + * @param this_gen pulse_driver_t pointer for the PulseAudio output + * instance. + */ +static void __xine_pa_stream_notify_callback(pa_stream *s, void *this_gen) +{ + pulse_driver_t * this = (pulse_driver_t*) this_gen; + + pa_threaded_mainloop_signal(this->mainloop, 0); +} + +/** + * @brief Callback function called when PA completed an operation * @param ctx Context which operation has succeeded - * @param success The success value for the operation (ignored) + * @param nbytes the number of bytes PA requested * @param this_gen pulse_driver_t pointer for the PulseAudio output * instance. */ -static void __xine_pa_context_success_callback(pa_context *const ctx, const int success, - void *const this_gen) +static void __xine_pa_stream_success_callback(pa_stream *s, int success, void *this_gen) { - pulse_driver_t *const this = (pulse_driver_t*)this_gen; + pulse_driver_t * this = (pulse_driver_t*) this_gen; - _x_assert(ctx); _x_assert(this); - _x_assert(ctx == this->pa_class->context); + if (!success) + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: stream operation failed: %s\n", pa_strerror(pa_context_errno(this->context))); - pa_threaded_mainloop_signal(this->pa_class->mainloop, 0); + pa_threaded_mainloop_signal(this->mainloop, 0); +} + +/** + * @brief Callback function called when PA completed an operation + * @param c Context on which operation has succeeded + * @param nbytes the number of bytes PA requested + * @param this_gen pulse_driver_t pointer for the PulseAudio output + * instance. + */ +static void __xine_pa_context_success_callback(pa_context *c, int success, void *this_gen) +{ + pulse_driver_t *this = (pulse_driver_t*) this_gen; + + if (!success) + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: context operation failed: %s\n", pa_strerror(pa_context_errno(this->context))); + + pa_threaded_mainloop_signal(this->mainloop, 0); } /** @@ -156,14 +202,14 @@ * This function saves the volume field of the passed structure to the * @c cvolume variable of the output instance. */ -static void __xine_pa_sink_info_callback(pa_context *const ctx, const pa_sink_input_info *const info, - const int is_last, void *const userdata) { +static void __xine_pa_sink_info_callback(pa_context *c, const pa_sink_input_info *info, + int is_last, void *userdata) { pulse_driver_t *const this = (pulse_driver_t *) userdata; if (is_last < 0) { xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: Failed to get sink input info: %s\n", - pa_strerror(pa_context_errno(this->pa_class->context))); + pa_strerror(pa_context_errno(this->context))); return; } @@ -171,36 +217,90 @@ return; this->cvolume = info->volume; + this->swvolume = pa_sw_volume_to_linear(pa_cvolume_avg(&info->volume)); + this->muted = info->mute; +} + +static int connect_context(pulse_driver_t *this) { + + if (this->context && (pa_context_get_state(this->context) == PA_CONTEXT_FAILED || + pa_context_get_state(this->context) == PA_CONTEXT_TERMINATED)) { + pa_context_unref(this->context); + this->context = NULL; + } + + if (!this->context) { + char fn[PATH_MAX], *p; + + if (pa_get_binary_name(fn, sizeof(fn))) + p = pa_path_get_filename(fn); + else + p = "Xine"; - pthread_mutex_unlock(&this->info_mutex); + this->context = pa_context_new(pa_threaded_mainloop_get_api(this->mainloop), p); + _x_assert(this->context); + + pa_context_set_state_callback(this->context, __xine_pa_context_state_callback, this); + } + + if (pa_context_get_state(this->context) == PA_CONTEXT_UNCONNECTED) { + + if (pa_context_connect(this->context, this->host, 0, NULL) < 0) { + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: failed to connect context object %s\n", pa_strerror(pa_context_errno(this->context))); + return -1; + } + } + + for (;;) { + pa_context_state_t state = pa_context_get_state(this->context); + + if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED) { + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: failed to connect context object: %s\n", pa_strerror(pa_context_errno(this->context))); + return -1; + } + + if (state == PA_CONTEXT_READY) + break; + + pa_threaded_mainloop_wait(this->mainloop); + } + + return 0; } /* * open the audio device for writing to */ static int ao_pulse_open(ao_driver_t *this_gen, - uint32_t bits, uint32_t rate, int mode) + uint32_t bits, uint32_t rate, int mode) { pulse_driver_t *this = (pulse_driver_t *) this_gen; - struct pa_sample_spec ss; - struct pa_buffer_attr a; - pa_stream_state_t streamstate; + pa_sample_spec ss; + pa_channel_map cm; + int r; xprintf (this->xine, XINE_VERBOSITY_DEBUG, - "audio_pulse_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode); + "audio_pulse_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode); if ( (mode & this->capabilities) == 0 ) { xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: unsupported mode %08x\n", mode); return 0; } + pa_threaded_mainloop_lock(this->mainloop); + if (this->stream) { - if ( mode == this->mode && rate == this->sample_rate && - bits == this->bits_per_sample ) + if (mode == this->mode && rate == this->sample_rate && + bits == this->bits_per_sample) { + + pa_threaded_mainloop_unlock(this->mainloop); return this->sample_rate; + } - this_gen->close(this_gen); + pa_stream_disconnect(this->stream); + pa_stream_unref(this->stream); + this->stream = NULL; } this->mode = mode; @@ -221,6 +321,8 @@ case 32: ss.format = PA_SAMPLE_FLOAT32NE; break; + default: + _x_assert(!"Should not be reached"); } if (!pa_sample_spec_valid(&ss)) { @@ -228,70 +330,86 @@ goto fail; } - if ( this->pa_class->context && pa_context_get_state(this->pa_class->context) > PA_CONTEXT_READY ) { - pa_context_unref(this->pa_class->context); - this->pa_class->context = NULL; - } - - if ( this->pa_class->context == NULL ) { - this->pa_class->context = pa_context_new(pa_threaded_mainloop_get_api(this->pa_class->mainloop), - __progname); - } - - pa_context_ref(this->pa_class->context); + cm.channels = ss.channels; - if ( pa_context_get_state(this->pa_class->context) == PA_CONTEXT_UNCONNECTED ) { - int ret; + switch (mode) { + case AO_CAP_MODE_MONO: + cm.map[0] = PA_CHANNEL_POSITION_MONO; + _x_assert(cm.channels == 1); + break; - pa_threaded_mainloop_lock(this->pa_class->mainloop); - ret = pa_context_connect(this->pa_class->context, this->host, 1, NULL); - if ( ret < 0 ) - goto fail_unlock; + case AO_CAP_MODE_STEREO: + cm.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT; + cm.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT; + _x_assert(cm.channels == 2); + break; - pa_context_set_state_callback(this->pa_class->context, __xine_pa_context_status_callback, this); + case AO_CAP_MODE_4CHANNEL: + cm.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT; + cm.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT; + cm.map[2] = PA_CHANNEL_POSITION_REAR_LEFT; + cm.map[3] = PA_CHANNEL_POSITION_REAR_RIGHT; + _x_assert(cm.channels == 4); + break; - pa_threaded_mainloop_wait(this->pa_class->mainloop); - pa_threaded_mainloop_unlock(this->pa_class->mainloop); + case AO_CAP_MODE_4_1CHANNEL: + case AO_CAP_MODE_5CHANNEL: + case AO_CAP_MODE_5_1CHANNEL: + cm.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT; + cm.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT; + cm.map[2] = PA_CHANNEL_POSITION_REAR_LEFT; + cm.map[3] = PA_CHANNEL_POSITION_REAR_RIGHT; + cm.map[4] = PA_CHANNEL_POSITION_FRONT_CENTER; + cm.map[5] = PA_CHANNEL_POSITION_LFE; + cm.channels = 6; + break; + default: + _x_assert(!"Should not be reached"); } - if (pa_context_get_state(this->pa_class->context) != PA_CONTEXT_READY) { - xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: Failed to connect to server: %s\n", - pa_strerror(pa_context_errno(this->pa_class->context))); + if (!pa_channel_map_valid(&cm)) { + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: Invalid channel map\n"); goto fail; } - this->stream = pa_stream_new(this->pa_class->context, "audio stream", &ss, NULL); + if (connect_context(this) < 0) + goto fail; + + _x_assert(!this->stream); + this->stream = pa_stream_new(this->context, "Audio Stream", &ss, &cm); _x_assert(this->stream); - a.maxlength = pa_bytes_per_second(&ss)*1; - a.tlength = a.maxlength*9/10; - a.prebuf = a.tlength/2; - a.minreq = a.tlength/10; + pa_stream_set_state_callback(this->stream, __xine_pa_stream_state_callback, this); + pa_stream_set_write_callback(this->stream, __xine_pa_stream_request_callback, this); + pa_stream_set_latency_update_callback(this->stream, __xine_pa_stream_notify_callback, this); - pa_stream_connect_playback(this->stream, this->sink, &a, - PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, + r = pa_stream_connect_playback(this->stream, this->sink, NULL, + PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL); - do { - xine_usec_sleep (100); + for (;;) { + pa_context_state_t cstate = pa_context_get_state(this->context); + pa_stream_state_t sstate = pa_stream_get_state(this->stream); + + if (cstate == PA_CONTEXT_FAILED || cstate == PA_CONTEXT_TERMINATED || + sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED) { + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: failed to connect context object: %s\n", pa_strerror(pa_context_errno(this->context))); + goto fail; + } - streamstate = pa_stream_get_state(this->stream); - } while (streamstate < PA_STREAM_READY); - - if (streamstate != PA_STREAM_READY) { - xprintf (this->xine, XINE_VERBOSITY_LOG, "audio_pulse_out: Failed to connect to server: %s\n", - pa_strerror(pa_context_errno(this->pa_class->context))); - goto fail; + if (sstate == PA_STREAM_READY) + break; + + pa_threaded_mainloop_wait(this->mainloop); } - this->frames_written = 0; - this->ao_driver.set_property(this, AO_PROP_PCM_VOL, 100); + pa_threaded_mainloop_unlock(this->mainloop); return this->sample_rate; - fail_unlock: - pa_threaded_mainloop_unlock(this->pa_class->mainloop); fail: + + pa_threaded_mainloop_unlock(this->mainloop); this_gen->close(this_gen); return 0; } @@ -319,217 +437,348 @@ { pulse_driver_t *this = (pulse_driver_t *) this_gen; size_t size = num_frames * this->bytes_per_frame; - int ret = 0; - - if ( !this->stream || !this->pa_class->context) - return -1; - - switch( pa_stream_get_state(this->stream) ) { - case PA_STREAM_READY: - while (size > 0) { - size_t l; + int ret = -1; + size_t done = 0; - while (!(l = pa_stream_writable_size(this->stream))) { - xine_usec_sleep (10000); - } + pa_threaded_mainloop_lock(this->mainloop); - if (l > size) - l = size; - - pa_stream_write(this->stream, data, l, NULL, 0, PA_SEEK_RELATIVE); - data = (int16_t *) ((uint8_t*) data + l); - size -= l; - } + while (size > 0) { + size_t l; - this->frames_written += num_frames; + for (;;) { - if (pa_stream_get_state(this->stream) == PA_STREAM_READY) - ret = 1; + if (!this->stream || + !this->context || + pa_context_get_state(this->context) != PA_CONTEXT_READY || + pa_stream_get_state(this->stream) != PA_STREAM_READY) + goto finish; - break; + if ((l = pa_stream_writable_size(this->stream)) == (size_t) -1) + goto finish; + + if (l > 0) + break; + + pa_threaded_mainloop_wait(this->mainloop); + } + + if (l > size) + l = size; + + pa_stream_write(this->stream, data, l, NULL, 0, PA_SEEK_RELATIVE); + data = (int16_t *) ((uint8_t*) data + l); + size -= l; + done += l; } + ret = done; + +finish: + + pa_threaded_mainloop_unlock(this->mainloop); + +/* fprintf(stderr, "write-out\n"); */ + return ret; -} +} static int ao_pulse_delay (ao_driver_t *this_gen) { pulse_driver_t *this = (pulse_driver_t *) this_gen; - pa_usec_t latency = 0; - unsigned int delay_frames; + int ret = 0; - if ( ! this->stream ) return this->frames_written; +/* fprintf(stderr, "delay-in\n"); */ - if (pa_stream_get_latency(this->stream, &latency, NULL) < 0) { - pa_context_unref(this->pa_class->context); - this->pa_class->context = NULL; + pa_threaded_mainloop_lock(this->mainloop); - pa_stream_disconnect(this->stream); - pa_stream_unref(this->stream); - this->stream = NULL; + for (;;) { + pa_usec_t latency = 0; - return 0; + if (!this->stream || + !this->context || + pa_context_get_state(this->context) != PA_CONTEXT_READY || + pa_stream_get_state(this->stream) != PA_STREAM_READY) + goto finish; + + if (pa_stream_get_latency(this->stream, &latency, NULL) >= 0) { + ret = (int) ((latency * this->sample_rate) / 1000000); + goto finish; + } + + if (pa_context_errno(this->context) != PA_ERR_NODATA) { + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: failed to query latency: %s\n", pa_strerror(pa_context_errno(this->context))); + goto finish; + } + + pa_threaded_mainloop_wait(this->mainloop); } - /* convert latency (us) to frame units. */ - delay_frames = (int)(latency * this->sample_rate / 1000000); +finish: - if( delay_frames > this->frames_written ) - return this->frames_written; - else - return delay_frames; + pa_threaded_mainloop_unlock(this->mainloop); + + return ret; } static void ao_pulse_close(ao_driver_t *this_gen) { pulse_driver_t *this = (pulse_driver_t *) this_gen; - - if (this->stream) { - if (pa_stream_get_state(this->stream) == PA_STREAM_READY) { - pthread_mutex_t completion_callback = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_lock(&completion_callback); - pa_stream_drain(this->stream, __xine_pa_stream_success_callback, &completion_callback); - pthread_mutex_lock(&completion_callback); - pthread_mutex_destroy(&completion_callback); - } + pa_threaded_mainloop_lock(this->mainloop); + if (this->stream) { pa_stream_disconnect(this->stream); pa_stream_unref(this->stream); this->stream = NULL; - - pa_context_unref(this->pa_class->context); } + + pa_threaded_mainloop_unlock(this->mainloop); } static uint32_t ao_pulse_get_capabilities (ao_driver_t *this_gen) { pulse_driver_t *this = (pulse_driver_t *) this_gen; + return this->capabilities; } -static void ao_pulse_exit(ao_driver_t *this_gen) -{ +static void ao_pulse_exit(ao_driver_t *this_gen) { pulse_driver_t *this = (pulse_driver_t *) this_gen; - free (this); + ao_pulse_close(this_gen); + + pa_threaded_mainloop_lock(this->mainloop); + + if (this->context) { + pa_context_disconnect(this->context); + pa_context_unref(this->context); + } + + pa_threaded_mainloop_unlock(this->mainloop); + + pa_threaded_mainloop_free(this->mainloop); + + free(this->host); + free(this->sink); + free(this); +} + +static int wait_for_operation(pulse_driver_t *this, pa_operation *o) { + + for (;;) { + + if (!this->stream || + !this->context || + pa_context_get_state(this->context) != PA_CONTEXT_READY || + pa_stream_get_state(this->stream) != PA_STREAM_READY) + return -1; + + if (pa_operation_get_state(o) != PA_OPERATION_RUNNING) + return 0; + + pa_threaded_mainloop_wait(this->mainloop); + } } static int ao_pulse_get_property (ao_driver_t *this_gen, int property) { pulse_driver_t *this = (pulse_driver_t *) this_gen; int result = 0; + pa_operation *o = NULL; - if ( ! this->stream || ! this->pa_class->context ) + pa_threaded_mainloop_lock(this->mainloop); + + if (!this->stream || + !this->context || + pa_context_get_state(this->context) != PA_CONTEXT_READY || + pa_stream_get_state(this->stream) != PA_STREAM_READY) { + pa_threaded_mainloop_unlock(this->mainloop); return 0; + } switch(property) { - case AO_PROP_PCM_VOL: - case AO_PROP_MIXER_VOL: - { - pthread_mutex_lock(&this->info_mutex); - pa_operation *o = pa_context_get_sink_input_info(this->pa_class->context, - pa_stream_get_index(this->stream), - __xine_pa_sink_info_callback, this); - if ( ! o ) return 0; - pthread_mutex_lock(&this->info_mutex); pthread_mutex_unlock(&this->info_mutex); - - result = (pa_sw_volume_to_linear(this->swvolume)*100); - } - break; - case AO_PROP_MUTE_VOL: - result = pa_cvolume_is_muted(&this->cvolume); - break; + case AO_PROP_MUTE_VOL: + case AO_PROP_PCM_VOL: + case AO_PROP_MIXER_VOL: + + o = pa_context_get_sink_input_info(this->context, pa_stream_get_index(this->stream), + __xine_pa_sink_info_callback, this); + + break; + } + + if (o) { + wait_for_operation(this, o); + pa_operation_unref(o); } - + + switch(property) { + + case AO_PROP_MUTE_VOL: + result = this->muted; + break; + + case AO_PROP_PCM_VOL: + case AO_PROP_MIXER_VOL: + result = (int) (pa_sw_volume_to_linear(this->swvolume)*100); + break; + } + + pa_threaded_mainloop_unlock(this->mainloop); + return result; } static int ao_pulse_set_property (ao_driver_t *this_gen, int property, int value) { pulse_driver_t *this = (pulse_driver_t *) this_gen; int result = ~value; + pa_operation *o = NULL; - if ( ! this->stream || ! this->pa_class->context ) - return result; + pa_threaded_mainloop_lock(this->mainloop); + + if (!this->stream || + !this->context || + pa_context_get_state(this->context) != PA_CONTEXT_READY || + pa_stream_get_state(this->stream) != PA_STREAM_READY) { + pa_threaded_mainloop_unlock(this->mainloop); + return 0; + } switch(property) { - case AO_PROP_PCM_VOL: - case AO_PROP_MIXER_VOL: - this->swvolume = pa_sw_volume_from_linear((double)value/100.0); - pa_cvolume_set(&this->cvolume, pa_stream_get_sample_spec(this->stream)->channels, this->swvolume); - - pa_context_set_sink_input_volume(this->pa_class->context, pa_stream_get_index(this->stream), - &this->cvolume, __xine_pa_context_success_callback, this); - - result = value; - break; - - case AO_PROP_MUTE_VOL: - if ( value ) - pa_cvolume_mute(&this->cvolume, pa_stream_get_sample_spec(this->stream)->channels); - else + case AO_PROP_PCM_VOL: + case AO_PROP_MIXER_VOL: + + this->swvolume = pa_sw_volume_from_linear((double)value/100.0); pa_cvolume_set(&this->cvolume, pa_stream_get_sample_spec(this->stream)->channels, this->swvolume); - pa_context_set_sink_input_volume(this->pa_class->context, pa_stream_get_index(this->stream), - &this->cvolume, __xine_pa_context_success_callback, this); - - result = value; - break; + o = pa_context_set_sink_input_volume(this->context, pa_stream_get_index(this->stream), + &this->cvolume, __xine_pa_context_success_callback, this); + + result = value; + break; + + case AO_PROP_MUTE_VOL: + + this->muted = value; + + o = pa_context_set_sink_input_mute(this->context, pa_stream_get_index(this->stream), + value, __xine_pa_context_success_callback, this); + + result = value; + } + + if (o) { + wait_for_operation(this, o); + pa_operation_unref(o); } - + + pa_threaded_mainloop_unlock(this->mainloop); + return result; } static int ao_pulse_ctrl(ao_driver_t *this_gen, int cmd, ...) { pulse_driver_t *this = (pulse_driver_t *) this_gen; + pa_operation *o = NULL; + + pa_threaded_mainloop_lock(this->mainloop); - if ( ! this->stream ) return 0; + if (!this->stream || + !this->context || + pa_context_get_state(this->context) != PA_CONTEXT_READY || + pa_stream_get_state(this->stream) != PA_STREAM_READY) { + pa_threaded_mainloop_unlock(this->mainloop); + return 0; + } switch (cmd) { - case AO_CTRL_FLUSH_BUFFERS: - _x_assert(this->stream && this->pa_class->context); + case AO_CTRL_FLUSH_BUFFERS: - if(pa_stream_get_state(this->stream) == PA_STREAM_READY) { - pthread_mutex_t completion_callback = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_lock(&completion_callback); - pa_stream_flush(this->stream, __xine_pa_stream_success_callback, &completion_callback); + o = pa_stream_flush(this->stream, __xine_pa_stream_success_callback, this); + break; - pthread_mutex_lock(&completion_callback); - pthread_mutex_destroy(&completion_callback); - } + case AO_CTRL_PLAY_RESUME: + case AO_CTRL_PLAY_PAUSE: - this->frames_written = 0; + o = pa_stream_cork(this->stream, cmd == AO_CTRL_PLAY_PAUSE, __xine_pa_stream_success_callback, this); + break; + } - break; + if (o) { + wait_for_operation(this, o); + pa_operation_unref(o); } + pa_threaded_mainloop_unlock(this->mainloop); + return 0; } static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *data) { pulse_class_t *class = (pulse_class_t *) class_gen; pulse_driver_t *this; - char *device; + const char* device; + int r; lprintf ("audio_pulse_out: open_plugin called\n"); this = (pulse_driver_t *) xine_xmalloc (sizeof (pulse_driver_t)); if (!this) return NULL; + this->xine = class->xine; + this->host = NULL; + this->sink = NULL; + this->context = NULL; + this->mainloop = NULL; + + device = class->xine->config->register_string(class->xine->config, + "audio.pulseaudio_device", + "", + _("device used for pulseaudio"), + _("use 'server[:sink]' for setting the " + "pulseaudio sink device."), + 10, NULL, + NULL); + + if (device && *device) { + char *sep = strrchr(device, ':'); + if ( sep ) { + if (!(this->host = strndup(device, sep-device))) { + free(this); + return NULL; + } + + if (!(this->sink = strdup(sep+1))) { + free(this->host); + free(this); + return NULL; + } + } else { + + if (!(this->host = strdup(device))) { + free(this); + return NULL; + } + } + } + + this->mainloop = pa_threaded_mainloop_new(); + _x_assert(this->mainloop); + pa_threaded_mainloop_start(this->mainloop); /* * set capabilities */ - this->capabilities = AO_CAP_MODE_MONO | AO_CAP_MODE_STEREO | AO_CAP_MODE_4CHANNEL | - AO_CAP_MODE_4_1CHANNEL | AO_CAP_MODE_5CHANNEL | - AO_CAP_MODE_5_1CHANNEL | AO_CAP_MIXER_VOL | - AO_CAP_PCM_VOL | AO_CAP_MUTE_VOL | AO_CAP_8BITS | - AO_CAP_16BITS | AO_CAP_FLOAT32; + this->capabilities = + AO_CAP_MODE_MONO | AO_CAP_MODE_STEREO | AO_CAP_MODE_4CHANNEL | + AO_CAP_MODE_4_1CHANNEL | AO_CAP_MODE_5CHANNEL | AO_CAP_MODE_5_1CHANNEL | + AO_CAP_MIXER_VOL | AO_CAP_PCM_VOL | AO_CAP_MUTE_VOL | + AO_CAP_8BITS | AO_CAP_16BITS | AO_CAP_FLOAT32; this->sample_rate = 0; - this->host = NULL; - this->sink = NULL; - + this->ao_driver.get_capabilities = ao_pulse_get_capabilities; this->ao_driver.get_property = ao_pulse_get_property; this->ao_driver.set_property = ao_pulse_set_property; @@ -541,33 +790,22 @@ this->ao_driver.close = ao_pulse_close; this->ao_driver.exit = ao_pulse_exit; this->ao_driver.get_gap_tolerance = ao_pulse_get_gap_tolerance; - this->ao_driver.control = ao_pulse_ctrl; - - device = this->xine->config->register_string(this->xine->config, - "audio.pulseaudio_device", - "", - _("device used for pulseaudio"), - _("use 'server[:sink]' for setting the " - "pulseaudio sink device."), - 10, NULL, - NULL); - - if (device && *device) { - char *sep = strchr(device, ':'); - if ( sep ) { - this->host = strndup(device, sep-device); - this->sink = strdup(&sep[1]); - } else - this->host = strdup(device); - } - - pthread_mutex_init(&this->info_mutex, NULL); + this->ao_driver.control = ao_pulse_ctrl; xprintf (class->xine, XINE_VERBOSITY_DEBUG, "audio_pulse_out: host %s sink %s\n", this->host ? this->host : "(null)", this->sink ? this->sink : "(null)"); this->pa_class = class; + pa_threaded_mainloop_lock(this->mainloop); + r = connect_context(this); + pa_threaded_mainloop_unlock(this->mainloop); + + if (r < 0) { + ao_pulse_exit((ao_driver_t *) this); + return NULL; + } + return &this->ao_driver; } @@ -587,13 +825,7 @@ pulse_class_t *this = (pulse_class_t *) this_gen; - if ( this->context ) - pa_context_unref(this->context); - - pa_threaded_mainloop_stop(this->mainloop); - pa_threaded_mainloop_free(this->mainloop); - - free (this); + free(this); } static void *init_class (xine_t *xine, void *data) { @@ -606,25 +838,17 @@ if (!this) return NULL; + this->xine = xine; this->driver_class.open_plugin = open_plugin; this->driver_class.get_identifier = get_identifier; this->driver_class.get_description = get_description; this->driver_class.dispose = dispose_class; - this->xine = xine; - - this->mainloop = pa_threaded_mainloop_new(); - _x_assert(this->mainloop); - - pa_threaded_mainloop_start(this->mainloop); - - this->context = NULL; - return this; } static const ao_info_t ao_info_pulse = { - 6 + 12 }; /* @@ -636,5 +860,3 @@ { PLUGIN_AUDIO_OUT, 8, "pulseaudio", XINE_VERSION_CODE, &ao_info_pulse, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; - - --- xine-lib-1.1.11.1.orig/src/libffmpeg/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -491,8 +491,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -517,8 +517,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -528,12 +528,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavutil/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavutil/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,7 @@ libavutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libavutil_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -513,8 +513,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -526,8 +526,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -537,12 +537,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -82,7 +82,7 @@ libavcodec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libavcodec_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -859,8 +859,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -885,8 +885,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -896,12 +896,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/alpha/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/alpha/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/mlib/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/mlib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,7 @@ am__objects_3 = libavcodec_mlib_dummy.lo am_libavcodec_mlib_la_OBJECTS = $(am__objects_2) $(am__objects_3) libavcodec_mlib_la_OBJECTS = $(am_libavcodec_mlib_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -479,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -492,8 +492,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -503,12 +503,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/sparc/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/sparc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -65,7 +65,7 @@ am__objects_3 = libavcodec_sparc_dummy.lo am_libavcodec_sparc_la_OBJECTS = $(am__objects_2) $(am__objects_3) libavcodec_sparc_la_OBJECTS = $(am_libavcodec_sparc_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -479,8 +479,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -492,8 +492,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -503,12 +503,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/ppc/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/ppc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -62,7 +62,7 @@ am__objects_1 = libavcodec_ppc_dummy.lo am_libavcodec_ppc_la_OBJECTS = $(am__objects_1) libavcodec_ppc_la_OBJECTS = $(am_libavcodec_ppc_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -495,8 +495,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -508,8 +508,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -519,12 +519,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/libpostproc/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/libpostproc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,7 +61,7 @@ libpostprocess_la_LIBADD = am_libpostprocess_la_OBJECTS = postprocess.lo libpostprocess_la_OBJECTS = $(am_libpostprocess_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -476,8 +476,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -489,8 +489,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -500,12 +500,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/i386/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/i386/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,7 +72,7 @@ am__objects_3 = libavcodec_mmx_dummy.lo am_libavcodec_mmx_la_OBJECTS = $(am__objects_2) $(am__objects_3) libavcodec_mmx_la_OBJECTS = $(am_libavcodec_mmx_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -525,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -538,8 +538,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -549,12 +549,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/libavcodec/armv4l/Makefile.in +++ xine-lib-1.1.11.1/src/libffmpeg/libavcodec/armv4l/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,7 +63,7 @@ am__objects_2 = libavcodec_armv4l_dummy.lo am_libavcodec_armv4l_la_OBJECTS = $(am__objects_1) $(am__objects_2) libavcodec_armv4l_la_OBJECTS = $(am_libavcodec_armv4l_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -485,8 +485,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -498,8 +498,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -509,12 +509,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libffmpeg/ffmpeg_config.h +++ xine-lib-1.1.11.1/src/libffmpeg/ffmpeg_config.h @@ -0,0 +1,475 @@ +/* Automatically generated */ +#define CONFIG_AASC_DECODER 1 +#define ENABLE_AASC_DECODER 1 +#define CONFIG_ASV1_DECODER 1 +#define ENABLE_ASV1_DECODER 1 +#define CONFIG_ASV2_DECODER 1 +#define ENABLE_ASV2_DECODER 1 +#define CONFIG_AVS_DECODER 1 +#define ENABLE_AVS_DECODER 1 +#define CONFIG_CSCD_DECODER 1 +#define ENABLE_CSCD_DECODER 1 +#define CONFIG_CYUV_DECODER 1 +#define ENABLE_CYUV_DECODER 1 +#define CONFIG_DVVIDEO_DECODER 1 +#define ENABLE_DVVIDEO_DECODER 1 +#define CONFIG_EIGHTBPS_DECODER 1 +#define ENABLE_EIGHTBPS_DECODER 1 +#define CONFIG_FLIC_DECODER 1 +#define ENABLE_FLIC_DECODER 1 +#define CONFIG_FLV_DECODER 1 +#define ENABLE_FLV_DECODER 1 +#define CONFIG_FOURXM_DECODER 1 +#define ENABLE_FOURXM_DECODER 1 +#define CONFIG_FRAPS_DECODER 1 +#define ENABLE_FRAPS_DECODER 1 +#define CONFIG_HUFFYUV_DECODER 1 +#define ENABLE_HUFFYUV_DECODER 1 +#define CONFIG_IDCIN_DECODER 1 +#define ENABLE_IDCIN_DECODER 1 +#define CONFIG_INTERPLAY_VIDEO_DECODER 1 +#define ENABLE_INTERPLAY_VIDEO_DECODER 1 +#define CONFIG_KMVC_DECODER 1 +#define ENABLE_KMVC_DECODER 1 +#define CONFIG_LOCO_DECODER 1 +#define ENABLE_LOCO_DECODER 1 +#define CONFIG_MMVIDEO_DECODER 1 +#define ENABLE_MMVIDEO_DECODER 1 +#define CONFIG_NUV_DECODER 1 +#define ENABLE_NUV_DECODER 1 +#define CONFIG_QDRAW_DECODER 1 +#define ENABLE_QDRAW_DECODER 1 +#define CONFIG_QPEG_DECODER 1 +#define ENABLE_QPEG_DECODER 1 +#define CONFIG_ROQ_DECODER 1 +#define ENABLE_ROQ_DECODER 1 +#define CONFIG_RPZA_DECODER 1 +#define ENABLE_RPZA_DECODER 1 +#define CONFIG_SMACKER_DECODER 1 +#define ENABLE_SMACKER_DECODER 1 +#define CONFIG_SMC_DECODER 1 +#define ENABLE_SMC_DECODER 1 +#define CONFIG_SNOW_DECODER 1 +#define ENABLE_SNOW_DECODER 1 +#define CONFIG_TRUEMOTION1_DECODER 1 +#define ENABLE_TRUEMOTION1_DECODER 1 +#define CONFIG_TRUEMOTION2_DECODER 1 +#define ENABLE_TRUEMOTION2_DECODER 1 +#define CONFIG_TSCC_DECODER 1 +#define ENABLE_TSCC_DECODER 1 +#define CONFIG_ULTI_DECODER 1 +#define ENABLE_ULTI_DECODER 1 +#define CONFIG_VCR1_DECODER 1 +#define ENABLE_VCR1_DECODER 1 +#define CONFIG_VMDVIDEO_DECODER 1 +#define ENABLE_VMDVIDEO_DECODER 1 +#define CONFIG_WNV1_DECODER 1 +#define ENABLE_WNV1_DECODER 1 +#define CONFIG_XAN_WC3_DECODER 1 +#define ENABLE_XAN_WC3_DECODER 1 +#define CONFIG_XL_DECODER 1 +#define ENABLE_XL_DECODER 1 +#define CONFIG_ZMBV_DECODER 1 +#define ENABLE_ZMBV_DECODER 1 +#define CONFIG_ALAC_DECODER 1 +#define ENABLE_ALAC_DECODER 1 +#define CONFIG_AMR_NB_DECODER 1 +#define ENABLE_AMR_NB_DECODER 1 +#define CONFIG_AMR_WB_DECODER 1 +#define ENABLE_AMR_WB_DECODER 1 +#define CONFIG_LIBGSM_DECODER 1 +#define ENABLE_LIBGSM_DECODER 1 +#define CONFIG_MACE3_DECODER 1 +#define ENABLE_MACE3_DECODER 1 +#define CONFIG_MACE6_DECODER 1 +#define ENABLE_MACE6_DECODER 1 +#define CONFIG_SHORTEN_DECODER 1 +#define ENABLE_SHORTEN_DECODER 1 +#define CONFIG_SMACKAUD_DECODER 1 +#define ENABLE_SMACKAUD_DECODER 1 +#define CONFIG_TRUESPEECH_DECODER 1 +#define ENABLE_TRUESPEECH_DECODER 1 +#define CONFIG_TTA_DECODER 1 +#define ENABLE_TTA_DECODER 1 +#define CONFIG_VMDAUDIO_DECODER 1 +#define ENABLE_VMDAUDIO_DECODER 1 +#define CONFIG_PCM_ALAW_DECODER 1 +#define ENABLE_PCM_ALAW_DECODER 1 +#define CONFIG_PCM_MULAW_DECODER 1 +#define ENABLE_PCM_MULAW_DECODER 1 +#define CONFIG_PCM_S8_DECODER 1 +#define ENABLE_PCM_S8_DECODER 1 +#define CONFIG_PCM_S16BE_DECODER 1 +#define ENABLE_PCM_S16BE_DECODER 1 +#define CONFIG_PCM_S16LE_DECODER 1 +#define ENABLE_PCM_S16LE_DECODER 1 +#define CONFIG_PCM_S24BE_DECODER 1 +#define ENABLE_PCM_S24BE_DECODER 1 +#define CONFIG_PCM_S24DAUD_DECODER 1 +#define ENABLE_PCM_S24DAUD_DECODER 1 +#define CONFIG_PCM_S24LE_DECODER 1 +#define ENABLE_PCM_S24LE_DECODER 1 +#define CONFIG_PCM_S32BE_DECODER 1 +#define ENABLE_PCM_S32BE_DECODER 1 +#define CONFIG_PCM_S32LE_DECODER 1 +#define ENABLE_PCM_S32LE_DECODER 1 +#define CONFIG_PCM_U8_DECODER 1 +#define ENABLE_PCM_U8_DECODER 1 +#define CONFIG_PCM_U16BE_DECODER 1 +#define ENABLE_PCM_U16BE_DECODER 1 +#define CONFIG_PCM_U16LE_DECODER 1 +#define ENABLE_PCM_U16LE_DECODER 1 +#define CONFIG_PCM_U24BE_DECODER 1 +#define ENABLE_PCM_U24BE_DECODER 1 +#define CONFIG_PCM_U24LE_DECODER 1 +#define ENABLE_PCM_U24LE_DECODER 1 +#define CONFIG_PCM_U32BE_DECODER 1 +#define ENABLE_PCM_U32BE_DECODER 1 +#define CONFIG_PCM_U32LE_DECODER 1 +#define ENABLE_PCM_U32LE_DECODER 1 +#define CONFIG_INTERPLAY_DPCM_DECODER 1 +#define ENABLE_INTERPLAY_DPCM_DECODER 1 +#define CONFIG_ROQ_DPCM_DECODER 1 +#define ENABLE_ROQ_DPCM_DECODER 1 +#define CONFIG_SOL_DPCM_DECODER 1 +#define ENABLE_SOL_DPCM_DECODER 1 +#define CONFIG_VQA_DECODER 1 +#define ENABLE_VQA_DECODER 1 +#define CONFIG_XAN_DPCM_DECODER 1 +#define ENABLE_XAN_DPCM_DECODER 1 +#define CONFIG_ADPCM_4XM_DECODER 1 +#define ENABLE_ADPCM_4XM_DECODER 1 +#define CONFIG_ADPCM_CT_DECODER 1 +#define ENABLE_ADPCM_CT_DECODER 1 +#define CONFIG_ADPCM_EA_DECODER 1 +#define ENABLE_ADPCM_EA_DECODER 1 +#define CONFIG_ADPCM_IMA_DK3_DECODER 1 +#define ENABLE_ADPCM_IMA_DK3_DECODER 1 +#define CONFIG_ADPCM_IMA_DK4_DECODER 1 +#define ENABLE_ADPCM_IMA_DK4_DECODER 1 +#define CONFIG_ADPCM_IMA_QT_DECODER 1 +#define ENABLE_ADPCM_IMA_QT_DECODER 1 +#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 1 +#define ENABLE_ADPCM_IMA_SMJPEG_DECODER 1 +#define CONFIG_ADPCM_IMA_WAV_DECODER 1 +#define ENABLE_ADPCM_IMA_WAV_DECODER 1 +#define CONFIG_ADPCM_IMA_WS_DECODER 1 +#define ENABLE_ADPCM_IMA_WS_DECODER 1 +#define CONFIG_ADPCM_MS_DECODER 1 +#define ENABLE_ADPCM_MS_DECODER 1 +#define CONFIG_ADPCM_SBPRO_2_DECODER 1 +#define ENABLE_ADPCM_SBPRO_2_DECODER 1 +#define CONFIG_ADPCM_SBPRO_3_DECODER 1 +#define ENABLE_ADPCM_SBPRO_3_DECODER 1 +#define CONFIG_ADPCM_SBPRO_4_DECODER 1 +#define ENABLE_ADPCM_SBPRO_4_DECODER 1 +#define CONFIG_ADPCM_XA_DECODER 1 +#define ENABLE_ADPCM_XA_DECODER 1 +#define CONFIG_ADPCM_YAMAHA_DECODER 1 +#define ENABLE_ADPCM_YAMAHA_DECODER 1 +#define CONFIG_CINEPAK_DECODER 1 +#define ENABLE_CINEPAK_DECODER 1 +#define CONFIG_FLASHSV_DECODER 1 +#define ENABLE_FLASHSV_DECODER 1 +#define CONFIG_H261_DECODER 1 +#define ENABLE_H261_DECODER 1 +#define CONFIG_H263_DECODER 1 +#define ENABLE_H263_DECODER 1 +#define CONFIG_H263I_DECODER 1 +#define ENABLE_H263I_DECODER 1 +#define CONFIG_H264_DECODER 1 +#define ENABLE_H264_DECODER 1 +#define CONFIG_INDEO2_DECODER 1 +#define ENABLE_INDEO2_DECODER 1 +#define CONFIG_INDEO3_DECODER 1 +#define ENABLE_INDEO3_DECODER 1 +#define CONFIG_MJPEG_DECODER 1 +#define ENABLE_MJPEG_DECODER 1 +#define CONFIG_MJPEGB_DECODER 1 +#define ENABLE_MJPEGB_DECODER 1 +#define CONFIG_MPEG1VIDEO_DECODER 1 +#define ENABLE_MPEG1VIDEO_DECODER 1 +#define CONFIG_MPEG2VIDEO_DECODER 1 +#define ENABLE_MPEG2VIDEO_DECODER 1 +#define CONFIG_MPEG4_DECODER 1 +#define ENABLE_MPEG4_DECODER 1 +#define CONFIG_MPEGVIDEO_DECODER 1 +#define ENABLE_MPEGVIDEO_DECODER 1 +#define CONFIG_MSMPEG4V1_DECODER 1 +#define ENABLE_MSMPEG4V1_DECODER 1 +#define CONFIG_MSMPEG4V2_DECODER 1 +#define ENABLE_MSMPEG4V2_DECODER 1 +#define CONFIG_MSMPEG4V3_DECODER 1 +#define ENABLE_MSMPEG4V3_DECODER 1 +#define CONFIG_MSRLE_DECODER 1 +#define ENABLE_MSRLE_DECODER 1 +#define CONFIG_MSVIDEO1_DECODER 1 +#define ENABLE_MSVIDEO1_DECODER 1 +#define CONFIG_QTRLE_DECODER 1 +#define ENABLE_QTRLE_DECODER 1 +#define CONFIG_RV10_DECODER 1 +#define ENABLE_RV10_DECODER 1 +#define CONFIG_RV20_DECODER 1 +#define ENABLE_RV20_DECODER 1 +#define CONFIG_SVQ1_DECODER 1 +#define ENABLE_SVQ1_DECODER 1 +#define CONFIG_SVQ3_DECODER 1 +#define ENABLE_SVQ3_DECODER 1 +#define CONFIG_VC1_DECODER 1 +#define ENABLE_VC1_DECODER 1 +#define CONFIG_VP3_DECODER 1 +#define ENABLE_VP3_DECODER 1 +#define CONFIG_VP5_DECODER 1 +#define ENABLE_VP5_DECODER 1 +#define CONFIG_VP6_DECODER 1 +#define ENABLE_VP6_DECODER 1 +#define CONFIG_VP6F_DECODER 1 +#define ENABLE_VP6F_DECODER 1 +#define CONFIG_WMV1_DECODER 1 +#define ENABLE_WMV1_DECODER 1 +#define CONFIG_WMV2_DECODER 1 +#define ENABLE_WMV2_DECODER 1 +#define CONFIG_WMV3_DECODER 1 +#define ENABLE_WMV3_DECODER 1 +#define CONFIG_COOK_DECODER 1 +#define ENABLE_COOK_DECODER 1 +#define CONFIG_DTS_DECODER 1 +#define ENABLE_DTS_DECODER 1 +#define CONFIG_FLAC_DECODER 1 +#define ENABLE_FLAC_DECODER 1 +#define CONFIG_MP2_DECODER 1 +#define ENABLE_MP2_DECODER 1 +#define CONFIG_MP3_DECODER 1 +#define ENABLE_MP3_DECODER 1 +#define CONFIG_QDM2_DECODER 1 +#define ENABLE_QDM2_DECODER 1 +#define CONFIG_RA_144_DECODER 1 +#define ENABLE_RA_144_DECODER 1 +#define CONFIG_RA_288_DECODER 1 +#define ENABLE_RA_288_DECODER 1 +#define CONFIG_WAVPACK_DECODER 1 +#define ENABLE_WAVPACK_DECODER 1 +#define CONFIG_WMAV1_DECODER 1 +#define ENABLE_WMAV1_DECODER 1 +#define CONFIG_WMAV2_DECODER 1 +#define ENABLE_WMAV2_DECODER 1 +#define CONFIG_ADPCM_SWF_DECODER 1 +#define ENABLE_ADPCM_SWF_DECODER 1 +#define ENABLE_BMP_DECODER 0 +#define ENABLE_CAVS_DECODER 0 +#define ENABLE_CLJR_DECODER 0 +#define ENABLE_DSICINVIDEO_DECODER 0 +#define ENABLE_FFV1_DECODER 0 +#define ENABLE_FFVHUFF_DECODER 0 +#define ENABLE_GIF_DECODER 0 +#define ENABLE_MDEC_DECODER 0 +#define ENABLE_MPEG_XVMC_DECODER 0 +#define ENABLE_MSZH_DECODER 0 +#define ENABLE_PNG_DECODER 0 +#define ENABLE_RAWVIDEO_DECODER 0 +#define ENABLE_SP5X_DECODER 0 +#define ENABLE_TARGA_DECODER 0 +#define ENABLE_TIERTEXSEQVIDEO_DECODER 0 +#define ENABLE_TIFF_DECODER 0 +#define ENABLE_VMNC_DECODER 0 +#define ENABLE_ZLIB_DECODER 0 +#define ENABLE_DSICINAUDIO_DECODER 0 +#define ENABLE_IMC_DECODER 0 +#define ENABLE_MP3ADU_DECODER 0 +#define ENABLE_MP3ON4_DECODER 0 +#define ENABLE_MPC7_DECODER 0 +#define ENABLE_SONIC_DECODER 0 +#define ENABLE_WS_SND1_DECODER 0 +#define ENABLE_ADPCM_ADX_DECODER 0 +#define ENABLE_ADPCM_G726_DECODER 0 +#define ENABLE_DVBSUB_DECODER 0 +#define ENABLE_DVDSUB_DECODER 0 +#define ENABLE_THEORA_DECODER 0 +#define ENABLE_AAC_DECODER 0 +#define ENABLE_MPEG4AAC_DECODER 0 +#define ENABLE_AC3_DECODER 0 +#define ENABLE_VORBIS_DECODER 0 +#define ENABLE_AASC_ENCODER 0 +#define ENABLE_ASV1_ENCODER 0 +#define ENABLE_ASV2_ENCODER 0 +#define ENABLE_AVS_ENCODER 0 +#define ENABLE_CSCD_ENCODER 0 +#define ENABLE_CYUV_ENCODER 0 +#define ENABLE_DVVIDEO_ENCODER 0 +#define ENABLE_EIGHTBPS_ENCODER 0 +#define ENABLE_FLIC_ENCODER 0 +#define ENABLE_FLV_ENCODER 0 +#define ENABLE_FOURXM_ENCODER 0 +#define ENABLE_FRAPS_ENCODER 0 +#define ENABLE_HUFFYUV_ENCODER 0 +#define ENABLE_IDCIN_ENCODER 0 +#define ENABLE_INTERPLAY_VIDEO_ENCODER 0 +#define ENABLE_KMVC_ENCODER 0 +#define ENABLE_LOCO_ENCODER 0 +#define ENABLE_MMVIDEO_ENCODER 0 +#define ENABLE_NUV_ENCODER 0 +#define ENABLE_QDRAW_ENCODER 0 +#define ENABLE_QPEG_ENCODER 0 +#define ENABLE_ROQ_ENCODER 0 +#define ENABLE_RPZA_ENCODER 0 +#define ENABLE_SMACKER_ENCODER 0 +#define ENABLE_SMC_ENCODER 0 +#define ENABLE_SNOW_ENCODER 0 +#define ENABLE_TRUEMOTION1_ENCODER 0 +#define ENABLE_TRUEMOTION2_ENCODER 0 +#define ENABLE_TSCC_ENCODER 0 +#define ENABLE_ULTI_ENCODER 0 +#define ENABLE_VCR1_ENCODER 0 +#define ENABLE_VMDVIDEO_ENCODER 0 +#define ENABLE_WNV1_ENCODER 0 +#define ENABLE_XAN_WC3_ENCODER 0 +#define ENABLE_XL_ENCODER 0 +#define ENABLE_ZMBV_ENCODER 0 +#define ENABLE_ALAC_ENCODER 0 +#define ENABLE_AMR_NB_ENCODER 0 +#define ENABLE_AMR_WB_ENCODER 0 +#define ENABLE_LIBGSM_ENCODER 0 +#define ENABLE_MACE3_ENCODER 0 +#define ENABLE_MACE6_ENCODER 0 +#define ENABLE_SHORTEN_ENCODER 0 +#define ENABLE_SMACKAUD_ENCODER 0 +#define ENABLE_TRUESPEECH_ENCODER 0 +#define ENABLE_TTA_ENCODER 0 +#define ENABLE_VMDAUDIO_ENCODER 0 +#define ENABLE_PCM_ALAW_ENCODER 0 +#define ENABLE_PCM_MULAW_ENCODER 0 +#define ENABLE_PCM_S8_ENCODER 0 +#define ENABLE_PCM_S16BE_ENCODER 0 +#define ENABLE_PCM_S16LE_ENCODER 0 +#define ENABLE_PCM_S24BE_ENCODER 0 +#define ENABLE_PCM_S24DAUD_ENCODER 0 +#define ENABLE_PCM_S24LE_ENCODER 0 +#define ENABLE_PCM_S32BE_ENCODER 0 +#define ENABLE_PCM_S32LE_ENCODER 0 +#define ENABLE_PCM_U8_ENCODER 0 +#define ENABLE_PCM_U16BE_ENCODER 0 +#define ENABLE_PCM_U16LE_ENCODER 0 +#define ENABLE_PCM_U24BE_ENCODER 0 +#define ENABLE_PCM_U24LE_ENCODER 0 +#define ENABLE_PCM_U32BE_ENCODER 0 +#define ENABLE_PCM_U32LE_ENCODER 0 +#define ENABLE_INTERPLAY_DPCM_ENCODER 0 +#define ENABLE_ROQ_DPCM_ENCODER 0 +#define ENABLE_SOL_DPCM_ENCODER 0 +#define ENABLE_VQA_ENCODER 0 +#define ENABLE_XAN_DPCM_ENCODER 0 +#define ENABLE_ADPCM_4XM_ENCODER 0 +#define ENABLE_ADPCM_CT_ENCODER 0 +#define ENABLE_ADPCM_EA_ENCODER 0 +#define ENABLE_ADPCM_IMA_DK3_ENCODER 0 +#define ENABLE_ADPCM_IMA_DK4_ENCODER 0 +#define ENABLE_ADPCM_IMA_QT_ENCODER 0 +#define ENABLE_ADPCM_IMA_SMJPEG_ENCODER 0 +#define ENABLE_ADPCM_IMA_WAV_ENCODER 0 +#define ENABLE_ADPCM_IMA_WS_ENCODER 0 +#define ENABLE_ADPCM_MS_ENCODER 0 +#define ENABLE_ADPCM_SBPRO_2_ENCODER 0 +#define ENABLE_ADPCM_SBPRO_3_ENCODER 0 +#define ENABLE_ADPCM_SBPRO_4_ENCODER 0 +#define ENABLE_ADPCM_XA_ENCODER 0 +#define ENABLE_ADPCM_YAMAHA_ENCODER 0 +#define ENABLE_CINEPAK_ENCODER 0 +#define ENABLE_FLASHSV_ENCODER 0 +#define ENABLE_H261_ENCODER 0 +#define ENABLE_H263_ENCODER 0 +#define ENABLE_H263I_ENCODER 0 +#define ENABLE_H264_ENCODER 0 +#define ENABLE_INDEO2_ENCODER 0 +#define ENABLE_INDEO3_ENCODER 0 +#define ENABLE_MJPEG_ENCODER 0 +#define ENABLE_MJPEGB_ENCODER 0 +#define ENABLE_MPEG1VIDEO_ENCODER 0 +#define ENABLE_MPEG2VIDEO_ENCODER 0 +#define ENABLE_MPEG4_ENCODER 0 +#define ENABLE_MPEGVIDEO_ENCODER 0 +#define ENABLE_MSMPEG4V1_ENCODER 0 +#define ENABLE_MSMPEG4V2_ENCODER 0 +#define ENABLE_MSMPEG4V3_ENCODER 0 +#define ENABLE_MSRLE_ENCODER 0 +#define ENABLE_MSVIDEO1_ENCODER 0 +#define ENABLE_QTRLE_ENCODER 0 +#define ENABLE_RV10_ENCODER 0 +#define ENABLE_RV20_ENCODER 0 +#define ENABLE_SVQ1_ENCODER 0 +#define ENABLE_SVQ3_ENCODER 0 +#define ENABLE_VC1_ENCODER 0 +#define ENABLE_VP3_ENCODER 0 +#define ENABLE_VP5_ENCODER 0 +#define ENABLE_VP6_ENCODER 0 +#define ENABLE_VP6F_ENCODER 0 +#define ENABLE_WMV1_ENCODER 0 +#define ENABLE_WMV2_ENCODER 0 +#define ENABLE_WMV3_ENCODER 0 +#define ENABLE_COOK_ENCODER 0 +#define ENABLE_DTS_ENCODER 0 +#define ENABLE_FLAC_ENCODER 0 +#define ENABLE_MP2_ENCODER 0 +#define ENABLE_MP3_ENCODER 0 +#define ENABLE_QDM2_ENCODER 0 +#define ENABLE_RA_144_ENCODER 0 +#define ENABLE_RA_288_ENCODER 0 +#define ENABLE_WAVPACK_ENCODER 0 +#define ENABLE_WMAV1_ENCODER 0 +#define ENABLE_WMAV2_ENCODER 0 +#define ENABLE_ADPCM_SWF_ENCODER 0 +#define ENABLE_BMP_ENCODER 0 +#define ENABLE_CAVS_ENCODER 0 +#define ENABLE_CLJR_ENCODER 0 +#define ENABLE_DSICINVIDEO_ENCODER 0 +#define ENABLE_FFV1_ENCODER 0 +#define ENABLE_FFVHUFF_ENCODER 0 +#define ENABLE_GIF_ENCODER 0 +#define ENABLE_MDEC_ENCODER 0 +#define ENABLE_MPEG_XVMC_ENCODER 0 +#define ENABLE_MSZH_ENCODER 0 +#define ENABLE_PNG_ENCODER 0 +#define ENABLE_RAWVIDEO_ENCODER 0 +#define ENABLE_SP5X_ENCODER 0 +#define ENABLE_TARGA_ENCODER 0 +#define ENABLE_TIERTEXSEQVIDEO_ENCODER 0 +#define ENABLE_TIFF_ENCODER 0 +#define ENABLE_VMNC_ENCODER 0 +#define ENABLE_ZLIB_ENCODER 0 +#define ENABLE_DSICINAUDIO_ENCODER 0 +#define ENABLE_IMC_ENCODER 0 +#define ENABLE_MP3ADU_ENCODER 0 +#define ENABLE_MP3ON4_ENCODER 0 +#define ENABLE_MPC7_ENCODER 0 +#define ENABLE_SONIC_ENCODER 0 +#define ENABLE_WS_SND1_ENCODER 0 +#define ENABLE_ADPCM_ADX_ENCODER 0 +#define ENABLE_ADPCM_G726_ENCODER 0 +#define ENABLE_DVBSUB_ENCODER 0 +#define ENABLE_DVDSUB_ENCODER 0 +#define ENABLE_THEORA_ENCODER 0 +#define ENABLE_AAC_ENCODER 0 +#define ENABLE_MPEG4AAC_ENCODER 0 +#define ENABLE_AC3_ENCODER 0 +#define ENABLE_VORBIS_ENCODER 0 +#define ENABLE_H263P_ENCODER 0 +#define ENABLE_JPEGLS_ENCODER 0 +#define ENABLE_LJPEG_ENCODER 0 +#define ENABLE_PAM_ENCODER 0 +#define ENABLE_PBM_ENCODER 0 +#define ENABLE_PGM_ENCODER 0 +#define ENABLE_PGMYUV_ENCODER 0 +#define ENABLE_PPM_ENCODER 0 +#define ENABLE_SONIC_LS_ENCODER 0 +#define ENABLE_AAC_PARSER 0 +#define ENABLE_AC3_PARSER 0 +#define ENABLE_CAVSVIDEO_PARSER 0 +#define ENABLE_DVBSUB_PARSER 0 +#define ENABLE_DVDSUB_PARSER 0 +#define ENABLE_H261_PARSER 0 +#define ENABLE_H263_PARSER 0 +#define ENABLE_H264_PARSER 0 +#define ENABLE_MJPEG_PARSER 0 +#define ENABLE_MPEG4VIDEO_PARSER 0 +#define ENABLE_MPEGAUDIO_PARSER 0 +#define ENABLE_MPEGVIDEO_PARSER 0 +#define ENABLE_PNM_PARSER 0 --- xine-lib-1.1.11.1.orig/src/libxineadec/Makefile.in +++ xine-lib-1.1.11.1/src/libxineadec/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -119,7 +119,7 @@ $(LDFLAGS) -o $@ @HAVE_VORBIS_TRUE@am_xineplug_decode_vorbis_la_rpath = -rpath \ @HAVE_VORBIS_TRUE@ $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -525,8 +525,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -534,8 +534,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -706,8 +706,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -732,8 +732,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -743,12 +743,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libxineadec/nosefart/Makefile.in +++ xine-lib-1.1.11.1/src/libxineadec/nosefart/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -69,7 +69,7 @@ libnosefart_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libnosefart_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -593,8 +593,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -606,8 +606,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -617,12 +617,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/libxineadec/gsm610/Makefile.in +++ xine-lib-1.1.11.1/src/libxineadec/gsm610/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -68,7 +68,7 @@ libgsm610_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgsm610_la_CFLAGS) \ $(CFLAGS) $(libgsm610_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -575,8 +575,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -588,8 +588,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -599,12 +599,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- xine-lib-1.1.11.1.orig/src/liba52/Makefile.in +++ xine-lib-1.1.11.1/src/liba52/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,7 +87,7 @@ $(xineplug_decode_a52_la_CFLAGS) $(CFLAGS) \ $(xineplug_decode_a52_la_LDFLAGS) $(LDFLAGS) -o $@ @A52_TRUE@am_xineplug_decode_a52_la_rpath = -rpath $(xineplugdir) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -472,8 +472,8 @@ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ else :; fi; \ done @@ -481,8 +481,8 @@ @$(NORMAL_UNINSTALL) @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ done clean-xineplugLTLIBRARIES: @@ -583,8 +583,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -596,8 +596,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -607,12 +607,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique