[SCM] xbmc/master: Fix MIPS build by patching upstream

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Thu Oct 23 11:08:50 UTC 2014


The following commit has been merged in the master branch:
commit c877b16b5f85a22945989ccc9e7f5da4fe658f45
Author: Balint Reczey <balint at balitreczey.hu>
Date:   Mon Oct 20 16:18:14 2014 +0100

    Fix MIPS build by patching upstream

diff --git a/debian/patches/0016-mips-Fix-build-with-using-OpenGL-rendering.patch b/debian/patches/0016-mips-Fix-build-with-using-OpenGL-rendering.patch
new file mode 100644
index 0000000..07f563c
--- /dev/null
+++ b/debian/patches/0016-mips-Fix-build-with-using-OpenGL-rendering.patch
@@ -0,0 +1,25 @@
+From 9ca099cfbd12d496f19a1b7dfb068a07b0379c71 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Mon, 20 Oct 2014 17:01:51 +0200
+Subject: [PATCH] mips: Fix build with using OpenGL rendering
+
+---
+ xbmc/cores/VideoRenderers/LinuxRendererGL.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoRenderers/LinuxRendererGL.h
+index 63ea287..d80be59 100644
+--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.h
++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.h
+@@ -330,7 +330,7 @@ protected:
+ 
+ 
+ inline int NP2( unsigned x ) {
+-#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__)
++#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__mips__)
+   // If there are any issues compiling this, just append a ' && 0'
+   // to the above to make it '#if defined(TARGET_POSIX) && 0'
+ 
+-- 
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index c2686c2..64c7994 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@
 0012-mips-add-atomics.patch
 0013-mips-Add-configure-option-for-mips-and-mipsel.patch
 0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch
+0016-mips-Fix-build-with-using-OpenGL-rendering.patch
 03-privacy.patch
 04-differentiate-from-vanilla-XBMC.patch
 05-Fix-GLES-with-X11.patch
@@ -17,4 +18,3 @@
 07-use-system-groovy.patch
 08-armel.patch
 09-use-correct-ftgl.h
-

-- 
xbmc packaging



More information about the pkg-multimedia-commits mailing list