From 704af298383de1a3c170f23ad95770064f726bd0 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Wed, 17 Jun 2015 01:18:26 -0500 Subject: Update to Kodi 15.0 beta 2 Temporarily disable libcec support. Fedora package needs to be updated first. --- kodi-14.0-dvddemux-ffmpeg.patch | 4 ++-- kodi-14.0-hdhomerun.patch | 37 ++++++++++++++++++------------------- kodi-15.0-gcc5.patch | 20 ++++++++++++++++++++ kodi-generate-tarball-xz.sh | 6 +++--- kodi.spec | 36 +++++++++++++++++++++++++----------- xbmc-13.0-dvdread.patch | 6 +++--- xbmc-13.0-libmysqlclient.patch | 6 +++--- 7 files changed, 74 insertions(+), 41 deletions(-) create mode 100644 kodi-15.0-gcc5.patch diff --git a/kodi-14.0-dvddemux-ffmpeg.patch b/kodi-14.0-dvddemux-ffmpeg.patch index 0c6d627..9e18b11 100644 --- a/kodi-14.0-dvddemux-ffmpeg.patch +++ b/kodi-14.0-dvddemux-ffmpeg.patch @@ -1,12 +1,12 @@ --- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01 11:18:24.000000000 -0500 +++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866 -0500 -@@ -519,10 +519,6 @@ +@@ -542,10 +542,6 @@ void CDVDDemuxFFmpeg::Flush() { - // 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/kodi-14.0-hdhomerun.patch b/kodi-14.0-hdhomerun.patch index 1bbe13e..85b3810 100644 --- a/kodi-14.0-hdhomerun.patch +++ b/kodi-14.0-hdhomerun.patch @@ -15,7 +15,7 @@ diff --git a/Makefile.in b/Makefile.in index 8eda3c4..fbb19bd 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -204,7 +204,6 @@ +@@ -188,7 +188,6 @@ LIB_DIRS=\ lib/cximage-6.0 \ lib/libexif \ @@ -23,36 +23,35 @@ index 8eda3c4..fbb19bd 100644 lib/cpluff \ lib/xbmc-dll-symbols -@@ -425,8 +424,6 @@ +@@ -404,15 +403,13 @@ + endif + libexif: dllloader $(MAKE) -C lib/libexif - cmyth: dllloader - $(MAKE) -C lib/cmyth -libhdhomerun: dllloader - $(MAKE) -C lib/libhdhomerun - papcodecs: dllloader dvdpcodecs - test -d system/players/paplayer || mkdir system/players/paplayer - $(MAKE) -C lib/vgmstream -@@ -454,7 +451,7 @@ - codecs: papcodecs dvdpcodecs dvdpextcodecs + imagelib: dllloader + $(MAKE) -C lib/cximage-6.0 --libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) -+libs: $(LIBSSE4) imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) + codecs: dvdpcodecs dvdpextcodecs - externals: codecs libs visualizations screensavers libaddon pvraddons +-libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so ++libs: $(LIBSSE4) imagelib libexif system/libcpluff-@ARCH@.so -diff --git a/configure.in b/configure.in + externals: codecs libs visualizations screensavers libaddon + +diff --git a/configure.ac b/configure.ac index 343292e..2060e24 100644 ---- a/configure.in -+++ b/configure.in -@@ -2544,7 +2544,6 @@ OUTPUT_FILES="Makefile \ +--- a/configure.ac ++++ b/configure.ac +@@ -2478,7 +2478,6 @@ + xbmc/network/httprequesthandler/python/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 \ diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h index 150b00f..57936be 100644 --- a/xbmc/filesystem/DllHDHomeRun.h diff --git a/kodi-15.0-gcc5.patch b/kodi-15.0-gcc5.patch new file mode 100644 index 0000000..b11929c --- /dev/null +++ b/kodi-15.0-gcc5.patch @@ -0,0 +1,20 @@ +--- 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 diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index a3b2154..49b3493 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,10 +1,10 @@ #!/bin/sh -MAJORVERSION=14 -MINORVERSION=2 +MAJORVERSION=15 +MINORVERSION=0b2 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 -CODENAME=Helix +CODENAME=Isengard VERSION=${MAJORVERSION}.${MINORVERSION}${GITSHORT:+-${GITSHORT}} diff --git a/kodi.spec b/kodi.spec index afe7be9..04d59de 100644 --- a/kodi.spec +++ b/kodi.spec @@ -1,13 +1,13 @@ -#global PRERELEASE b1 -%global DIRVERSION %{version} +%global PRERELEASE b2 +#global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases -#global DIRVERSION %{version}%{PRERELEASE} +%global DIRVERSION %{version}%{PRERELEASE} %global _hardened_build 1 Name: kodi -Version: 14.2 -Release: 2%{?dist} +Version: 15.0 +Release: 0.1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -41,8 +41,8 @@ Patch4: kodi-14.0-versioning.patch # 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 @@ Provides: xbmc = %{version} %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: libbluray-devel 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: libva-devel 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 @@ BuildRequires: mesa-libGLES-devel %endif BuildRequires: nasm BuildRequires: pcre-devel +BuildRequires: pixman-devel BuildRequires: pulseaudio-libs-devel BuildRequires: python-devel BuildRequires: python-pillow @@ -175,6 +180,9 @@ BuildRequires: tinyxml-devel 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: google-roboto-fonts 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 @@ chmod +x bootstrap %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 @@ fi %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,9 @@ fi %changelog +* Tue Jun 16 2015 Michael Cronenworth - 15.0-0.1 +- Kodi 15.0 beta 2 + * Fri May 22 2015 Michael Cronenworth - 14.2-2 - GCC5 fixes diff --git a/xbmc-13.0-dvdread.patch b/xbmc-13.0-dvdread.patch index d694a95..4e681da 100644 --- a/xbmc-13.0-dvdread.patch +++ b/xbmc-13.0-dvdread.patch @@ -34,10 +34,10 @@ index 8bc4795..1fc31a4 100644 %: %.ac autoreconf -vif $(@D) -@rm -rf $(@D)/autom4te.cache -diff --git a/configure.in b/configure.in +diff --git a/configure.ac b/configure.ac index beb8aac..343292e 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -2860,27 +2860,9 @@ --with-pic ], [$SKIP_CONFIG_DVDCSS]) diff --git a/xbmc-13.0-libmysqlclient.patch b/xbmc-13.0-libmysqlclient.patch index cbadc45..5c9318b 100644 --- a/xbmc-13.0-libmysqlclient.patch +++ b/xbmc-13.0-libmysqlclient.patch @@ -12,10 +12,10 @@ See https://bugzilla.redhat.com/1069079 configure.in | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/configure.in b/configure.in +diff --git a/configure.ac b/configure.ac index 2060e24..2a20339 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -2898,6 +2898,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ ./configure \ CFLAGS="$CFLAGS" \ -- cgit