summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2006-02-25 09:05:36 +0000
committerReinhard Tartler <siretart@tauware.de>2006-02-25 09:05:36 +0000
commit072ac74a5a4ebc3c74da94bc14c1f251680cc7b3 (patch)
tree8960f5546b5c01a386ae6df0720a7c2fdb2651c2
parent154426d51ab2eb7fda7b1d2a579e56a0615161a8 (diff)
downloadxine-lib-072ac74a5a4ebc3c74da94bc14c1f251680cc7b3.tar.gz
xine-lib-072ac74a5a4ebc3c74da94bc14c1f251680cc7b3.tar.bz2
enabling external libmad
enabling xvmc dependency CVS patchset: 7906 CVS date: 2006/02/25 09:05:36
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules2
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 877ebb8cd..c0072da87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xine-lib (1.1.1-2) unstable; urgency=low
+
+ * Use external libmad (Closes: #336437)
+ * enable support for libxvmc1, now that we have xorg in debian
+
+ -- Reinhard Tartler <siretart@tauware.de> Sat, 25 Feb 2006 09:39:33 +0100
+
xine-lib (1.1.1-1) unstable; urgency=low
* New upstream release! (Closes: #326936, #353150, #332919)
diff --git a/debian/control b/debian/control
index 8b636ff40..522e09400 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev, libxv-dev, 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
+Build-Depends: debhelper (>= 4.0.4), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev, libxv-dev, 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
Build-Conflicts: libdvdnav-dev
Standards-Version: 3.6.2
diff --git a/debian/rules b/debian/rules
index d43819a00..975286110 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,8 @@ 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: configure-stamp
configure-stamp:
dh_testdir