[SCM] vlc/master: Enable libva on kFreeBSD.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Tue Oct 29 00:54:22 UTC 2013
The following commit has been merged in the master branch:
commit ecc639b9babf1df518ceb3301c3af807dda051fa
Author: Benjamin Drung <bdrung at debian.org>
Date: Tue Oct 29 01:54:08 2013 +0100
Enable libva on kFreeBSD.
diff --git a/debian/control b/debian/control
index 9541cd9..64b742d 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,7 @@ Build-Depends: autopoint,
libudev-dev [linux-any],
libupnp-dev,
libv4l-dev [linux-any],
- libva-dev [linux-any],
+ libva-dev [kfreebsd-any linux-any],
libvcdinfo-dev (>= 0.7.22),
libvorbis-dev,
libx11-dev,
diff --git a/debian/rules b/debian/rules
index 8e3e04b..8e9fbea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,7 +141,6 @@ confflags += \
--enable-atmo \
--enable-dc1394 \
--enable-dv1394 \
- --enable-libva \
--enable-linsys \
--enable-omxil \
--enable-udev \
@@ -152,7 +151,6 @@ confflags += \
--disable-atmo \
--disable-dc1394 \
--disable-dv1394 \
- --disable-libva \
--disable-linsys \
--disable-omxil \
--disable-udev \
@@ -168,11 +166,18 @@ removeplugins += \
libomxil \
linsys \
libudev \
- libvaapi \
$(NULL)
endif
# Linux and kFreeBSD specific flags
+ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS)))
+confflags += --enable-libva
+else
+confflags += --disable-libva
+removeplugins += libvaapi
+endif
+
+# Linux and kFreeBSD specific flags
# kfreebsd disabled due to a build failure
ifeq (,$(filter-out linux,$(DEB_HOST_ARCH_OS)))
confflags += --enable-v4l2
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list