From e4e6d6f5c3c42581bc171e1601563f758218b58e Mon Sep 17 00:00:00 2001 From: akdengi Date: Sun, 15 Dec 2013 23:41:26 +0400 Subject: [PATCH] enable xvmc again --- mesa.spec | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mesa.spec b/mesa.spec index 78347c9..205a51c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -36,8 +36,8 @@ Url: http://www.mesa3d.org Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaLib-%{short_ver}.tar.bz2 Source3: make-git-snapshot.sh Source5: mesa-driver-install -#Source6: XvMCConfig -#Source7: README.xvmc +Source6: XvMCConfig +Source7: README.xvmc Patch1: GLX_INDIRECT_RENDERING_mesa9_1.patch Patch2: mesa-9.2-evergreen-big-endian.patch Patch3: mesa-9.2-hardware-float.patch @@ -72,7 +72,7 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xt) -#BuildRequires: pkgconfig(xvmc) +BuildRequires: pkgconfig(xvmc) BuildRequires: pkgconfig(xxf86vm) %description @@ -80,8 +80,8 @@ Mesa is an OpenGL compatible 3D graphics library. %files %doc docs/COPYING docs/README.* -#config(noreplace) %{_sysconfdir}/XvMCConfig -#config(noreplace) %{_sysconfdir}/X11/XvMCConfig +%config(noreplace) %{_sysconfdir}/XvMCConfig +%config(noreplace) %{_sysconfdir}/X11/XvMCConfig %config(noreplace) %{_sysconfdir}/drirc #---------------------------------------------------------------------------- @@ -124,10 +124,10 @@ vdpau and xvmc state trackers. %{_libdir}/gallium-pipe/pipe_swrast.so %{_libdir}/gallium-pipe/pipe_vmwgfx.so # xvmc state tracker backends -#{_libdir}/libXvMCnouveau.so.* -#{_libdir}/libXvMCr300.so.* -#{_libdir}/libXvMCr600.so.* -#{_libdir}/libXvMCsoftpipe.so.* +%{_libdir}/libXvMCnouveau.so.* +%{_libdir}/libXvMCr300.so.* +%{_libdir}/libXvMCr600.so.* +%{_libdir}/libXvMCsoftpipe.so.* # vdpau state tracker backends %{_libdir}/vdpau/libvdpau_nouveau.so.* #{_libdir}/vdpau/libvdpau_r300.so.* @@ -221,7 +221,7 @@ package contains the headers needed to compile Mesa programs. %endif %{_includedir}/GL/wglext.h %{_libdir}/libGL.so -#{_libdir}/libXvMC*.so +%{_libdir}/libXvMC*.so %{_libdir}/pkgconfig/gl.pc %{_libdir}/pkgconfig/dri.pc %{_includedir}/GL/wmesa.h @@ -666,7 +666,6 @@ export LDFLAGS="-L%{_libdir}/llvm" --enable-egl \ --disable-gallium-egl \ --enable-gallium-gbm \ - --disable-xvmc \ --enable-gbm \ --enable-gles1 \ --enable-gles2 \ @@ -740,11 +739,11 @@ rm -f %{buildroot}%{_libdir}/vdpau/libvdpau_*.so # Install the config file needed for XvMC support, # move it to /etc/X11 and symlink it from /etc -# mkdir -p %{buildroot}%{_sysconfdir}/X11 -# install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/XvMCConfig -# ln -s -t %{buildroot}%{_sysconfdir}/ %{_sysconfdir}/X11/XvMCConfig +mkdir -p %{buildroot}%{_sysconfdir}/X11 +install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/XvMCConfig +ln -s -t %{buildroot}%{_sysconfdir}/ %{_sysconfdir}/X11/XvMCConfig # Tell the user about the need to adjust the config file according the actual HW mkdir -p %{buildroot}%{_docdir}/%{dridrivers}/ -#install -m 0644 %{SOURCE7} %{buildroot}%{_docdir}/%{dridrivers}/ +install -m 0644 %{SOURCE7} %{buildroot}%{_docdir}/%{dridrivers}/