Packman Build Service PMBS

Changes of Revision 46

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX.spec Changed

@@ -14,10 +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
+#
 
-
-%define _kodi_addons_dir %{_datadir}/kodi/addons
 %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}
@@ -35,6 +37,7 @@
 %endif
 %bcond_without enable_rpi_build
 %bcond_without enable_rpi_omxplayer
+
 Name:           kodi-noX
 Version:        15.0
 Release:        0
@@ -51,12 +54,23 @@
 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
+#Patch2:        disable_omxplayer_3d_support.patch
 Patch3:         cmake_no_deps.patch
 Patch4:         cmake_do_not_download.patch
 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
@@ -121,7 +135,7 @@
 BuildRequires:  libpulse-devel
 BuildRequires:  librtmp-devel
 BuildRequires:  libsamplerate-devel
-BuildRequires:  libsidplay2-1
+#BuildRequires:  libsidplay2-1
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libssh-devel
 BuildRequires:  libstdc++-devel
@@ -141,12 +155,15 @@
 BuildRequires:  python-devel
 BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:  sidplay-libs-devel
+#BuildRequires:  sidplay-libs-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  swig
 BuildRequires:  tinyxml-devel
 BuildRequires:  tinyxml2-devel
 BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 BuildRequires:  yasm
 BuildRequires:  zip
 BuildRequires:  zlib-devel
@@ -158,48 +175,16 @@
 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 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:  glew-devel
 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}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
-%endif
-%endif
+
 %if %{with enable_opengles}
 %ifnarch armv6l armv6hl
 BuildRequires:  Mesa-libEGL-devel
@@ -207,6 +192,9 @@
 %else
 %if %{with enable_rpi_build}
 BuildRequires:  raspberrypi-userland-devel
+%if %{with enable_rpi_omxplayer}
+BuildRequires:  omxplayer
+%endif
 %else
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
@@ -214,6 +202,19 @@
 %endif
 %endif
 
+# glxinfo is needed to check hw accel
+%if 0%{?suse_version} >= 1220
+%if !%{noX_build}
+Requires:       Mesa-demo-x
+Requires:       xdpyinfo
+%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,11 +240,10 @@
 Group:          Productivity/Multimedia/Video/Players
 BuildRequires:  jsoncpp-devel
 Requires:       libjsoncpp1
-%if %{noX_build}
 Requires:       %{name}
+%if %{noX_build}
 Conflicts:      %{name}-pvr.addons
 %else
-Requires:       %{name}-noX
 Conflicts:      %{name}-noX-pvr.addons
 %endif
 
@@ -274,12 +274,10 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
+### prep for pvr.addons
 pushd project/cmake/addons
-# For some non-aparent reason it searches for stuff in build/build/download
-mkdir build; cd build
 mkdir -p build/download
 tar xvf %{SOURCE2} -C build/download
-cd ..
 tar zxvf %{SOURCE3} --strip-components=1 -C depends/common/kodi-platform
 # remove kodi-platform dependencies, because they are alreay installed
 rm -f  depends/common/kodi-platform/deps.txt
@@ -287,15 +285,19 @@
 # We do not provide sidplay2 library on any SUSE distribution
 rm -rf addons/audiodecoder.sidplay
 popd
+# Setting the right libdir for 64bit builds
 %if "%{_libdir}" == "/usr/lib64"
 sed -i \
      -e 's:lib/${APP_NAME_LC}:lib64/${APP_NAME_LC}:g' \
      project/cmake/scripts/common/addon-helpers.cmake
 %endif
 
+###
+
 %build
 chmod +x bootstrap
 ./bootstrap
+
 %ifarch armv6l armv6hl
 %if %{with enable_rpi_build}
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
@@ -308,9 +310,13 @@
     --disable-ccache \
     --disable-static \
     --enable-airplay \
+    --enable-alsa \
     --enable-avahi \
-    --enable-libcap \
     --enable-fishbmc \
+    --enable-libbluray \
+    --enable-libcap \
+    --enable-libcec \
+    --enable-libusb \
     --enable-mid \
     --enable-mysql \
     --enable-nfs \
@@ -318,15 +324,12 @@
     --enable-pulse \
     --enable-rsxs \
     --enable-rtmp \
-    --enable-libbluray \
     --enable-samba \
+    --enable-shared \
     --enable-ssh \
-    --enable-libusb \
     --enable-texturepacker \
     --enable-upnp \
     --enable-webserver \
-    --enable-shared \
-    --enable-libcec \
 %if %{with enable_opengl}
     --enable-goom \
     --enable-vaapi \
@@ -361,12 +364,12 @@
     --disable-sdl \
     --disable-joystick \
 %endif
-    --enable-alsa
 
 make %{?_smp_mflags}
 
 pushd project/cmake/addons
 %cmake \
+	-DBUILD_DIR=build \
     -DBUILD_SHARED_LIBS=1 \
     -DNEED_SUDO=FALSE \
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \

kodi.spec Changed

@@ -14,10 +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
+#
 
-
-%define _kodi_addons_dir %{_datadir}/kodi/addons
 %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}
@@ -35,6 +37,7 @@
 %endif
 %bcond_without enable_rpi_build
 %bcond_without enable_rpi_omxplayer
+
 Name:           kodi
 Version:        15.0
 Release:        0
@@ -51,12 +54,23 @@
 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
+#Patch2:        disable_omxplayer_3d_support.patch
 Patch3:         cmake_no_deps.patch
 Patch4:         cmake_do_not_download.patch
 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
