tags 728594 pending patch tags 676702 pending thanks Hi,
On 11/03/2013 01:52 PM, Andreas Beckmann wrote: > Package: xbmc > Version: 2:12.0~git20130127.fb595f2-1 > Severity: serious > Justification: fails to build from source (but built successfully in the past) > > Hi, > > xbmc/experimental fails to rebuild with the current version of samba in > sid: > > CPP xbmc/filesystem/SmbFile.o > CPP xbmc/filesystem/SMBDirectory.o > SmbFile.cpp:30:26: fatal error: libsmbclient.h: No such file or directory > #include <libsmbclient.h> > ^ > compilation terminated. > SMBDirectory.cpp:47:26: fatal error: libsmbclient.h: No such file or directory > #include <libsmbclient.h> > ^ > compilation terminated. > make[2]: *** [SmbFile.o] Error 1 > make[2]: *** Waiting for unfinished jobs.... > make[2]: *** [SMBDirectory.o] Error 1 > make[2]: Leaving directory > `/tmp/buildd/xbmc-12.0~git20130127.fb595f2/xbmc/filesystem' > make[1]: *** [xbmc/filesystem/filesystem.a] Error 2 > make[1]: *** Waiting for unfinished jobs.... > > > libsmbclient-dev 2:4.0.10+dfsg-4 ships > /usr/include/samba-4.0/libsmbclient.h > > The pkgconfig settings for samba are correct and would add an > appropriate -I flag. I have uploaded a fixed version to DELAYED/10 for experimental with the attached patch. Cheers, Balint
diff -Nru xbmc-12.0~git20130127.fb595f2/debian/changelog xbmc-12.0~git20130127.fb595f2/debian/changelog --- xbmc-12.0~git20130127.fb595f2/debian/changelog 2013-01-30 02:16:52.000000000 +0100 +++ xbmc-12.0~git20130127.fb595f2/debian/changelog 2013-11-26 14:45:20.000000000 +0100 @@ -1,3 +1,15 @@ +xbmc (2:12.0~git20130127.fb595f2-1.1) experimental; urgency=low + + [Balint Reczey] + * Non-maintainer upload. + * Include samba-4.0/libsmbclient.h instead of libsmbclient.h to fix + FTBFS with Samba 4 (Closes: #728594) + + [Michael Biebl] + * Disable HAL support (Closes: #676702, #668486) + + -- Balint Reczey <bal...@balintreczey.hu> Mon, 25 Nov 2013 23:19:08 +0100 + xbmc (2:12.0~git20130127.fb595f2-1) experimental; urgency=low * New upload for XBMC 12.0 Frodo. diff -Nru xbmc-12.0~git20130127.fb595f2/debian/control xbmc-12.0~git20130127.fb595f2/debian/control --- xbmc-12.0~git20130127.fb595f2/debian/control 2013-01-30 02:13:05.000000000 +0100 +++ xbmc-12.0~git20130127.fb595f2/debian/control 2013-11-26 14:45:36.000000000 +0100 @@ -71,7 +71,6 @@ libomxil-bellagio-dev [armel], python-imaging, libplist-dev, - libhal-storage-dev, libcec-dev (>= 2), libudev-dev, udev, diff -Nru xbmc-12.0~git20130127.fb595f2/debian/patches/01_use_samba4_includes.patch xbmc-12.0~git20130127.fb595f2/debian/patches/01_use_samba4_includes.patch --- xbmc-12.0~git20130127.fb595f2/debian/patches/01_use_samba4_includes.patch 1970-01-01 01:00:00.000000000 +0100 +++ xbmc-12.0~git20130127.fb595f2/debian/patches/01_use_samba4_includes.patch 2013-11-26 00:56:18.000000000 +0100 @@ -0,0 +1,43 @@ +Description: Use Samba4's libsmbclient.h + Samba4 moved libsmbclient.h from /usr/include/ to + /usr/include/samba-4.0/ . + This patch makes XBMC use the header file from the new location. + . +Author: Balint Reczey <bal...@balintreczey.hu> +Bug-Debian: http://bugs.debian.org/728594 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- xbmc-12.0~git20130127.fb595f2.orig/xbmc/filesystem/SmbFile.cpp ++++ xbmc-12.0~git20130127.fb595f2/xbmc/filesystem/SmbFile.cpp +@@ -27,7 +27,7 @@ + #include "PasswordManager.h" + #include "SMBDirectory.h" + #include "Util.h" +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include "settings/AdvancedSettings.h" + #include "settings/GUISettings.h" + #include "threads/SingleLock.h" +--- xbmc-12.0~git20130127.fb595f2.orig/xbmc/filesystem/SMBDirectory.cpp ++++ xbmc-12.0~git20130127.fb595f2/xbmc/filesystem/SMBDirectory.cpp +@@ -44,7 +44,7 @@ + #include "threads/SingleLock.h" + #include "PasswordManager.h" + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + + #if defined(TARGET_DARWIN) + #define XBMC_SMB_MOUNT_PATH "Library/Application Support/XBMC/Mounts/" diff -Nru xbmc-12.0~git20130127.fb595f2/debian/patches/series xbmc-12.0~git20130127.fb595f2/debian/patches/series --- xbmc-12.0~git20130127.fb595f2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ xbmc-12.0~git20130127.fb595f2/debian/patches/series 2013-11-26 00:55:53.000000000 +0100 @@ -0,0 +1 @@ +01_use_samba4_includes.patch diff -Nru xbmc-12.0~git20130127.fb595f2/debian/rules xbmc-12.0~git20130127.fb595f2/debian/rules --- xbmc-12.0~git20130127.fb595f2/debian/rules 2013-01-30 02:13:05.000000000 +0100 +++ xbmc-12.0~git20130127.fb595f2/debian/rules 2013-11-26 14:46:44.000000000 +0100 @@ -66,7 +66,7 @@ --enable-rtmp \ --enable-ffmpeg-libvorbis \ --disable-mid \ - --enable-hal \ + --disable-hal \ --enable-avahi \ --disable-asap-codec \ --enable-webserver \
signature.asc
Description: OpenPGP digital signature