From e51d1977652b578378593e5c85111ae36c227d6b Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 19 Jan 2017 14:19:03 -0500 Subject: media-tv/kodi: cleanup, fix build problem -17.0_rc3-r2, -9999: fix typo -14.1, -14.1, -15.2, -16.0, -16.1-r1, -17.0_rc3-r1, -17.0_rc3-r2, -17.0_rc3: remove obsoleted ebuilds -16.1-r2: fix loss of precision defined behavior build failure -9999: don't delete fontconfig files because upstream now handles that Gentoo-bugs: 606124, 600930 Closes: https://github.com/gentoo/gentoo/pull/3545 --- .../kodi/files/kodi-14.0-dvddemux-ffmpeg.patch | 16 ------ media-tv/kodi/files/kodi-14.1-gcc-5.patch | 47 --------------- media-tv/kodi/files/kodi-15.1-texturepacker.patch | 25 -------- .../kodi-16.1-GUIFontTTFGL-loses-precision.patch | 63 ++++++++++++++++++++ media-tv/kodi/files/kodi-9999-nomythtv.patch | 67 ---------------------- 5 files changed, 63 insertions(+), 155 deletions(-) delete mode 100644 media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch delete mode 100644 media-tv/kodi/files/kodi-14.1-gcc-5.patch delete mode 100644 media-tv/kodi/files/kodi-15.1-texturepacker.patch create mode 100644 media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch delete mode 100644 media-tv/kodi/files/kodi-9999-nomythtv.patch (limited to 'media-tv/kodi/files') diff --git a/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch deleted file mode 100644 index 94b86666f9ed..000000000000 --- a/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch +++ /dev/null @@ -1,16 +0,0 @@ -sniped from: -http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/kodi-14.0-dvddemux-ffmpeg.patch?root=free&view=markup - ---- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -519,10 +519,6 @@ - - void CDVDDemuxFFmpeg::Flush() - { -- // naughty usage of an internal ffmpeg function -- if (m_pFormatContext) -- av_read_frame_flush(m_pFormatContext); -- - m_currentPts = DVD_NOPTS_VALUE; - - m_pkt.result = -1; diff --git a/media-tv/kodi/files/kodi-14.1-gcc-5.patch b/media-tv/kodi/files/kodi-14.1-gcc-5.patch deleted file mode 100644 index 5134ea1e10bd..000000000000 --- a/media-tv/kodi/files/kodi-14.1-gcc-5.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/557300 - -fix from upstream - -From 2d792707c7ad60c598616183bd1e7c41382961c3 Mon Sep 17 00:00:00 2001 -From: Michael Cronenworth -Date: Tue, 19 May 2015 16:43:36 -0500 -Subject: [PATCH] Always declare gnu89 inline standard - -GCC5 switches the minimum inline standard requirements from gnu89 to gnu11. ---- - xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h | 4 ---- - xbmc/screensavers/rsxs-0.9/lib/argp.h | 2 +- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -index ff4f575..92eda3b 100644 ---- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -+++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -@@ -198,11 +198,7 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); - #endif - - #ifndef ARGP_FS_EI --#ifdef __clang__ - #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) --#else --#define ARGP_FS_EI extern inline --#endif - #endif - - ARGP_FS_EI size_t -diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp.h b/xbmc/screensavers/rsxs-0.9/lib/argp.h -index ae7fa04..c83c75e 100644 ---- a/xbmc/screensavers/rsxs-0.9/lib/argp.h -+++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h -@@ -559,7 +559,7 @@ extern void *__argp_input (const struct argp *__restrict __argp, - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline)) - # endif - - ARGP_EI void --- -2.4.4 - diff --git a/media-tv/kodi/files/kodi-15.1-texturepacker.patch b/media-tv/kodi/files/kodi-15.1-texturepacker.patch deleted file mode 100644 index 19309c58d447..000000000000 --- a/media-tv/kodi/files/kodi-15.1-texturepacker.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- tools/depends/native/TexturePacker/Makefile -+++ tools/depends/native/TexturePacker/Makefile -@@ -9,14 +9,10 @@ - - ifeq ($(NATIVEPLATFORM),) - PLATFORM = native -- EXTRA_CONFIGURE = --enable-static - else - PLATFORM = $(NATIVEPLATFORM) - endif - --ifeq ($(NATIVE_OS), linux) -- EXTRA_CONFIGURE = --enable-static --endif - ifeq ($(NATIVE_OS), android) - EXTRA_CONFIGURE = --enable-static - endif -@@ -35,7 +35,6 @@ all: .installed-$(PLATFORM) - $(PLATFORM): ../libsquish-native/.installed-$(PLATFORM) - -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) - cd $(PLATFORM); cp -a $(SOURCE)/* . -- cd $(PLATFORM); ./autogen.sh - cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)" - - diff --git a/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch b/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch new file mode 100644 index 000000000000..30ed1e06793c --- /dev/null +++ b/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch @@ -0,0 +1,63 @@ +From fa6f5d761b600b0a8b52db18168e540b03f79ceb Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Mon, 21 Dec 2015 11:29:23 +0100 +Subject: [PATCH] [GUIFont] - the BufferHandle is a GLUInt for gl and gles and + a void * for dx + +--- + xbmc/guilib/GUIFontCache.h | 10 ++++++++-- + xbmc/guilib/GUIFontTTFGL.cpp | 4 ++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/xbmc/guilib/GUIFontCache.h b/xbmc/guilib/GUIFontCache.h +index 7cbe91d..ab35919 100644 +--- a/xbmc/guilib/GUIFontCache.h ++++ b/xbmc/guilib/GUIFontCache.h +@@ -37,6 +37,7 @@ + #include + + #include "TransformMatrix.h" ++#include "system.h" + + #define FONT_CACHE_TIME_LIMIT (1000) + #define FONT_CACHE_DIST_LIMIT (0.01f) +@@ -231,10 +232,15 @@ struct CGUIFontCacheDynamicPosition + + struct CVertexBuffer + { +- void *bufferHandle; ++#if defined(HAS_GL) || defined(HAS_GLES) ++ typedef unsigned int BufferHandleType; ++#elif defined(HAS_DX) ++ typedef void* BufferHandleType; ++#endif ++ BufferHandleType bufferHandle; // this is really a GLuint + size_t size; + CVertexBuffer() : bufferHandle(NULL), size(0), m_font(NULL) {} +- CVertexBuffer(void *bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} ++ CVertexBuffer(BufferHandleType bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} + CVertexBuffer(const CVertexBuffer &other) : bufferHandle(other.bufferHandle), size(other.size), m_font(other.m_font) + { + /* In practice, the copy constructor is only called before a vertex buffer +diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp +index f2f3a41..c4aaa3b 100644 +--- a/xbmc/guilib/GUIFontTTFGL.cpp ++++ b/xbmc/guilib/GUIFontTTFGL.cpp +@@ -232,7 +232,7 @@ void CGUIFontTTFGL::LastEnd() + glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glMatrixModview.Get()); + + // Bind the buffer to the OpenGL context's GL_ARRAY_BUFFER binding point +- glBindBuffer(GL_ARRAY_BUFFER, (GLuint) m_vertexTrans[i].vertexBuffer->bufferHandle); ++ glBindBuffer(GL_ARRAY_BUFFER, m_vertexTrans[i].vertexBuffer->bufferHandle); + + // Do the actual drawing operation, split into groups of characters no + // larger than the pre-determined size of the element array +@@ -285,7 +285,7 @@ CVertexBuffer CGUIFontTTFGL::CreateVertexBuffer(const std::vector &vert + // Unbind GL_ARRAY_BUFFER + glBindBuffer(GL_ARRAY_BUFFER, 0); + +- return CVertexBuffer((void *) bufferHandle, vertices.size() / 4, this); ++ return CVertexBuffer(bufferHandle, vertices.size() / 4, this); + } + + void CGUIFontTTFGL::DestroyVertexBuffer(CVertexBuffer &buffer) const diff --git a/media-tv/kodi/files/kodi-9999-nomythtv.patch b/media-tv/kodi/files/kodi-9999-nomythtv.patch deleted file mode 100644 index 40ab23b98d1c..000000000000 --- a/media-tv/kodi/files/kodi-9999-nomythtv.patch +++ /dev/null @@ -1,67 +0,0 @@ -http://trac.xbmc.org/ticket/11775 - -make mythtv support optional - -diff --git a/Makefile.in b/Makefile.in -index 9ffae7e..17cc525 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -209,7 +209,7 @@ LIB_DIRS=\ - lib/cpluff \ - lib/xbmc-dll-symbols - --ifeq (@USE_MYSQL@,1) -+ifeq (@USE_MYTHTV@,1) - LIB_DIRS += lib/cmyth - CMYTH=cmyth - endif -diff --git a/configure.in b/configure.in -index d44825f..629d7b4 100755 ---- a/configure.in -+++ b/configure.in -@@ -479,6 +479,12 @@ AC_ARG_ENABLE([mysql], - [AS_HELP_STRING([--disable-mysql], - [disable mysql])], - -+AC_ARG_ENABLE([mythtv], -+ [AS_HELP_STRING([--disable-mythtv], -+ [disable mythtv])], -+ [use_mythtv=$enableval], -+ [use_mythtv=yes]) -+ - AC_ARG_ENABLE([webserver], - [AS_HELP_STRING([--disable-webserver], - [disable webserver])], -@@ -1080,6 +1086,9 @@ if test "$use_mysql" = "yes"; then - else - AC_MSG_ERROR($missing_program) - fi -+ if test "$use_mythtv" = "yes"; then -+ AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"]) -+ fi - fi - AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library)) - AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library)) -@@ -2372,6 +2381,15 @@ else - final_message="$final_message\n MySQL:\tNo" - USE_MYSQL=0 - fi -+ -+if test "$use_mythtv" = "yes"; then -+ final_message="$final_message\n MythTV:\tYes" -+ USE_MYTHTV=1 -+else -+ final_message="$final_message\n MythTV:\tNo" -+ USE_MYTHTV=0 -+fi -+ - if test "$use_webserver" = "yes"; then - final_message="$final_message\n Webserver:\tYes" - USE_WEB_SERVER=1 -@@ -2675,6 +2693,7 @@ AC_SUBST(USE_LIBUDEV) - AC_SUBST(USE_LIBUSB) - AC_SUBST(USE_LIBCEC) - AC_SUBST(USE_MYSQL) -+AC_SUBST(USE_MYTHTV) - AC_SUBST(USE_WAYLAND) - -- cgit v1.2.3-65-gdbad