From e8cb8d911e0782f45e2ccd26e7b6bc9c9c675e7a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 11 Nov 2010 14:34:20 -0500
Subject: [PATCH] vg, abi magic, swrastg magic

---
 mesa-7.10-swrastg.patch | 23 ++++++++++++++++++++
 mesa.spec               | 48 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 mesa-7.10-swrastg.patch

diff --git a/mesa-7.10-swrastg.patch b/mesa-7.10-swrastg.patch
new file mode 100644
index 0000000..4fc5957
--- /dev/null
+++ b/mesa-7.10-swrastg.patch
@@ -0,0 +1,23 @@
+diff -up mesa-20101020/src/gallium/drivers/llvmpipe/Makefile.jx mesa-20101020/src/gallium/drivers/llvmpipe/Makefile
+diff -up mesa-20101020/src/gallium/targets/dri-swrast/Makefile.jx mesa-20101020/src/gallium/targets/dri-swrast/Makefile
+--- mesa-20101020/src/gallium/targets/dri-swrast/Makefile.jx	2010-10-20 15:54:57.000000000 -0400
++++ mesa-20101020/src/gallium/targets/dri-swrast/Makefile	2010-11-08 14:39:47.000000000 -0500
+@@ -26,6 +26,8 @@ C_SOURCES = \
+ 
+ ASM_SOURCES =
+ 
++LDFLAGS += -Wl,--version-script,../version-script
++
+ include ../Makefile.dri
+ 
+ INCLUDES += \
+diff -up mesa-20101020/src/gallium/targets/version-script.jx mesa-20101020/src/gallium/targets/version-script
+--- mesa-20101020/src/gallium/targets/version-script.jx	2010-11-08 14:39:56.000000000 -0500
++++ mesa-20101020/src/gallium/targets/version-script	2010-11-08 14:40:36.000000000 -0500
+@@ -0,0 +1,6 @@
++GALLIUM {
++    global:
++	__dri*;
++    local:
++	*;
++};
diff --git a/mesa.spec b/mesa.spec
index 012db1b..f0a4c6f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -15,7 +15,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.10
-Release: 0.9%{?dist}
+Release: 0.10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -33,6 +33,7 @@ Patch4: nouveau-legacy-enable.patch
 #Patch7: mesa-7.1-link-shared.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
+Patch31: mesa-7.10-swrastg.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -183,10 +184,31 @@ Mesa offscreen rendering development package
 %package -n xorg-x11-drv-vmwgfx
 Summary: VMware GFX DDX driver
 Group: User Interface/X Hardware Support
+Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires videodrv)
 
 %description -n xorg-x11-drv-vmwgfx
 2D driver for VMware SVGA vGPU
 
+%package libOpenVG
+Summary: Mesa libOpenVG runtime library
+Group: System Environment/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: mesa-dri-drivers = %{version}-%{release}
+
+%description libOpenVG
+Mesa libOpenVG runtime library
+
+
+%package libOpenVG-devel
+Summary: Mesa libOpenVG development package
+Group: Development/Libraries
+Requires: mesa-libOpenVG = %{version}-%{release}
+
+%description libOpenVG-devel
+Mesa libOpenVG development package
+
+
 %prep
 #setup -q -n mesa-%{version}%{?snapshot} -b0 -b2
 %setup -q -n mesa-%{gitdate} -b2
@@ -195,6 +217,7 @@ Group: User Interface/X Hardware Support
 %patch4 -p1 -b .nouveau
 #%patch7 -p1 -b .dricore
 %patch30 -p1 -b .vblank-warning
+%patch31 -p1 -b .jx 
 
 %build
 
@@ -227,7 +250,7 @@ make clean
     --disable-gl-osmesa \
     --with-driver=dri \
     --with-dri-driverdir=%{_libdir}/dri \
-    --with-state-trackers=dri,glx,egl \
+    --with-state-trackers=dri,glx,egl,vega \
     --enable-egl \
     --enable-gles1 \
     --enable-gles2 \
@@ -333,6 +356,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGLESv2.so.2
 %{_libdir}/libGLESv2.so.2.*
 
+%files libOpenVG
+%defattr(-,root,root,-)
+%doc docs/COPYING
+%{_libdir}/egl/st_OpenVG.so
+%{_libdir}/libOpenVG.so.1
+%{_libdir}/libOpenVG.so.1.0.0
+
 %files dri-drivers
 %defattr(-,root,root,-)
 %doc docs/COPYING
@@ -395,6 +425,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGLESv1_CM.so
 %{_libdir}/libGLESv2.so
 
+%files libOpenVG-devel
+%defattr(-,root,root,-)
+%{_includedir}/VG/openvg.h
+%{_includedir}/VG/vgext.h
+%{_includedir}/VG/vgplatform.h
+%{_includedir}/VG/vgu.h
+%{_libdir}/libOpenVG.so
+%{_libdir}/pkgconfig/vg.pc
+
 %files libGLU
 %defattr(-,root,root,-)
 %{_libdir}/libGLU.so.1
@@ -419,6 +458,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libOSMesa.so
 
 %changelog
+* Thu Nov 11 2010 Adam Jackson <ajax@redhat.com> 7.10-0.10
+- Build libOpenVG too
+- Add X driver ABI magic for vmwgfx
+- Linker script hack for swrastg to make it slightly less offensively huge
+
 * Mon Nov 08 2010 Dave Airlie <airlied@redhat.com> 7.10-0.9
 - update to latest git snap + enable r600g by default