Packman Build Service PMBS

kodi-noX.spec Changed

@@ -17,7 +17,6 @@
 
 
 %define _kodi_addons_dir %{_datadir}/kodi/addons
-%define ffmpeg_archive_name 2.6.2-Isengard-beta
 %define kodi_version Isengard
 # 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")
@@ -44,7 +43,6 @@
 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
@@ -70,6 +68,7 @@
 BuildRequires:  doxygen
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
+BuildRequires:  ffmpeg-devel >= 2.6.2
 BuildRequires:  flac-devel
 BuildRequires:  flex
 BuildRequires:  fontconfig-devel
@@ -243,11 +242,7 @@
 %patch1
 %patch3
 %patch4
-%ifarch x86_64
 %patch5
-%endif
-
-cp %{SOURCE1} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
 
 # 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')
@@ -256,6 +251,18 @@
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
+# Fix the final version string showing as "exported"
+# instead of the SVN revision number.
+export HAVE_GIT="no" GIT_REV="exported"
+
+# avoid long delays when powerkit isn't running
+sed -i \
+    -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+    xbmc/linux/*.cpp
+
+# Tweak autotool timestamps to avoid regeneration
+find . -type f -exec touch -r configure {} +
+
 chmod +x bootstrap
 ./bootstrap
 
@@ -266,15 +273,30 @@
 %endif
 %endif
 %configure \
+    --with-ffmpeg=shared \
+    --disable-debug \
+    --disable-optimizations \
+    --disable-ccache \
+    --disable-static \
     --enable-airplay \
-    --enable-vdpau \
-    --enable-vaapi \
+    --enable-avahi \
+    --enable-libcap \
+    --enable-fishbmc \
+    --enable-mid \
+    --enable-mysql \
+    --enable-nfs \
+    --enable-projectm \
+    --enable-pulse \
+    --enable-rsxs \
     --enable-rtmp \
     --enable-libbluray \
-    --disable-debug \
+    --enable-samba \
+    --enable-ssh \
+    --enable-libusb \
+    --enable-texturepacker \
+    --enable-upnp \
+    --enable-webserver \
     --enable-shared \
-    --enable-optimizations \
-    --disable-static \
     --enable-libcec \
 %if %{with enable_opengl}
     --enable-goom \
@@ -301,7 +323,8 @@
 %endif
 %endif
 %ifarch armv7l armv7hl
-    --enable-tegra --disable-neon \
+    --enable-tegra \
+    --disable-neon \
 %endif
 %if %{noX_build}
     --disable-x11 \

kodi.spec Changed

@@ -17,7 +17,6 @@
 
 
 %define _kodi_addons_dir %{_datadir}/kodi/addons
-%define ffmpeg_archive_name 2.6.2-Isengard-beta
 %define kodi_version Isengard
 # 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")
@@ -44,7 +43,6 @@
 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
@@ -70,6 +68,7 @@
 BuildRequires:  doxygen
 BuildRequires:  enca-devel
 BuildRequires:  fdupes
+BuildRequires:  ffmpeg-devel >= 2.6.2
 BuildRequires:  flac-devel
 BuildRequires:  flex
 BuildRequires:  fontconfig-devel
@@ -243,11 +242,7 @@
 %patch1
 %patch3
 %patch4
-%ifarch x86_64
 %patch5
-%endif
-
-cp %{SOURCE1} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
 
 # 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')
@@ -256,6 +251,18 @@
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
+# Fix the final version string showing as "exported"
+# instead of the SVN revision number.
+export HAVE_GIT="no" GIT_REV="exported"
+
+# avoid long delays when powerkit isn't running
+sed -i \
+    -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+    xbmc/linux/*.cpp
+
+# Tweak autotool timestamps to avoid regeneration
+find . -type f -exec touch -r configure {} +
+
 chmod +x bootstrap
 ./bootstrap
 
@@ -266,15 +273,30 @@
 %endif
 %endif
 %configure \
+    --with-ffmpeg=shared \
+    --disable-debug \
+    --disable-optimizations \
+    --disable-ccache \
+    --disable-static \
     --enable-airplay \
-    --enable-vdpau \
-    --enable-vaapi \
+    --enable-avahi \
+    --enable-libcap \
+    --enable-fishbmc \
+    --enable-mid \
+    --enable-mysql \
+    --enable-nfs \
+    --enable-projectm \
+    --enable-pulse \
+    --enable-rsxs \
     --enable-rtmp \
     --enable-libbluray \
-    --disable-debug \
+    --enable-samba \
+    --enable-ssh \
+    --enable-libusb \
+    --enable-texturepacker \
+    --enable-upnp \
+    --enable-webserver \
     --enable-shared \
-    --enable-optimizations \
-    --disable-static \
     --enable-libcec \
 %if %{with enable_opengl}
     --enable-goom \
@@ -301,7 +323,8 @@
 %endif
 %endif
 %ifarch armv7l armv7hl
-    --enable-tegra --disable-neon \
+    --enable-tegra \
+    --disable-neon \
 %endif
 %if %{noX_build}
     --disable-x11 \

cmake_build64.patch Changed

_service Deleted

_service:download_files:2.6.2-Isengard-beta.tar.gz Deleted

Changes of Revision 25