enable VAAPI, libcap, and pvraddons-with-dependencies

- Enable VAAPI: add BR: libva-devel (#2613)
- Add libcap BR (allows binding on privileged ports)
- Add patch to build pvraddons-with-dependencies

2 files changed, 66 insertions, 3 deletions

diff --git a/xbmc-12.0-pvraddons-with-dependencies.patch b/xbmc-12.0-pvraddons-with-dependencies.patch
new file mode 100644
index 0000000..ff3e80e
--- /dev/null
+++ b/xbmc-12.0-pvraddons-with-dependencies.patch
@@ -0,0 +1,49 @@
+From 3eb985a5b256958370d8d5cb4864e31a0458b05f Mon Sep 17 00:00:00 2001
+From: wsnipex <wsnipex@a1.net>
+Date: Sun, 4 Nov 2012 14:05:52 +0100
+Subject: [PATCH] configure: add --enable-pvraddons-with-dependencies switch
+ for intree building of PVR Addons
+
+---
+ configure.in |   12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 7889dde..fd6cea0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -521,6 +521,14 @@ AC_ARG_ENABLE([external-ffmpeg],
+   [use_external_ffmpeg=$use_external_libraries])
+ 
+ ### End of external library options
++### PVR addons specific
++AC_ARG_ENABLE([pvraddons-with-dependencies],
++  [AS_HELP_STRING([--enable-pvraddons-with-dependencies],
++  [enable build of pvr addons with dependencies (default is no) 'Linux only'])],
++  [use_pvraddons_with_deps=$enableval],
++  [use_pvraddons_with_deps=no])
++
++### End PVR addons specific
+ 
+ if test "x$host_vendor" != "xapple"; then
+   DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT"
+@@ -2764,12 +2772,16 @@ XB_CONFIG_MODULE([pvr-addons], [
+    if test "$USE_EXTERNAL_FFMPEG" = 1; then
+       PVR_EXT_FFMPEG="--enable-external-ffmpeg"
+    fi
++   if test "$use_pvraddons_with_deps" = "yes"; then
++      ADDONS_WITH_DEPS="--enable-addons-with-dependencies"
++   fi
+   ./configure \
+     --prefix="${prefix}" \
+     --host=$host_alias \
+     --build=$build_alias \
+     --target=$target_alias \
+     $PVR_EXT_FFMPEG \
++    $ADDONS_WITH_DEPS \
+     CC="$CC" \
+     CXX="$CXX" \
+     CFLAGS="$CFLAGS" \
+-- 
+1.7.10
+
diff --git a/xbmc.spec b/xbmc.spec
index f6e1756..5f4db4c 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -5,7 +5,7 @@
 
 Name: xbmc
 Version: 12.0
-Release: 0.3.%{PRERELEASE}%{?dist}
+Release: 0.4.%{PRERELEASE}%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -23,6 +23,12 @@ Source1: xbmc-generate-tarball-xz.sh
 Source2: xbmc-pvr-addons-1e666ced21-patched.tar.xz
 Source3: xbmc-pvr-addons-generate-tarball-xz.sh
 
+# https://github.com/xbmc/xbmc/pull/1725.patch
+# We need this as long as we build addons together with the main XBMC
+# software. (This will probably never get merged upstream; see pull
+# request for details.)
+Patch1: xbmc-12.0-pvraddons-with-dependencies.patch
+
 # filed ticket, but patch still needs work
 # http://trac.xbmc.org/ticket/9658
 Patch2: xbmc-12.0-dvdread.patch
@@ -170,12 +176,12 @@ BuildRequires: lame-devel
 %if 0%{?_with_libssh}
 BuildRequires: libssh-devel
 %endif
+BuildRequires: libcap-devel
 
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
 BuildRequires: afpfs-ng-devel
-# VAAPI currently not working, comment-out
-#BuildRequires: libva-freeworld-devel
+BuildRequires: libva-devel
 
 # need explicit requires for these packages
 # as they are dynamically loaded via XBMC's arcane 
@@ -226,6 +232,7 @@ forecast functions, together third-party plugins.
 
 %setup -q -a 2 -n %{name}-%{DIRVERSION}
 
+%patch1 -p1
 %patch2 -p0
 #patch3 -p0
 %patch4 -p1
@@ -258,6 +265,7 @@ chmod +x bootstrap
 --enable-goom \
 --enable-external-libraries \
 --enable-pulse \
+--enable-pvraddons-with-dependencies \
 %if 0%{?_with_libssh} == 0
 --disable-ssh \
 %endif
@@ -334,6 +342,12 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.4.Frodo_rc1
+- Disable crystalhd on non-x86 (by kwizart)
+- Enable VAAPI: add BR: libva-devel (#2613)
+- Add libcap BR (allows binding on privileged ports)
+- Add patch to build pvraddons-with-dependencies
+
 * Wed Dec 12 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.3.Frodo_rc1
 - Update to Frodo RC 1