summaryrefslogtreecommitdiffstats
path: root/package/kodi/0012-Fix_includes_in_amcodec.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2017-04-29 10:37:28 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-29 11:48:27 +0200
commit24a07d58af39f534845b671bea8c96dc88ef713c (patch)
tree7ab4c635e415789b2bde63d9d90cd7b5fa0ff0fa /package/kodi/0012-Fix_includes_in_amcodec.patch
parente81839aff14f0b61af557c7054318297cbeb7b94 (diff)
downloadbuildroot-24a07d58af39f534845b671bea8c96dc88ef713c.tar.gz
buildroot-24a07d58af39f534845b671bea8c96dc88ef713c.zip
package/kodi: bump to version 17.1-Krypton
Removed unneeded patches - 0001-Fixup-include-path.patch (not needed after CMake switch) - 0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch (applied upstream) - 0006-ffmpeg30.patch (was backported from 17.0-Krypton to 16.0-Jarvis) - 0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch (was backported from 17.0-Krypton to 16.0-Jarvis) - 0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch (was backported from 17.0-Krypton to 16.0-Jarvis) - 0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch (cximage was removed in bump from 16.x to 17.0) - 0010-curl-support-version-7.5.0-and-upwards.patch (applied upstream) - 0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch (applied upstream) - 0012-Fix_includes_in_amcodec.patch (was backported from 17.0-Krypton to 16.0-Jarvis) Rebased patches - 0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch also renamed to 0001-... Removed dependencies not needed anymore: - boost https://github.com/xbmc/xbmc/commit/41ae93f0913f7ba72087a48370f8d66a3eac9fcc - giflib https://github.com/xbmc/xbmc/commit/d44338baf1f6d1e6b76cd7dbab6453d76cc2ac31 - jasper/tiff https://github.com/xbmc/xbmc/commit/00724eb109a702f0098089d849f7c02ea173a4a9 - jpeg https://github.com/xbmc/xbmc/commit/7d5bdfb9a09348bde92b323ef6077b5e75edaca7 - libdcadec https://github.com/xbmc/xbmc/commit/378eb2687c1da5f97ef47c78431033b52f0d4417 - libglew https://github.com/xbmc/xbmc/commit/03ff0d5ea02963b1283fe8bc7c1bad18f2dd97b6 - libgcrypt was already an optional dependency in Kodi 16, not part of the CMake buildsystem anymore - libmpeg2 https://github.com/xbmc/xbmc/commit/d22c829d67937e8d03fdac8f8b0bf2d1fa8fbf70 - libogg/libvorbis https://github.com/xbmc/xbmc/commit/4c609691776ab845d83153e19d191b7fd445edb9 - libpng https://github.com/xbmc/xbmc/commit/be6b50c6c3f91809a9045c199d054cbc1d637d5d - librtmp, the new rtmp inputstream addon will be added later https://github.com/xbmc/xbmc/commit/d04f43a4eb6f920cc42a28627b580f17e2be1bb5 - libsquish https://github.com/xbmc/xbmc/commit/ed03f828be3615d294eb4a4cfccc5cdccec22997 - xlib_libXmu - xlib_libXt Switched to CMake, autoconf was deprecated: https://github.com/xbmc/xbmc/pull/10797 The dependency for egl/gles on arm, formerly enforced by the automake build system, was not ported to CMake. Bumped BR2_TOOLCHAIN_GCC_AT_LEAST to 4.8 to fix build errors with gcc-4.7 found while testing http://autobuild.buildroot.net/toolchains/configs/sourcery-x86.config For details please read http://lists.busybox.net/pipermail/buildroot/2017-April/190195.html Added hard-dependency for libegl, needed after https://github.com/xbmc/xbmc/commit/0ac305f7cf82e98021b6e0d70c3d4c51fc1cf18a Libva support depends on X11 https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/FindVAAPI.cmake#L42 and OpenGL/EGL https://github.com/xbmc/xbmc/blob/Krypton/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h#L23 Libvdpau support depends on X11 https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/modules/FindVDPAU.cmake#L21 and OpenGL/EGL https://github.com/xbmc/xbmc/blob/Krypton/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h#L43 Updated clean-up hook and added host-xmlstarlet as dependency to manipulate the list of default system addons in addon-manifest.xml. Added dependency to BR2_ENABLE_LOCALE, needs iconv_open: https://github.com/xbmc/xbmc/blob/Krypton/xbmc/utils/CharsetConverter.cpp#L200 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [Thomas: minor tweaks.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/kodi/0012-Fix_includes_in_amcodec.patch')
-rw-r--r--package/kodi/0012-Fix_includes_in_amcodec.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/package/kodi/0012-Fix_includes_in_amcodec.patch b/package/kodi/0012-Fix_includes_in_amcodec.patch
deleted file mode 100644
index 4a6d44f686..0000000000
--- a/package/kodi/0012-Fix_includes_in_amcodec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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)
OpenPOWER on IntegriCloud