Request 2426 (accepted)

Overview

Request 2426 (accepted)

- Remove pkgconfig(platform) dep since this is only a libcec dep
- Remove SDL2 dep for kodi-noX* builds
- Rework again platform and player management

Created by guillaume over 8 years ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi-noX-raspberry-pi

Submit package home:guil...ltimedia / kodi-noX-...berry-pi 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

@@ -21,7 +21,7 @@
 %define kodi_version Isengard
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build ("%{name}" == "kodi-noX")
+%define noX_build 1
 %if %{noX_build}
 # no X build needs openGL ES
 %bcond_with enable_opengl
@@ -37,12 +37,7 @@
 %endif
 
 %define kodi_platform raspberry-pi
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
-# Enable omxplayer for RPi and RPi2
 %define kodi_player omxplayer
-%else
-%define kodi_player none
-%endif
 
 Name:           kodi-noX-raspberry-pi
 Version:        15.2
@@ -162,10 +157,11 @@
 BuildRequires:  pkgconfig(mad)
 BuildRequires:  pkgconfig(nettle)
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(platform)
 BuildRequires:  pkgconfig(python)
 BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
 BuildRequires:  pkgconfig(sdl2)
+%endif
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(taglib) >= 1.8
@@ -193,18 +189,18 @@
 BuildRequires:  pkgconfig(vdpau)
 %endif
 %if %{with enable_opengles}
-%if %{kodi_platform} == "none"
+%if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
 %else
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" 
+%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2")
 BuildRequires:  raspberrypi-userland-devel
 %endif
 %endif
 %endif
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
-BuildRequires:  omxplayer
+Requires:       omxplayer
 %endif
 # glxinfo is needed to check hw accel
 %if 0%{?suse_version} >= 1220
@@ -305,7 +301,7 @@
 chmod +x bootstrap
 ./bootstrap
 
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
+%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 %configure \
@@ -347,11 +343,11 @@
 %else
     --disable-gles \
 %endif
-%if %{kodi_platform} != "none"
+%if "%{kodi_platform}" != "none"
       --with-platform=%{kodi_platform} \
 %endif
-%if %{kodi_player} != "none"
-      --enable-player=%{kodi_player} \
+%if "%{kodi_player}" != "none"
+      --enable-player="%{kodi_player}" \
 %endif
 %ifarch armv7l armv7hl
     --enable-tegra \

kodi-noX-raspberry-pi2.spec Changed

@@ -21,7 +21,7 @@
 %define kodi_version Isengard
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build ("%{name}" == "kodi-noX")
+%define noX_build 1
 %if %{noX_build}
 # no X build needs openGL ES
 %bcond_with enable_opengl
@@ -37,12 +37,7 @@
 %endif
 
 %define kodi_platform raspberry-pi2
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
-# Enable omxplayer for RPi and RPi2
 %define kodi_player omxplayer
-%else
-%define kodi_player none
-%endif
 
 Name:           kodi-noX-raspberry-pi2
 Version:        15.2
@@ -162,10 +157,11 @@
 BuildRequires:  pkgconfig(mad)
 BuildRequires:  pkgconfig(nettle)
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(platform)
 BuildRequires:  pkgconfig(python)
 BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
 BuildRequires:  pkgconfig(sdl2)
+%endif
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(taglib) >= 1.8
@@ -193,18 +189,18 @@
 BuildRequires:  pkgconfig(vdpau)
 %endif
 %if %{with enable_opengles}
-%if %{kodi_platform} == "none"
+%if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
 %else
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" 
+%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2")
 BuildRequires:  raspberrypi-userland-devel
 %endif
 %endif
 %endif
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
-BuildRequires:  omxplayer
+Requires:       omxplayer
 %endif
 # glxinfo is needed to check hw accel
 %if 0%{?suse_version} >= 1220
@@ -305,7 +301,7 @@
 chmod +x bootstrap
 ./bootstrap
 
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
+%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 %configure \
@@ -347,11 +343,11 @@
 %else
     --disable-gles \
 %endif
-%if %{kodi_platform} != "none"
+%if "%{kodi_platform}" != "none"
       --with-platform=%{kodi_platform} \
 %endif
-%if %{kodi_player} != "none"
-      --enable-player=%{kodi_player} \
+%if "%{kodi_player}" != "none"
+      --enable-player="%{kodi_player}" \
 %endif
 %ifarch armv7l armv7hl
     --enable-tegra \

kodi-noX.spec Changed

@@ -21,7 +21,7 @@
 %define kodi_version Isengard
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build ("%{name}" == "kodi-noX")
+%define noX_build 1
 %if %{noX_build}
 # no X build needs openGL ES
 %bcond_with enable_opengl
@@ -37,12 +37,7 @@
 %endif
 
 %define kodi_platform none
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
-# Enable omxplayer for RPi and RPi2
-%define kodi_player omxplayer
-%else
 %define kodi_player none
-%endif
 
 Name:           kodi-noX
 Version:        15.2
@@ -162,10 +157,11 @@
 BuildRequires:  pkgconfig(mad)
 BuildRequires:  pkgconfig(nettle)
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(platform)
 BuildRequires:  pkgconfig(python)
 BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
 BuildRequires:  pkgconfig(sdl2)
