Packman Build Service PMBS

Changes of Revision 24

kodi-noX.spec Changed

@@ -1,18 +1,24 @@
 #
-# Please submit bugfixes or comments via https://bugs.links2linux.org/
+# spec file for package kodi
 #
-# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with the pre_checkin.sh script
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
-%define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 %define ffmpeg_archive_name 2.6.2-Isengard-beta
 %define kodi_version Isengard
-
-%bcond_without enable_rpi_build
-%bcond_without enable_rpi_omxplayer
-
 # 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")
 %if %{noX_build}
@@ -20,7 +26,7 @@
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
-%ifarch %{arm} armv6l armv6hl
+%ifarch %arm armv6l armv6hl
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
@@ -28,60 +34,38 @@
 %bcond_with enable_opengles
 %endif
 %endif
-
-Name:        kodi-noX
-Version:     15.0rc1
-Release:     0
-Summary:     Kodi Media center
-License:     GPL-2.0+ and GPL-3.0+
-Group:       Productivity/Multimedia/Video/Players
-Url:         http://kodi.tv/
-
-Source0:     %{version}-%{kodi_version}.tar.gz 
-Source1:     https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz
-Source2:     pvr-addons.tar.bz2
-Source3:     kodi-platform-054a42f66.tar.gz
-Patch1:      no-xbmc-symbolic-link.patch
+%bcond_without enable_rpi_build
+%bcond_without enable_rpi_omxplayer
+Name:           kodi-noX
+Version:        15.0rc1
+Release:        0
+Summary:        Kodi Media center
+License:        GPL-2.0+ and GPL-3.0+
+Group:          Productivity/Multimedia/Video/Players
+Url:            http://kodi.tv/
+Source0:        %{version}-%{kodi_version}.tar.gz
+Source1:        https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz
+Source2:        pvr-addons.tar.bz2
+Source3:        kodi-platform-054a42f66.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
 # Raspberry Pi (armv6): omxplayer 3D support is only available for non X11 KODI
 #Patch2:     disable_omxplayer_3d_support.patch
-Patch3:	     cmake_no_deps.patch
-Patch4:      cmake_do_not_download.patch
-Patch5:      cmake_build64.patch
-BuildRoot:   %{_tmppath}/%{name}-%{version}-build
-ExcludeArch: ppc64
-%if %{noX_build}
-Conflicts:   kodi
-%else
-Conflicts:   kodi-noX
-%endif
-Obsoletes:   xbmc <= %{version}
-Provides:    xbmc = %{version}
-Conflicts:   xbmc
-
-%if 0%{?suse_version} < 1140
-BuildRequires:  hal-devel
-%endif
-%if 0%{?fedora} >= 14
-BuildRequires:  gettext-autopoint
-%else
-BuildRequires:  gettext
-%endif
-%ifarch armv6l armv6hl
-%if %{with enable_rpi_build}
-%if %{with enable_rpi_omxplayer}
-BuildRequires:  omxplayer
-%endif
-%endif
-%endif
+Patch3:         cmake_no_deps.patch
+Patch4:         cmake_do_not_download.patch
+Patch5:         cmake_build64.patch
 BuildRequires:  -post-build-checks
 BuildRequires:  alsa-devel
 BuildRequires:  avahi-devel
+BuildRequires:  bluez-devel
 BuildRequires:  boost-devel
+BuildRequires:  byacc
 BuildRequires:  ccache
+BuildRequires:  cec-client-devel >= 3.0.0
 # needed to delete the fixed rpath introduced by smbclient
 BuildRequires:  chrpath
 BuildRequires:  cmake
-BuildRequires:  curl curl-devel
+BuildRequires:  curl
+BuildRequires:  curl-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  enca-devel
@@ -93,12 +77,10 @@
 BuildRequires:  fribidi-devel
 BuildRequires:  ftgl-devel
 BuildRequires:  gcc-c++
-%if %{with enable_opengl}
-BuildRequires:  glew-devel
-%endif
+BuildRequires:  gettext
 BuildRequires:  giflib-devel
 BuildRequires:  glibc-devel
-BuildRequires:	gmp-devel
+BuildRequires:  gmp-devel
 BuildRequires:  gperf
 BuildRequires:  java
 BuildRequires:  libSDL-devel
