diff options
| -rw-r--r-- | debian/README.Debian | 67 | ||||
| -rw-r--r-- | debian/changelog | 38 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 30 |
4 files changed, 79 insertions, 60 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index baa3c7cf8..ba052459d 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,58 +1,29 @@ -xine-lib for Debian -------------------- - -This library is (part of) the official successor of the xine video player. -xine used to ship as two binary packages, one main player and an extra DVD -plugin, so you could replace that with one that supports CSS. -With this version, a better Plugin architecture is introduced, so you can have -several DVD plugins in parallel. -Unfortunately, there is no Debian package for any CSS capable, 0.5 compatible -plugin yet. - -You can build one from source, though. -Two of the most famous plugins are: -http://www.geocities.com/captain_css/ (stable, plays most DVDs, simple setup) -http://dvd.sf.net (tries to support navigation, still fails on many DVDs) - -If this all sounds strange to you, or maybe you're looking for Debian packaged -plugins, just read the DVD story that came with xine: - - The CSS plugin story... ======================= -xine, as supported by upstream supports reading DVDs via an input plugin -(available as package xine-dvd in Debian). But this plugin is restricted to -non-encrypted DVDs, ie. a very small fraction of the DVDs currently -available... - -This is due to some legal uncertainties surrounding the CSS ("Content -Scrambling System") descrambling code: Lots of people think that it's no -problem (ie. "fair use") to use CSS descrambling software to watch DVDs with -any player they like, but this has not been proven in court yet... - -Currently, there is no "official" css plugin for xine, but unofficial -ones is available from several sites. One of these packages, the "captain_css" -plugin, has even been packaged for Debian. it is available in some apt-gettable -archives, so you can easily install it after adding one (or more) of these -lines to your /etc/apt/sources.list : +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. -deb http://samfundet.no/debian woody css -deb ftp://ftp.dodds.net/debian woody css +For more information how to install the necessary plugin, please read +/usr/share/doc/libdvdread3/README.Debian -DISCLAIMER: This is an absolutely incomplete list, provided just for your - convenience. Please notify the maintainer of this package - at <xine@packages.debian.org> if you know of any other sources! -If you want to get the plugin manually, you can use one of these sites: -(the disclaimer still applies) +The Default audio plugin story... (#354437, et al) +================================================== -original source: -http://members.nbci.com/captain_css/ +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.) -debian packages: -http://samfundet.no/debian/dists/woody/css/ -ftp://ftp.dodds.net/debian/dists/woody/css/ +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" - -- Siggi Langauf <siggi@debian.org>, Sun, 5 Aug 2001 20:26:31 +0200 diff --git a/debian/changelog b/debian/changelog index 894931704..9fd991c9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,41 @@ +xine-lib (1.1.1+cvs20060702-2) UNRELEASED; urgency=low + + * updated README.Debian + + -- Reinhard Tartler <siretart@tauware.de> Mon, 3 Jul 2006 11:13:30 +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 <siretart@tauware.de> 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 <siretart@tauware.de> Sat, 24 Jun 2006 13:22:26 +0000 + xine-lib (1.1.1-3) UNRELEASED; urgency=low * (re)introduce libxine1-dbg package. (Closes: #373135) diff --git a/debian/control b/debian/control index b3fd55a54..bdb9a26a5 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: libs Priority: optional Maintainer: Siggi Langauf <siggi@debian.org> Uploaders: Philipp Matthias Hahn <pmhahn@debian.org>, Reinhard Tartler <siretart@tauware.de> -Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev | xlibs-static-dev (<< 6.8.0), libxv-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libvcdinfo-dev, libmad0-dev, libxvmc-dev | xlibs-dev (<< 6.8.0) +Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev | xlibs-static-dev (<< 6.8.0), libxv-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libvcdinfo-dev, libmad0-dev, libxvmc-dev | xlibs-dev (<< 6.8.0), w3m, automake1.9, autoconf, libtool Build-Conflicts: libdvdnav-dev -Standards-Version: 3.6.2 +Standards-Version: 3.7.2 Package: libxine-dev Architecture: any diff --git a/debian/rules b/debian/rules index 39a030499..3a5af27ef 100755 --- a/debian/rules +++ b/debian/rules @@ -54,28 +54,40 @@ ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS))) DEB_BUILD_GNU_OPTION := --build=$(DEB_BUILD_GNU_TYPE) endif -CONFIGURE_FLAGS := --prefix=/usr --mandir=\$${prefix}/share/man --with-external-libmad +CONFIGURE_FLAGS := --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --with-external-libmad \ + $(DEB_BUILD_GNU_OPTION) \ + CFLAGS="$(CFLAGS)" configure: configure-stamp configure-stamp: dh_testdir - ./configure --prefix=/usr --mandir=\$${prefix}/share/man --with-external-libmad --with-xv-path=/usr/lib \ - $(DEB_BUILD_GNU_OPTION) CFLAGS="$(CFLAGS)" + # let's run autohell on the buildds! + chmod +x ./autogen.sh + ./autogen.sh $(CONFIGURE_FLAGS) touch configure-stamp build: configure-stamp build-stamp build-stamp: dh_testdir - $(MAKE) - touch build-stamp +update-config-sub-guess: + @echo updateing config.sub and config.guess + @echo package autotools-dev must be installed! + cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.guess config.guess + clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp po/*.gmo - test -f Makefile && $(MAKE) distclean || true + rm -f build-stamp configure-stamp po/*.gmo po/stamp-po + -$(MAKE) distclean + # remove more cruft leftover by autohell + -find . -name Makefile.in -print | xargs rm + rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing dh_clean install: build @@ -83,7 +95,6 @@ install: build dh_testroot dh_clean -k dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \ LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib @@ -105,9 +116,8 @@ binary-arch: build install dh_strip --dbg-package=libxine1 dh_compress dh_fixperms - dh_makeshlibs -V 'libxine1 (>= 1.1.0)' + dh_makeshlibs -V 'libxine1 (>= 1.1.1+cvs20060621-1)' dh_installdeb -# dh_shlibdeps chmod +x debian/shlibdeps.sh debian/shlibdeps.sh libxine${major} dh_gencontrol |