Request 4023 (accepted)

Overview

Request 4023 (accepted)

- Use BuildRequires and configure options as checked by configure.ac

- Remove obsolete patch: add_rpi2_support.patch

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

Submit kodi

Submit package home:olh:branches:Multimedia / 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

@@ -23,24 +23,22 @@
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build 1
-%if %{noX_build}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_with kodi_with_X11
+%define kodi_platform raspberry-pi
+%define kodi_player omxplayer
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform raspberry-pi
-%define kodi_player omxplayer
+ExclusiveArch: armv6l armv6hl
 
 Name:           kodi-noX-raspberry-pi
 Version:        17.4
@@ -60,134 +58,84 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.tar.gz
+Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+Patch4:         kodi.aarch64.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
+BuildRequires:  gawk
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  java
-BuildRequires:  libcap-devel
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
-BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
-BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(mariadb)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(dcadec)
-BuildRequires:  pkgconfig(dvdread)
-BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  lzo-devel
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  tinyxml-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(yajl) >= 2
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-%endif
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libass) >= 0.9.7
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libplist)
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(libcap)
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  swig
+BuildRequires:  java
+BuildRequires:  doxygen
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(libva)
-%endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(nettle)
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(samplerate)
-%if !%{noX_build}
-BuildRequires:  pkgconfig(sdl2)
-%endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(taglib) >= 1.8
-BuildRequires:  pkgconfig(tinyxml2)
-%if 0%{?suse_version} > 1320
-# Otherwise fails with configure error on libcec because udev.pc file is not found
-BuildRequires:  pkgconfig(udev)
-%endif
-BuildRequires:  pkgconfig(uuid)
-%if %{with enable_opengl}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(libva) >= 0.38
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
 %endif
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(zlib)
-
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -198,26 +146,37 @@
 %endif
 %endif
 %endif
-
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-# glxinfo is needed to check hw accel
-%if 0%{?suse_version} >= 1220
-%if !%{noX_build}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  unzip
+BuildRequires:  zip
+%ifarch %ix86
+BuildRequires:  nasm
 %endif
+%if %{dev_build}
+BuildRequires:  ccache
 %endif
 
+# cpluff
+BuildRequires:  pkgconfig(expat)
+
+# TexturePacker
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  giflib-devel
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  lzo-devel
+#
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -235,7 +194,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -246,11 +205,11 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
+%patch0
 %patch1
 %patch2
 %patch3
-%patch4 -p0
-#%patch6 -p1
+%patch4
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -281,7 +240,7 @@
 
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-		
+
 chmod +x bootstrap
 ./bootstrap
 
@@ -294,53 +253,63 @@
 %endif
 
 %configure \
-    --disable-libbluray \
     --with-ffmpeg=shared \
-    --enable-airplay \
+    --disable-shared-lib \
+    --disable-debug \
+    --disable-optimizations \
+    --disable-gl \
+    --disable-gles \
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-openmax \
+    --disable-tegra \
+    --disable-profiling \
+    --enable-x11 \
+    --disable-ccache \
     --enable-alsa \
-    --enable-avahi \
-    --enable-libcap \
-    --enable-libcec \
-    --enable-libusb \
-    --enable-mid \
-    --enable-mysql \
-    --enable-nfs \
+    --enable-dbus \
     --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-shared \
     --enable-ssh \
-    --enable-texturepacker \
+    --enable-samba \
+    --enable-nfs \
+    --enable-airplay \
+    --disable-airtunes \
     --enable-upnp \
+    --enable-mid \
+    --enable-avahi \
+    --disable-mdnsembedded \
+    --disable-non-free \
+    --enable-mysql \
     --enable-webserver \
