Packman Build Service PMBS

kodi-next.spec Changed

@@ -18,7 +18,8 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Leia
+#%define kodi_version Leia
+%define kodi_version ''
 %define ffmpeg_version 4.0.3-Leia-RC5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
@@ -46,13 +47,14 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        18.4
+Version:        master
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://kodi.tv/
-Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+#Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
@@ -65,8 +67,8 @@
 # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
 Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
 Source24:       http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
-Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
-Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
+#Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
+Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.11.0.tar.gz
 Source27:       http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 %if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
@@ -83,6 +85,7 @@
 
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  binutils-gold
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
@@ -94,10 +97,11 @@
 BuildRequires:  gcc8-c++
 %endif
 BuildRequires:  ghostscript
+BuildRequires:  graphviz
 BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libcurl)
@@ -122,6 +126,7 @@
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(lirc)
+BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
@@ -289,7 +294,8 @@
 Development files for Kodi Media Center
 
 %prep
-%setup -q -n xbmc-%{version}-%{kodi_version}
+#%setup -q -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version}
 
 #%patch0
 #%patch1
@@ -299,7 +305,7 @@
 #%patch5
 %patch6
 %patch7
-%patch8 -p1
+##%patch8 -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
@@ -342,10 +348,6 @@
     -DCMAKE_CXX_COMPILER=$CXX \
     -DFMT_URL=%{SOURCE24} \
     -DENABLE_INTERNAL_FMT=ON \
-    -DRapidJSON_URL=%{SOURCE25} \
-    -DENABLE_INTERNAL_RapidJSON=ON \
-    -DFFMPEG_URL=%{SOURCE30} \
-    -DENABLE_INTERNAL_FFMPEG=OFF \
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
@@ -354,9 +356,16 @@
     -DFLATBUFFERS_URL=%{SOURCE26} \
     -DENABLE_INTERNAL_FSTRCMP=ON \
     -DFSTRCMP_URL=%{SOURCE27} \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DENABLE_INTERNAL_RapidJSON=OFF \
+    -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 
-    
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+
+    #-DRapidJSON_URL=%{SOURCE25} \
+    #-DENABLE_INTERNAL_RapidJSON=ON \
+%define _smp_mflags -j4
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX 
 
 %install
 pushd build
@@ -588,12 +597,12 @@
 %{_includedir}/kodi/Network.h
 %{_includedir}/kodi/libXBMC_pvr.h
 %{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_game.h
-%{_includedir}/kodi/kodi_game_dll.h
+#%{_includedir}/kodi/libKODI_game.h
+#%{_includedir}/kodi/kodi_game_dll.h
 %{_includedir}/kodi/AddonBase.h
 %{_includedir}/kodi/kodi_vfs_types.h
 %{_includedir}/kodi/StreamCrypto.h
-%{_includedir}/kodi/kodi_game_types.h
+#%{_includedir}/kodi/kodi_game_types.h
 %{_includedir}/kodi/General.h
 %dir %{_includedir}/kodi/platform
 %dir %{_includedir}/kodi/platform/android
@@ -609,16 +618,20 @@
 %{_includedir}/kodi/addon-instance/ImageDecoder.h
 %{_includedir}/kodi/addon-instance/Screensaver.h
 %{_includedir}/kodi/addon-instance/PeripheralUtils.h
+%{_includedir}/kodi/addon-instance/Game.h
 %{_includedir}/kodi/libXBMC_addon.h
 %{_includedir}/kodi/versions.h
 %{_includedir}/kodi/xbmc_pvr_dll.h
 %{_includedir}/kodi/xbmc_pvr_types.h
 %{_includedir}/kodi/StreamCodec.h
+%{_includedir}/kodi/AudioEngine.h
+%{_includedir}/kodi/InputStreamConstants.h
 %dir %{_includedir}/kodi/gui
 %{_includedir}/kodi/gui/definitions.h
 %{_includedir}/kodi/gui/Window.h
 %{_includedir}/kodi/gui/General.h
 %{_includedir}/kodi/gui/ListItem.h
+%{_includedir}/kodi/gui/renderHelper.h
 %dir %{_includedir}/kodi/gui/dialogs
 %{_includedir}/kodi/gui/dialogs/Select.h
 %{_includedir}/kodi/gui/dialogs/OK.h
@@ -643,6 +656,10 @@
 %{_includedir}/kodi/gui/controls/RadioButton.h
 %{_includedir}/kodi/gui/controls/Button.h
 %{_includedir}/kodi/gui/controls/Spin.h
+%dir %{_includedir}/kodi/gui/gl
+%{_includedir}/kodi/gui/gl/GL.h
+%{_includedir}/kodi/gui/gl/GLonDX.h
+%{_includedir}/kodi/gui/gl/Shader.h
 %{_includedir}/kodi/DemuxCrypto.h
 %{_includedir}/kodi/DemuxPacket.h
 %{_includedir}/kodi/TimingConstants.h

kodi.spec Changed

@@ -18,7 +18,8 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Leia
+#%define kodi_version Leia
+%define kodi_version ''
 %define ffmpeg_version 4.0.3-Leia-RC5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
@@ -46,13 +47,14 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        18.4
+Version:        master
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://kodi.tv/
-Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+#Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
@@ -65,8 +67,8 @@
 # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
 Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
 Source24:       http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
-Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
-Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
+#Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
+Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.11.0.tar.gz
 Source27:       http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 %if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
@@ -83,6 +85,7 @@
 
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  binutils-gold
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
@@ -94,10 +97,11 @@
 BuildRequires:  gcc8-c++
 %endif
 BuildRequires:  ghostscript
+BuildRequires:  graphviz
 BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libcurl)
