[SCM] kodi/master: Refresh patches
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Mon Aug 3 08:20:40 UTC 2015
The following commit has been merged in the master branch:
commit 5eaad4ef6299a2a783f79d5a3514e623d5d5d27e
Author: Balint Reczey <balint at balintreczey.hu>
Date: Sun Aug 2 20:54:50 2015 +0200
Refresh patches
diff --git a/debian/patches/0001-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch b/debian/patches/0001-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
deleted file mode 100644
index 4465fb8..0000000
--- a/debian/patches/0001-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 879a4cfcd6b0a31d7f483d91a3685f4c497036cb Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Tue, 4 Nov 2014 00:13:21 +0100
-Subject: [PATCH 1/6] linux: Check for Logind first, then *Kit-s with UPower
- when detecting PM framework
-
-Logind is the most likely candidate to work nowadays and latest UPower does
-not provide suspend/hibernate API.
----
- xbmc/powermanagement/PowerManager.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
-index 5900f98..27948b5 100644
---- a/xbmc/powermanagement/PowerManager.cpp
-+++ b/xbmc/powermanagement/PowerManager.cpp
-@@ -75,12 +75,12 @@ void CPowerManager::Initialize()
- m_instance = new CAndroidPowerSyscall();
- #elif defined(TARGET_POSIX)
- #if defined(HAS_DBUS)
-- if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
-+ if (CLogindUPowerSyscall::HasLogind())
-+ m_instance = new CLogindUPowerSyscall();
-+ else if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
- m_instance = new CConsoleUPowerSyscall();
- else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
- m_instance = new CConsoleDeviceKitPowerSyscall();
-- else if (CLogindUPowerSyscall::HasLogind())
-- m_instance = new CLogindUPowerSyscall();
- else if (CUPowerSyscall::HasUPower())
- m_instance = new CUPowerSyscall();
- else
---
-2.1.1
-
diff --git a/debian/patches/0002-mips-add-guards.patch b/debian/patches/0002-mips-add-guards.patch
deleted file mode 100644
index e64f951..0000000
--- a/debian/patches/0002-mips-add-guards.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 15179cf949eab8a5fa57db92d168b07b8f32acd1 Mon Sep 17 00:00:00 2001
-From: theuni <theuni-nospam- at xbmc.org>
-Date: Fri, 30 Sep 2011 06:16:18 -0400
-Subject: [PATCH 2/6] mips: add guards
-
-Updated for Helix by Balint Reczey
----
- Makefile.in | 2 +-
- xbmc/cores/DllLoader/DllLoader.h | 2 +-
- xbmc/cores/DllLoader/ldt_keeper.c | 2 +-
- xbmc/linux/PlatformDefs.h | 2 +-
- xbmc/utils/fastmemcpy.c | 2 +-
- xbmc/utils/fastmemcpy.h | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1ce9039..0a56132 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -441,7 +441,7 @@ ifeq (@USE_ASAP_CODEC@,1)
- endif
- endif
- $(MAKE) -C lib/stsound/StSoundLibrary
--ifeq ($(or $(findstring powerpc, at ARCH@),$(findstring x86_64-linux, at ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd, at ARCH@)),)
-+ifeq ($(or $(findstring powerpc, at ARCH@),$(findstring x86_64-linux, at ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd, at ARCH@),$(findstring mips, at ARCH@)),)
- $(MAKE) -C lib/snesapu/SNES/SNESAPU
- endif
- imagelib: dllloader
-diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h
-index c32c2b0..070aee6 100644
---- a/xbmc/cores/DllLoader/DllLoader.h
-+++ b/xbmc/cores/DllLoader/DllLoader.h
-@@ -23,7 +23,7 @@
- #include "coffldr.h"
- #include "LibraryLoader.h"
-
--#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__)
-+#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__)
- #define USE_LDT_KEEPER
- #include "ldt_keeper.h"
- #endif
-diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
-index 91c7a22..8af9a86 100644
---- a/xbmc/cores/DllLoader/ldt_keeper.c
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c
-@@ -19,7 +19,7 @@
- */
-
- //#ifndef __powerpc__
--#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__)
-+#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__mips__)
-
- #include "ldt_keeper.h"
-
-diff --git a/xbmc/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h
-index 1686961..4350075 100644
---- a/xbmc/linux/PlatformDefs.h
-+++ b/xbmc/linux/PlatformDefs.h
-@@ -161,7 +161,7 @@
- #define __int64 long long
- #define __uint64 unsigned long long
-
--#if defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__) || defined (__arm__) // should this be powerpc64 only?
-+#if defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__) || defined (__arm__) || defined(__mips__) // should this be powerpc64 only?
- #define __stdcall
- #else /* !__x86_64__ */
- #define __stdcall __attribute__((__stdcall__))
-diff --git a/xbmc/utils/fastmemcpy.c b/xbmc/utils/fastmemcpy.c
-index d2a1d49..ec9019a 100644
---- a/xbmc/utils/fastmemcpy.c
-+++ b/xbmc/utils/fastmemcpy.c
-@@ -25,7 +25,7 @@
- * <http://www.gnu.org/licenses/>.
- *
- */
--#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__)
-+#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__)
- #define HAVE_MMX2
- #define HAVE_SSE
-
-diff --git a/xbmc/utils/fastmemcpy.h b/xbmc/utils/fastmemcpy.h
-index ce78d49..43f5904 100644
---- a/xbmc/utils/fastmemcpy.h
-+++ b/xbmc/utils/fastmemcpy.h
-@@ -23,7 +23,7 @@
- extern "C" {
- #endif
-
--#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(TARGET_ANDROID) && !defined(TARGET_DARWIN_IOS)
-+#if !defined(TARGET_WINDOWS) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(TARGET_ANDROID) && !defined(TARGET_DARWIN_IOS)
- void * fast_memcpy(void * to, const void * from, size_t len);
- //#define fast_memcpy memcpy
- #else
---
-2.1.1
-
diff --git a/debian/patches/0003-mips-add-atomics.patch b/debian/patches/0003-mips-add-atomics.patch
deleted file mode 100644
index 053b809..0000000
--- a/debian/patches/0003-mips-add-atomics.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From 36604dc16c9100c7e8fb2f567f8c443054d08522 Mon Sep 17 00:00:00 2001
-From: theuni <theuni-nospam- at xbmc.org>
-Date: Fri, 30 Sep 2011 06:17:00 -0400
-Subject: [PATCH 3/6] mips: add atomics
-
-Most taken from the Linux kernel.
-
-Updated for Helix by Balint Reczey
----
- xbmc/threads/Atomics.cpp | 35 ++++++--------
- xbmc/threads/MipsAtomics.h | 115 +++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 130 insertions(+), 20 deletions(-)
- create mode 100644 xbmc/threads/MipsAtomics.h
-
-diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
-index 12d3e56..ca5d981 100644
---- a/xbmc/threads/Atomics.cpp
-+++ b/xbmc/threads/Atomics.cpp
-@@ -20,6 +20,12 @@
-
- #include "Atomics.h"
- #include "system.h"
-+
-+#if defined(__mips__)
-+#include "MipsAtomics.h"
-+pthread_mutex_t cmpxchg_mutex = PTHREAD_MUTEX_INITIALIZER;
-+#endif
-+
- ///////////////////////////////////////////////////////////////////////////
- // 32-bit atomic compare-and-swap
- // Returns previous value of *pAddr
-@@ -63,10 +69,7 @@ long cas(volatile long *pAddr, long expectedVal, long swapVal)
- return prev;
-
- #elif defined(__mips__)
--// TODO:
-- unsigned int prev;
-- #error atomic cas undefined for mips
-- return prev;
-+ return cmpxchg32(pAddr, expectedVal, swapVal);
-
- #elif defined(TARGET_WINDOWS)
- long prev;
-@@ -103,11 +106,14 @@ long cas(volatile long *pAddr, long expectedVal, long swapVal)
- ///////////////////////////////////////////////////////////////////////////
- long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal)
- {
--#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__) // PowerPC, ARM, and MIPS
-+#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)// PowerPC and ARM
- // Not available/required
- // Hack to allow compilation
- throw "cas2 is not implemented";
-
-+#elif defined(__mips__)
-+ return cmpxchg64(pAddr, expectedVal, swapVal);
-+
- #elif defined(TARGET_WINDOWS)
- long long prev;
- __asm
-@@ -183,10 +189,7 @@ long AtomicIncrement(volatile long* pAddr)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- long val;
-- #error AtomicIncrement undefined for mips
-- return val;
-+ return atomic_add(1, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- long val;
-@@ -261,10 +264,7 @@ long AtomicAdd(volatile long* pAddr, long amount)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- long val;
-- #error AtomicAdd undefined for mips
-- return val;
-+ return atomic_add(amount, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- __asm
-@@ -339,10 +339,7 @@ long AtomicDecrement(volatile long* pAddr)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- long val;
-- #error AtomicDecrement undefined for mips
-- return val;
-+ return atomic_sub(1, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- long val;
-@@ -418,9 +415,7 @@ long AtomicSubtract(volatile long* pAddr, long amount)
- return val;
-
- #elif defined(__mips__)
--// TODO:
-- #error AtomicSubtract undefined for mips
-- return val;
-+ return atomic_sub(amount, pAddr);
-
- #elif defined(TARGET_WINDOWS)
- amount *= -1;
-diff --git a/xbmc/threads/MipsAtomics.h b/xbmc/threads/MipsAtomics.h
-new file mode 100644
-index 0000000..8ff69b6
---- /dev/null
-+++ b/xbmc/threads/MipsAtomics.h
-@@ -0,0 +1,115 @@
-+/*
-+ * Copyright (C) 2005-2011 Team XBMC
-+ * http://www.xbmc.org
-+ *
-+ * This Program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This Program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with XBMC; see the file COPYING. If not, write to
-+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * http://www.gnu.org/copyleft/gpl.html
-+ *
-+ * Copyright (C) 2003, 06, 07 by Ralf Baechle (ralf at linux-mips.org)
-+ *
-+ * Most of this file was borrowed from the linux kernel.
-+ */
-+
-+#ifndef __ATOMIC_MIPS_H_
-+#define __ATOMIC_MIPS_H_
-+
-+#include <inttypes.h>
-+#include <pthread.h>
-+
-+extern pthread_mutex_t cmpxchg_mutex;
-+
-+static inline long cmpxchg32(volatile long *m, long oldval, long newval)
-+{
-+ long retval;
-+ __asm__ __volatile__( \
-+ " .set push \n" \
-+ " .set noat \n" \
-+ " .set mips3 \n" \
-+ "1: ll %0, %2 # __cmpxchg_asm \n" \
-+ " bne %0, %z3, 2f \n" \
-+ " .set mips0 \n" \
-+ " move $1, %z4 \n" \
-+ " .set mips3 \n" \
-+ " sc $1, %1 \n" \
-+ " beqz $1, 3f \n" \
-+ "2: \n" \
-+ " .subsection 2 \n" \
-+ "3: b 1b \n" \
-+ " .previous \n" \
-+ " .set pop \n" \
-+ : "=&r" (retval), "=R" (*m) \
-+ : "R" (*m), "Jr" (oldval), "Jr" (newval) \
-+ : "memory"); \
-+
-+ return retval;
-+}
-+
-+
-+static inline long long cmpxchg64(volatile long long *ptr,
-+ long long oldval, long long newval)
-+{
-+ long long prev;
-+
-+ pthread_mutex_lock(&cmpxchg_mutex);
-+ prev = *(long long *)ptr;
-+ if (prev == oldval)
-+ *(long long *)ptr = newval;
-+ pthread_mutex_unlock(&cmpxchg_mutex);
-+ return prev;
-+}
-+
-+
-+static __inline__ long atomic_add(int i, volatile long* v)
-+{
-+ long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_add \n"
-+ " addu %0, %2 \n"
-+ " sc %0, %1 \n"
-+ " beqz %0, 2f \n"
-+ " .subsection 2 \n"
-+ "2: b 1b \n"
-+ " .previous \n"
-+ " .set mips0 \n"
-+ : "=&r" (temp), "=m" (*v)
-+ : "Ir" (i), "m" (*v));
-+
-+ return temp;
-+}
-+
-+static __inline__ long atomic_sub(int i, volatile long* v)
-+{
-+ long temp;
-+
-+ __asm__ __volatile__(
-+ " .set mips3 \n"
-+ "1: ll %0, %1 # atomic_sub \n"
-+ " subu %0, %2 \n"
-+ " sc %0, %1 \n"
-+ " beqz %0, 2f \n"
-+ " .subsection 2 \n"
-+ "2: b 1b \n"
-+ " .previous \n"
-+ " .set mips0 \n"
-+ : "=&r" (temp), "=m" (*v)
-+ : "Ir" (i), "m" (*v));
-+
-+ return temp;
-+}
-+
-+
-+#endif
---
-2.1.1
-
diff --git a/debian/patches/0004-mips-Add-configure-option-for-mips-and-mipsel.patch b/debian/patches/0004-mips-Add-configure-option-for-mips-and-mipsel.patch
deleted file mode 100644
index b196a0c..0000000
--- a/debian/patches/0004-mips-Add-configure-option-for-mips-and-mipsel.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 33b84cf0af7f42c8cbe6532905b89a94bf1cb094 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Fri, 30 Sep 2011 06:22:51 -0400
-Subject: [PATCH 4/6] mips: Add configure option for mips and mipsel
-
----
- configure.in | 10 ++++++++++
- m4/xbmc_arch.m4 | 3 +++
- 2 files changed, 13 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index fe2e882..62a6387 100644
---- a/configure.in
-+++ b/configure.in
-@@ -691,6 +691,16 @@ case $host in
- use_wayland=no
- build_shared_lib=yes
- ;;
-+ mips*-*-linux-gnu*)
-+ ARCH="mips"
-+ use_arch="mips"
-+ use_joystick=no
-+ use_gles=no
-+ use_gl=yes
-+ use_sdl=yes
-+ use_wayland=no
-+ USE_STATIC_FFMPEG=1
-+ ;;
- *)
- AC_MSG_ERROR(unsupported host ($host))
- esac
-diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4
-index 5bcdd81..f9ab5cd 100644
---- a/m4/xbmc_arch.m4
-+++ b/m4/xbmc_arch.m4
-@@ -32,6 +32,9 @@ case $host in
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
- AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
- ;;
-+ mips*-*-linux-gnu*|mips*-*-linux-uclibc*)
-+ AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-+ ;;
- *-*linux-android*)
- AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID")
- ;;
---
-2.1.1
-
diff --git a/debian/patches/0005-mips-Don-t-use-ASM-rounding-on-MIPS.patch b/debian/patches/0005-mips-Don-t-use-ASM-rounding-on-MIPS.patch
deleted file mode 100644
index 2caeb49..0000000
--- a/debian/patches/0005-mips-Don-t-use-ASM-rounding-on-MIPS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4e15d0d88c014ad6bcf1243e9c28053aac4da5b9 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Mon, 13 Oct 2014 17:10:40 +0100
-Subject: [PATCH 5/6] mips: Don't use ASM rounding on MIPS
-
----
- xbmc/utils/MathUtils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
-index ea32f37..82165f2 100644
---- a/xbmc/utils/MathUtils.h
-+++ b/xbmc/utils/MathUtils.h
-@@ -34,6 +34,7 @@
-
- #if defined(__ppc__) || \
- defined(__powerpc__) || \
-+ defined(__mips__) || \
- defined(__arm__)
- #define DISABLE_MATHUTILS_ASM_ROUND_INT
- #endif
---
-2.1.1
-
diff --git a/debian/patches/0006-mips-Fix-build-with-using-OpenGL-rendering.patch b/debian/patches/0006-mips-Fix-build-with-using-OpenGL-rendering.patch
deleted file mode 100644
index 3501d85..0000000
--- a/debian/patches/0006-mips-Fix-build-with-using-OpenGL-rendering.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b9ca26bc35295ae72f46ec5a716c550c11857d41 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 6/6] 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 e74b01e..2f757d8 100644
---- a/xbmc/cores/VideoRenderers/LinuxRendererGL.h
-+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.h
-@@ -325,7 +325,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/0007-mips-Fix-addon-shared-library-naming.patch b/debian/patches/0007-mips-Fix-addon-shared-library-naming.patch
deleted file mode 100644
index d5c9de1..0000000
--- a/debian/patches/0007-mips-Fix-addon-shared-library-naming.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 378c6034335b959a6f48dd020ce0ceba5cb6b3d8 Mon Sep 17 00:00:00 2001
-From: Andriy Prystupa <andriy.prystupa at globallogic.com>
-Date: Sat, 17 Jan 2015 00:23:52 +0100
-Subject: [PATCH] mips: Fix addon shared library naming
-
----
- addons/library.xbmc.addon/libXBMC_addon.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/addons/library.xbmc.addon/libXBMC_addon.h b/addons/library.xbmc.addon/libXBMC_addon.h
-index 3e822f4..c3ed54f 100644
---- a/addons/library.xbmc.addon/libXBMC_addon.h
-+++ b/addons/library.xbmc.addon/libXBMC_addon.h
-@@ -55,8 +55,8 @@ typedef intptr_t ssize_t;
- #define ADDON_HELPER_ARCH "powerpc64-linux"
- #elif defined(__ARMEL__)
- #define ADDON_HELPER_ARCH "arm"
--#elif defined(_MIPSEL)
--#define ADDON_HELPER_ARCH "mipsel-linux"
-+#elif defined(__mips__)
-+#define ADDON_HELPER_ARCH "mips"
- #else
- #define ADDON_HELPER_ARCH "i486-linux"
- #endif
---
-2.1.4
-
diff --git a/debian/patches/01-ffmpeg-bump-to-2.6.patch b/debian/patches/01-ffmpeg-bump-to-2.6.patch
deleted file mode 100644
index 3052bcb..0000000
--- a/debian/patches/01-ffmpeg-bump-to-2.6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f122e4fdd7971bbbbeab46c295ff23373d49bdc3 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta at online.de>
-Date: Sat, 7 Mar 2015 10:03:43 +0100
-Subject: [PATCH] [ffmpeg] bump to 2.6
-
----
- configure.in | 12 ++++++------
- tools/depends/target/ffmpeg/FFMPEG-VERSION | 2 +-
- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -1683,12 +1683,12 @@
- fi
-
- # FFmpeg
--FFMPEG_LIBNAMES="libavcodec >= 56.1.100
-- libavfilter >= 5.1.100
-- libavformat >= 56.4.101
-- libavutil >= 54.7.100
-- libpostproc >= 53.0.100
-- libswscale >= 3.0.100
-+FFMPEG_LIBNAMES="libavcodec >= 56.26.100
-+ libavfilter >= 5.11.102
-+ libavformat >= 56.25.101
-+ libavutil >= 54.20.100
-+ libpostproc >= 53.3.100
-+ libswscale >= 3.1.101
- libswresample >= 1.1.100"
-
- ffmpeg_build="${abs_top_srcdir}/tools/depends/target/ffmpeg"
---- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -541,7 +541,7 @@
- {
- // naughty usage of an internal ffmpeg function
- if (m_pFormatContext)
-- av_read_frame_flush(m_pFormatContext);
-+ avformat_flush(m_pFormatContext);
-
- m_currentPts = DVD_NOPTS_VALUE;
-
diff --git a/debian/patches/03-privacy.patch b/debian/patches/03-privacy.patch
index a3a0881..6d43889 100644
--- a/debian/patches/03-privacy.patch
+++ b/debian/patches/03-privacy.patch
@@ -1,13 +1,11 @@
-diff --git a/system/settings/settings.xml b/system/settings/settings.xml
-index f92bd59..a856784 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
-@@ -92,7 +92,7 @@
- <group id="2">
- <setting id="lookandfeel.enablerssfeeds" type="boolean" label="13305" help="36111">
+@@ -260,7 +260,7 @@
+ <group id="1">
+ <setting id="filelists.showparentdiritems" type="boolean" label="13306" help="36122">
<level>1</level>
- <default>true</default>
+ <default>false</default>
<control type="toggle" />
</setting>
- <setting id="lookandfeel.rssedit" type="string" parent="lookandfeel.enablerssfeeds" label="21450" help="36112">
+ <setting id="filelists.showextensions" type="boolean" label="497" help="36123">
diff --git a/debian/patches/04-differentiate-from-vanilla-Kodi.patch b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
index a1e5ebd..05a6154 100644
--- a/debian/patches/04-differentiate-from-vanilla-Kodi.patch
+++ b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
@@ -21,7 +21,7 @@
<left>0</left>
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
-@@ -4240,12 +4240,12 @@
+@@ -4352,12 +4352,12 @@
if (strlen(CCompileInfo::GetSuffix()) == 0)
return StringUtils::Format("%d.%d", CCompileInfo::GetMajor(), CCompileInfo::GetMinor());
else
@@ -29,16 +29,16 @@
+ return StringUtils::Format("%d.%d-%s Debian package version:%s", CCompileInfo::GetMajor(), CCompileInfo::GetMinor(), CCompileInfo::GetSuffix(), DEB_VERSION);
}
- CStdString CGUIInfoManager::GetVersion()
+ std::string CGUIInfoManager::GetVersion()
{
- return GetVersionShort() + " Git:" + CCompileInfo::GetSCMID();
+ return GetVersionShort() + " Git: (unknown)";
}
- CStdString CGUIInfoManager::GetBuild()
-@@ -4255,7 +4255,7 @@
+ std::string CGUIInfoManager::GetBuild()
+@@ -4367,7 +4367,7 @@
- CStdString CGUIInfoManager::GetAppName()
+ std::string CGUIInfoManager::GetAppName()
{
- return CCompileInfo::GetAppName();
+ return StringUtils::Format("%s from Debian", CCompileInfo::GetAppName());
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 5258770..92aafca 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -5,15 +5,7 @@ Forwarded: not-needed
--- a/Makefile.in
+++ b/Makefile.in
-@@ -191,7 +191,6 @@
- PAPCODECS_DIRS= \
- lib/nosefart \
- lib/timidity \
-- lib/libsidplay2 \
- lib/stsound/StSoundLibrary \
- lib/snesapu/SNES/SNESAPU \
- lib/vgmstream
-@@ -204,7 +203,6 @@
+@@ -187,7 +187,6 @@
LIB_DIRS=\
lib/cximage-6.0 \
lib/libexif \
@@ -21,75 +13,54 @@ Forwarded: not-needed
lib/cpluff \
lib/xbmc-dll-symbols
-@@ -433,7 +431,7 @@
- $(MAKE) -C lib/timidity
- $(MAKE) -C lib/nosefart
- ifneq ($(findstring arm-osx, at ARCH@), arm-osx)
-- $(MAKE) -C lib/libsidplay2
-+# $(MAKE) -C lib/libsidplay2
- endif
- ifeq (@USE_ASAP_CODEC@,1)
- ifneq ($(findstring osx, at ARCH@), osx)
-@@ -454,7 +452,7 @@
+@@ -411,7 +410,7 @@
- codecs: papcodecs dvdpcodecs dvdpextcodecs
+ codecs: dvdpcodecs dvdpextcodecs
--libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
-+libs: $(LIBSSE4) imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
+-libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff- at ARCH@.so
++libs: $(LIBSSE4) imagelib libexif system/libcpluff- at ARCH@.so
- externals: codecs libs visualizations screensavers libaddon pvraddons
+ externals: codecs libs visualizations screensavers libaddon
--- a/bootstrap.mk
+++ b/bootstrap.mk
@@ -2,7 +2,7 @@
BOOTSTRAP_SUBDIRS += xbmc/screensavers/rsxs-0.9/configure.ac
- BOOTSTRAP_SUBDIRS += xbmc/visualizations/Goom/goom2k4-0/configure.in
+ BOOTSTRAP_SUBDIRS += xbmc/visualizations/Goom/goom2k4-0/configure.ac
BOOTSTRAP_SUBDIRS += lib/cpluff/configure.ac
-BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac
+#BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac
ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
---- a/configure.in
-+++ b/configure.in
-@@ -1162,6 +1162,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1218,6 +1218,9 @@
PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.8],
[INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],
AC_MSG_ERROR($missing_library))
-+PKG_CHECK_MODULES([SIDPLAY], [libsidplay2],
-+ [INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],
-+ AC_MSG_ERROR($missing_library))
+PKG_CHECK_MODULES([DVDREAD], [dvdread],
+ [INCLUDES="$INCLUDES $DVDREAD_CFLAGS"; LIBS="$LIBS $DVDREAD_LIBS"],
+ AC_MSG_ERROR($missing_library))
if test "$use_optical_drive" = "yes"; then
PKG_CHECK_MODULES([CDIO], [libcdio],
-@@ -1253,6 +1259,8 @@
- XB_FIND_SONAME([MODPLUG], [modplug])
+@@ -1312,6 +1315,7 @@
+ XB_FIND_SONAME([VORBISFILE], [vorbisfile])
XB_FIND_SONAME([ASS], [ass])
XB_FIND_SONAME([MPEG2], [mpeg2])
+XB_FIND_SONAME([HDHOMERUN], [hdhomerun])
-+XB_FIND_SONAME([SIDPLAY2], [sidplay2])
# WebServer
if test "$use_webserver" = "yes"; then
-@@ -2458,7 +2466,6 @@
- lib/timidity/Makefile \
- lib/asap/Makefile \
- lib/nosefart/Makefile \
-- lib/libsidplay2/Makefile \
- lib/vgmstream/Makefile \
- lib/snesapu/SNES/SNESAPU/Makefile \
- lib/stsound/StSoundLibrary/Makefile \
-@@ -2474,7 +2481,6 @@
+@@ -2477,7 +2481,6 @@
+ xbmc/network/Makefile \
+ xbmc/network/upnp/Makefile \
lib/libexif/Makefile \
- lib/libXDAAP/Makefile \
- lib/cmyth/Makefile \
- lib/libhdhomerun/Makefile \
- lib/libsquish/Makefile \
lib/cximage-6.0/Makefile \
lib/libUPnP/Makefile \
+ xbmc/DllPaths_generated.h \
--- a/lib/cximage-6.0/Makefile.in
+++ b/lib/cximage-6.0/Makefile.in
@@ -4,8 +4,8 @@
@@ -121,17 +92,8 @@ Forwarded: not-needed
-#define DLL_PATH_LIBHDHOMERUN "special://xbmcbin/system/hdhomerun-@ARCH@.so"
+#define DLL_PATH_LIBHDHOMERUN "@HDHOMERUN_SONAME@"
#define DLL_PATH_MEDIAINFO "special://xbmcbin/system/mediainfo-@ARCH@.so"
- #define DLL_PATH_LIBCMYTH "special://xbmcbin/system/libcmyth-@ARCH@.so"
-@@ -54,7 +54,7 @@
- #define DLL_PATH_MODULE_CODEC "special://xbmcbin/system/players/paplayer/dumb-@ARCH@.so"
- #define DLL_PATH_MPC_CODEC "special://xbmcbin/system/players/paplayer/libmpcdec-@ARCH@.so"
- #define DLL_PATH_NSF_CODEC "special://xbmcbin/system/players/paplayer/nosefart-@ARCH@.so"
--#define DLL_PATH_SID_CODEC "special://xbmcbin/system/players/paplayer/libsidplay2-@ARCH@.so"
-+#define DLL_PATH_SID_CODEC "@SIDPLAY2_SONAME@"
- #define DLL_PATH_SPC_CODEC "special://xbmcbin/system/players/paplayer/SNESAPU-@ARCH@.so"
- #define DLL_PATH_VGM_CODEC "special://xbmcbin/system/players/paplayer/vgmstream-@ARCH@.so"
- #define DLL_PATH_WAVPACK_CODEC "@WAVPACK_SONAME@"
+ #define DLL_PATH_LIBRTMP "@RTMP_SONAME@"
--- a/xbmc/filesystem/DllHDHomeRun.h
+++ b/xbmc/filesystem/DllHDHomeRun.h
@@ -20,7 +20,7 @@
diff --git a/debian/patches/07-use-system-groovy.patch b/debian/patches/07-use-system-groovy.patch
index ee9c9e2..32d66bf 100644
--- a/debian/patches/07-use-system-groovy.patch
+++ b/debian/patches/07-use-system-groovy.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/codegenerator.mk
+++ b/codegenerator.mk
-@@ -41,10 +41,9 @@
+@@ -42,10 +42,9 @@
$(GENDIR)/%.cpp: $(GENDIR)/%.xml $(JAVA) $(SWIG) $(DOXY_XML_PATH)
# Work around potential groovy bug reported at: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733234
diff --git a/debian/patches/10-dont-use-omitted-files.patch b/debian/patches/10-dont-use-omitted-files.patch
index 7cd4a7f..8b03f4e 100644
--- a/debian/patches/10-dont-use-omitted-files.patch
+++ b/debian/patches/10-dont-use-omitted-files.patch
@@ -1,10 +1,8 @@
-diff --git a/configure.in b/configure.in
-index 9337c1f..eb83e59 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2509,7 +2509,6 @@ OUTPUT_FILES="Makefile \
- tools/Linux/FEH-ARM.py \
- tools/TexturePacker/Makefile \
+--- a/configure.ac
++++ b/configure.ac
+@@ -2505,7 +2505,6 @@
+ tools/Linux/${APP_NAME_LC}-standalone.sh \
+ tools/Linux/${APP_NAME_LC}-xsession.desktop \
tools/EventClients/Makefile \
- tools/EventClients/Clients/OSXRemote/Makefile \
xbmc/peripherals/bus/Makefile \
diff --git a/debian/patches/series b/debian/patches/series
index 44ba69f..efdf6b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,3 @@
-0001-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
-0002-mips-add-guards.patch
-0003-mips-add-atomics.patch
-0004-mips-Add-configure-option-for-mips-and-mipsel.patch
-0005-mips-Don-t-use-ASM-rounding-on-MIPS.patch
-0006-mips-Fix-build-with-using-OpenGL-rendering.patch
-0007-mips-Fix-addon-shared-library-naming.patch
-01-ffmpeg-bump-to-2.6.patch
03-privacy.patch
04-differentiate-from-vanilla-Kodi.patch
06-use-external-libraries.patch
--
kodi packaging
More information about the pkg-multimedia-commits
mailing list