Request 4613 (accepted)

Overview

Request 4613 (accepted)

version update to 18.4 and fix gcc9 dependency for Tumblweed

Created by sagiben about 5 years ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi

Submit package home:sagiben / kodi to package Multimedia / kodi

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

@@ -46,7 +46,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        18.3
+Version:        18.4
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -86,8 +86,13 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+BuildRequires:	gcc9
+BuildRequires:  gcc9-c++
+%else
 BuildRequires:  gcc8
 BuildRequires:  gcc8-c++
+%endif
 BuildRequires:  ghostscript
 BuildRequires:  groff-full
 BuildRequires:  libtool
@@ -318,6 +323,14 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+ export CC=gcc-9
+ export CXX=g++-9
+%else
+ export CC=gcc-8
+ export CXX=g++-8
+%endif
+
 %cmake \
 %ifarch i586
     -DCMAKE_C_FLAGS='-msse' \
@@ -325,8 +338,8 @@
 %if %{dev_build}
     -DVERBOSE=ON \
 %endif
-    -DCMAKE_C_COMPILER=gcc-8 \
-    -DCMAKE_CXX_COMPILER=g++-8 \
+    -DCMAKE_C_COMPILER=$CC \
+    -DCMAKE_CXX_COMPILER=$CXX \
     -DFMT_URL=%{SOURCE24} \
     -DENABLE_INTERNAL_FMT=ON \
     -DRapidJSON_URL=%{SOURCE25} \
@@ -343,7 +356,7 @@
     -DFSTRCMP_URL=%{SOURCE27} \
     -DBUILD_SHARED_LIBS=1 
     
-make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8 || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
 pushd build

kodi-noX-raspberry-pi2.spec Changed

@@ -46,7 +46,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi2
-Version:        18.3
+Version:        18.4
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -86,8 +86,13 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+BuildRequires:	gcc9
+BuildRequires:  gcc9-c++
+%else
 BuildRequires:  gcc8
 BuildRequires:  gcc8-c++
+%endif
 BuildRequires:  ghostscript
 BuildRequires:  groff-full
 BuildRequires:  libtool
@@ -318,6 +323,14 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+ export CC=gcc-9
+ export CXX=g++-9
+%else
+ export CC=gcc-8
+ export CXX=g++-8
+%endif
+
 %cmake \
 %ifarch i586
     -DCMAKE_C_FLAGS='-msse' \
@@ -325,8 +338,8 @@
 %if %{dev_build}
     -DVERBOSE=ON \
 %endif
-    -DCMAKE_C_COMPILER=gcc-8 \
-    -DCMAKE_CXX_COMPILER=g++-8 \
+    -DCMAKE_C_COMPILER=$CC \
+    -DCMAKE_CXX_COMPILER=$CXX \
     -DFMT_URL=%{SOURCE24} \
     -DENABLE_INTERNAL_FMT=ON \
     -DRapidJSON_URL=%{SOURCE25} \
@@ -343,7 +356,7 @@
     -DFSTRCMP_URL=%{SOURCE27} \
     -DBUILD_SHARED_LIBS=1 
     
-make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8 || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
 pushd build

kodi-noX.spec Changed

@@ -46,7 +46,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        18.3
+Version:        18.4
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -86,8 +86,13 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+BuildRequires:	gcc9
+BuildRequires:  gcc9-c++
+%else
 BuildRequires:  gcc8
 BuildRequires:  gcc8-c++
+%endif
 BuildRequires:  ghostscript
 BuildRequires:  groff-full
 BuildRequires:  libtool
@@ -318,6 +323,14 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+ export CC=gcc-9
+ export CXX=g++-9
+%else
+ export CC=gcc-8
+ export CXX=g++-8
+%endif
+
 %cmake \
 %ifarch i586
     -DCMAKE_C_FLAGS='-msse' \
@@ -325,8 +338,8 @@
 %if %{dev_build}
     -DVERBOSE=ON \
 %endif
-    -DCMAKE_C_COMPILER=gcc-8 \
-    -DCMAKE_CXX_COMPILER=g++-8 \
+    -DCMAKE_C_COMPILER=$CC \
+    -DCMAKE_CXX_COMPILER=$CXX \
     -DFMT_URL=%{SOURCE24} \
     -DENABLE_INTERNAL_FMT=ON \
     -DRapidJSON_URL=%{SOURCE25} \
@@ -343,7 +356,7 @@
     -DFSTRCMP_URL=%{SOURCE27} \
     -DBUILD_SHARED_LIBS=1 
     
-make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8 || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
 pushd build

kodi.spec Changed

@@ -46,7 +46,7 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        18.3
+Version:        18.4
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -86,8 +86,13 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+BuildRequires:	gcc9
+BuildRequires:  gcc9-c++
+%else
 BuildRequires:  gcc8
 BuildRequires:  gcc8-c++
+%endif
 BuildRequires:  ghostscript
 BuildRequires:  groff-full
 BuildRequires:  libtool
@@ -318,6 +323,14 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
+%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
+ export CC=gcc-9
+ export CXX=g++-9
+%else
+ export CC=gcc-8
+ export CXX=g++-8
+%endif
+
 %cmake \
 %ifarch i586
     -DCMAKE_C_FLAGS='-msse' \
@@ -325,8 +338,8 @@
 %if %{dev_build}
     -DVERBOSE=ON \
 %endif
-    -DCMAKE_C_COMPILER=gcc-8 \
-    -DCMAKE_CXX_COMPILER=g++-8 \
+    -DCMAKE_C_COMPILER=$CC \
+    -DCMAKE_CXX_COMPILER=$CXX \
     -DFMT_URL=%{SOURCE24} \
     -DENABLE_INTERNAL_FMT=ON \
     -DRapidJSON_URL=%{SOURCE25} \
@@ -343,7 +356,7 @@
     -DFSTRCMP_URL=%{SOURCE27} \
     -DBUILD_SHARED_LIBS=1 
     
-make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8 || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
 pushd build

Build Results
RPM Lint

Refresh

Comments for request 4613 0

Request History

sagiben created request about 5 years ago

version update to 18.4 and fix gcc9 dependency for Tumblweed

sagiben accepted request about 5 years ago