-%define name XFree86-glx
-%define mesaname Mesa
-%define version 4.2.0
%define mesaversion 3.2.1
-%define release 0.1
-%define serial 3
-%define prefix /usr/X11R6
-
%define glx_ver latest
Summary: OpenGL 1.2 compatible 3D graphics library
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Serial: %{serial}
-Prefix: %{prefix}
-Copyright: LGPL
-Group: System/Libraries
-URL: http://www.mesa3d.org
+Summary(pl): Bilioteka grfiki 3D kompatybilna z OpenGL 1.2
+Name: XFree86-glx
+Version: 4.2.0
+Release: 0.2
+License: LGPL
Vendor: Brian Paul <brian_paul@mesa3d.org>
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-Source: ftp://ftp.mesa3d.org/pub/mesa/MesaLib-%{mesaversion}.tar.bz2
-Source1: ftp://ftp.mesa3d.org/pub/mesa/MesaDemos-%{mesaversion}.tar.bz2
+Group: X11/Libraries
+Source0: ftp://ftp.mesa3d.org/pub/sourceforge/mesa3d/MesaLib-%{mesaversion}.tar.bz2
+Source1: ftp://ftp.mesa3d.org/pub/sourceforge/mesa3d/MesaDemos-%{mesaversion}.tar.bz2
Source2: http://snow.ashlu.bc.ca/glx/snapshots/utah-glx-src-%{glx_ver}.tar.gz
-Obsoletes: Mesa
-Obsoletes: XFree86-OpenGL-core
-Obsoletes: XFree86-OpenGL-libs
-
+URL: http://www.mesa3d.org/
BuildPreReq: binutils >= 2.9.1.0.19a
Conflicts: XFree86 =< 4.1.0
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes: Mesa
+Obsoletes: XFree86-OpenGL-core
+Obsoletes: XFree86-OpenGL-libs
+
+%define _prefix /usr/X11R6
+%define _sysconfdir /etc/X11
%description
This is an implementation of the Mesa 3D library and GLX with support
for hardware acceleration. GLX was developed by SGI as an extension to
-the X window system to integrate OpenGL rendering functions.
-This allows the Mesa 3D library to perform its 3D rendering functions
-within the X server's process, rather than within the X client program.
-This offers potential performance benefits, because the rendered image
-does not have to be moved from the X client program to the X server.
-(Only the commands required to render the image are sent.)
-It also makes 3-D hardware acceleration much more practical (and fast). This
-package includes a accelerated hardware drivers for video card
-based on NVIDIA Riva series and ATI Rage Pro chipsets.
-
-The Mesa 3D graphics library is a powerful and generic toolset for creating
-hardware assisted computer graphics. To the extent that Mesa utilizes the
-OpenGL command syntax or state machine, it is being used with authorization
-from Silicon Graphics, Inc. However, the author (Brian Paul) makes no claim
-that Mesa is in any way a compatible replacement for OpenGL or associated with
-Silicon Graphics, Inc. Those who want a licensed implementation of OpenGL
-should contact a licensed vendor. However, Mesa is very similar to OpenGL, and
-you might find Mesa to be a valid alternative to OpenGL.
+the X window system to integrate OpenGL rendering functions. This
+allows the Mesa 3D library to perform its 3D rendering functions
+within the X server's process, rather than within the X client
+program. This offers potential performance benefits, because the
+rendered image does not have to be moved from the X client program to
+the X server. (Only the commands required to render the image are
+sent.) It also makes 3-D hardware acceleration much more practical
+(and fast). This package includes a accelerated hardware drivers for
+video card based on NVIDIA Riva series and ATI Rage Pro chipsets.
+
+The Mesa 3D graphics library is a powerful and generic toolset for
+creating hardware assisted computer graphics. To the extent that Mesa
+utilizes the OpenGL command syntax or state machine, it is being used
+with authorization from Silicon Graphics, Inc. However, the author
+(Brian Paul) makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with Silicon Graphics, Inc. Those
+who want a licensed implementation of OpenGL should contact a licensed
+vendor. However, Mesa is very similar to OpenGL, and you might find
+Mesa to be a valid alternative to OpenGL.
This package is based on Mesa %{mesaver} and utah glx-%{glxver}.
%package devel
Summary: Development files for Mesa (OpenGL compatible 3D lib)
-Group: Development/C
+Summary(pl): Pliki i biblioteki nag³ówkowe dla Mesy (biblioteka 3D OpenGL)
+Group: X11/Development/Libraries
Requires: %{name}
-%description devel
-Mesa is an OpenGL 1.2 compatible 3D graphics library.
-Headers needed to compile Mesa programs.
+%description devel
+Mesa is an OpenGL 1.2 compatible 3D graphics library. Headers needed
+to compile Mesa programs.
%prep
-%setup -q -n %{mesaname}-%{mesaversion} -b1 -a2
+%setup -q -n Mesa-%{mesaversion} -b1 -a2
[ -d glx-xf4 ] && ln -s glx-xf4 glx;
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS| sed 's/-m486 *//g'`; export RPM_OPT_FLAGS;
%build
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS| sed 's/-m486 *//g'`; export RPM_OPT_FLAGS;
-
%ifarch i386 i486
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=%{prefix} \
- --sysconfdir=/etc/X11 \
- --disable-mmx \
- --disable-3dnow \
- --without-ggi \
- --enable-mga=no \
- --enable-mach64=no \
- --enable-tnt=yes \
- --enable-i810=no \
- --enable-s3virge=no \
- --enable-s3savage=no \
- --enable-sis6326=no
+CFLAGS="%{rpmcflags}" CXXFLAGS="%{rpmcflags}" \
+./configure --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --disable-mmx \
+ --disable-3dnow \
+ --without-ggi \
+ --enable-mga=no \
+ --enable-mach64=no \
+ --enable-tnt=yes \
+ --enable-i810=no \
+ --enable-s3virge=no \
+ --enable-s3savage=no \
+ --enable-sis6326=no
%endif
%ifarch i586 i686 k6 k7
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=%{prefix} \
- --sysconfdir=/etc/X11 \
- --with-glide=/usr \
- --without-ggi \
- --enable-mga=no \
- --enable-mach64=no \
- --enable-tnt=yes \
- --enable-i810=no \
- --enable-s3virge=no \
- --enable-s3savage=no \
- --enable-sis6326=no
+./configure --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --with-glide=/usr \
+ --without-ggi \
+ --enable-mga=no \
+ --enable-mach64=no \
+ --enable-tnt=yes \
+ --enable-i810=no \
+ --enable-s3virge=no \
+ --enable-s3savage=no \
+ --enable-sis6326=no
%endif
%ifnarch i386 i486 i586 i686 k6 k7
-./configure --prefix=%{prefix} \
- --sysconfdir=/etc/X11 \
+./configure --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
--disable-3dnow \
--without-ggi \
--enable-mga=no \
--enable-sis6326=no
%endif
-make
+%{__make}
%ifarch alpha sparc sparc64 ppc # Skip utah_glx for alpha - (fg) also skip it for
# sparc - (jb) also added skip for ppc
--disable-agp \
--disable-glut \
--disable-GLU \
- --prefix=%{prefix} \
- --sysconfdir=/etc/X11 \
+ --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
--without-x86-asm \
--without-mmx-asm \
--without-3dnow-asm \
ac_cv_prog_have_ps2pdf=${ac_cv_prog_have_ps2pdf=no}
ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes}
EOF
-./configure --enable-text --enable-html --enable-ps --enable-pdf
+
+./configure --enable-text \
+ --enable-html \
+ --enable-ps \
+ --enable-pdf
cd ..
-make
+%{__make}
cd ..
%endif # Skip glx for Alpha
%install
-[ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-mkdir -p $RPM_BUILD_ROOT%{prefix}/include
-mkdir -p $RPM_BUILD_ROOT%{prefix}/include/GL
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/modules/
-make DESTDIR=$RPM_BUILD_ROOT install
-cp include/GL/svgamesa.h $RPM_BUILD_ROOT%{prefix}/include/GL/
-cp glx/servGL/libglx.so $RPM_BUILD_ROOT%{prefix}/lib/modules/
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_includedir}/GL,%{_sysconfdir},/usr/bin}
+install -d $RPM_BUILD_ROOT%{_libdir}/modules
+
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+cp include/GL/svgamesa.h $RPM_BUILD_ROOT%{_includedir}/GL/
+cp glx/servGL/libglx.so $RPM_BUILD_ROOT%{_libdir}/modules/
%ifarch alpha sparc sparc64 ppc
echo 'Skipping utah_glx'
%else
-mkdir -p $RPM_BUILD_ROOT/usr/bin
cat > $RPM_BUILD_ROOT/usr/bin/glx <<EOF
#!/bin/sh
-LD_PRELOAD=%{prefix}/lib/libGL.so.1.0 "\$@"
+LD_PRELOAD=%{_prefix}/lib/libGL.so.1.0 "\$@"
EOF
-chmod +x $RPM_BUILD_ROOT/usr/bin/glx
## glx
cd glx
-mkdir -p $RPM_BUILD_ROOT/etc/X11
-make DESTDIR=$RPM_BUILD_ROOT sysconfdir=/etc/X11 install
+%{__make} DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install
cd ..
-%endif # glx
+%endif # glx
-cd $RPM_BUILD_ROOT/%{prefix}/lib/
+cd $RPM_BUILD_ROOT/%{_prefix}/lib/
ln -sf libGL.so.1 libGL.so
ln -sf libGLU.so.1 libGLU.so
ln -sf libGLU.so.1 libGLU.so.3
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc docs/COPYRIGHT docs/README docs/README.X11 docs/COPYING
-%doc glx/docs/README.i810 glx/docs/README.mach64 glx/docs/README.mga
-%doc glx/docs/README.nv glx/docs/README.s3virge
-%doc docs/COPYRIGHT docs/README docs/README.X11 docs/COPYING
-%{prefix}/lib/libGL.so.*
-%{prefix}/lib/libMesaGL.so.*
-%{prefix}/lib/libGLU.so.*
-%{prefix}/lib/libMesaGLU.so.*
-%{prefix}/lib/libglut.so.*
-%{prefix}/lib/modules/libglx.so
-
+%defattr(644,root,root,755)
+%doc docs/{COPYRIGHT,README*,COPYING,DEVINFO,CONFORM,VERSIONS} glx/docs/README.*
+%attr(755,root,root) /usr/bin/glx
+%{_libdir}/*.so.*
+%config %{_sysconfdir}/mesa.conf
%ifarch i386 i486 i586 i686 k6 k7
-/usr/bin/glx
-# %{prefix}/lib/modules/*
-%config /etc/X11/glx.conf
+# %{_prefix}/lib/modules/*
+%config %{_sysconfdir}/glx.conf
%endif
-%config /etc/X11/mesa.conf
%files devel
-%defattr(-,root,root)
-%doc docs/COPYRIGHT docs/README docs/README.X11 docs/COPYING docs/DEVINFO
-%doc docs/CONFORM docs/VERSIONS
-%doc docs/COPYRIGHT docs/README docs/README.X11 docs/COPYING
-%dir %{prefix}/include/GL
-%{prefix}/include/GL/glu.h
-%{prefix}/include/GL/glu_mangle.h
-%{prefix}/include/GL/glut.h
-%{prefix}/lib/libGLU.so
-%{prefix}/lib/libMesaGLU.so
-%{prefix}/lib/libglut.so
-%{prefix}/lib/libGL.la
-%{prefix}/lib/libGLU.la
-%{prefix}/lib/libglut.la
-%{prefix}/include/GL/gl.h
-%{prefix}/include/GL/gl_mangle.h
-%{prefix}/include/GL/osmesa.h
+%defattr(644,root,root,755)
+%dir %{_includedir}/GL
+%{_includedir}/GL/gl*.h
+%{_includedir}/GL/o*.h
+%{_includedir}/GL/x*.h
%ifarch i386 i486 i586 i686 k6 k7
-%{prefix}/include/GL/svgamesa.h
+%{_includedir}/GL/svgamesa.h
%endif
-%{prefix}/include/GL/glx.h
-%{prefix}/include/GL/glx_mangle.h
-%{prefix}/include/GL/xmesa.h
-%{prefix}/include/GL/xmesa_x.h
-%{prefix}/include/GL/xmesa_xf86.h
-%{prefix}/lib/libGL.so
-%{prefix}/lib/libMesaGL.so
+%{_prefix}/lib/lib*.so
+%{_prefix}/lib/lib*.la