diff options
| -rw-r--r-- | debian/control | 22 | ||||
| -rwxr-xr-x | debian/rules | 25 |
2 files changed, 30 insertions, 17 deletions
diff --git a/debian/control b/debian/control index a1faae54c..f83f8f650 100644 --- a/debian/control +++ b/debian/control @@ -7,23 +7,23 @@ 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], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], 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, - libsmbclient-dev, libspeex-dev, libmng-dev, - libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), - w3m, transfig, sgmltools-lite, gs-gpl | gs -Build-Conflicts: libdvdnav-dev, libvcdinfo-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 Standards-Version: 3.7.2 Package: libxine-dev diff --git a/debian/rules b/debian/rules index 604954649..b44bccd81 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 \ --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 |