Request 6331 (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

@@ -110,6 +110,7 @@
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
 %endif
 Patch5:         0005-kodi-comply-with-pipewire-prototypes.patch
+Patch6:         0006-kodi-comply-with-curl-types.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,16 +120,11 @@
 BuildRequires:  gawk
 %if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
 # Use the default compiler on Tumbleweed
-BuildRequires:	gcc
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
-%endif
+BuildRequires:  gcc10
+BuildRequires:  gcc10-c++
 %endif
 BuildRequires:  ghostscript
 BuildRequires:  graphviz
@@ -394,18 +390,22 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
-%else
-%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
-%endif
+test -x "$(type -P gcc)"   && CC="$_"
+test -x "$(type -P g++)"   && CXX="$_"
+test -x "$(type -P gcc-9)" && CC="$_"
+test -x "$(type -P g++-9)" && CXX="$_"
+test -x "$(type -P gcc-10)" && CC="$_"
+test -x "$(type -P g++-10)" && CXX="$_"
+test -x "$(type -P gcc-11)" && CC="$_"
+test -x "$(type -P g++-11)" && CXX="$_"
+test -x "$(type -P gcc-12)" && CC="$_"
+test -x "$(type -P g++-12)" && CXX="$_"
+test -x "$(type -P gcc-13)" && CC="$_"
+test -x "$(type -P g++-13)" && CXX="$_"
+test -x "$(type -P gcc-14)" && CC="$_"
+test -x "$(type -P g++-14)" && CXX="$_"
+CC="$(readlink -f ${CC})"
+CXX="$(readlink -f ${CXX})"
 
 export CMAKE_POLICY_VERSION_MINIMUM="3.5"

kodi-noX-raspberry-pi2.spec Changed

@@ -110,6 +110,7 @@
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
 %endif
 Patch5:         0005-kodi-comply-with-pipewire-prototypes.patch
+Patch6:         0006-kodi-comply-with-curl-types.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,16 +120,11 @@
 BuildRequires:  gawk
 %if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
 # Use the default compiler on Tumbleweed
-BuildRequires:	gcc
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
-%endif
+BuildRequires:  gcc10
+BuildRequires:  gcc10-c++
 %endif
 BuildRequires:  ghostscript
 BuildRequires:  graphviz
@@ -394,18 +390,22 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
-%else
-%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
-%endif
+test -x "$(type -P gcc)"   && CC="$_"
+test -x "$(type -P g++)"   && CXX="$_"
+test -x "$(type -P gcc-9)" && CC="$_"
+test -x "$(type -P g++-9)" && CXX="$_"
+test -x "$(type -P gcc-10)" && CC="$_"
+test -x "$(type -P g++-10)" && CXX="$_"
+test -x "$(type -P gcc-11)" && CC="$_"
+test -x "$(type -P g++-11)" && CXX="$_"
+test -x "$(type -P gcc-12)" && CC="$_"
+test -x "$(type -P g++-12)" && CXX="$_"
+test -x "$(type -P gcc-13)" && CC="$_"
+test -x "$(type -P g++-13)" && CXX="$_"
+test -x "$(type -P gcc-14)" && CC="$_"
+test -x "$(type -P g++-14)" && CXX="$_"
+CC="$(readlink -f ${CC})"
+CXX="$(readlink -f ${CXX})"
 
 export CMAKE_POLICY_VERSION_MINIMUM="3.5"

kodi-noX.spec Changed

@@ -110,6 +110,7 @@
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
 %endif
 Patch5:         0005-kodi-comply-with-pipewire-prototypes.patch
+Patch6:         0006-kodi-comply-with-curl-types.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,16 +120,11 @@
 BuildRequires:  gawk
 %if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
 # Use the default compiler on Tumbleweed
-BuildRequires:	gcc
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
-%endif
+BuildRequires:  gcc10
+BuildRequires:  gcc10-c++
 %endif
 BuildRequires:  ghostscript
 BuildRequires:  graphviz
@@ -394,18 +390,22 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
-%else
-%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
-%endif
+test -x "$(type -P gcc)"   && CC="$_"
+test -x "$(type -P g++)"   && CXX="$_"
+test -x "$(type -P gcc-9)" && CC="$_"
+test -x "$(type -P g++-9)" && CXX="$_"
+test -x "$(type -P gcc-10)" && CC="$_"
+test -x "$(type -P g++-10)" && CXX="$_"
+test -x "$(type -P gcc-11)" && CC="$_"
+test -x "$(type -P g++-11)" && CXX="$_"
+test -x "$(type -P gcc-12)" && CC="$_"
+test -x "$(type -P g++-12)" && CXX="$_"
+test -x "$(type -P gcc-13)" && CC="$_"
+test -x "$(type -P g++-13)" && CXX="$_"
+test -x "$(type -P gcc-14)" && CC="$_"
+test -x "$(type -P g++-14)" && CXX="$_"
+CC="$(readlink -f ${CC})"
+CXX="$(readlink -f ${CXX})"
 
 export CMAKE_POLICY_VERSION_MINIMUM="3.5"

kodi.spec Changed

@@ -110,6 +110,7 @@
 Patch4:         0004-kodi-workaround-pipewire-bug.patch
 %endif
 Patch5:         0005-kodi-comply-with-pipewire-prototypes.patch
+Patch6:         0006-kodi-comply-with-curl-types.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,16 +120,11 @@
 BuildRequires:  gawk
 %if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
 # Use the default compiler on Tumbleweed
-BuildRequires:	gcc
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
-%endif
+BuildRequires:  gcc10
+BuildRequires:  gcc10-c++
 %endif
 BuildRequires:  ghostscript
 BuildRequires:  graphviz
@@ -394,18 +390,22 @@
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
-%else
-%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
-%endif
+test -x "$(type -P gcc)"   && CC="$_"
+test -x "$(type -P g++)"   && CXX="$_"
+test -x "$(type -P gcc-9)" && CC="$_"
+test -x "$(type -P g++-9)" && CXX="$_"
+test -x "$(type -P gcc-10)" && CC="$_"
+test -x "$(type -P g++-10)" && CXX="$_"
+test -x "$(type -P gcc-11)" && CC="$_"
+test -x "$(type -P g++-11)" && CXX="$_"
+test -x "$(type -P gcc-12)" && CC="$_"
+test -x "$(type -P g++-12)" && CXX="$_"
+test -x "$(type -P gcc-13)" && CC="$_"
+test -x "$(type -P g++-13)" && CXX="$_"
+test -x "$(type -P gcc-14)" && CC="$_"
+test -x "$(type -P g++-14)" && CXX="$_"
+CC="$(readlink -f ${CC})"
+CXX="$(readlink -f ${CXX})"
 
 export CMAKE_POLICY_VERSION_MINIMUM="3.5"

0006-kodi-comply-with-curl-types.patch Added

Overview

Request 6331 (accepted)

Request History