[SCM] libav/master: Fix build for hurd. Thanks to Samuel Thibault for patch.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Wed May 2 01:06:05 UTC 2012


The following commit has been merged in the master branch:
commit 49cdff7e068c09990dadfc774575fed2679db789
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Tue May 1 21:05:52 2012 -0400

    Fix build for hurd. Thanks to Samuel Thibault for patch.

diff --git a/debian/confflags b/debian/confflags
index 68e210f..49b5cac 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -97,7 +97,6 @@ confflags += --extra-version='$(DEB_VERSION)'
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
 confflags += --prefix=/usr
 confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
-confflags += --enable-vaapi
 confflags += --enable-vdpau
 confflags += --enable-bzlib
 confflags += --enable-frei0r
@@ -113,6 +112,7 @@ confflags += --enable-zlib
 confflags += --enable-libvpx
 confflags += --enable-runtime-cpudetect
 confflags += --enable-libfreetype
+confflags += --enable-libpulse
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
 # plenty of incompatible assembly; not sure how to detect that properly
@@ -125,8 +125,8 @@ endif
 
 confflags += $(extra_common_confflags)
 
-# pulse is not available on the hurd
-confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
+# libva is not available on the hurd
+confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
 
 # this part below is intended for the 'Libav' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
diff --git a/debian/control b/debian/control
index cdb4d48..bee330c 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends:
  libopencore-amrnb-dev,
  libopencore-amrwb-dev,
  libopenjpeg-dev,
- libpulse-dev [!hurd-any],
+ libpulse-dev,
  libraw1394-dev [linux-any],
  librtmp-dev (>= 2.2e-4),
  libschroedinger-dev,
@@ -43,7 +43,7 @@ Build-Depends:
  libspeex-dev,
  libtheora-dev (>> 0.0.0.alpha4),
  libtiff4-dev | libtiff-dev,
- libva-dev,
+ libva-dev [!hurd-any],
  libvdpau-dev,
  libvo-aacenc-dev,
  libvo-amrwbenc-dev,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list