tags 729691 + patch thanks Dear maintainer,
I've prepared an NMU for xine-lib (versioned as 1.1.21-1.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. David
diff -Nru xine-lib-1.1.21/debian/changelog xine-lib-1.1.21/debian/changelog
--- xine-lib-1.1.21/debian/changelog 2013-09-14 11:36:51.000000000 -0400
+++ xine-lib-1.1.21/debian/changelog 2013-12-24 23:10:55.000000000 -0400
@@ -1,3 +1,10 @@
+xine-lib (1.1.21-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Adapt to libsmbclient.h new path. (Closes: #729691)
+
+ -- David Prévot <taf...@debian.org> Tue, 24 Dec 2013 23:00:23 -0400
+
xine-lib (1.1.21-1.1) unstable; urgency=high
* Non-maintainer upload.
diff -Nru xine-lib-1.1.21/debian/control xine-lib-1.1.21/debian/control
--- xine-lib-1.1.21/debian/control 2013-09-14 11:35:45.000000000 -0400
+++ xine-lib-1.1.21/debian/control 2013-12-24 23:10:55.000000000 -0400
@@ -20,7 +20,7 @@
liblircclient-dev, libjack-jackd2-dev | libjack-dev (>= 0.116.1-3) | libjack-dev (<< 0.110),
libdirectfb-dev, libgtk2.0-dev,
libfaad-dev, libflac-dev, libsdl1.2-dev, libwavpack-dev,
- libsmbclient-dev, libspeex-dev, libmng-dev,
+ libsmbclient-dev (>= 2:4), libspeex-dev, libmng-dev,
libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76), libvcdinfo-dev,
libdvdnav-dev [!hurd-i386], libdvdread-dev [!hurd-i386],
zlib1g-dev, w3m, transfig, sgmltools-lite,
diff -Nru xine-lib-1.1.21/debian/patches/debian-changes xine-lib-1.1.21/debian/patches/debian-changes
--- xine-lib-1.1.21/debian/patches/debian-changes 2013-09-14 11:37:13.000000000 -0400
+++ xine-lib-1.1.21/debian/patches/debian-changes 2013-12-24 23:12:43.000000000 -0400
@@ -504,3 +504,36 @@
+#define ENABLE_MPEGAUDIO_PARSER 0
+#define ENABLE_MPEGVIDEO_PARSER 0
+#define ENABLE_PNM_PARSER 0
+--- xine-lib-1.1.21.orig/src/input/input_smb.c
++++ xine-lib-1.1.21/src/input/input_smb.c
+@@ -28,7 +28,7 @@
+ #include "compat.h"
+ #include "input_plugin.h"
+
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <sys/types.h>
+ #include <errno.h>
+
+--- xine-lib-1.1.21.orig/configure.ac
++++ xine-lib-1.1.21/configure.ac
+@@ -1699,7 +1699,7 @@ AC_ARG_ENABLE([samba],
+
+ if test "x$with_samba" = "xyes"; then
+ AC_CHECK_LIB(smbclient, smbc_init,
+- [ AC_CHECK_HEADER(libsmbclient.h,
++ [ AC_CHECK_HEADER(samba-4.0/libsmbclient.h,
+ [ have_libsmbclient=yes
+ LIBSMBCLIENT_LIBS="-lsmbclient" ],
+ AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))],
+--- xine-lib-1.1.21.orig/configure
++++ xine-lib-1.1.21/configure
+@@ -26505,7 +26505,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smbclient_smbc_init" >&5
+ $as_echo "$ac_cv_lib_smbclient_smbc_init" >&6; }
+ if test "x$ac_cv_lib_smbclient_smbc_init" = xyes; then :
+- ac_fn_c_check_header_mongrel "$LINENO" "libsmbclient.h" "ac_cv_header_libsmbclient_h" "$ac_includes_default"
++ ac_fn_c_check_header_mongrel "$LINENO" "samba-4.0/libsmbclient.h" "ac_cv_header_libsmbclient_h" "$ac_includes_default"
+ if test "x$ac_cv_header_libsmbclient_h" = xyes; then :
+ have_libsmbclient=yes
+ LIBSMBCLIENT_LIBS="-lsmbclient"
signature.asc
Description: Digital signature
