mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
Merge pull request #1316 from lrusak/kodi-17-wp-libreelec-8.0
remove uneeded patches
This commit is contained in:
@@ -1,30 +0,0 @@
|
||||
From 26d1905c371dd7e0e23bb589ccf29f2bfec5b8af Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Sat, 18 Apr 2015 15:12:49 +0300
|
||||
Subject: [PATCH 01/13] enable PYTHONOPTIMIZE with external Python
|
||||
|
||||
---
|
||||
xbmc/interfaces/python/XBPython.cpp | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp
|
||||
index af8d608..6213dbe 100644
|
||||
--- a/xbmc/interfaces/python/XBPython.cpp
|
||||
+++ b/xbmc/interfaces/python/XBPython.cpp
|
||||
@@ -568,10 +568,9 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker)
|
||||
// at http://docs.python.org/using/cmdline.html#environment-variables
|
||||
|
||||
#if !defined(TARGET_WINDOWS) && !defined(TARGET_ANDROID)
|
||||
- /* PYTHONOPTIMIZE is set off intentionally when using external Python.
|
||||
- Reason for this is because we cannot be sure what version of Python
|
||||
- was used to compile the various Python object files (i.e. .pyo,
|
||||
- .pyc, etc.). */
|
||||
+ // Required for python to find optimized code (pyo) files
|
||||
+ setenv("PYTHONOPTIMIZE", "1", 1);
|
||||
+
|
||||
// check if we are running as real xbmc.app or just binary
|
||||
if (!CUtil::GetFrameworksPath(true).empty())
|
||||
{
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From a1f4a5a74bb8e9fd48ec3d45bc908861dddb0296 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Deryskyba <alex@codesnake.com>
|
||||
Date: Mon, 8 Sep 2014 23:29:40 +0300
|
||||
Subject: [PATCH 02/10] [aml] Reorder libraries in configure script to prevent
|
||||
linker errors when linking with libsmbclient
|
||||
|
||||
Place libsmbclient before all other libraries to prevent linker errors when linking
|
||||
with libsmbclient if the libc that is currently used doesn't contain some functions
|
||||
such as dn_expand (which are often included in libc), but are actually included in
|
||||
libresolv.
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5b8c04b..7869041 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1305,7 +1305,7 @@ fi
|
||||
# samba
|
||||
if test "x$use_samba" != "xno"; then
|
||||
PKG_CHECK_MODULES([SAMBA], [smbclient],
|
||||
- [INCLUDES="$INCLUDES $SAMBA_CFLAGS"; LIBS="$LIBS $SAMBA_LIBS"],
|
||||
+ [INCLUDES="$INCLUDES $SAMBA_CFLAGS"; LIBS="$SAMBA_LIBS $LIBS"],
|
||||
[AC_CHECK_LIB([smbclient], [main],,
|
||||
use_samba=no;AC_MSG_ERROR($missing_library))
|
||||
USE_LIBSMBCLIENT=0
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
Reference in New Issue
Block a user