- restored VDPAU support

diff --git a/xbmc-vdpau.patch b/xbmc-vdpau.patch
new file mode 100644 (file)
index 0000000..621bcd8
--- /dev/null
+++ b/xbmc-vdpau.patch
@@ -0,0 +1,27 @@
+--- xbmc-12.3-Frodo/configure.in.orig  2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/configure.in       2014-01-03 22:57:57.000000000 +0100
+@@ -1573,15 +1573,6 @@
+   USE_EXTERNAL_FFMPEG=1
+   AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
+ 
+-  # Disable vdpau support if external libavcodec doesn't have it
+-  AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
+-    [if test "x$use_vdpau" = "xyes"; then
+-      AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
+-    else
+-      use_vdpau=no
+-      AC_MSG_RESULT($ffmpeg_vdpau_not_supported)
+-    fi])
+-
+   # Check for 'PIX_FMT_VDPAU_MPEG4' from libavutil
+   if test "x$use_vdpau" != "xno"; then
+     AC_LANG_PUSH([C++])
+@@ -2539,7 +2530,7 @@
+     # extra-cflags must be passed alone or it gets expanded wrong by the ffmpeg configure
+     FFMPEG_EXTRACFLAGS="$CFLAGS $FFMPEG_EXTRACFLAGS -w -D_DARWIN_C_SOURCE -Dattribute_deprecated="
+ 
+-    ./configure --extra-cflags="$FFMPEG_EXTRACFLAGS" $ffmpg_config --as="$AS"
++    LDFLAGS="$LDFLAGS" ./configure --extra-cflags="$FFMPEG_EXTRACFLAGS" $ffmpg_config --as="$AS"
+ 
+     # if using llvm-gcc-4.2 as assembler, -MMD is not enough to generate
+     # dependency files in the right place, replace it with something that works

diff --git a/xbmc.spec b/xbmc.spec
index fb6ba416fd91f93f46e782ea5d01c1726798712f..6edd8ac7bf8fcb305a2597ef9fbdb39f89cec0ba 100644 (file)
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -22,6 +22,7 @@ Source0:      http://mirrors.xbmc.org/releases/source/%{name}-%{version}.tar.gz
 # Source0-md5: 7ae385ebf8e5cfcb917393235e6efbdb
 Patch0:                ffmpeg2.patch
 Patch1:                jpeglib-boolean.patch
+Patch2:                %{name}-vdpau.patch
 URL:           http://xbmc.org/
 BuildRequires: Mesa-libGLU-devel
 BuildRequires: OpenGL-devel
@@ -131,6 +132,7 @@ forecast functions, together third-party plugins.
 %setup -q -n %{name}-%{version}-%{codename}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 ./bootstrap