@@ -109,10 +91,6 @@
 BuildRequires:  libbz2-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libcdio-devel
-BuildRequires:  cec-client-devel >= 3.0.0
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
 BuildRequires:  libdca-devel
 BuildRequires:  libdvdread-devel
 BuildRequires:  libexpat-devel
@@ -126,18 +104,20 @@
 BuildRequires:  libmad-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmodplug-devel
-BuildRequires:	libmp3lame-devel
+BuildRequires:  libmp3lame-devel
 BuildRequires:  libmpeg2-devel
+BuildRequires:  libmysqlclient-devel
 BuildRequires:  libnettle-devel
 BuildRequires:  libnfs-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libpcrecpp0
-BuildRequires:	libplatform-devel
+BuildRequires:  libplatform-devel
 BuildRequires:  libplist-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  librtmp-devel
 BuildRequires:  libsamplerate-devel
+BuildRequires:  libsidplay2-1
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libssh-devel
 BuildRequires:  libstdc++-devel
@@ -146,40 +126,62 @@
 BuildRequires:  libtool
 BuildRequires:  libudev-devel
 BuildRequires:  libva-devel
-%if %{with enable_opengl}
-BuildRequires:  libvdpau-devel
-%endif
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
-BuildRequires:  libmysqlclient-devel
 BuildRequires:  nasm
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
 BuildRequires:  python-devel
-BuildRequires:	readline-devel
+BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:	sidplay-libs-devel libsidplay2-1 
+BuildRequires:  sidplay-libs-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  swig
-BuildRequires:  tinyxml2-devel tinyxml-devel
+BuildRequires:  tinyxml-devel
+BuildRequires:  tinyxml2-devel
 BuildRequires:  unzip
-BuildRequires:  bluez-devel
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
 BuildRequires:  yasm
-BuildRequires:  byacc
 BuildRequires:  zip
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(glib-2.0)
-
-## kodi needs the same libtag version which was used to build against
-Requires:       libtag1 = %{_libtag_ver}
 # kodi needs libnfs to access nfs sources, it is not automatically required
 Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
+Obsoletes:      xbmc < %{version}
+Provides:       xbmc = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExcludeArch: ppc64
+%if %{noX_build}
+Conflicts:      kodi
+%else
+Conflicts:      kodi-noX
+%endif
+%if 0%{?suse_version} < 1140
+BuildRequires:  hal-devel
+%endif
+%ifarch armv6l armv6hl
+%if %{with enable_rpi_build}
+%if %{with enable_rpi_omxplayer}
+BuildRequires:  omxplayer
+%endif
+%endif
+%endif
+%if %{with enable_opengl}
+BuildRequires:  glew-devel
+%endif
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
+%endif
+%if %{with enable_opengl}
+BuildRequires:  libvdpau-devel
+%endif
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 # glxinfo is needed to check hw accel
 %if 0%{?suse_version} >= 1220
 %if !%{noX_build}
@@ -222,23 +224,22 @@
 Development files for Kodi Media Center
 
 %package pvr.addons
-Summary:	PVR Addons files for Kodi
+Summary:        PVR Addons files for Kodi
 Group:          Productivity/Multimedia/Video/Players
+BuildRequires:  jsoncpp-devel
 Requires:       %{name}
+Requires:       libjsoncpp1
 %if %{noX_build}
 Conflicts:      %{name}-pvr.addons
 %else
 Conflicts:      %{name}-noX-pvr.addons
 %endif
-BuildRequires:	jsoncpp-devel
-Requires:       libjsoncpp1
 
 %description pvr.addons
 PVR Addons for Kodi Media Center
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-
 %patch1
 %patch3
 %patch4
@@ -265,47 +266,50 @@
 %endif
 %endif
 %configure \
---enable-airplay \
---enable-vdpau \
---enable-vaapi \
---enable-rtmp \
---enable-libbluray \
---disable-debug \
---enable-shared \
---enable-optimizations \
---disable-static \
---enable-libcec \
---enable-alsa \
+    --enable-airplay \
+    --enable-vdpau \
+    --enable-vaapi \
+    --enable-rtmp \
+    --enable-libbluray \
+    --disable-debug \
+    --enable-shared \
+    --enable-optimizations \
+    --disable-static \
+    --enable-libcec \
 %if %{with enable_opengl}