@@ -122,6 +126,7 @@
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(lirc)
+BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
@@ -289,7 +294,8 @@
 Development files for Kodi Media Center
 
 %prep
-%setup -q -n xbmc-%{version}-%{kodi_version}
+#%setup -q -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version}
 
 #%patch0
 #%patch1
@@ -299,7 +305,7 @@
 #%patch5
 %patch6
 %patch7
-%patch8 -p1
+##%patch8 -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
@@ -342,10 +348,6 @@
     -DCMAKE_CXX_COMPILER=$CXX \
     -DFMT_URL=%{SOURCE24} \
     -DENABLE_INTERNAL_FMT=ON \
-    -DRapidJSON_URL=%{SOURCE25} \
-    -DENABLE_INTERNAL_RapidJSON=ON \
-    -DFFMPEG_URL=%{SOURCE30} \
-    -DENABLE_INTERNAL_FFMPEG=OFF \
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
@@ -354,9 +356,16 @@
     -DFLATBUFFERS_URL=%{SOURCE26} \
     -DENABLE_INTERNAL_FSTRCMP=ON \
     -DFSTRCMP_URL=%{SOURCE27} \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DENABLE_INTERNAL_RapidJSON=OFF \
+    -DX11_RENDER_SYSTEM=gl \
     -DBUILD_SHARED_LIBS=1 
-    
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+
+    #-DRapidJSON_URL=%{SOURCE25} \
+    #-DENABLE_INTERNAL_RapidJSON=ON \
+%define _smp_mflags -j4
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX 
 
 %install
 pushd build
@@ -588,12 +597,12 @@
 %{_includedir}/kodi/Network.h
 %{_includedir}/kodi/libXBMC_pvr.h
 %{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_game.h
-%{_includedir}/kodi/kodi_game_dll.h
+#%{_includedir}/kodi/libKODI_game.h
+#%{_includedir}/kodi/kodi_game_dll.h
 %{_includedir}/kodi/AddonBase.h
 %{_includedir}/kodi/kodi_vfs_types.h
 %{_includedir}/kodi/StreamCrypto.h
-%{_includedir}/kodi/kodi_game_types.h
+#%{_includedir}/kodi/kodi_game_types.h
 %{_includedir}/kodi/General.h
 %dir %{_includedir}/kodi/platform
 %dir %{_includedir}/kodi/platform/android
@@ -609,16 +618,20 @@
 %{_includedir}/kodi/addon-instance/ImageDecoder.h
 %{_includedir}/kodi/addon-instance/Screensaver.h
 %{_includedir}/kodi/addon-instance/PeripheralUtils.h
+%{_includedir}/kodi/addon-instance/Game.h
 %{_includedir}/kodi/libXBMC_addon.h
 %{_includedir}/kodi/versions.h
 %{_includedir}/kodi/xbmc_pvr_dll.h
 %{_includedir}/kodi/xbmc_pvr_types.h
 %{_includedir}/kodi/StreamCodec.h
+%{_includedir}/kodi/AudioEngine.h
+%{_includedir}/kodi/InputStreamConstants.h
 %dir %{_includedir}/kodi/gui
 %{_includedir}/kodi/gui/definitions.h
 %{_includedir}/kodi/gui/Window.h
 %{_includedir}/kodi/gui/General.h
 %{_includedir}/kodi/gui/ListItem.h
+%{_includedir}/kodi/gui/renderHelper.h
 %dir %{_includedir}/kodi/gui/dialogs
 %{_includedir}/kodi/gui/dialogs/Select.h
 %{_includedir}/kodi/gui/dialogs/OK.h
@@ -643,6 +656,10 @@
 %{_includedir}/kodi/gui/controls/RadioButton.h
 %{_includedir}/kodi/gui/controls/Button.h
 %{_includedir}/kodi/gui/controls/Spin.h
+%dir %{_includedir}/kodi/gui/gl
+%{_includedir}/kodi/gui/gl/GL.h
+%{_includedir}/kodi/gui/gl/GLonDX.h
+%{_includedir}/kodi/gui/gl/Shader.h
 %{_includedir}/kodi/DemuxCrypto.h
 %{_includedir}/kodi/DemuxPacket.h
 %{_includedir}/kodi/TimingConstants.h

kodi.VERSION Changed

Changes of Revision 99