[SCM] vlc/master: Disable Video4Linux2 on kFreeBSD due to a build failure.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Mon Oct 28 23:12:00 UTC 2013


The following commit has been merged in the master branch:
commit 8d10161b3596d25bdc0e6d7e608ed7a3d3758da9
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Oct 29 00:10:48 2013 +0100

    Disable Video4Linux2 on kFreeBSD due to a build failure.
    
    Closes: #728130

diff --git a/debian/control b/debian/control
index 348d216..9541cd9 100644
--- a/debian/control
+++ b/debian/control
@@ -86,7 +86,7 @@ Build-Depends: autopoint,
                libtwolame-dev (>= 0.3.8),
                libudev-dev [linux-any],
                libupnp-dev,
-               libv4l-dev [kfreebsd-any linux-any],
+               libv4l-dev [linux-any],
                libva-dev [linux-any],
                libvcdinfo-dev (>= 0.7.22),
                libvorbis-dev,
diff --git a/debian/rules b/debian/rules
index ed83789..7453098 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,7 +171,8 @@ removeplugins += \
 endif
 
 # Linux and kFreeBSD specific flags
-ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS)))
+# kfreebsd disabled due to a build failure
+ifeq (,$(filter-out linux,$(DEB_HOST_ARCH_OS)))
 confflags += --enable-v4l2
 else
 confflags += --disable-v4l2

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list