-  --enable-goom \
-  --enable-vaapi \
-  --enable-vdpau \
-  --enable-gl \
+    --enable-goom \
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-gl \
 %else
-  --disable-goom \
-  --disable-vaapi \
-  --disable-vdpau \
-  --disable-gl \
+    --disable-goom \
+    --disable-vaapi \
+    --disable-vdpau \
+    --disable-gl \
 %endif
 %if %{with enable_opengles}
-  --enable-gles \
+    --enable-gles \
 %else
-  --disable-gles \
+    --disable-gles \
 %endif
 %ifarch armv6l armv6hl
 %if %{with enable_rpi_build}
-    --with-platform=raspberry-pi \
+      --with-platform=raspberry-pi \
 %if %{with enable_rpi_omxplayer}
       --enable-player=omxplayer \
 %endif
 %endif
 %endif
 %ifarch armv7l armv7hl
-  --enable-tegra --disable-neon \
+    --enable-tegra --disable-neon \
 %endif
 %if %{noX_build}
-  --disable-x11 --disable-xrandr --disable-sdl --disable-joystick \
+    --disable-x11 \
+    --disable-xrandr \
+    --disable-sdl \
+    --disable-joystick \
 %endif
+    --enable-alsa
 
 make %{?_smp_mflags}
 
@@ -319,16 +323,15 @@
 # TODO :
 rm -rf addons/audiodecoder.sidplay
 
