rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bsp/buildroot/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch Normal file
View File

@@ -0,0 +1,30 @@
From a17e8d39cf01e26955574acd236b4ef5b54b8c3b Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Mon, 5 Sep 2016 12:34:20 +0200
Subject: [PATCH 2/2] xbmc_pvr_types.h: Fix compilation with gcc6
Backport of upstream commit from master branch:
https://github.com/xbmc/xbmc/commit/c8a346109926fa03bf6882c0b6e3885af0e0f8ed
This patch can be removed when Kodi is bumped to 17.0-Krypton.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
xbmc/addons/include/xbmc_pvr_types.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h
index c5ab20b..e518de1 100644
--- a/xbmc/addons/include/xbmc_pvr_types.h
+++ b/xbmc/addons/include/xbmc_pvr_types.h
@@ -34,6 +34,7 @@
#endif
#include <string.h>
#include <stdint.h>
+#include <stdio.h>
#include "xbmc_addon_types.h"
#include "xbmc_epg_types.h"
--
2.9.3

38
bsp/buildroot/package/kodi/0012-Fix_includes_in_amcodec.patch Normal file
View File

@@ -0,0 +1,38 @@
commit 4bbb21aa5cee6b2f40759aa8b1bd65246a237f79
Author: Alex Deryskyba <alex@codesnake.com>
Date: Wed May 4 01:38:27 2016 +0200
[aml] Fix includes in amcodec/codec.h to make them relative
[Taken from upstream commit
https://github.com/xbmc/xbmc/commit/4bbb21aa5cee6b2f40759aa8b1bd65246a237f79.]
Signed-off-by: Dagg Stompler <daggs@gmx.com>
diff --git a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
index 187d4d5..632c24e 100644
--- a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
+++ b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
@@ -12,8 +12,8 @@
#ifndef CODEC_CTRL_H_
#define CODEC_CTRL_H_
-#include <codec_type.h>
-#include <codec_error.h>
+#include "codec_type.h"
+#include "codec_error.h"
int codec_init(codec_para_t *);
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
index a1a3447..1bf5a89 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
@@ -24,8 +24,6 @@ endif
ifeq (@USE_LIBAMCODEC@,1)
SRCS += AMLCodec.cpp
SRCS += DVDVideoCodecAmlogic.cpp
-INCLUDES += -I$(prefix)/include/amcodec
-INCLUDES += -I$(prefix)/include/amplayer
endif
ifeq (@USE_ANDROID@,1)

24
bsp/buildroot/package/kodi/Config.in
View File

@@ -1,17 +1,19 @@
config BR2_PACKAGE_KODI_ARCH_SUPPORTS
bool
depends on BR2_USE_MMU # libcdio, and others
default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \
&& BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
&& BR2_TOOLCHAIN_HAS_SYNC_8
comment "kodi needs a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6"
comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6"
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_USE_WCHAR || BR2_STATIC_LIBS \
|| !BR2_HOST_GCC_AT_LEAST_4_6 \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
|| BR2_TOOLCHAIN_USES_MUSL
depends on BR2_USE_MMU
|| BR2_TOOLCHAIN_USES_MUSL \
|| !BR2_PACKAGE_PYTHON \
|| BR2_PACKAGE_PYTHON_PYC_ONLY
config BR2_PACKAGE_KODI_EGL_GLES
bool
@@ -42,10 +44,11 @@ menuconfig BR2_PACKAGE_KODI
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_TOOLCHAIN_USES_MUSL
depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL
depends on BR2_USE_MMU # python
depends on BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS # python
depends on !BR2_STATIC_LIBS # libsquish, and others
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
depends on BR2_PACKAGE_PYTHON
depends on !BR2_PACKAGE_PYTHON_PYC_ONLY
select BR2_NEEDS_HOST_JAVA
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_THREAD
@@ -83,7 +86,6 @@ menuconfig BR2_PACKAGE_KODI
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_PCRE_UCP
select BR2_PACKAGE_PYTHON
select BR2_PACKAGE_PYTHON_BSDDB
select BR2_PACKAGE_PYTHON_BZIP2
select BR2_PACKAGE_PYTHON_CURSES
@@ -200,16 +202,9 @@ config BR2_PACKAGE_KODI_LIBSHAIRPLAY
Enable Shairport support.
Select this if you want to stream content from an Apple device.
comment "samba support needs a glibc or uClibc toolchain w/ RPC"
depends on (!BR2_TOOLCHAIN_USES_GLIBC && \
!BR2_TOOLCHAIN_USES_UCLIBC) || !BR2_TOOLCHAIN_HAS_NATIVE_RPC
config BR2_PACKAGE_KODI_LIBSMBCLIENT
bool "samba"
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
depends on BR2_TOOLCHAIN_HAS_SYNC_4
select BR2_PACKAGE_SAMBA4
depends on BR2_PACKAGE_SAMBA4
help
Enable Samba support
@@ -284,7 +279,6 @@ menu "Audio encoder addons"
endmenu
menu "PVR addons"
source "package/kodi-addon-xvdr/Config.in"
source "package/kodi-pvr-argustv/Config.in"
source "package/kodi-pvr-dvblink/Config.in"
source "package/kodi-pvr-dvbviewer/Config.in"

17
bsp/buildroot/package/kodi/kodi.mk
View File

@@ -96,9 +96,10 @@ endif
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
KODI_DEPENDENCIES += rpi-userland
KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
LIBS="-lvcos -lvchostif"
KODI_INCLUDES += \
-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
KODI_LIBS = -lvcos -lvchostif
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
@@ -113,6 +114,16 @@ KODI_DEPENDENCIES += imx-vpuwrap
KODI_CONF_OPTS += --enable-codec=imxvpu
endif
ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
KODI_DEPENDENCIES += libamcodec
KODI_CONF_OPTS += --enable-codec=amcodec
KODI_INCLUDES += -I$(STAGING_DIR)/usr/include/amcodec
endif
KODI_CONF_ENV += \
INCLUDES="$(KODI_INCLUDES)" \
LIBS="$(KODI_LIBS)"
ifeq ($(BR2_PACKAGE_LIBCAP),y)
KODI_CONF_OPTS += --enable-libcap
KODI_DEPENDENCIES += libcap