From 5ca2aec4812832edfdd3af135372c27928bb588c29912cb49754dcb46cb67977 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Wed, 31 Aug 2011 08:52:01 +0000
Subject: [PATCH] Accepting request 80092 from X11:Drivers:Video

- fixes the build in a more correct way :-) Hopefully!

OBS-URL: https://build.opensuse.org/request/show/80092
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvdpau?expand=0&rev=13
---
 libvdpau-missing-lX11.diff  |  8 --------
 libvdpau.changes            |  5 +++++
 libvdpau.spec               |  4 +++-
 vdpauinfo-missing-lX11.diff | 11 +++++++++++
 4 files changed, 19 insertions(+), 9 deletions(-)
 delete mode 100644 libvdpau-missing-lX11.diff
 create mode 100644 vdpauinfo-missing-lX11.diff

diff --git a/libvdpau-missing-lX11.diff b/libvdpau-missing-lX11.diff
deleted file mode 100644
index b826eb3..0000000
--- a/libvdpau-missing-lX11.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- vdpau.pc.in.orig	2011-08-29 12:24:17.000000000 +0000
-+++ vdpau.pc.in	2011-08-29 12:24:48.000000000 +0000
-@@ -9,4 +9,4 @@ Description: The Video Decode and Presen
- Version: @PACKAGE_VERSION@
- Requires.private: x11
- Cflags: -I${includedir}
--Libs: -L${libdir} -lvdpau
-+Libs: -L${libdir} -lvdpau -lX11
diff --git a/libvdpau.changes b/libvdpau.changes
index bdfc07d..5c20c23 100644
--- a/libvdpau.changes
+++ b/libvdpau.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 29 14:47:54 UTC 2011 - sndirsch@suse.com
+
+- fixes the build in a more correct way :-) Hopefully!
+
 -------------------------------------------------------------------
 Mon Aug 29 12:19:11 UTC 2011 - sndirsch@suse.com
 
diff --git a/libvdpau.spec b/libvdpau.spec
index efb5b48..3d4df23 100644
--- a/libvdpau.spec
+++ b/libvdpau.spec
@@ -29,7 +29,7 @@ Source1:        vdpauinfo-0.0.6.tar.gz
 Source2:        README
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
-Patch:          libvdpau-missing-lX11.diff
+Patch:          vdpauinfo-missing-lX11.diff
 BuildRequires:  gcc-c++ pkgconfig xorg-x11-devel
 BuildRequires:  doxygen graphviz texlive
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -80,7 +80,9 @@ Its usage is documented in the README.
 
 %prep
 %setup -q -b1
+pushd ../vdpauinfo-*
 %patch -p0
+popd
 
 %build
 %configure
diff --git a/vdpauinfo-missing-lX11.diff b/vdpauinfo-missing-lX11.diff
new file mode 100644
index 0000000..50bfe89
--- /dev/null
+++ b/vdpauinfo-missing-lX11.diff
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2011-08-29 16:31:04.069536000 +0200
++++ configure.ac	2011-08-29 16:31:31.424105000 +0200
+@@ -8,7 +8,7 @@
+ 
+ PKG_CHECK_MODULES(VDPAU, x11 [vdpau >= 0.2])
+ VDPAUINFO_CXXFLAGS="$VDPAUINFO_CXXFLAGS $VDPAU_CFLAGS"
+-VDPAUINFO_LIBS="$VDPAUINFO_LIBS $VDPAU_LIBS"
++VDPAUINFO_LIBS="$VDPAUINFO_LIBS $VDPAU_LIBS -lX11"
+ 
+ AC_SUBST(VDPAUINFO_CXXFLAGS)
+ AC_SUBST(VDPAUINFO_LIBS)