rpms/kodi/devel kodi-15.0-gcc5.patch, NONE, 1.1 kodi-15.0-hdhomerun.patch, NONE, 1.1 kodi-generate-tarball-xz.sh, 1.3, 1.4 kodi.spec, 1.5, 1.6 kodi-14.0-gcc5.patch, 1.1, NONE kodi-14.0-hdhomerun.patch, 1.1, NONE

Thu Jul 23 03:12:16 CEST 2015

Author: mooninite

Update of /cvs/free/rpms/kodi/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10108

Modified Files:
	kodi-generate-tarball-xz.sh kodi.spec 
Added Files:
	kodi-15.0-gcc5.patch kodi-15.0-hdhomerun.patch 
Removed Files:
	kodi-14.0-gcc5.patch kodi-14.0-hdhomerun.patch 
Log Message:
* Wed Jul 22 2015 Michael Cronenworth <mike at cchtml.com> - 15.0-1
- Kodi 15.0 final


kodi-15.0-gcc5.patch:
 stdbool_.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kodi-15.0-gcc5.patch ---
--- a/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h	2015-06-17 00:49:22.686927610 -0500
+++ b/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h	2015-06-17 00:51:40.145624074 -0500
@@ -78,7 +78,7 @@
 typedef bool _Bool;
 # endif
 #else
-# if !defined __GNUC__
+# if !defined __GNUC__ || __GNUC__ >= 5
    /* If @HAVE__BOOL@:
         Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
         the built-in _Bool type is used.  See
@@ -96,6 +96,8 @@
           "warning(1185): enumerated type mixed with another type".
         The only benefit of the enum type, debuggability, is not important
         with these compilers.  So use 'signed char' and no typedef.  */
+   /* The default C mode changed from C89 to C11, which removes the _Bool
+      type.  */
 #  define _Bool signed char
 enum { false = 0, true = 1 };
 # else

kodi-15.0-hdhomerun.patch:
 Makefile.in                    |    5 --
 configure.ac                   |    1 
 xbmc/filesystem/DllHDHomeRun.h |   79 ++++++++++++++++++++++++++---------------
 3 files changed, 53 insertions(+), 32 deletions(-)

--- NEW FILE kodi-15.0-hdhomerun.patch ---
>From 6c05d16be3bae96479363c2117c28c4261374ab4 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Fri, 24 Aug 2012 19:34:47 -0600
Subject: [PATCH 2/3] Fedora: use external hdhomerun

Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
(cherry picked from commit ef5c269992b32d67de7547e9f530b6c971381f45)
---
 Makefile.in                    |  5 +--
 configure.in                   |  1 -
 xbmc/filesystem/DllHDHomeRun.h | 78 ++++++++++++++++++++++++++++--------------
 3 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8eda3c4..fbb19bd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -188,7 +188,6 @@
 LIB_DIRS=\
 	lib/cximage-6.0 \
 	lib/libexif \
-	lib/libhdhomerun \
 	lib/cpluff \
 	lib/xbmc-dll-symbols
 
@@ -404,15 +403,13 @@
 endif
 libexif: dllloader
 	$(MAKE) -C lib/libexif
-libhdhomerun: dllloader
-	$(MAKE) -C lib/libhdhomerun
 
 imagelib: dllloader
 	$(MAKE) -C lib/cximage-6.0
 
 codecs: dvdpcodecs dvdpextcodecs
 
-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
 
diff --git a/configure.ac b/configure.ac
index 343292e..2060e24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2477,7 +2477,6 @@
     xbmc/network/Makefile \
     xbmc/network/upnp/Makefile \
     lib/libexif/Makefile \
-    lib/libhdhomerun/Makefile \
     lib/cximage-6.0/Makefile \
     lib/libUPnP/Makefile \
     xbmc/DllPaths_generated.h \
diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
index 150b00f..57936be 100644
--- a/xbmc/filesystem/DllHDHomeRun.h
+++ b/xbmc/filesystem/DllHDHomeRun.h
@@ -20,7 +20,7 @@
  */
 
 #include "DynamicDll.h"
