Packman Build Service PMBS

Changes of Revision 51

kodi-noX.changes Changed

kodi-noX.spec Changed

@@ -14,12 +14,12 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with the pre_checkin.sh script
-#
 
+
+# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
+# kodi.* files with the pre_checkin.sh script
 %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")
 %if %{noX_build}
@@ -37,7 +37,6 @@
 %endif
 %bcond_without enable_rpi_build
 %bcond_without enable_rpi_omxplayer
-
 Name:           kodi-noX
 Version:        15.0
 Release:        0
@@ -60,17 +59,6 @@
 Patch6:         kodi-texturepacker.patch
 # PATCH-FIX-UPSTREAM: fix build with gcc5 (Tumbleweed)
 Patch7:         kodi-15.0-gcc5.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
-Conflicts:      kodi
-%else
-Conflicts:      kodi-noX
-%endif
-Obsoletes:      xbmc < %{version}
-Provides:       xbmc = %{version}
-
 BuildRequires:  alsa-devel
 BuildRequires:  avahi-devel
 BuildRequires:  bluez-devel
@@ -161,9 +149,6 @@
 BuildRequires:  tinyxml-devel
 BuildRequires:  tinyxml2-devel
 BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
 BuildRequires:  yasm
 BuildRequires:  zip
 BuildRequires:  zlib-devel
@@ -175,16 +160,29 @@
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libmpg123)
 BuildRequires:  pkgconfig(libswresample) >= 1.1.100
-
+# 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 !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
 %endif
-
 %if %{with enable_opengl}
 BuildRequires:  glew-devel
 BuildRequires:  libvdpau-devel
 %endif
-
 %if %{with enable_opengles}
 %ifnarch armv6l armv6hl
 BuildRequires:  Mesa-libEGL-devel
@@ -201,7 +199,6 @@
 %endif
 %endif
 %endif
-
 # glxinfo is needed to check hw accel
 %if 0%{?suse_version} >= 1220
 %if !%{noX_build}
@@ -210,11 +207,6 @@
 %endif
 %endif
 
-# 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
-
 %description
 KODI media center is a free cross-platform media-player jukebox and
 entertainment hub.  KODI can play a spectrum of of multimedia formats,
@@ -239,8 +231,8 @@
 Summary:        PVR Addons files for Kodi
 Group:          Productivity/Multimedia/Video/Players
 BuildRequires:  jsoncpp-devel
-Requires:       libjsoncpp1
 Requires:       %{name}
+Requires:       libjsoncpp1
 %if %{noX_build}
 Conflicts:      %{name}-pvr.addons
 %else
@@ -286,7 +278,7 @@
 rm -rf addons/audiodecoder.sidplay
 popd
 # Setting the right libdir for 64bit builds
-%if "%{_libdir}" == "/usr/lib64"
+%if "%{_libdir}" == "%{_prefix}/lib64"
 sed -i \
      -e 's:lib/${APP_NAME_LC}:lib64/${APP_NAME_LC}:g' \
      project/cmake/scripts/common/addon-helpers.cmake
@@ -305,10 +297,6 @@
 %endif
 %configure \
     --with-ffmpeg=shared \
-    --disable-debug \
-    --disable-optimizations \
-    --disable-ccache \
-    --disable-static \
     --enable-airplay \
     --enable-alsa \
     --enable-avahi \
@@ -364,6 +352,10 @@
     --disable-sdl \
     --disable-joystick \
 %endif
+    --disable-debug \
+    --disable-optimizations \
+    --disable-ccache \
+    --disable-static 
 
 make %{?_smp_mflags}
 
@@ -375,15 +367,15 @@
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
+make %{?_smp_mflags}
 
 # 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')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 for file in audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+    sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
-make %{?_smp_mflags}
 popd
 
 %install

kodi.spec Changed

@@ -276,12 +276,6 @@
 rm -rf depends/common/tinyxml depends/common/platform
 # We do not provide sidplay2 library on any SUSE distribution
 rm -rf addons/audiodecoder.sidplay
-# 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')
-FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-for file in audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
-    sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
 popd
 # Setting the right libdir for 64bit builds
 %if "%{_libdir}" == "%{_prefix}/lib64"
@@ -303,10 +297,6 @@
 %endif
 %configure \
     --with-ffmpeg=shared \
-    --disable-debug \
-    --disable-optimizations \
-    --disable-ccache \
-    --disable-static \
     --enable-airplay \
     --enable-alsa \
     --enable-avahi \
@@ -362,6 +352,11 @@
     --disable-sdl \
     --disable-joystick \
 %endif
+    --disable-debug \
+    --disable-optimizations \
+    --disable-ccache \
+    --disable-static 
+
 make %{?_smp_mflags}
 
 pushd project/cmake/addons
@@ -373,6 +368,14 @@
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
 make %{?_smp_mflags}
+
+# 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')
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
+for file in audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
+    sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+
 popd
 
 %install