+    --enable-optical-drive \
+    --disable-libbluray \
+    --enable-libxslt \
+    --enable-texturepacker \
+    --enable-udev \
+    --disable-libusb \
+    --enable-libcec \
+    --enable-lcms2 \
+    --enable-libbluetooth \
+    --enable-libcap \
+    --disable-gtest \
+    --disable-codec \
+    --disable-libav-compat \
 %if %{with enable_opengl}
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
-%else
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
-%else
-    --disable-gles \
 %endif
-%if "%{kodi_platform}" != "none"
     --with-platform=%{kodi_platform} \
-%endif
 %if %{with kodi_libbluray}
     --enable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
 %endif
-%ifarch armv7l armv7hl
-    --enable-tegra \
-    --disable-neon \
-%endif
-%if %{noX_build}
+%if %{without kodi_with_X11}
     --disable-x11 \
     --disable-xrandr \
     --disable-sdl \
@@ -350,12 +319,7 @@
     --enable-debug \
     --enable-ccache \
 %endif
-%if !%{dev_build}
-    --disable-debug \
-    --disable-ccache \
-%endif
-    --disable-optimizations \
-    --disable-static 
+    --disable-static
 
 make V=1 %{?_smp_mflags}
 
@@ -367,7 +331,7 @@
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # Systemd service file
-%if %{noX_build}
+%if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -422,7 +386,7 @@
 %{_bindir}/kodi
 %dir %{_libdir}/kodi
 %{_libdir}/kodi/kodi.bin
-%if !%{noX_build}
+%if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %endif
 %{_bindir}/kodi-standalone
