[SCM] vlc/master: crystalhd is only available on amd64 and i386.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Sat Jun 30 15:12:31 UTC 2012 

The following commit has been merged in the master branch:
commit 59a1cf9ff1bb524967c9ec7caa55991b761dd861
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jun 30 17:00:11 2012 +0200

    crystalhd is only available on amd64 and i386.

diff --git a/debian/control b/debian/control
index ad14d04..7367245 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: autopoint,
                libcaca-dev (>= 0.99.beta4),
                libcddb2-dev,
                libcdio-dev (>= 0.78.2),
-               libcrystalhd-dev,
+               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 32b0bc7..2ee76ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 VERSION = $(shell dpkg-parsechangelog|sed -n 's/^Version: //p')
 DEBIAN_VERSION = $(shell echo $(VERSION)|sed -nr 's/[^:]+://; s/.*-([^-]+$$)/\1/p')
@@ -44,7 +45,6 @@ confflags += \
 	--enable-bluray \
 	--enable-bonjour \
 	--enable-caca \
-	--enable-crystalhd \
 	--enable-dbus \
 	--enable-dca \
 	--enable-dirac \
@@ -125,15 +125,59 @@ confflags += \
 	--enable-linsys \
 	--enable-pvr \
 	--enable-udev \
-	--enable-v4l2 \
 	$(NULL)
-endif
-
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+else
 confflags += \
 	--disable-alsa \
-	--enable-v4l2 \
+	--disable-atmo \
+	--disable-dc1394 \
+	--disable-dv \
+	--disable-libva \
+	--disable-linsys \
+	--disable-pvr \
+	--disable-udev \
 	$(NULL)
+removeplugins += alsa libatmo libdc1394 libdtv libaccess_dv libfb linsys libpvr libudev
+endif
+
+# Linux and kFreeBSD specific flags
+ifneq ($(filter $(DEB_HOST_ARCH_OS),linux kfreebsd),)
+confflags += --enable-v4l2
+else
+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
+else
+confflags += --disable-mmx --disable-sse
+removeplugins += 3dn mmx mmxext sse2
+endif
+
+# ARM specific optimizations
+ifneq ($(filter $(DEB_HOST_ARCH_CPU),armel armhf),)
+confflags += --enable-neon
+else
+confflags += --disable-neon
+removeplugins += neon
+endif
+
+# PowerPC specific optimizations
+ifneq ($(filter $(DEB_HOST_ARCH_CPU),powerpc),)
+confflags += --enable-altivec
+else
+confflags += --disable-altivec
+removeplugins += altivec
 endif
 
 %:
@@ -143,10 +187,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_clean:
-	[ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak \
-		debian/vlc-nox.install
-	rm -f debian/vlc-nox.install.kfreebsd
-	rm -f debian/vlc-nox.install.hurd
+	[ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak debian/vlc-nox.install
 	rm -rf tmp/
 	dh_auto_clean
 
@@ -177,17 +218,9 @@ endif
 endif
 
 override_dh_install:
-	cp debian/vlc-nox.install debian/vlc-nox.install.bak
-	for dir in sse2 3dnow altivec arm_neon mmx mmxext ; do \
-	        if test -d debian/tmp/usr/lib/vlc/plugins/$${dir}; then \
-	                echo usr/lib/vlc/plugins/$${dir} >> debian/vlc-nox.install ; \
-	        fi ; \
-	done
-	# Remove some modules on non-linux arch
-	sed -e '/\(lib\|libaccess_\)\(alsa\|atmo\|dc1394\|dtv\|dv\|fb\|pvr\|udev\)_/d;/liblinsys_/d' \
-	 debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
-	sed -e '/\(lib\|libaccess_\)v4l2_/d' \
-	 debian/vlc-nox.install.kfreebsd > debian/vlc-nox.install.hurd
+	# Remove disabled plugins
+	test -f debian/vlc-nox.install.bak || cp debian/vlc-nox.install debian/vlc-nox.install.bak
+	sed -i "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc-nox.install
 	cp tmp/libvlc.a debian/tmp/usr/lib
 	cp tmp/libvlccore.a debian/tmp/usr/lib
 	# Clean up libtool crap
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 45de0c9..d7aa607 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -4,6 +4,7 @@ usr/bin/rvlc
 usr/bin/vlc
 usr/bin/vlc-wrapper
 usr/lib/vlc/lua/
+usr/lib/vlc/plugins/3dnow/libmemcpy3dn_plugin.so
 usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so
 usr/lib/vlc/plugins/access/libaccess_attachment_plugin.so
 usr/lib/vlc/plugins/access/libaccess_avio_plugin.so
@@ -41,6 +42,11 @@ usr/lib/vlc/plugins/access/libvcd_plugin.so
 usr/lib/vlc/plugins/access/libvcdx_plugin.so
 usr/lib/vlc/plugins/access/libzip_plugin.so
 usr/lib/vlc/plugins/access_output
+usr/lib/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so
+usr/lib/vlc/plugins/altivec/libmemcpyaltivec_plugin.so
+usr/lib/vlc/plugins/arm_neon/libaudio_format_neon_plugin.so
+usr/lib/vlc/plugins/arm_neon/libchroma_yuv_neon_plugin.so
+usr/lib/vlc/plugins/arm_neon/libyuv_rgb_neon_plugin.so
 usr/lib/vlc/plugins/audio_filter
 usr/lib/vlc/plugins/audio_mixer
 usr/lib/vlc/plugins/audio_output/libadummy_plugin.so
@@ -104,6 +110,11 @@ usr/lib/vlc/plugins/misc/libosd_parser_plugin.so
 usr/lib/vlc/plugins/misc/libstats_plugin.so
 usr/lib/vlc/plugins/misc/libvod_rtsp_plugin.so
 usr/lib/vlc/plugins/misc/libxml_plugin.so
+usr/lib/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so
+usr/lib/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so
+usr/lib/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so
+usr/lib/vlc/plugins/mmx/libmemcpymmx_plugin.so
+usr/lib/vlc/plugins/mmxext/libmemcpymmxext_plugin.so
 usr/lib/vlc/plugins/mux
 usr/lib/vlc/plugins/notify/libtelepathy_plugin.so
 usr/lib/vlc/plugins/packetizer
@@ -115,6 +126,9 @@ usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
 usr/lib/vlc/plugins/services_discovery/libsap_plugin.so
 usr/lib/vlc/plugins/services_discovery/libudev_plugin.so
 usr/lib/vlc/plugins/services_discovery/libupnp_plugin.so
+usr/lib/vlc/plugins/sse2/libi420_rgb_sse2_plugin.so
+usr/lib/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.so
+usr/lib/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so
 usr/lib/vlc/plugins/stream_filter
 usr/lib/vlc/plugins/stream_out
 usr/lib/vlc/plugins/text_renderer/libfreetype_plugin.so

-- 
VLC media player packaging

More information about the pkg-multimedia-commits mailing list