[SCM] vlc/squeeze-backports: Disable crystalhd

edwardw-guest at users.alioth.debian.org edwardw-guest at users.alioth.debian.org
Wed Aug 8 02:14:57 UTC 2012


The following commit has been merged in the squeeze-backports branch:
commit 73d9edf36a5463a100d8b1efc8420225aa9daa88
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Tue Aug 7 16:03:11 2012 -0400

    Disable crystalhd
    
    Crystalhd is not available in squeeze.

diff --git a/debian/control b/debian/control
index 7b050b2..874306a 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Build-Depends: autopoint,
                libcaca-dev (>= 0.99.beta4),
                libcddb2-dev,
                libcdio-dev (>= 0.78.2),
-               libcrystalhd-dev [amd64 i386],
                libdc1394-22-dev (>= 2.1.0) [linux-any],
                libdca-dev,
                libdirac-dev,
diff --git a/debian/rules b/debian/rules
index 60fc1ca..6e28fb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,7 @@ confflags += \
 # projectm -> broken
 # sqlite -> still in development
 # telx -> incompatible with zvbi
+# crystalhd -> not in squeeze
 confflags += \
 	--disable-dxva2 \
 	--disable-gnomevfs \
@@ -112,6 +113,7 @@ confflags += \
 	--disable-projectm \
 	--disable-sqlite \
 	--disable-telx \
+	--disable-crystalhd \
 	$(NULL)
 
 # Linux specific flags
@@ -166,14 +168,6 @@ confflags += --disable-v4l2
 removeplugins += libv4l2
 endif
 
-# Linux amd64 and i386 specific flags
-ifneq ($(filter $(DEB_HOST_ARCH),amd64 i386),)
-confflags += --enable-crystalhd
-else
-confflags += --disable-crystalhd
-removeplugins += libcrystalhd
-endif
-
 # amd64 and i386 specific optimizations
 ifneq ($(filter $(DEB_HOST_ARCH_CPU),amd64 i386),)
 confflags += --enable-mmx --enable-sse

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list