[SCM] kodi/experimental: Fix FTBFS on alpha by not using Intel assempler code

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Sun Apr 2 20:54:03 UTC 2017


The following commit has been merged in the experimental branch:
commit e201fa29f03d05130922420ec74dac2b67664fc4
Author: Balint Reczey <balint.reczey at canonical.com>
Date:   Sat Mar 25 21:57:18 2017 +0100

    Fix FTBFS on alpha by not using Intel assempler code
    
    Closes: #856815

diff --git a/debian/patches/16-fix-alpha-build.patch b/debian/patches/16-fix-alpha-build.patch
new file mode 100644
index 0000000..0acfb99
--- /dev/null
+++ b/debian/patches/16-fix-alpha-build.patch
@@ -0,0 +1,84 @@
+Description: Fix alpha build
+Forwarded: not-needed
+Author:  Michael Cree <mcree at orcon.net.nz>
+Bug: https://bugs.debian.org/856815
+
+Index: kodi-17.0+dfsg1/xbmc/cores/DllLoader/DllLoader.h
+===================================================================
+--- kodi-17.0+dfsg1.orig/xbmc/cores/DllLoader/DllLoader.h
++++ kodi-17.0+dfsg1/xbmc/cores/DllLoader/DllLoader.h
+@@ -23,7 +23,7 @@
+ #include "coffldr.h"
+ #include "LibraryLoader.h"
+ 
+-#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
++#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__)
+ #define USE_LDT_KEEPER
+ #include "ldt_keeper.h"
+ #endif
+Index: kodi-17.0+dfsg1/xbmc/cores/DllLoader/ldt_keeper.c
+===================================================================
+--- kodi-17.0+dfsg1.orig/xbmc/cores/DllLoader/ldt_keeper.c
++++ kodi-17.0+dfsg1/xbmc/cores/DllLoader/ldt_keeper.c
+@@ -19,7 +19,7 @@
+  */
+ 
+ //#ifndef __powerpc__
+-#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
++#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__)
+ 
+ #include "ldt_keeper.h"
+ 
+Index: kodi-17.0+dfsg1/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+===================================================================
+--- kodi-17.0+dfsg1.orig/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
++++ kodi-17.0+dfsg1/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+@@ -293,7 +293,7 @@ protected:
+ 
+ 
+ inline int NP2( unsigned x ) {
+-#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
++#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__)
+   // If there are any issues compiling this, just append a ' && 0'
+   // to the above to make it '#if defined(TARGET_POSIX) && 0'
+ 
+Index: kodi-17.0+dfsg1/xbmc/threads/Atomics.cpp
+===================================================================
+--- kodi-17.0+dfsg1.orig/xbmc/threads/Atomics.cpp
++++ kodi-17.0+dfsg1/xbmc/threads/Atomics.cpp
+@@ -106,7 +106,7 @@ long cas(volatile long *pAddr, long expe
+ ///////////////////////////////////////////////////////////////////////////
+ long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal)
+ {
+-#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) || defined(__s390x__) // PowerPC and ARM
++#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) || defined(__s390x__) || defined(__alpha__)// PowerPC and ARM
+ // Not available/required
+ // Hack to allow compilation
+   throw "cas2 is not implemented";
+Index: kodi-17.0+dfsg1/xbmc/threads/Atomics.h
+===================================================================
+--- kodi-17.0+dfsg1.orig/xbmc/threads/Atomics.h
++++ kodi-17.0+dfsg1/xbmc/threads/Atomics.h
+@@ -22,7 +22,7 @@
+ 
+ //! @todo Inline these methods
+ long cas(volatile long *pAddr, long expectedVal, long swapVal);
+-#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__s390x__)
++#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__s390x__) && !defined(__alpha__)
+ long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal);
+ #endif
+ long AtomicIncrement(volatile long* pAddr);
+Index: kodi-17.0+dfsg1/xbmc/utils/MathUtils.h
+===================================================================
+--- kodi-17.0+dfsg1.orig/xbmc/utils/MathUtils.h
++++ kodi-17.0+dfsg1/xbmc/utils/MathUtils.h
+@@ -37,7 +37,8 @@
+     defined(__mips__) || \
+     defined(__arm__) || \
+     defined(__s390x__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || \
++    defined(__alpha__)
+   #define DISABLE_MATHUTILS_ASM_ROUND_INT
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2c93c98..23da68d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,7 @@
 13-fix-tests.patch
 14-ignore-test-results.patch
 15-dont-use-openssl.patch
+16-fix-alpha-build.patch
 libdvdnav-0001-xbmc-dvdnav-allow-get-set-vm-state.patch
 libdvdnav-0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch
 libdvdnav-0003-xbmc-dvdnav-detection-of-dvd-name.patch

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list