summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2016-04-02 15:45:16 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2016-04-02 15:45:24 +0100
commit998de2831a15b5d8635babc38ed57292bee6d491 (patch)
tree29a13ee58f8e04cd71973618ae45582eebf576da /media-sound/xmms2/files
parentmedia-tv/tvheadend: restrict build with ffmpeg-3 (diff)
downloadgentoo-998de2831a15b5d8635babc38ed57292bee6d491.tar.gz
gentoo-998de2831a15b5d8635babc38ed57292bee6d491.tar.bz2
gentoo-998de2831a15b5d8635babc38ed57292bee6d491.zip
media-sound/xmms2: backported samba detection fix
While at it updated to non-deprecated python and ruby eclasses. Package-Manager: portage-2.2.28
Diffstat (limited to 'media-sound/xmms2/files')
-rw-r--r--media-sound/xmms2/files/xmms2-0.8-samba-4.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/media-sound/xmms2/files/xmms2-0.8-samba-4.patch b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
new file mode 100644
index 000000000000..937f3d75bea9
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
@@ -0,0 +1,30 @@
+commit 86ea5e2d2ac2d8c8c1aee484e8c264440fafcb6a
+Author: Daniel P. Chokola <dan.chokola@gmail.com>
+Date: Wed Jan 1 14:57:35 2014 -0500
+
+ BUG(2573): Samba 4.0 uses pkg-config. Find libsmbclient.h properly.
+
+diff --git a/src/plugins/samba/wscript b/src/plugins/samba/wscript
+index 8398169..77d7cda 100644
+--- a/src/plugins/samba/wscript
++++ b/src/plugins/samba/wscript
+@@ -1,8 +1,17 @@
+ from waftools.plugin import plugin
++from waflib import Errors
+
+ def plugin_configure(conf):
+- conf.check_cc(header_name="libsmbclient.h")
+- conf.check(lib="smbclient", uselib_store="smbclient")
++ try:
++ conf.check_cfg(package="smbclient", uselib_store="smbclient",
++ args="--cflags --libs")
++ except Errors.ConfigurationError:
++ conf.check_cc(header_name="libsmbclient.h",
++ uselib="smbclient",
++ type="cshlib")
++ conf.check(lib="smbclient", uselib_store="smbclient",
++ uselib="smbclient",
++ type="cshlib")
+
+ configure, build = plugin("samba", configure=plugin_configure,
+ libs=["smbclient"])