SPECS: xorg-xserver-xgl.spec - build needed libGL - rel 2

[wolf]

Author: wolf                         Date: Sat Feb 25 01:13:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build needed libGL
- rel 2

---- Files affected:
SPECS:
   xorg-xserver-xgl.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-xgl.spec
diff -u SPECS/xorg-xserver-xgl.spec:1.6 SPECS/xorg-xserver-xgl.spec:1.7
--- SPECS/xorg-xserver-xgl.spec:1.6	Thu Feb 23 20:01:16 2006
+++ SPECS/xorg-xserver-xgl.spec	Sat Feb 25 02:12:55 2006
@@ -1,10 +1,14 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	libGL		# don't build mesa's libGL
+#
 Summary:	Xgl X server
 Summary(pl):	Serwer X Xgl
 Name:		xorg-xserver-xgl
 %define		_snap	20060223
 Version:	0.0.%{_snap}
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Servers
 Source0:	xserver-%{_snap}.tar.bz2
@@ -93,6 +97,21 @@
 
 Ten pakiet zawiera serwer Xgl.
 
+%package libGL
+Summary:	OpenGL library used inside Xgl
+Summary(pl):	Biblioteka OpenGL używana wewnątrz Xgl
+Group:		X11/Servers
+Requires:	%{name} = %{version}-%{release}
+
+%description libGL
+OpenGL library used inside Xgl to allow rendering. You still need
+normal OpenGL library (like nvidia's or ati's) to run Xgl.
+
+%description libGL -l pl
+BIblioteka OpenGL używana wewnątrz Xgl w celu umożliwienia
+renderingu. Normalna biblioteka OpenGL (jak nvidii lub ati) jest
+w dalszym ciągu potrzebna by uruchomić Xgl.
+
 %prep
 %setup -q -a1 -n xserver-%{_snap}
 cd Mesa-%{_snap}
@@ -121,6 +140,26 @@
 
 %{__make}
 
+# build libGL from mesa snap
+%if %{with libGL}
+cd ../Mesa-%{_snap}
+
+%ifarch %{ix86}
+targ=-x86
+%else
+targ=""
+%endif
+
+%{__make} linux${targ} \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
+	OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
+	XLIB_DIR=%{_libdir} \
+	SRC_DIRS="glx/x11" \
+	PROGRAM_DIRS=
+
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -130,6 +169,16 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
+%if %{with libGL}
+install -d $RPM_BUILD_ROOT%{_libdir}/xgl
+
+cd ../Mesa-%{_snap}/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
+
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -139,12 +188,21 @@
 %dir %{_libdir}/xorg/modules/xgl
 %attr(755,root,root) %{_libdir}/xorg/modules/xgl/lib*.so
 
+%files libGL
+%defattr(644,root,root,755)
+%dir %{_libdir}/xgl
+%attr(755,root,root) %{_libdir}/xgl/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/02/25 01:12:55  wolf
+- build needed libGL
+- rel 2
+
 Revision 1.6  2006/02/23 19:01:16  wolf
 - md5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-xserver-xgl.spec?r1=1.6&r2=1.7&f=u