summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-11 20:13:44 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-11 20:13:44 +0100
commit494b949523221dc1f2ad65ac6827340235bbeb00 (patch)
tree7085117b5d482c39c072d6aa7c25254f214695b5 /debian
parent628c4cbd9d023e74a7c6805d7ec0f163f2c172d1 (diff)
parent5c29923095c53ae9788bf77b7b6d416a689434e6 (diff)
downloadxine-lib-494b949523221dc1f2ad65ac6827340235bbeb00.tar.gz
xine-lib-494b949523221dc1f2ad65ac6827340235bbeb00.tar.bz2
Merge from 1.1.
--HG-- rename : include/xine.h.in => include/xine.h
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control17
-rwxr-xr-xdebian/rules25
3 files changed, 29 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index b015c2afa..29f4db045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
-- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100
-xine-lib (1.1.10.1+hg-0) unstable; urgency=low
+xine-lib (1.1.12~hg-0) unstable; urgency=low
[ Darren Salt ]
* Hg snapshot.
@@ -14,7 +14,7 @@ xine-lib (1.1.10.1+hg-0) unstable; urgency=low
* remove gs from build-dependencies
* change the maintainer field to xine-devel@lists.sourceforge.net.
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Thu, 07 Feb 2008 17:52:34 +0000
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 08 Apr 2008 15:29:17 +0100
xine-lib (1.1.5~cvs-0) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d3a1b1bde..e6b61a18c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,23 +7,22 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
libavcodec-dev (>= 0.cvs20070307-3) | libavcodeccvs-dev,
libavformat-dev (>= 0.cvs20070307-3) | libavformatcvs-dev,
libpostproc-dev (>= 0.cvs20070307-3) | libpostproccvs-dev,
- libxcb-xinerama0-dev | libxv-dev (<< 1:1.0.3), libxcb-xv0-dev | libxv-dev (<< 1:1.0.3),
- libxcb-xvmc0-dev | libxv-dev (<< 1:1.0.3), libxcb-shm0-dev | libxv-dev (<< 1:1.0.3),
+ libxcb-xv0-dev | libxv-dev (<< 1:1.0.3),
+ libxcb-shm0-dev | libxv-dev (<< 1:1.0.3),
libxcb-shape0-dev | libxv-dev (<< 1:1.0.3),
- libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev,
+ libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaa1-dev, libcaca-dev, libmodplug-dev,
- libmagick9-dev, libpng12-dev, libfreetype6-dev,
+ libjack-dev, libpulse-dev, libartsc0-dev,
+ libmagick9-dev | libmagick-dev, libpng12-dev, libfreetype6-dev,
libogg-dev, libvorbis-dev, libtheora-dev,
libesd0-dev, libgnomevfs2-dev,
- zlib1g-dev, libartsc0-dev,
- liblircclient-dev, libjack0.100.0-dev | libjack-dev,
+ liblircclient-dev,
libdirectfb-dev (>= 0.9.22), libgtk2.0-dev,
- libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-dev,
+ libflac-dev, libsdl1.2-dev, libwavpack-dev,
libsmbclient-dev, libspeex-dev, libmng-dev,
libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), libvcdinfo-dev,
- w3m, xmlto, librsvg2-bin
-Build-Conflicts: libdvdnav-dev
+ zlib1g-dev, w3m, xmlto, librsvg2-bin
Standards-Version: 3.7.2
Package: libxine-dev
diff --git a/debian/rules b/debian/rules
index 96dce1aa0..b2894e584 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,18 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
BUILD_TARGET := debug
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
+
# note also "noauto" to inhibit running of autogen.sh
# the "optimize" flag disables compatibility hacks
@@ -67,6 +79,7 @@ CONFIGURE_FLAGS := --prefix=/usr \
--with-external-ffmpeg=soft \
--with-freetype \
--with-wavpack \
+ --enable-ipv6 \
$(DEB_BUILD_CONFIG_OPTIONS) \
CFLAGS="$(CFLAGS)"
@@ -87,7 +100,7 @@ endif
build: configure-stamp build-stamp
build-stamp:
dh_testdir
- $(MAKE)
+ $(MAKE) -j $(NJOBS)
touch build-stamp
update-config-sub-guess:
@@ -100,11 +113,11 @@ clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp po/*.gmo po/stamp-po
- -$(MAKE) distclean
- # remove more cruft leftover by autohell
- rm -f doc/faq/faq.html doc/faq/faq.txt doc/hackersguide/hackersguide.html m4/caca.m4
- -test -f .noauto || find . -name Makefile.in -print | xargs -r rm
- test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing aclocal.m4 include/configure.h.in
+ if test -f .noauto; then \
+ [ ! -f Makefile ] || $(MAKE) distclean; \
+ else \
+ [ ! -f Makefile ] || $(MAKE) maintainer-clean; \
+ fi
dh_clean
install: build