[SCM] vlc/experimental: 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
Fri Jan 2 13:45:06 UTC 2015
The following commit has been merged in the experimental branch:
commit 648f94e23f170ef237ce6a96aade883ceb75960e
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Fri Jan 2 14:45:23 2015 +0100
Disable build samba plugin on hurd for fix FTBFS. (Closes: #765578)
diff --git a/debian/changelog b/debian/changelog
index 88be8c4..26ffe03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
vlc (2.2.0~rc2-1+exp1) UNRELEASED; urgency=medium
+ [ Sebastian Ramacher ]
* Regenerate plugin cache using triggers. (Closes: #755154) (LP: #1328466)
- debian/vlc-nox.postinst: Run vlc-cache-gen.
- debian/vlc-nox.postrm: Remove generated cache.
@@ -7,6 +8,9 @@ vlc (2.2.0~rc2-1+exp1) UNRELEASED; urgency=medium
- debian/vlc-nox.install.in: Do not install pre-generated plugins.dat.
* debian/rules: Build with -Wl,--as-needed.
+ [ Mateusz Łukasik ]
+ * Disable build samba plugin on hurd for fix FTBFS. (Closes: #765578)
+
-- Sebastian Ramacher <sramacher at debian.org> Sun, 16 Nov 2014 02:52:58 +0100
vlc (2.2.0~rc2-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index e1ed44d..f13ff73 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,
@@ -335,7 +335,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 3adfa6a..478887f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -239,6 +239,15 @@ CFLAGS += -mtune=8548
CXXFLAGS += -mtune=8548
endif
+# Disable samba on hurd
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+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