@@ -435,7 +399,7 @@
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/*
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -546,7 +510,7 @@
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
 
-%if %{noX_build}
+%if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service

kodi-noX-raspberry-pi2.spec Changed

@@ -23,24 +23,22 @@
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build 1
-%if %{noX_build}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_with kodi_with_X11
+%define kodi_platform raspberry-pi2
+%define kodi_player omxplayer
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform raspberry-pi2
-%define kodi_player omxplayer
+ExclusiveArch: armv7l armv7hl
 
 Name:           kodi-noX-raspberry-pi2
 Version:        17.4
@@ -60,134 +58,84 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.tar.gz
+Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+Patch4:         kodi.aarch64.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
+BuildRequires:  gawk
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  java
-BuildRequires:  libcap-devel
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
-BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
-BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(mariadb)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(dcadec)
-BuildRequires:  pkgconfig(dvdread)
-BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  lzo-devel
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  tinyxml-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(yajl) >= 2
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-%endif
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libass) >= 0.9.7
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libplist)
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(libcap)
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  swig
+BuildRequires:  java
+BuildRequires:  doxygen
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(libva)
-%endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(nettle)
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(samplerate)
-%if !%{noX_build}
-BuildRequires:  pkgconfig(sdl2)
-%endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(taglib) >= 1.8
-BuildRequires:  pkgconfig(tinyxml2)
-%if 0%{?suse_version} > 1320
-# Otherwise fails with configure error on libcec because udev.pc file is not found
-BuildRequires:  pkgconfig(udev)
-%endif
-BuildRequires:  pkgconfig(uuid)
-%if %{with enable_opengl}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(libva) >= 0.38
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
 %endif
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(zlib)
-
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -198,26 +146,37 @@
 %endif
 %endif
 %endif
-
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-# glxinfo is needed to check hw accel
-%if 0%{?suse_version} >= 1220
-%if !%{noX_build}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  unzip
+BuildRequires:  zip
+%ifarch %ix86
+BuildRequires:  nasm
 %endif
+%if %{dev_build}
+BuildRequires:  ccache
 %endif
 
+# cpluff
+BuildRequires:  pkgconfig(expat)
+
+# TexturePacker
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  giflib-devel
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  lzo-devel
+#
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -235,7 +194,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -246,11 +205,11 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
+%patch0
 %patch1
 %patch2
 %patch3
-%patch4 -p0
-#%patch6 -p1
+%patch4
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -281,7 +240,7 @@
 
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-		
+
 chmod +x bootstrap
 ./bootstrap
 
@@ -294,53 +253,63 @@
 %endif
 
 %configure \
-    --disable-libbluray \
     --with-ffmpeg=shared \
-    --enable-airplay \
+    --disable-shared-lib \
+    --disable-debug \
+    --disable-optimizations \
+    --disable-gl \
+    --disable-gles \
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-openmax \
+    --disable-tegra \
+    --disable-profiling \
+    --enable-x11 \
+    --disable-ccache \
     --enable-alsa \
-    --enable-avahi \
-    --enable-libcap \
-    --enable-libcec \
-    --enable-libusb \
-    --enable-mid \
-    --enable-mysql \
-    --enable-nfs \
+    --enable-dbus \
     --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-shared \
     --enable-ssh \
-    --enable-texturepacker \
+    --enable-samba \
+    --enable-nfs \
+    --enable-airplay \
+    --disable-airtunes \
     --enable-upnp \
+    --enable-mid \
+    --enable-avahi \
+    --disable-mdnsembedded \
+    --disable-non-free \
+    --enable-mysql \
     --enable-webserver \
+    --enable-optical-drive \
+    --disable-libbluray \
+    --enable-libxslt \
+    --enable-texturepacker \
+    --enable-udev \
+    --disable-libusb \
+    --enable-libcec \
+    --enable-lcms2 \
+    --enable-libbluetooth \
+    --enable-libcap \
+    --disable-gtest \
+    --disable-codec \
+    --disable-libav-compat \
 %if %{with enable_opengl}
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
-%else
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
-%else
-    --disable-gles \
 %endif
-%if "%{kodi_platform}" != "none"
     --with-platform=%{kodi_platform} \
-%endif
 %if %{with kodi_libbluray}
     --enable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
 %endif
-%ifarch armv7l armv7hl
-    --enable-tegra \
-    --disable-neon \
-%endif
-%if %{noX_build}
+%if %{without kodi_with_X11}
     --disable-x11 \
     --disable-xrandr \
     --disable-sdl \
@@ -350,12 +319,7 @@
     --enable-debug \
     --enable-ccache \
 %endif
-%if !%{dev_build}
-    --disable-debug \
-    --disable-ccache \
-%endif
-    --disable-optimizations \
-    --disable-static 
+    --disable-static
 
 make V=1 %{?_smp_mflags}
 
@@ -367,7 +331,7 @@
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # Systemd service file
-%if %{noX_build}
+%if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -422,7 +386,7 @@
 %{_bindir}/kodi
 %dir %{_libdir}/kodi
 %{_libdir}/kodi/kodi.bin
-%if !%{noX_build}
+%if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %endif
 %{_bindir}/kodi-standalone
@@ -435,7 +399,7 @@
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/*
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -546,7 +510,7 @@
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
 
-%if %{noX_build}
+%if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service

kodi-noX.spec Changed

@@ -23,24 +23,22 @@
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build 1
-%if %{noX_build}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_with kodi_with_X11
+%define kodi_platform none
+%define kodi_player none
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform none
-%define kodi_player none
+ExclusiveArch: does-not-build
 
 Name:           kodi-noX
 Version:        17.4
@@ -60,134 +58,84 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.tar.gz
+Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+Patch4:         kodi.aarch64.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
+BuildRequires:  gawk
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  java
-BuildRequires:  libcap-devel
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
-BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
-BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(mariadb)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(dcadec)
-BuildRequires:  pkgconfig(dvdread)
-BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  lzo-devel
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  tinyxml-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(yajl) >= 2
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-%endif
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libass) >= 0.9.7
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libplist)
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(libcap)
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  swig
+BuildRequires:  java
+BuildRequires:  doxygen
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(libva)
-%endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(nettle)
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(samplerate)
-%if !%{noX_build}
-BuildRequires:  pkgconfig(sdl2)
-%endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(taglib) >= 1.8
-BuildRequires:  pkgconfig(tinyxml2)
-%if 0%{?suse_version} > 1320
-# Otherwise fails with configure error on libcec because udev.pc file is not found
-BuildRequires:  pkgconfig(udev)
-%endif
-BuildRequires:  pkgconfig(uuid)
-%if %{with enable_opengl}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(libva) >= 0.38
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
 %endif
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(zlib)
-
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -198,26 +146,37 @@
 %endif
 %endif
 %endif
-
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-# glxinfo is needed to check hw accel
-%if 0%{?suse_version} >= 1220
-%if !%{noX_build}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  unzip
+BuildRequires:  zip
+%ifarch %ix86
+BuildRequires:  nasm
 %endif
+%if %{dev_build}
+BuildRequires:  ccache
 %endif
 
+# cpluff
+BuildRequires:  pkgconfig(expat)
+
+# TexturePacker
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  giflib-devel
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  lzo-devel
+#
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -235,7 +194,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -246,11 +205,11 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
+%patch0
 %patch1
 %patch2
 %patch3
-%patch4 -p0
-#%patch6 -p1
+%patch4
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -281,7 +240,7 @@
 
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-		
+
 chmod +x bootstrap
 ./bootstrap
 
@@ -294,53 +253,63 @@
 %endif
 
 %configure \
-    --disable-libbluray \
     --with-ffmpeg=shared \
-    --enable-airplay \
+    --disable-shared-lib \
+    --disable-debug \
+    --disable-optimizations \
+    --disable-gl \
+    --disable-gles \
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-openmax \
+    --disable-tegra \
+    --disable-profiling \
+    --enable-x11 \
+    --disable-ccache \
     --enable-alsa \
-    --enable-avahi \
-    --enable-libcap \
-    --enable-libcec \
-    --enable-libusb \
-    --enable-mid \
-    --enable-mysql \
-    --enable-nfs \
+    --enable-dbus \
     --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-shared \
     --enable-ssh \
-    --enable-texturepacker \
+    --enable-samba \
+    --enable-nfs \
+    --enable-airplay \
+    --disable-airtunes \
     --enable-upnp \
+    --enable-mid \
+    --enable-avahi \
+    --disable-mdnsembedded \
+    --disable-non-free \
+    --enable-mysql \
     --enable-webserver \
+    --enable-optical-drive \
+    --disable-libbluray \
+    --enable-libxslt \
+    --enable-texturepacker \
+    --enable-udev \
+    --disable-libusb \
+    --enable-libcec \
+    --enable-lcms2 \
+    --enable-libbluetooth \
+    --enable-libcap \
+    --disable-gtest \
+    --disable-codec \
+    --disable-libav-compat \
 %if %{with enable_opengl}
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
-%else
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
-%else
-    --disable-gles \
 %endif
-%if "%{kodi_platform}" != "none"
     --with-platform=%{kodi_platform} \
-%endif
 %if %{with kodi_libbluray}
     --enable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
 %endif
-%ifarch armv7l armv7hl
-    --enable-tegra \
-    --disable-neon \
-%endif
-%if %{noX_build}
+%if %{without kodi_with_X11}
     --disable-x11 \
     --disable-xrandr \
     --disable-sdl \
@@ -350,12 +319,7 @@
     --enable-debug \
     --enable-ccache \
 %endif
-%if !%{dev_build}
-    --disable-debug \
-    --disable-ccache \
-%endif
-    --disable-optimizations \
-    --disable-static 
+    --disable-static
 
 make V=1 %{?_smp_mflags}
 
@@ -367,7 +331,7 @@
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # Systemd service file
-%if %{noX_build}
+%if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -422,7 +386,7 @@
 %{_bindir}/kodi
 %dir %{_libdir}/kodi
 %{_libdir}/kodi/kodi.bin
-%if !%{noX_build}
+%if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %endif
 %{_bindir}/kodi-standalone
@@ -435,7 +399,7 @@
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/*
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -546,7 +510,7 @@
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
 
-%if %{noX_build}
+%if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service

kodi.spec Changed

@@ -23,24 +23,22 @@
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build 0
-%if %{noX_build}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_without kodi_with_X11
+%define kodi_platform none
+%define kodi_player none
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform none
-%define kodi_player none
+ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
 Version:        17.4
@@ -60,134 +58,84 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.tar.gz
+Patch0:         kodi.arm.patch
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+Patch4:         kodi.aarch64.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
+BuildRequires:  gawk
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  java
-BuildRequires:  libcap-devel
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
-BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
-BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(mariadb)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(dcadec)
-BuildRequires:  pkgconfig(dvdread)
-BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  lzo-devel
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  tinyxml-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(yajl) >= 2
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-%endif
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libass) >= 0.9.7
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libplist)
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(libcap)
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  swig
+BuildRequires:  java
+BuildRequires:  doxygen
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(libva)
-%endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(nettle)
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(samplerate)
-%if !%{noX_build}
-BuildRequires:  pkgconfig(sdl2)
-%endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(taglib) >= 1.8
-BuildRequires:  pkgconfig(tinyxml2)
-%if 0%{?suse_version} > 1320
-# Otherwise fails with configure error on libcec because udev.pc file is not found
-BuildRequires:  pkgconfig(udev)
-%endif
-BuildRequires:  pkgconfig(uuid)
-%if %{with enable_opengl}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(libva) >= 0.38
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
 %endif
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(zlib)
-
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -198,26 +146,37 @@
 %endif
 %endif
 %endif
-
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-# glxinfo is needed to check hw accel
-%if 0%{?suse_version} >= 1220
-%if !%{noX_build}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  unzip
+BuildRequires:  zip
+%ifarch %ix86
+BuildRequires:  nasm
 %endif
+%if %{dev_build}
+BuildRequires:  ccache
 %endif
 
+# cpluff
+BuildRequires:  pkgconfig(expat)
+
+# TexturePacker
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  giflib-devel
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  lzo-devel
+#
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -235,7 +194,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -246,11 +205,11 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
+%patch0
 %patch1
 %patch2
 %patch3
-%patch4 -p0
-#%patch6 -p1
+%patch4
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -281,7 +240,7 @@
 
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-		
+
 chmod +x bootstrap
 ./bootstrap
 
@@ -294,53 +253,63 @@
 %endif
 
 %configure \
-    --disable-libbluray \
     --with-ffmpeg=shared \
-    --enable-airplay \
+    --disable-shared-lib \
+    --disable-debug \
+    --disable-optimizations \
+    --disable-gl \
+    --disable-gles \
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-openmax \
+    --disable-tegra \
+    --disable-profiling \
+    --enable-x11 \
+    --disable-ccache \
     --enable-alsa \
-    --enable-avahi \
-    --enable-libcap \
-    --enable-libcec \
-    --enable-libusb \
-    --enable-mid \
-    --enable-mysql \
-    --enable-nfs \
+    --enable-dbus \
     --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-shared \
     --enable-ssh \
-    --enable-texturepacker \
+    --enable-samba \
+    --enable-nfs \
+    --enable-airplay \
+    --disable-airtunes \
     --enable-upnp \
+    --enable-mid \
+    --enable-avahi \
+    --disable-mdnsembedded \
+    --disable-non-free \
+    --enable-mysql \
     --enable-webserver \
+    --enable-optical-drive \
+    --disable-libbluray \
+    --enable-libxslt \
+    --enable-texturepacker \
+    --enable-udev \
+    --disable-libusb \
+    --enable-libcec \
+    --enable-lcms2 \
+    --enable-libbluetooth \
+    --enable-libcap \
+    --disable-gtest \
+    --disable-codec \
+    --disable-libav-compat \
 %if %{with enable_opengl}
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
-%else
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
-%else
-    --disable-gles \
 %endif
-%if "%{kodi_platform}" != "none"
     --with-platform=%{kodi_platform} \
-%endif
 %if %{with kodi_libbluray}
     --enable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
 %endif
-%ifarch armv7l armv7hl
-    --enable-tegra \
-    --disable-neon \
-%endif
-%if %{noX_build}
+%if %{without kodi_with_X11}
     --disable-x11 \
     --disable-xrandr \
     --disable-sdl \
@@ -350,12 +319,7 @@
     --enable-debug \
     --enable-ccache \
 %endif
-%if !%{dev_build}
-    --disable-debug \
-    --disable-ccache \
-%endif
-    --disable-optimizations \
-    --disable-static 
+    --disable-static
 
 make V=1 %{?_smp_mflags}
 
@@ -367,7 +331,7 @@
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # Systemd service file
-%if %{noX_build}
+%if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -422,7 +386,7 @@
 %{_bindir}/kodi
 %dir %{_libdir}/kodi
 %{_libdir}/kodi/kodi.bin
-%if !%{noX_build}
+%if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %endif
 %{_bindir}/kodi-standalone
@@ -435,7 +399,7 @@
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/*
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -546,7 +510,7 @@
 %dir %{_libdir}/kodi/addons/library.kodi.peripheral
 %{_libdir}/kodi/addons/library.kodi.peripheral/*
 
-%if %{noX_build}
+%if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service

add_rpi2_support.patch Deleted

kodi.aarch64.patch Added

@@ -0,0 +1,40 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -624,13 +624,6 @@ case $host in
+      ARCH="aarch64"
+      use_arch="aarch64"
+      use_neon=yes
+-     # Check whether --enable-gl was given.
+-     if test "${enable_gl+set}" = set; then :
+-       enableval=$enable_gl; use_gl=$enableval
+-     else
+-       use_gl=no
+-       use_gles=yes
+-     fi
+      USE_STATIC_FFMPEG=1
+      ;;
+   arm*-*linux-android*)
+--- m4/xbmc_arch.m4.orig
++++ m4/xbmc_arch.m4
+@@ -23,6 +23,9 @@ case $build in
+   powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
+      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
+      ;;
++  aarch64-*-linux-gnu*|aarch64-*-linux-uclibc*)
++     AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
++     ;;
+   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
+      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
+      ;;
+--- tools/depends/configure.ac.orig
++++ tools/depends/configure.ac
+@@ -120,6 +120,9 @@ platform_cc=gcc
+ platform_cxx=g++
+ 
+ case $build in
++  aarch64*-*-linux-gnu*|aarch*-*-linux-be*)
++    build_os="linux"
++  ;;
+   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
+     build_os="linux"
+   ;;

kodi.arm.patch Added

pre_checkin.sh Changed

@@ -2,7 +2,9 @@
 
 name=kodi
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with this pre_checkin.sh script
-sed -e "s/%define noX_build 0/%define noX_build 1/g
+ARCH_RESTRICTIONS="does-not-build"
+sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
+	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
 	s/^Name:.*$name/&-noX/" $name.spec > $name-noX.spec
 cp $name.changes $name-noX.changes
 
@@ -15,8 +17,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 noX_build 0/%define noX_build 1/g
-	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
+	sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
+	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
+	s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
 	cp $name.changes $name-noX-$BOARDNAME.changes
@@ -25,8 +28,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 noX_build 0/%define noX_build 1/g
-	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
+	sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
+	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
+	s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
 	cp $name.changes $name-noX-$BOARDNAME.changes

Build Results
RPM Lint

Refresh

Comments for request 4023 0

Request History

olh created request about 7 years ago

- Use BuildRequires and configure options as checked by configure.ac

- Remove obsolete patch: add_rpi2_support.patch

olh accepted request about 7 years ago