[packages/xine-lib] - fix libsmbclient detection
baggins
baggins at pld-linux.org
Wed Feb 5 18:02:11 CET 2014
commit 233a6176172ff946f174c2e61e0d6f636ba27ad6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Feb 5 18:01:59 2014 +0100
- fix libsmbclient detection
smbclient.patch | 23 +++++++++++++++++++++++
xine-lib.spec | 2 ++
2 files changed, 25 insertions(+)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index c1727c8..cc18301 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -53,6 +53,7 @@ Patch3: %{name}-ac.patch
# from DirectFB 1.7.0
Patch4: %{name}-vdpau-hooks.patch
Patch5: %{name}-missing.patch
+Patch6: smbclient.patch
URL: http://xine.sourceforge.net/
%{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.22}
%{?with_fusionsound:BuildRequires: FusionSound-devel >= 0.9.23}
@@ -952,6 +953,7 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%{__gettextize}
diff --git a/smbclient.patch b/smbclient.patch
new file mode 100644
index 0000000..a6bcfd6
--- /dev/null
+++ b/smbclient.patch
@@ -0,0 +1,23 @@
+--- xine-lib-1.2.3/m4/input.m4~ 2012-02-09 00:41:11.000000000 +0100
++++ xine-lib-1.2.3/m4/input.m4 2014-02-05 17:59:55.505504611 +0100
+@@ -79,8 +79,8 @@
+ dnl libsmbclient
+ XINE_ARG_ENABLE([samba], [Enable support for the Samba plugin])
+ if test x"$enable_samba" != x"no"; then
+- AC_CHECK_LIB([smbclient], [smbc_init],
+- [AC_CHECK_HEADERS([libsmbclient.h], [have_samba=yes LIBSMBCLIENT_LIBS="-lsmbclient"])])
++ PKG_CHECK_MODULES([LIBSMBCLIENT], [smbclient], [have_samba=yes])
++ AC_SUBST(LIBSMBCLIENT_CFLAGS)
+ AC_SUBST(LIBSMBCLIENT_LIBS)
+ if test x"$hard_enable_samba" = x"yes" && test x"$have_samba" != x"yes"; then
+ AC_MSG_ERROR([Samba support requested, but Samba not found])
+--- xine-lib-1.2.3/src/input/Makefile.am~ 2012-06-30 20:02:39.000000000 +0200
++++ xine-lib-1.2.3/src/input/Makefile.am 2014-02-05 18:01:03.505504119 +0100
+@@ -150,6 +150,7 @@
+ xineplug_inp_gnome_vfs_la_CFLAGS = $(AM_CFLAGS) $(GNOME_VFS_CFLAGS)
+
+ xineplug_inp_smb_la_SOURCES = input_smb.c
++xineplug_inp_smb_la_CFLAGS = $(AM_CFLAGS) $(LIBSMBCLIENT_CFLAGS)
+ xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL)
+
+ xineplug_inp_pvr_la_SOURCES = input_pvr.c
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xine-lib.git/commitdiff/233a6176172ff946f174c2e61e0d6f636ba27ad6
More information about the pld-cvs-commit
mailing list