@@ -121,7 +135,7 @@
 BuildRequires:  libpulse-devel
 BuildRequires:  librtmp-devel
 BuildRequires:  libsamplerate-devel
-BuildRequires:  libsidplay2-1
+#BuildRequires:  libsidplay2-1
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libssh-devel
 BuildRequires:  libstdc++-devel
@@ -141,12 +155,15 @@
 BuildRequires:  python-devel
 BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:  sidplay-libs-devel
+#BuildRequires:  sidplay-libs-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  swig
 BuildRequires:  tinyxml-devel
 BuildRequires:  tinyxml2-devel
 BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 BuildRequires:  yasm
 BuildRequires:  zip
 BuildRequires:  zlib-devel
@@ -158,48 +175,16 @@
 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 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:  glew-devel
 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}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
-%endif
-%endif
+
 %if %{with enable_opengles}
 %ifnarch armv6l armv6hl
 BuildRequires:  Mesa-libEGL-devel
@@ -207,6 +192,9 @@
 %else
 %if %{with enable_rpi_build}
 BuildRequires:  raspberrypi-userland-devel
+%if %{with enable_rpi_omxplayer}
+BuildRequires:  omxplayer
+%endif
 %else
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
@@ -214,6 +202,19 @@
 %endif
 %endif
 
+# glxinfo is needed to check hw accel
+%if 0%{?suse_version} >= 1220
+%if !%{noX_build}
+Requires:       Mesa-demo-x
+Requires:       xdpyinfo
+%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,11 +240,10 @@
 Group:          Productivity/Multimedia/Video/Players
 BuildRequires:  jsoncpp-devel
 Requires:       libjsoncpp1
-%if %{noX_build}
 Requires:       %{name}
+%if %{noX_build}
 Conflicts:      %{name}-pvr.addons
 %else
-Requires:       %{name}-noX
 Conflicts:      %{name}-noX-pvr.addons
 %endif
 
@@ -274,12 +274,10 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
+### prep for pvr.addons
 pushd project/cmake/addons
-# For some non-aparent reason it searches for stuff in build/build/download
-mkdir build; cd build
 mkdir -p build/download
 tar xvf %{SOURCE2} -C build/download
-cd ..
 tar zxvf %{SOURCE3} --strip-components=1 -C depends/common/kodi-platform
 # remove kodi-platform dependencies, because they are alreay installed
 rm -f  depends/common/kodi-platform/deps.txt
@@ -287,15 +285,19 @@
 # We do not provide sidplay2 library on any SUSE distribution
 rm -rf addons/audiodecoder.sidplay
 popd
+# Setting the right libdir for 64bit builds
 %if "%{_libdir}" == "/usr/lib64"
 sed -i \
      -e 's:lib/${APP_NAME_LC}:lib64/${APP_NAME_LC}:g' \
      project/cmake/scripts/common/addon-helpers.cmake
 %endif
 
+###
+
 %build
 chmod +x bootstrap
 ./bootstrap
+
 %ifarch armv6l armv6hl
 %if %{with enable_rpi_build}
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
@@ -308,9 +310,13 @@
     --disable-ccache \
     --disable-static \
     --enable-airplay \
+    --enable-alsa \
     --enable-avahi \
-    --enable-libcap \
     --enable-fishbmc \
+    --enable-libbluray \
+    --enable-libcap \
+    --enable-libcec \
+    --enable-libusb \
     --enable-mid \
     --enable-mysql \
     --enable-nfs \
@@ -318,15 +324,12 @@
     --enable-pulse \
     --enable-rsxs \
     --enable-rtmp \
-    --enable-libbluray \
     --enable-samba \
+    --enable-shared \
     --enable-ssh \
-    --enable-libusb \
     --enable-texturepacker \
     --enable-upnp \
     --enable-webserver \
-    --enable-shared \
-    --enable-libcec \
 %if %{with enable_opengl}
     --enable-goom \
     --enable-vaapi \
@@ -361,12 +364,12 @@
     --disable-sdl \
     --disable-joystick \
 %endif
-    --enable-alsa
 
 make %{?_smp_mflags}
 
 pushd project/cmake/addons
 %cmake \
+	-DBUILD_DIR=build \
     -DBUILD_SHARED_LIBS=1 \
     -DNEED_SUDO=FALSE \
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \

cmake_build64.patch Deleted

@@ -1,18 +0,0 @@
-Index: project/cmake/scripts/common/addon-helpers.cmake
-===================================================================
---- project/cmake/scripts/common/addon-helpers.cmake.orig
-+++ project/cmake/scripts/common/addon-helpers.cmake
-@@ -85,11 +85,11 @@ macro (build_addon target prefix libs)
-         message(FATAL_ERROR "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix ${${APP_NAME_UC}_PREFIX}. Please pass -DOVERRIDE_PATHS=1 to skip this check")
-       else()
-         if(NOT CMAKE_INSTALL_LIBDIR)
--          set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${APP_NAME_LC}")
-+          set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${APP_NAME_LC}")
-         endif()
-       endif()
-     else()
--      set(CMAKE_INSTALL_LIBDIR "lib/${APP_NAME_LC}")
-+      set(CMAKE_INSTALL_LIBDIR "lib${LIB_SUFFIX}/${APP_NAME_LC}")
-     endif()
-     INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target})
-     INSTALL(DIRECTORY ${target} DESTINATION share/${APP_NAME_LC}/addons)