+%endif
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(taglib) >= 1.8
@@ -193,18 +189,18 @@
 BuildRequires:  pkgconfig(vdpau)
 %endif
 %if %{with enable_opengles}
-%if %{kodi_platform} == "none"
+%if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
 %else
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" 
+%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2")
 BuildRequires:  raspberrypi-userland-devel
 %endif
 %endif
 %endif
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
-BuildRequires:  omxplayer
+Requires:       omxplayer
 %endif
 # glxinfo is needed to check hw accel
 %if 0%{?suse_version} >= 1220
@@ -305,7 +301,7 @@
 chmod +x bootstrap
 ./bootstrap
 
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
+%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 %configure \
@@ -347,11 +343,11 @@
 %else
     --disable-gles \
 %endif
-%if %{kodi_platform} != "none"
+%if "%{kodi_platform}" != "none"
       --with-platform=%{kodi_platform} \
 %endif
-%if %{kodi_player} != "none"
-      --enable-player=%{kodi_player} \
+%if "%{kodi_player}" != "none"
+      --enable-player="%{kodi_player}" \
 %endif
 %ifarch armv7l armv7hl
     --enable-tegra \

kodi.spec Changed

@@ -21,7 +21,7 @@
 %define kodi_version Isengard
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build ("%{name}" == "kodi-noX")
+%define noX_build 0
 %if %{noX_build}
 # no X build needs openGL ES
 %bcond_with enable_opengl
@@ -37,12 +37,7 @@
 %endif
 
 %define kodi_platform none
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
-# Enable omxplayer for RPi and RPi2
-%define kodi_player omxplayer
-%else
 %define kodi_player none
-%endif
 
 Name:           kodi
 Version:        15.2
@@ -162,10 +157,11 @@
 BuildRequires:  pkgconfig(mad)
 BuildRequires:  pkgconfig(nettle)
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(platform)
 BuildRequires:  pkgconfig(python)
 BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
 BuildRequires:  pkgconfig(sdl2)
+%endif
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(taglib) >= 1.8
@@ -193,18 +189,18 @@
 BuildRequires:  pkgconfig(vdpau)
 %endif
 %if %{with enable_opengles}
-%if %{kodi_platform} == "none"
+%if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
 %else
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" 
+%if ("%{kodi_platform}" == "raspberry-pi") || ("%{kodi_platform}" == "raspberry-pi2")
 BuildRequires:  raspberrypi-userland-devel
 %endif
 %endif
 %endif
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
-BuildRequires:  omxplayer
+Requires:       omxplayer
 %endif
 # glxinfo is needed to check hw accel
 %if 0%{?suse_version} >= 1220
@@ -305,7 +301,7 @@
 chmod +x bootstrap
 ./bootstrap
 
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
+%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 %configure \
@@ -347,11 +343,11 @@
 %else
     --disable-gles \
 %endif
-%if %{kodi_platform} != "none"
+%if "%{kodi_platform}" != "none"
       --with-platform=%{kodi_platform} \
 %endif
-%if %{kodi_player} != "none"
-      --enable-player=%{kodi_player} \
+%if "%{kodi_player}" != "none"
+      --enable-player="%{kodi_player}" \
 %endif
 %ifarch armv7l armv7hl
     --enable-tegra \

pre_checkin.sh Changed

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with this pre_checkin.sh script
-sed -e 's/^Name:.*kodi/&-noX/' kodi.spec > kodi-noX.spec
+sed -e 's/%define noX_build 0/%define noX_build 1/g
+	s/^Name:.*kodi/&-noX/' kodi.spec > kodi-noX.spec
 cp kodi.changes kodi-noX.changes
 
 # Kodi platforms
@@ -13,7 +14,9 @@
 for BOARDNAME in $armv6_platforms; do
 	ARCH_RESTRICTIONS="armv6l armv6hl" # Not used for now
 	# Enable platform build for the given platform (only noX version)
-	sed -e "s/%define kodi_platform none/%define kodi_platform $armv6_platforms/g
+	sed -e "s/%define noX_build 0/%define noX_build 1/g
+	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
+	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec
 	cp kodi.changes kodi-noX-$BOARDNAME.changes
 done
@@ -21,7 +24,9 @@
 for BOARDNAME in $armv7_platforms; do
 	ARCH_RESTRICTIONS="armv7l armv7hl"
 	# Enable platform build for the given platform (only noX version)
-	sed -e "s/%define kodi_platform none/%define kodi_platform $armv7_platforms/g
+	sed -e "s/%define noX_build 0/%define noX_build 1/g
+	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
+	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec
 	cp kodi.changes kodi-noX-$BOARDNAME.changes
 done

Build Results
RPM Lint

Refresh

Comments for request 2426 0

Request History

guillaume created request over 8 years ago

- Remove pkgconfig(platform) dep since this is only a libcec dep
- Remove SDL2 dep for kodi-noX* builds
- Rework again platform and player management

guillaume accepted request over 8 years ago

Please add a comment