Request 4068 (accepted)

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -19,7 +19,7 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
-%define ffmpeg_version 3.1.11
+%define ffmpeg_version 3.1.11-Krypton-17.5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -41,10 +41,10 @@
 #
 %bcond_without kodi_libbluray
 
-ExclusiveArch: armv6l armv6hl
+ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        17.5
+Version:        17.6
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -63,7 +63,7 @@
 Source23:       libdvdread-master.tar.gz
 %if %{without sysffmpeg}
 # DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
 Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
@@ -301,13 +301,13 @@
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
 %if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
 %endif
 
 %build
 export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}

kodi-noX-raspberry-pi2.spec Changed

@@ -19,7 +19,7 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
-%define ffmpeg_version 3.1.11
+%define ffmpeg_version 3.1.11-Krypton-17.5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -44,7 +44,7 @@
 ExclusiveArch: armv7l armv7hl
 
 Name:           kodi-noX-raspberry-pi2
-Version:        17.5
+Version:        17.6
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -63,7 +63,7 @@
 Source23:       libdvdread-master.tar.gz
 %if %{without sysffmpeg}
 # DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
 Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
@@ -301,13 +301,13 @@
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
 %if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
 %endif
 
 %build
 export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}

kodi-noX.spec Changed

@@ -19,7 +19,7 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
-%define ffmpeg_version 3.1.11
+%define ffmpeg_version 3.1.11-Krypton-17.5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -44,7 +44,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        17.5
+Version:        17.6
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -63,7 +63,7 @@
 Source23:       libdvdread-master.tar.gz
 %if %{without sysffmpeg}
 # DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
 Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
@@ -301,13 +301,13 @@
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
 %if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
 %endif
 
 %build
 export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}

kodi.spec Changed

@@ -19,7 +19,7 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
-%define ffmpeg_version 3.1.11
+%define ffmpeg_version 3.1.11-Krypton-17.5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -44,7 +44,7 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        17.5
+Version:        17.6
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -63,7 +63,7 @@
 Source23:       libdvdread-master.tar.gz
 %if %{without sysffmpeg}
 # DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
 Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
@@ -301,13 +301,13 @@
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
 %if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
 %endif
 
 %build
 export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}

kodi.VERSION Changed

pre_checkin.sh Changed

Overview

Request 4068 (accepted)

Request History