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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 10 10:04:25 UTC 2012


The following commit has been merged in the ubuntu branch:
commit ca47bc3587fbc28cd551ab8ed3b00266695c8f64
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.
    
    (cherry picked from commit 49cdff7e068c09990dadfc774575fed2679db789)
    
    Conflicts:
    
    	debian/confflags
    	debian/control

diff --git a/debian/control b/debian/control
index 0b5d111..a4e15ff 100644
--- a/debian/control
+++ b/debian/control
@@ -30,14 +30,14 @@ Build-Depends:
  libgsm1-dev,
  libimlib2-dev,
  libjack-dev,
- libpulse-dev [!hurd-any],
+ libpulse-dev,
  libraw1394-dev [linux-any],
  libschroedinger-dev,
  libsdl1.2-dev,
  libspeex-dev,
  libtheora-dev (>> 0.0.0.alpha4),
  libtiff4-dev | libtiff-dev,
- libva-dev [!hurd-i386],
+ libva-dev [!hurd-any],
  libvdpau-dev,
  libvorbis-dev,
  libvpx-dev,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list