[SCM] vlc/master: Reduce libX11 or libxcb linkage to a warning

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun May 29 11:20:01 UTC 2016


The following commit has been merged in the master branch:
commit ae7923de3c4cf30c104dc6a6907631b355055b00
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun May 29 13:08:05 2016 +0200

    Reduce libX11 or libxcb linkage to a warning
    
    Moving the ffmpeg and libtheora plugins to vlc does not make much sense.

diff --git a/debian/rules b/debian/rules
index f0de01c..54e3a2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -397,15 +397,12 @@ override_dh_install:
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# Check that we did not install a plugin linked with libX11 or
 	# libxcb in vlc-nox
-	BORKED=no; \
 	LD_LIBRARY_PATH="debian/libvlccore8/usr/lib:debian/libvlc5/usr/lib$${LD_LIBRARY_PATH:+:}$${LD_LIBRARY_PATH:-}"; \
 	for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
 		if ldd -r $$file | egrep -q -e 'libX11\.so' -e 'libxcb\.so'; then \
-			BORKED=yes; \
-			echo $$file depends on libX11 or libxcb; \
+			echo warning: $$file depends on libX11 or libxcb; \
 		fi; \
 	done; \
-	if test "$$BORKED" = yes; then exit 1; fi
 	# Install zsh completion if available
 	find extras/analyser/_vlc -exec \
 		dh_install -pvlc-nox '{}' usr/share/zsh/vendor-completions \;

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list