[SCM] vlc/master: Disable build samba plugin on hurd for fix FTBFS. (Closes: #765578)

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Sat Feb 28 14:00:17 UTC 2015


The following commit has been merged in the master branch:
commit 6471a29e7f704f1819ff945de7756f222f562dce
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sat Feb 28 15:00:48 2015 +0100

    Disable build samba plugin on hurd for fix FTBFS. (Closes: #765578)

diff --git a/debian/changelog b/debian/changelog
index 869c129..d9a93f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ vlc (2.2.0-1) UNRELEASED; urgency=medium
   * Drop patches included upstream:
     - demux-mp4-fix-buffer-overflow-in-parsing-of-string-b.patch
     - stream_out-rtp-don-t-use-VLA-for-user-controlled-dat.patch
+  * Disable build samba plugin on hurd for fix FTBFS. (Closes: #765578)
 
  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Fri, 27 Feb 2015 22:41:49 +0100
 
diff --git a/debian/control b/debian/control
index f158f12..6d2d583 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Build-Depends: autopoint,
                libshine-dev (>= 3.0.0),
                libshout3-dev,
                libsidplay2-dev,
-               libsmbclient-dev,
+               libsmbclient-dev [!hurd-any],
                libspeex-dev (>= 1.0.5),
                libspeexdsp-dev (>= 1.0.5),
                libssh2-1-dev,
@@ -328,7 +328,7 @@ Description: VBI teletext plugin for VLC
  podcasts, and multimedia streams from various network sources.
 
 Package: vlc-plugin-samba
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Breaks: vlc-nox (<< 2.2.0~pre2-2~)
 Replaces: vlc-nox (<< 2.2.0~pre2-2~)
 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index 247bfdc..9589447 100755
--- a/debian/rules
+++ b/debian/rules
@@ -236,6 +236,14 @@ CFLAGS += -mtune=8548
 CXXFLAGS += -mtune=8548
 endif
 
+# Disable samba on hurd
+ifneq (,$(filter-out $(DEB_HOST_ARCH),hurd-i386))
+confflags += --enable-smbclient
+else
+confflags += --disable-smbclient
+removeplugins += smbclient
+endif
+
 confflags += \
 	CFLAGS="$(CFLAGS)" \
 	CXXFLAGS="$(CXXFLAGS)" \

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list