-cmake -DBUILD_DIR=build -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr -DBUILD_SHARED_LIBS=1 -DNEED_SUDO=FALSE .
+%cmake \
+    -DBUILD_SHARED_LIBS=1 \
+    -DNEED_SUDO=FALSE
+make %{?_smp_mflags}
 popd
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-pushd project/cmake/addons
-make %{?_smp_mflags}
-popd
-
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
@@ -600,7 +603,4 @@
 %{_kodi_addons_dir}/pvr.vuplus/*
 %{_kodi_addons_dir}/pvr.wmc/*
 
-
 %changelog
-
-

kodi.spec Changed

@@ -1,18 +1,24 @@
 #
-# Please submit bugfixes or comments via https://bugs.links2linux.org/
+# spec file for package kodi
 #
-# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with the pre_checkin.sh script
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
-%define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 %define ffmpeg_archive_name 2.6.2-Isengard-beta
 %define kodi_version Isengard
-
-%bcond_without enable_rpi_build
-%bcond_without enable_rpi_omxplayer
-
 # 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")
 %if %{noX_build}
@@ -20,7 +26,7 @@
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
-%ifarch %{arm} armv6l armv6hl
+%ifarch %arm armv6l armv6hl
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
@@ -28,60 +34,38 @@
 %bcond_with enable_opengles
 %endif
 %endif
-
-Name:        kodi
-Version:     15.0rc1
-Release:     0
-Summary:     Kodi Media center
-License:     GPL-2.0+ and GPL-3.0+
-Group:       Productivity/Multimedia/Video/Players
-Url:         http://kodi.tv/
-
-Source0:     %{version}-%{kodi_version}.tar.gz 
-Source1:     https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz
-Source2:     pvr-addons.tar.bz2
-Source3:     kodi-platform-054a42f66.tar.gz
-Patch1:      no-xbmc-symbolic-link.patch
+%bcond_without enable_rpi_build
+%bcond_without enable_rpi_omxplayer
+Name:           kodi
+Version:        15.0rc1
+Release:        0
+Summary:        Kodi Media center
+License:        GPL-2.0+ and GPL-3.0+
+Group:          Productivity/Multimedia/Video/Players
+Url:            http://kodi.tv/
+Source0:        %{version}-%{kodi_version}.tar.gz
+Source1:        https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz
+Source2:        pvr-addons.tar.bz2
+Source3:        kodi-platform-054a42f66.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
 # Raspberry Pi (armv6): omxplayer 3D support is only available for non X11 KODI
 #Patch2:     disable_omxplayer_3d_support.patch
-Patch3:	     cmake_no_deps.patch
-Patch4:      cmake_do_not_download.patch
-Patch5:      cmake_build64.patch
-BuildRoot:   %{_tmppath}/%{name}-%{version}-build
-ExcludeArch: ppc64
-%if %{noX_build}
-Conflicts:   kodi
-%else
-Conflicts:   kodi-noX
-%endif
-Obsoletes:   xbmc <= %{version}
-Provides:    xbmc = %{version}
-Conflicts:   xbmc
-
-%if 0%{?suse_version} < 1140
-BuildRequires:  hal-devel
-%endif
-%if 0%{?fedora} >= 14
-BuildRequires:  gettext-autopoint
-%else
-BuildRequires:  gettext
-%endif
-%ifarch armv6l armv6hl
-%if %{with enable_rpi_build}
-%if %{with enable_rpi_omxplayer}
-BuildRequires:  omxplayer
-%endif
-%endif
-%endif
+Patch3:         cmake_no_deps.patch
+Patch4:         cmake_do_not_download.patch
+Patch5:         cmake_build64.patch
 BuildRequires:  -post-build-checks
 BuildRequires:  alsa-devel
 BuildRequires:  avahi-devel
+BuildRequires:  bluez-devel
 BuildRequires:  boost-devel
+BuildRequires:  byacc
 BuildRequires:  ccache
+BuildRequires:  cec-client-devel >= 3.0.0
 # needed to delete the fixed rpath introduced by smbclient
 BuildRequires:  chrpath
 BuildRequires:  cmake
-BuildRequires:  curl curl-devel
+BuildRequires:  curl
+BuildRequires:  curl-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  enca-devel
@@ -93,12 +77,10 @@
 BuildRequires:  fribidi-devel
 BuildRequires:  ftgl-devel
 BuildRequires:  gcc-c++
-%if %{with enable_opengl}
-BuildRequires:  glew-devel
-%endif
+BuildRequires:  gettext
 BuildRequires:  giflib-devel
 BuildRequires:  glibc-devel
-BuildRequires:	gmp-devel
+BuildRequires:  gmp-devel
 BuildRequires:  gperf
 BuildRequires:  java
 BuildRequires:  libSDL-devel
@@ -109,10 +91,6 @@
 BuildRequires:  libbz2-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libcdio-devel
-BuildRequires:  cec-client-devel >= 3.0.0
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
 BuildRequires:  libdca-devel
 BuildRequires:  libdvdread-devel
 BuildRequires:  libexpat-devel
@@ -126,18 +104,20 @@
 BuildRequires:  libmad-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmodplug-devel
-BuildRequires:	libmp3lame-devel
+BuildRequires:  libmp3lame-devel
 BuildRequires:  libmpeg2-devel
+BuildRequires:  libmysqlclient-devel
 BuildRequires:  libnettle-devel
 BuildRequires:  libnfs-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libpcrecpp0
-BuildRequires:	libplatform-devel
+BuildRequires:  libplatform-devel
 BuildRequires:  libplist-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  librtmp-devel
 BuildRequires:  libsamplerate-devel
+BuildRequires:  libsidplay2-1
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libssh-devel
 BuildRequires:  libstdc++-devel
@@ -146,40 +126,62 @@
 BuildRequires:  libtool
 BuildRequires:  libudev-devel
 BuildRequires:  libva-devel
-%if %{with enable_opengl}
-BuildRequires:  libvdpau-devel
-%endif
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
-BuildRequires:  libmysqlclient-devel
 BuildRequires:  nasm
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
 BuildRequires:  python-devel
-BuildRequires:	readline-devel
+BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:	sidplay-libs-devel libsidplay2-1 
+BuildRequires:  sidplay-libs-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  swig
-BuildRequires:  tinyxml2-devel tinyxml-devel
+BuildRequires:  tinyxml-devel
+BuildRequires:  tinyxml2-devel
 BuildRequires:  unzip
-BuildRequires:  bluez-devel
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
 BuildRequires:  yasm
-BuildRequires:  byacc
 BuildRequires:  zip
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(glib-2.0)
-
-## kodi needs the same libtag version which was used to build against
-Requires:       libtag1 = %{_libtag_ver}
 # kodi needs libnfs to access nfs sources, it is not automatically required
 Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
+Obsoletes:      xbmc < %{version}
+Provides:       xbmc = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExcludeArch: ppc64
+%if %{noX_build}
+Conflicts:      kodi
+%else
+Conflicts:      kodi-noX
+%endif
+%if 0%{?suse_version} < 1140
+BuildRequires:  hal-devel
+%endif
+%ifarch armv6l armv6hl
+%if %{with enable_rpi_build}
+%if %{with enable_rpi_omxplayer}
+BuildRequires:  omxplayer
+%endif
+%endif
+%endif
+%if %{with enable_opengl}
+BuildRequires:  glew-devel
+%endif
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
+%endif
+%if %{with enable_opengl}
+BuildRequires:  libvdpau-devel
+%endif
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 # glxinfo is needed to check hw accel
 %if 0%{?suse_version} >= 1220
 %if !%{noX_build}
@@ -222,23 +224,22 @@
 Development files for Kodi Media Center
 
 %package pvr.addons
-Summary:	PVR Addons files for Kodi
+Summary:        PVR Addons files for Kodi
 Group:          Productivity/Multimedia/Video/Players
+BuildRequires:  jsoncpp-devel
 Requires:       %{name}
+Requires:       libjsoncpp1
 %if %{noX_build}
 Conflicts:      %{name}-pvr.addons
 %else
 Conflicts:      %{name}-noX-pvr.addons
 %endif
-BuildRequires:	jsoncpp-devel
-Requires:       libjsoncpp1
 
 %description pvr.addons
 PVR Addons for Kodi Media Center
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-
 %patch1
 %patch3
 %patch4
@@ -265,47 +266,50 @@
 %endif
 %endif
 %configure \
---enable-airplay \
---enable-vdpau \
---enable-vaapi \
---enable-rtmp \
---enable-libbluray \
---disable-debug \
---enable-shared \
---enable-optimizations \
---disable-static \
---enable-libcec \
---enable-alsa \
+    --enable-airplay \
+    --enable-vdpau \
+    --enable-vaapi \
+    --enable-rtmp \
+    --enable-libbluray \
+    --disable-debug \
+    --enable-shared \
+    --enable-optimizations \
+    --disable-static \
+    --enable-libcec \
 %if %{with enable_opengl}
-  --enable-goom \
-  --enable-vaapi \
-  --enable-vdpau \
-  --enable-gl \
+    --enable-goom \
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-gl \
 %else
-  --disable-goom \
-  --disable-vaapi \
-  --disable-vdpau \
-  --disable-gl \
+    --disable-goom \
+    --disable-vaapi \
+    --disable-vdpau \
+    --disable-gl \
 %endif
 %if %{with enable_opengles}
-  --enable-gles \
+    --enable-gles \
 %else
-  --disable-gles \
+    --disable-gles \
 %endif
 %ifarch armv6l armv6hl
 %if %{with enable_rpi_build}
-    --with-platform=raspberry-pi \
+      --with-platform=raspberry-pi \
 %if %{with enable_rpi_omxplayer}
       --enable-player=omxplayer \
 %endif
 %endif
 %endif
 %ifarch armv7l armv7hl
-  --enable-tegra --disable-neon \
+    --enable-tegra --disable-neon \
 %endif
 %if %{noX_build}
-  --disable-x11 --disable-xrandr --disable-sdl --disable-joystick \
+    --disable-x11 \
+    --disable-xrandr \
+    --disable-sdl \
+    --disable-joystick \
 %endif
+    --enable-alsa
 
 make %{?_smp_mflags}
 
@@ -319,16 +323,15 @@
 # TODO :
 rm -rf addons/audiodecoder.sidplay
 
-cmake -DBUILD_DIR=build -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr -DBUILD_SHARED_LIBS=1 -DNEED_SUDO=FALSE .
+%cmake \
+    -DBUILD_SHARED_LIBS=1 \
+    -DNEED_SUDO=FALSE
+make %{?_smp_mflags}
 popd
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-pushd project/cmake/addons
-make %{?_smp_mflags}
-popd
-
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
@@ -600,7 +603,4 @@
 %{_kodi_addons_dir}/pvr.vuplus/*
 %{_kodi_addons_dir}/pvr.wmc/*
 
-
 %changelog
-
-