-#include "lib/libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
 
 class DllHdHomeRunInterface
 {
@@ -41,30 +41,56 @@ public:
 
 class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
 {
-  DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
-  DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
-  DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
-  DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
-  DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
-  DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3))
-  DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
-  DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
-  DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
-  DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
-  DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
-  DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
-  BEGIN_METHOD_RESOLVE()
-    RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
-    RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
-  END_METHOD_RESOLVE()
+public:
+  virtual ~DllHdHomeRun () {};
+
+  virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
+      { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
+
+  virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
+      { return ::hdhomerun_device_create_from_str (p1, p2); }
+
+  virtual void device_destroy (struct hdhomerun_device_t* p1)
+      { ::hdhomerun_device_destroy (p1); }
+
+  virtual int device_stream_start (struct hdhomerun_device_t* p1)
+      { return ::hdhomerun_device_stream_start (p1); }
+
+
+  virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
+      { 
+        uint8_t *retval;
+
+        size_t tmp = *p3;
+        retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
+        *p3 = tmp;
+
+        return retval;
+      }
+
+  virtual void device_stream_stop (struct hdhomerun_device_t* p1)
+      { ::hdhomerun_device_stream_stop (p1); }
+
+  virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
+      { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
+
+  virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
+      { return ::hdhomerun_device_set_tuner_program (p1, p2); }
+
+
+  virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
+      { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
+
+
+  virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
+      { ::hdhomerun_device_set_tuner (p1, p2); }
+
+  virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
+      { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
+
+  // DLL faking.
+  virtual bool ResolveExports() { return true; }
+  virtual bool Load() { return true; }
+  virtual void Unload() {}
 };
 
-- 
1.8.5.3



Index: kodi-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/kodi-generate-tarball-xz.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kodi-generate-tarball-xz.sh	29 Mar 2015 06:05:13 -0000	1.3
+++ kodi-generate-tarball-xz.sh	23 Jul 2015 01:12:15 -0000	1.4
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-MAJORVERSION=14
-MINORVERSION=2
+MAJORVERSION=15
+MINORVERSION=0
 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
 #GITSHORT=ge988513
-CODENAME=Helix
+CODENAME=Isengard
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${GITSHORT:+-${GITSHORT}}
 


Index: kodi.spec
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/kodi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kodi.spec	22 May 2015 16:18:00 -0000	1.5
+++ kodi.spec	23 Jul 2015 01:12:15 -0000	1.6
@@ -1,4 +1,4 @@
-#global PRERELEASE b1
+#global PRERELEASE b2
 %global DIRVERSION %{version}
 #global GITCOMMIT Gotham_r2-ge988513
 # use the line below for pre-releases
@@ -6,8 +6,8 @@
 %global _hardened_build 1
 
 Name: kodi
-Version: 14.2
-Release: 2%{?dist}
+Version: 15.0
+Release: 1%{?dist}
 Summary: Media center
 
 License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -29,7 +29,7 @@
 
 # need to file trac ticket, this patch just forces external hdhomerun
 # functionality, needs to be able fallback internal version
-Patch2: kodi-14.0-hdhomerun.patch
+Patch2: kodi-15.0-hdhomerun.patch
 
 # Avoid segfault during goom's configure
 # https://bugzilla.redhat.com/1069079
@@ -41,8 +41,8 @@
 # Remove call to internal ffmpeg function (misued anyway)
 Patch5: kodi-14.0-dvddemux-ffmpeg.patch
 
-# GCC5 inline changes
-Patch6: kodi-14.0-gcc5.patch
+# The screensaver needs updating for GCC5
+Patch6: kodi-15.0-gcc5.patch
 
 # Kodi is the renamed XBMC project
 Obsoletes: xbmc < 14.0-1
@@ -54,8 +54,9 @@
 %global _with_libbluray 1
 %global _with_cwiid 1
 %global _with_libssh 1
-%global _with_libcec 1
+%global _with_libcec 0
 %global _with_external_ffmpeg 1
+%global _with_wayland 0
 %endif
 
 %ifarch x86_64 i686
@@ -117,7 +118,7 @@
 BuildRequires: libcap-devel
 BuildRequires: libcdio-devel
 %if 0%{?_with_libcec}
-BuildRequires: libcec-devel >= 2.2.0
+BuildRequires: libcec-devel >= 3.0.0
 %endif
 %if 0%{?_with_crystalhd}
 BuildRequires: libcrystalhd-devel
@@ -153,6 +154,9 @@
 BuildRequires: libvdpau-devel
 %endif
 BuildRequires: libvorbis-devel
+%if 0%{?_with_wayland}
+BuildRequires: libwayland-client-devel
+%endif
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: lzo-devel
@@ -164,6 +168,7 @@
 %endif
 BuildRequires: nasm
 BuildRequires: pcre-devel
+BuildRequires: pixman-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: python-devel
 BuildRequires: python-pillow
@@ -175,6 +180,9 @@
 BuildRequires: tre-devel
 BuildRequires: trousers-devel
 BuildRequires: wavpack-devel
+%if 0%{?_with_wayland}
+BuildRequires: weston-devel
+%endif
 BuildRequires: yajl-devel
 BuildRequires: zlib-devel
 
@@ -189,7 +197,7 @@
 Requires: libbluray%{?_isa}
 %endif
 %if 0%{?_with_libcec}
-Requires: libcec%{?_isa} >= 2.2.0
+Requires: libcec%{?_isa} >= 3.0.0
 %endif
 %if 0%{?_with_crystalhd}
 Requires: libcrystalhd%{?_isa}
@@ -285,6 +293,9 @@
 %if 0%{?_with_external_ffmpeg}
 --with-ffmpeg=shared \
 %endif
+%if 0%{?_with_wayland}
+--enable-wayland \
+%endif
 --enable-goom \
 --enable-pulse \
 --enable-joystick \
@@ -383,7 +394,7 @@
 
 %files
 %license copying.txt LICENSE.GPL
-%doc CONTRIBUTORS README.md docs
+%doc CONTRIBUTING.md README.md docs
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/xbmc
@@ -428,6 +439,12 @@
 
 
 %changelog
+* Wed Jul 22 2015 Michael Cronenworth <mike at cchtml.com> - 15.0-1
+- Kodi 15.0 final
+
+* Tue Jun 16 2015 Michael Cronenworth <mike at cchtml.com> - 15.0-0.1
+- Kodi 15.0 beta 2
+
 * Fri May 22 2015 Michael Cronenworth <mike at cchtml.com> - 14.2-2
 - GCC5 fixes
 


--- kodi-14.0-gcc5.patch DELETED ---


--- kodi-14.0-hdhomerun.patch DELETED ---
