From ea15242202205cf0d3313818ec880ae2cb7d7c62 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Sep 2011 21:53:23 +0200 Subject: [PATCH] xbmc: update to xbmc-1d0c129 Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- ...-add_support_to_specify_GIT_REV-0.1.patch} | 0 ...13-reenable_lcd_config_settings-0.1.patch} | 0 ...2-enable_afpfs_support_in_linux-0.1.patch} | 0 ...c-1d0c129-303-fix_libdvd_xFLAGS-0.1.patch} | 0 ...0c129-351-increase_YV12_buffers-0.1.patch} | 0 ...xSwapBuffers_going_to_far_ahead-0.1.patch} | 0 ...mber_of_video_surface_allocated-0.1.patch} | 0 ...0c129-402-enable_yasm_in_ffmpeg-0.1.patch} | 0 ...xbmc-1d0c129-404-add_lame_check-0.6.patch} | 0 ...ONOPTIMIZE_with_external_Python-0.1.patch} | 0 ...-1d0c129-452-change_lcd_content-0.1.patch} | 0 ...29-453-add_openelec.tv_RSS_news-0.1.patch} | 0 ...29-453-ps3_remote_be_more_quiet-0.1.patch} | 0 ...c-1d0c129-454-disable_backslash-0.1.patch} | 0 ...-add_remote_irtrans_mediacenter-0.1.patch} | 0 ...1d0c129-463-add_remote_devinput-0.1.patch} | 0 ...4-add_eject_keymapping_for_lirc-0.1.patch} | 0 ...bmc-4511eb1-203-let_select_Samba-0.3.patch | 159 ------------------ ...mba_sources_if_samba_is_disabled-0.1.patch | 92 ---------- 21 files changed, 2 insertions(+), 253 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-001-add_support_to_specify_GIT_REV-0.1.patch => xbmc-1d0c129-001-add_support_to_specify_GIT_REV-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-013-reenable_lcd_config_settings-0.1.patch => xbmc-1d0c129-013-reenable_lcd_config_settings-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-302-enable_afpfs_support_in_linux-0.1.patch => xbmc-1d0c129-302-enable_afpfs_support_in_linux-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-303-fix_libdvd_xFLAGS-0.1.patch => xbmc-1d0c129-303-fix_libdvd_xFLAGS-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-351-increase_YV12_buffers-0.1.patch => xbmc-1d0c129-351-increase_YV12_buffers-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch => xbmc-1d0c129-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch => xbmc-1d0c129-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-402-enable_yasm_in_ffmpeg-0.1.patch => xbmc-1d0c129-402-enable_yasm_in_ffmpeg-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-404-add_lame_check-0.6.patch => xbmc-1d0c129-404-add_lame_check-0.6.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch => xbmc-1d0c129-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-452-change_lcd_content-0.1.patch => xbmc-1d0c129-452-change_lcd_content-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-453-add_openelec.tv_RSS_news-0.1.patch => xbmc-1d0c129-453-add_openelec.tv_RSS_news-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-453-ps3_remote_be_more_quiet-0.1.patch => xbmc-1d0c129-453-ps3_remote_be_more_quiet-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-454-disable_backslash-0.1.patch => xbmc-1d0c129-454-disable_backslash-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-462-add_remote_irtrans_mediacenter-0.1.patch => xbmc-1d0c129-462-add_remote_irtrans_mediacenter-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-463-add_remote_devinput-0.1.patch => xbmc-1d0c129-463-add_remote_devinput-0.1.patch} (100%) rename packages/mediacenter/xbmc/patches/{xbmc-4511eb1-464-add_eject_keymapping_for_lirc-0.1.patch => xbmc-1d0c129-464-add_eject_keymapping_for_lirc-0.1.patch} (100%) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-4511eb1-203-let_select_Samba-0.3.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-4511eb1-204-exclude_samba_sources_if_samba_is_disabled-0.1.patch diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 990e5feaf2..bfd444bf8f 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="4511eb1" +PKG_VERSION="1d0c129" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index dc7a73eef1..80f0077abe 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="4511eb1" +PKG_VERSION="1d0c129" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-013-reenable_lcd_config_settings-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-013-reenable_lcd_config_settings-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-013-reenable_lcd_config_settings-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-302-enable_afpfs_support_in_linux-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-302-enable_afpfs_support_in_linux-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-302-enable_afpfs_support_in_linux-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-302-enable_afpfs_support_in_linux-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-351-increase_YV12_buffers-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-351-increase_YV12_buffers-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-351-increase_YV12_buffers-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-402-enable_yasm_in_ffmpeg-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-402-enable_yasm_in_ffmpeg-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-402-enable_yasm_in_ffmpeg-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-404-add_lame_check-0.6.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-404-add_lame_check-0.6.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-404-add_lame_check-0.6.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-453-ps3_remote_be_more_quiet-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-453-ps3_remote_be_more_quiet-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-453-ps3_remote_be_more_quiet-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-462-add_remote_irtrans_mediacenter-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-462-add_remote_irtrans_mediacenter-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-462-add_remote_irtrans_mediacenter-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-463-add_remote_devinput-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-1d0c129-464-add_eject_keymapping_for_lirc-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-4511eb1-464-add_eject_keymapping_for_lirc-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-1d0c129-464-add_eject_keymapping_for_lirc-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-203-let_select_Samba-0.3.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-203-let_select_Samba-0.3.patch deleted file mode 100644 index 48c40d9ab4..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-203-let_select_Samba-0.3.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff -Naur xbmc-8cb8ae1/configure.in xbmc-8cb8ae1.patch/configure.in ---- xbmc-8cb8ae1/configure.in 2011-09-14 19:15:24.254033004 +0200 -+++ xbmc-8cb8ae1.patch/configure.in 2011-09-15 07:07:13.269071939 +0200 -@@ -111,6 +111,7 @@ - libnfs_disabled="== NFS support disabled. ==" - libafpclient_not_found="== Could not find libafpclient. AFP support disabled. ==" - libafpclient_disabled="== AFP support disabled. ==" -+samba_disabled="== SAMBA support disabled. ==" - alsa_not_found="== Could not find ALSA. ALSA support disabled. ==" - dbus_not_found="== Could not find DBUS. DBUS support disabled. ==" - -@@ -270,6 +271,12 @@ - [use_librtmp=$enableval], - [use_librtmp=auto]) - -+AC_ARG_ENABLE([samba], -+ [AS_HELP_STRING([--disable-samba], -+ [disable SAMBA support (default is enabled)])], -+ [use_samba=$enableval], -+ [use_samba=yes]) -+ - AC_ARG_ENABLE([nfs], - [AS_HELP_STRING([--enable-nfs], - [enable NFS support via libnfs (default is auto)])], -@@ -655,7 +662,6 @@ - AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh])) --AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) - AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth])) - AC_CHECK_LIB([yajl], [main],, AC_MSG_ERROR($missing_library)) - -@@ -942,6 +948,18 @@ - AC_MSG_NOTICE($librtmp_disabled) - fi - -+# samba -+if test "x$use_samba" != "xno"; then -+ AC_CHECK_LIB([smbclient], [main],, -+ use_samba=no;AC_MSG_ERROR($missing_library)) -+else -+ AC_MSG_RESULT($samba_disabled) -+fi -+ -+if test "x$use_samba" != "xno"; then -+ AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed]) -+fi -+ - # libnfs - if test "$use_libnfs" != "no"; then - AC_CHECK_HEADERS([nfsc/libnfs.h],, -@@ -1563,6 +1581,12 @@ - final_message="$final_message\n libRTMP support:\tNo" - fi - -+if test "x$use_samba" != "xno"; then -+ final_message="$final_message\n libsmbclient support:\tYes" -+else -+ final_message="$final_message\n libsmbclient support:\tNo" -+fi -+ - if test "$use_libnfs" != "no"; then - final_message="$final_message\n libnfs support:\tYes" - else -diff -Naur xbmc-8cb8ae1/xbmc/dialogs/GUIDialogMediaSource.cpp xbmc-8cb8ae1.patch/xbmc/dialogs/GUIDialogMediaSource.cpp ---- xbmc-8cb8ae1/xbmc/dialogs/GUIDialogMediaSource.cpp 2011-09-13 05:37:49.000000000 +0200 -+++ xbmc-8cb8ae1.patch/xbmc/dialogs/GUIDialogMediaSource.cpp 2011-09-14 19:18:27.456425046 +0200 -@@ -237,9 +237,11 @@ - share1.m_ignore = true; - extraShares.push_back(share1); - -+#ifdef HAS_FILESYSTEM_SMB - share1.strPath = "smb://"; - share1.strName = g_localizeStrings.Get(20171); - extraShares.push_back(share1); -+#endif - - #ifdef HAS_FILESYSTEM_NFS - share1.strPath = "nfs://"; -@@ -285,9 +287,11 @@ - share1.strName = "ReplayTV Devices"; - extraShares.push_back(share1); - -+#ifdef HAS_FILESYSTEM_SMB - share1.strPath = "smb://"; - share1.strName = g_localizeStrings.Get(20171); - extraShares.push_back(share1); -+#endif - - #ifdef HAS_FILESYSTEM_NFS - share1.strPath = "nfs://"; -@@ -322,9 +326,11 @@ - extraShares.push_back(share1); - } - -+#ifdef HAS_FILESYSTEM_SMB - share1.strPath = "smb://"; - share1.strName = g_localizeStrings.Get(20171); - extraShares.push_back(share1); -+#endif - - #ifdef HAS_FILESYSTEM_NFS - share1.strPath = "nfs://"; -diff -Naur xbmc-8cb8ae1/xbmc/network/GUIDialogNetworkSetup.cpp xbmc-8cb8ae1.patch/xbmc/network/GUIDialogNetworkSetup.cpp ---- xbmc-8cb8ae1/xbmc/network/GUIDialogNetworkSetup.cpp 2011-09-13 05:37:54.000000000 +0200 -+++ xbmc-8cb8ae1.patch/xbmc/network/GUIDialogNetworkSetup.cpp 2011-09-14 19:18:45.745663929 +0200 -@@ -127,7 +127,9 @@ - return; - - pSpin->Clear(); -+#ifdef HAS_FILESYSTEM_SMB - pSpin->AddLabel(g_localizeStrings.Get(20171), NET_PROTOCOL_SMB); -+#endif - pSpin->AddLabel(g_localizeStrings.Get(20256), NET_PROTOCOL_HTSP); - pSpin->AddLabel(g_localizeStrings.Get(20257), NET_PROTOCOL_VTP); - pSpin->AddLabel(g_localizeStrings.Get(20258), NET_PROTOCOL_MYTH); -diff -Naur xbmc-8cb8ae1/xbmc/network/ZeroconfBrowser.cpp xbmc-8cb8ae1.patch/xbmc/network/ZeroconfBrowser.cpp ---- xbmc-8cb8ae1/xbmc/network/ZeroconfBrowser.cpp 2011-09-13 05:37:53.000000000 +0200 -+++ xbmc-8cb8ae1.patch/xbmc/network/ZeroconfBrowser.cpp 2011-09-15 10:11:24.049894106 +0200 -@@ -54,7 +54,9 @@ - - CZeroconfBrowser::CZeroconfBrowser():mp_crit_sec(new CCriticalSection),m_started(false) - { -+#ifdef HAS_FILESYSTEM_SMB - AddServiceType("_smb._tcp."); -+#endif - AddServiceType("_ftp._tcp."); - AddServiceType("_htsp._tcp."); - AddServiceType("_daap._tcp."); -diff -Naur xbmc-8cb8ae1/xbmc/system.h xbmc-8cb8ae1.patch/xbmc/system.h ---- xbmc-8cb8ae1/xbmc/system.h 2011-09-13 05:37:53.000000000 +0200 -+++ xbmc-8cb8ae1.patch/xbmc/system.h 2011-09-14 19:34:09.853626990 +0200 -@@ -52,7 +52,6 @@ - #endif - - #define HAS_FILESYSTEM --#define HAS_FILESYSTEM_SMB - #define HAS_FILESYSTEM_CDDA - #define HAS_FILESYSTEM_RTV - #define HAS_FILESYSTEM_DAAP -@@ -60,6 +59,10 @@ - #define HAS_FILESYSTEM_VTP - #define HAS_FILESYSTEM_HTSP - -+#ifdef HAVE_LIBSMBCLIENT -+ #define HAS_FILESYSTEM_SMB -+#endif -+ - #ifdef HAVE_LIBNFS - #define HAS_FILESYSTEM_NFS - #endif -@@ -99,6 +102,7 @@ - #define HAVE_LIBBLURAY - #define HAS_ASAP_CODEC - #define HAVE_YAJL_YAJL_VERSION_H -+#define HAS_FILESYSTEM_SMB - #define HAS_FILESYSTEM_NFS - #endif - diff --git a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-204-exclude_samba_sources_if_samba_is_disabled-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4511eb1-204-exclude_samba_sources_if_samba_is_disabled-0.1.patch deleted file mode 100644 index 60805921bf..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-4511eb1-204-exclude_samba_sources_if_samba_is_disabled-0.1.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -Naur xbmc-8cb8ae1/configure.in xbmc-8cb8ae1.patch/configure.in ---- xbmc-8cb8ae1/configure.in 2011-09-16 16:29:14.811482548 +0200 -+++ xbmc-8cb8ae1.patch/configure.in 2011-09-16 16:36:21.700065520 +0200 -@@ -944,12 +944,15 @@ - if test "x$use_samba" != "xno"; then - AC_CHECK_LIB([smbclient], [main],, - use_samba=no;AC_MSG_ERROR($missing_library)) -+ USE_LIBSMBCLIENT=0 - else - AC_MSG_RESULT($samba_disabled) -+ USE_LIBSMBCLIENT=0 - fi - - if test "x$use_samba" != "xno"; then - AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed]) -+ USE_LIBSMBCLIENT=1 - fi - - # libnfs -@@ -1707,6 +1710,7 @@ - AC_SUBST(USE_VDPAU) - AC_SUBST(USE_VAAPI) - AC_SUBST(USE_CRYSTALHD) -+AC_SUBST(USE_LIBSMBCLIENT) - AC_SUBST(USE_LIBNFS) - AC_SUBST(USE_LIBAFPCLIENT) - AC_SUBST(USE_VDA) -diff -Naur xbmc-8cb8ae1/xbmc/filesystem/FileSmb.cpp xbmc-8cb8ae1.patch/xbmc/filesystem/FileSmb.cpp ---- xbmc-8cb8ae1/xbmc/filesystem/FileSmb.cpp 2011-09-13 05:37:52.000000000 +0200 -+++ xbmc-8cb8ae1.patch/xbmc/filesystem/FileSmb.cpp 2011-09-16 16:42:38.552999670 +0200 -@@ -24,8 +24,6 @@ - ////////////////////////////////////////////////////////////////////// - - #include "system.h" -- --#if defined(HAS_FILESYSTEM_SMB) - #include "FileSmb.h" - #include "PasswordManager.h" - #include "SMBDirectory.h" -@@ -777,4 +775,3 @@ - CPasswordManager::GetInstance().AuthenticateURL(authURL); - return smb.URLEncode(authURL); - } --#endif -diff -Naur xbmc-8cb8ae1/xbmc/filesystem/Makefile.in xbmc-8cb8ae1.patch/xbmc/filesystem/Makefile.in ---- xbmc-8cb8ae1/xbmc/filesystem/Makefile.in 2011-09-13 05:37:52.000000000 +0200 -+++ xbmc-8cb8ae1.patch/xbmc/filesystem/Makefile.in 2011-09-16 16:41:58.828479325 +0200 -@@ -31,7 +31,6 @@ - FileRTV.cpp \ - FileShoutcast.cpp \ - FileSFTP.cpp \ -- FileSmb.cpp \ - FileSpecialProtocol.cpp \ - FileTuxBox.cpp \ - FileUDF.cpp \ -@@ -70,7 +69,6 @@ - SIDFileDirectory.cpp \ - Slingbox.cpp \ - SmartPlaylistDirectory.cpp \ -- SMBDirectory.cpp \ - SourcesDirectory.cpp \ - SpecialProtocol.cpp \ - SpecialProtocolDirectory.cpp \ -@@ -93,6 +91,11 @@ - SRCS+=RarManager.cpp - endif - -+ifeq (@USE_LIBSMBCLIENT@,1) -+SRCS+=FileSmb.cpp -+SRCS+=SMBDirectory.cpp -+endif -+ - ifeq (@USE_LIBNFS@,1) - SRCS+=FileNFS.cpp - SRCS+=NFSDirectory.cpp -diff -Naur xbmc-8cb8ae1/xbmc/filesystem/SMBDirectory.cpp xbmc-8cb8ae1.patch/xbmc/filesystem/SMBDirectory.cpp ---- xbmc-8cb8ae1/xbmc/filesystem/SMBDirectory.cpp 2011-09-13 05:37:52.000000000 +0200 -+++ xbmc-8cb8ae1.patch/xbmc/filesystem/SMBDirectory.cpp 2011-09-16 16:43:27.957646887 +0200 -@@ -33,7 +33,6 @@ - - #include "system.h" - --#if defined(HAS_FILESYSTEM_SMB) - #include "SMBDirectory.h" - #include "Util.h" - #include "guilib/LocalizeStrings.h" -@@ -501,5 +500,3 @@ - return XBMC_SMB_MOUNT_PATH + strPath; - #endif - } -- --#endif