- mesa snap up do wersji 20060411 czyli tej samej ktora jest w Mesa.spec
- w zwiazku z tym rel++
- patch do mesy zbedny
- zeby sie kompilowalo trzeba przekopiowac bitset.h
- u mnie dziala ;)
Prosze o commit w przypadku braku zastrzezen.
--- SPECS/xorg-xserver-xgl.spec 2006-04-14 15:49:51.933094944 +0200
+++ SPECS/xorg-xserver-xgl-shad.spec 2006-04-14 15:49:31.568190880 +0200
@@ -6,17 +6,16 @@
Summary: Xgl X server
Summary(pl): Serwer X Xgl
Name: xorg-xserver-xgl
-%define _mesasnap 20060406
+%define _mesasnap 20060411
%define _snap 20060411
Version: 0.0.%{_snap}
-Release: 1
+Release: 2
License: MIT
Group: X11/Servers
Source0: xserver-%{_snap}.tar.bz2
# Source0-md5: f73dba494834a0dff86259486a3b10eb
-Source1: Mesa-%{_mesasnap}.tar.bz2
-# Source1-md5: 277cc3e846bfe33862ea70c2558721aa
-Patch0: %{name}-mesa-tfp-update-1.patch
+Source1: Mesa-%{_mesasnap}.tar.gz
+# Source1-md5: 247ed3daac8440e3a38d573afb0e1f23
URL: http://www.freedesktop.org/wiki/Software/Xgl
# for glx headers
BuildRequires: Mesa-libGL-devel
@@ -113,8 +112,8 @@
%prep
%setup -q -a1 -n xserver-%{_snap}
-cd Mesa-%{_mesasnap}
-%patch0 -p0
+#cd Mesa-%{_mesasnap}
+cp Mesa/src/mesa/main/bitset.h xorg/GL/mesa/main/
%build
cd xorg
@@ -135,13 +134,13 @@
--disable-xvfb \
--disable-xnest \
--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi"
\
- --with-mesa-source="`pwd`/../Mesa-%{_mesasnap}"
+ --with-mesa-source="`pwd`/../Mesa"
%{__make}
# build libGL from mesa snap
%if %{with libGL}
-cd ../Mesa-%{_mesasnap}
+cd ../Mesa
%ifarch %{ix86}
targ=-x86
@@ -171,7 +170,8 @@
%if %{with libGL}
install -d $RPM_BUILD_ROOT%{_libdir}/xgl
-cd ../Mesa-%{_mesasnap}/lib
+#cd ../Mesa-%{_mesasnap}/lib
+cd ../Mesa/lib
install libGL.so.1.2 $RPM_BUILD_ROOT%{_libdir}/xgl
ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{_libdir}/xgl/libGL.so.1
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
