#
# TODO:
-# - separate libGL/libGLU/libGLw,progs?
+# - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
+# - package OpenGL man pages (from monolith or SGI) somewhere
#
# Conditional build:
-%bcond_with glide # with GLIDE (broken now)
%bcond_without motif # build static libGLw without Motif interface
#
Summary: Free OpenGL implementation
-Summary(pl): Wolnodostêpna implementacja standardu OpenGL
+Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 6.4
-Release: 1.1
+Version: 6.5.3
+Release: 1
License: MIT (core), SGI (GLU,libGLw) and others - see COPYRIGHT file
Group: X11/Libraries
Source0: http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: 85a84e47a3f718f752f306b9e0954ef6
+# Source0-md5: 46359457147c469745f24b5074a186f0
Source1: http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5: 1a8c4d4fc699233f5fdb902b8753099e
+# Source1-md5: 8af91773ab2653fe537499676b05f2e8
+Source2: nouveau_drm.h
+Patch0: %{name}-realclean.patch
URL: http://www.mesa3d.org/
-%{?with_glide:BuildRequires: Glide3-DRI-devel}
BuildRequires: expat-devel
-BuildRequires: libdrm-devel >= 1.0.4-1.20051022
+BuildRequires: libdrm-devel >= 2.2.0
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.4d
%{?with_motif:BuildRequires: motif-devel}
BuildRequires: sed >= 4.0
+BuildRequires: xorg-lib-libXt-devel
BuildRequires: xorg-lib-libXxf86vm-devel
BuildRequires: xorg-proto-glproto-devel
+BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-util-makedepend
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# avoid XFree86-OpenGL* dependency
-# Glide3 can be provided by Glide_V3-DRI or Glide_V5-DRI
-%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.4 libglide3.so.3
-
%define _sysconfdir /etc/X11
%description
license from SGI, and makes no claim that Mesa is in any way a
compatible replacement for OpenGL or associated with SGI.
-%description -l pl
-Mesa jest bibliotek± grafiki 3D z API bardzo podobnym do OpenGL(R). Do
-tego stopnia, ¿e Mesa u¿ywa sk³adni i automatu OpenGL jest u¿ywana z
-autoryzacj± Silicon Graphics, Inc. Jednak autor nie posiada licencji
-OpenGL od SGI i nie twierdzi, ¿e Mesa jest kompatybilnym zamiennikiem
-OpenGL ani powi±zana z SGI.
+%description -l pl.UTF-8
+Mesa jest biblioteką grafiki 3D z API bardzo podobnym do OpenGL(R). Do
+tego stopnia, że Mesa używa składni i automatu OpenGL jest używana z
+autoryzacją Silicon Graphics, Inc. Jednak autor nie posiada licencji
+OpenGL od SGI i nie twierdzi, że Mesa jest kompatybilnym zamiennikiem
+OpenGL ani powiązana z SGI.
%package libGL
Summary: Free Mesa3D implementation of libGL OpenGL library
-Summary(pl): Wolnodostêpna implementacja Mesa3D biblioteki libGL ze standardu OpenGL
+Summary(pl.UTF-8): Wolnodostępna implementacja Mesa3D biblioteki libGL ze standardu OpenGL
License: MIT
Group: X11/Libraries
-%{?with_glide:Requires: Glide3-DRI}
-Provides: OpenGL = 1.5
+Requires: libdrm >= 2.2.0
+Provides: OpenGL = 2.1
# reports version 1.3, but supports glXGetProcAddress() from 1.4
Provides: OpenGL-GLX = 1.4
-Obsoletes: XFree86-OpenGL-libGL
+Obsoletes: Mesa
+Obsoletes: Mesa-dri
+Obsoletes: X11-OpenGL-libGL < 1:7.0.0
+Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
%description libGL
Mesa is a 3-D graphics library with an API which is very similar to
This package contains libGL which implements OpenGL 1.5 and GLX 1.4
specifications. It uses DRI for rendering.
-%description libGL -l pl
-Mesa jest bibliotek± grafiki 3D z API bardzo podobnym do OpenGL(R). Do
-tego stopnia, ¿e Mesa u¿ywa sk³adni i automatu OpenGL jest u¿ywana z
-autoryzacj± Silicon Graphics, Inc. Jednak autor nie posiada licencji
-OpenGL od SGI i nie twierdzi, ¿e Mesa jest kompatybilnym zamiennikiem
-OpenGL ani powi±zana z SGI.
+%description libGL -l pl.UTF-8
+Mesa jest biblioteką grafiki 3D z API bardzo podobnym do OpenGL(R). Do
+tego stopnia, że Mesa używa składni i automatu OpenGL jest używana z
+autoryzacją Silicon Graphics, Inc. Jednak autor nie posiada licencji
+OpenGL od SGI i nie twierdzi, że Mesa jest kompatybilnym zamiennikiem
+OpenGL ani powiązana z SGI.
-Ten pakiet zawiera libGL implementuj±c± specyfikacje OpenGL 1.5 oraz
-GLX 1.4. U¿ywa DRI do renderowania.
+Ten pakiet zawiera libGL implementującą specyfikacje OpenGL 1.5 oraz
+GLX 1.4. Używa DRI do renderowania.
%package libGL-devel
Summary: Header files for Mesa3D libGL library
-Summary(pl): Pliki nag³ówkowe biblioteki libGL z projektu Mesa3D
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libGL z projektu Mesa3D
License: MIT
Group: X11/Development/Libraries
# loose dependency on libGL to use with other libGL binaries
Requires: OpenGL >= 1.5
Requires: xorg-lib-libX11-devel
-Provides: OpenGL-devel = 1.5
+Provides: OpenGL-devel = 2.1
Provides: OpenGL-GLX-devel = 1.4
Obsoletes: Mesa-devel
-Obsoletes: XFree86-OpenGL-devel
-Obsoletes: XFree86-OpenGL-devel-base
+Obsoletes: X11-OpenGL-devel < 1:7.0.0
+Obsoletes: X11-OpenGL-devel-base < 1:7.0.0
+Obsoletes: XFree86-OpenGL-devel < 1:7.0.0
+Obsoletes: XFree86-OpenGL-devel-base < 1:7.0.0
%description libGL-devel
Header files for Mesa3D libGL library.
-%description libGL-devel -l pl
-Pliki nag³ówkowe biblioteki libGL z projektu Mesa3D.
+%description libGL-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libGL z projektu Mesa3D.
%package libGL-static
Summary: Static Mesa3D libGL library
-Summary(pl): Statyczna biblioteka libGL z projektu Mesa3D
+Summary(pl.UTF-8): Statyczna biblioteka libGL z projektu Mesa3D
License: MIT
Group: X11/Development/Libraries
Requires: %{name}-libGL-devel = %{version}-%{release}
-Provides: OpenGL-static = 1.5
+Provides: OpenGL-static = 2.1
Obsoletes: Mesa-static
+Obsoletes: X11-OpenGL-static < 1:7.0.0
+Obsoletes: XFree86-OpenGL-static < 1:7.0.0
%description libGL-static
Static Mesa3D libGL library. It uses software renderer.
-%description libGL-static -l pl
-Statyczna biblioteka libGL z projektu Mesa3D. U¿ywa programowego
+%description libGL-static -l pl.UTF-8
+Statyczna biblioteka libGL z projektu Mesa3D. Używa programowego
renderingu.
%package libGLU
Summary: SGI implementation of libGLU OpenGL library
-Summary(pl): Implementacja SGI biblioteki libGLU ze standardu OpenGL
+Summary(pl.UTF-8): Implementacja SGI biblioteki libGLU ze standardu OpenGL
License: SGI Free Software License B v1.1
Group: Libraries
# loose dependency on libGL.so.1 to use with other libGL binaries
Requires: OpenGL >= 1.2
Provides: OpenGL-GLU = 1.3
Obsoletes: Mesa-devel
-Obsoletes: XFree86-OpenGL-libs
+Obsoletes: X11-OpenGL-libs < 1:7.0.0
+Obsoletes: XFree86-OpenGL-libs < 1:7.0.0
%description libGLU
SGI implementation of libGLU OpenGL library. It implements OpenGL GLU
1.3 specifications.
-%description libGLU -l pl
+%description libGLU -l pl.UTF-8
Implementacja SGI biblioteki libGLU ze standardu OpenGL. Implementuje
-specyfikacjê OpenGL GLU 1.3.
+specyfikację OpenGL GLU 1.3.
%package libGLU-devel
Summary: Header files for SGI libGLU library
-Summary(pl): Pliki nag³ówkowe biblioteki SGI libGLU
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki SGI libGLU
License: SGI Free Software License B v1.1
Group: Development/Libraries
Requires: %{name}-libGLU = %{version}-%{release}
%description libGLU-devel
Header files for SGI libGLU library.
-%description libGLU-devel -l pl
-Pliki nag³ówkowe biblioteki SGI libGLU.
+%description libGLU-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki SGI libGLU.
%package libGLU-static
Summary: Static SGI libGLU library
-Summary(pl): Statyczna biblioteka SGI libGLU
+Summary(pl.UTF-8): Statyczna biblioteka SGI libGLU
License: SGI Free Software License B v1.1
Group: Development/Libraries
Requires: %{name}-libGLU-devel = %{version}-%{release}
%description libGLU-static
Static SGI libGLU library.
-%description libGLU-static -l pl
+%description libGLU-static -l pl.UTF-8
Statyczna biblioteka SGI libGLU.
%package libGLw
Summary: SGI OpenGL Xt widgets library
-Summary(pl): Biblioteka SGI widgetów Xt dla OpenGL-a
+Summary(pl.UTF-8): Biblioteka SGI widgetów Xt dla OpenGL-a
License: SGI MIT-like
Group: Libraries
# loose dependency on libGL.so.1 to use with other libGL binaries
%description libGLw
SGI OpenGL Xt widgets library.
-%description libGLU -l pl
-Biblioteka SGI widgetów Xt dla OpenGL-a.
+%description libGLU -l pl.UTF-8
+Biblioteka SGI widgetów Xt dla OpenGL-a.
%package libGLw-devel
Summary: Header files for SGI libGLw library
-Summary(pl): Pliki nag³ówkowe biblioteki SGI libGLw
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki SGI libGLw
License: SGI Free Software License B v1.1
Group: Development/Libraries
Requires: %{name}-libGLw = %{version}-%{release}
%description libGLw-devel
Header files for SGI libGLw library.
-%description libGLw-devel -l pl
-Pliki nag³ówkowe biblioteki SGI libGLw.
+%description libGLw-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki SGI libGLw.
%package libGLw-static
Summary: Static SGI libGLw library
-Summary(pl): Statyczna biblioteka SGI libGLw
+Summary(pl.UTF-8): Statyczna biblioteka SGI libGLw
License: SGI Free Software License B v1.1
Group: Development/Libraries
Requires: %{name}-libGLw-devel = %{version}-%{release}
%description libGLw-static
Static SGI libGLw library.
-%description libGLw-static -l pl
+%description libGLw-static -l pl.UTF-8
Statyczna biblioteka SGI libGLw.
%package utils
Summary: OpenGL utilities from Mesa3D
-Summary(pl): Programy narzêdziowe OpenGL z projektu Mesa3D
-Group: X11/Applications/Graphisc
+Summary(pl.UTF-8): Programy narzędziowe OpenGL z projektu Mesa3D
+Group: X11/Applications/Graphics
# loose deps on libGL/libGLU
%description utils
OpenGL utilities from Mesa3D: glxgears and glxinfo.
-%description utils -l pl
-Programy narzêdziowe OpenGL z projektu Mesa3D: glxgears i glxinfo.
+%description utils -l pl.UTF-8
+Programy narzędziowe OpenGL z projektu Mesa3D: glxgears i glxinfo.
%package demos
Summary: Mesa Demos
-Summary(pl): Programy demonstruj±ce mo¿liwo¶ci bibliotek Mesa
+Summary(pl.UTF-8): Programy demonstrujące możliwości bibliotek Mesa
Group: Development/Libraries
Requires: OpenGL-devel
%description demos
Demonstration programs for the Mesa libraries.
-%description demos -l pl
+%description demos -l pl.UTF-8
Programy demonstracyjne dla bibliotek Mesa.
-%package dri
+%package dri-driver-ati-mach64
Summary: X.org DRI drivers
-Summary(pl): Sterowniki DRI dla X.org
-Group: Development/Libraries
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-ati
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+
+%description dri-driver-ati-mach64
+X.org DRI drivers for ATI mach64 card family.
+
+%description dri-driver-ati-mach64 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart ATI mach64.
+
+%package dri-driver-ati-radeon-R100
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-ati
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-radeon-dri
+
+%description dri-driver-ati-radeon-R100
+X.org DRI drivers for ATI R100 card family (Radeon 7000-7500).
+
+%description dri-driver-ati-radeon-R100 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart ATI R100 (Radeon 7000-7500).
+
+%package dri-driver-ati-radeon-R200
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-ati
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-radeon-dri
+
+%description dri-driver-ati-radeon-R200
+X.org DRI drivers for ATI R200 card family (Radeon 8500-92xx)
+
+%description dri-driver-ati-radeon-R200 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart ATI R200 (Radeon 8500-92xx).
+
+%package dri-driver-ati-radeon-R300
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-ati
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-radeon-dri
+
+%description dri-driver-ati-radeon-R300
+X.org DRI drivers for ATI R300 card family.
+
+%description dri-driver-ati-radeon-R300 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart ATI R300.
+
+%package dri-driver-ati-rage128
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-ati
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-r128-dri
+
+%description dri-driver-ati-rage128
+X.org DRI drivers for ATI rage128 card family.
+
+%description dri-driver-ati-rage128 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart ATI rage128.
+
+%package dri-driver-ffb
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-sunffb
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+
+%description dri-driver-ffb
+X.org DRI drivers for SUN Creator3D and Elite3D card family.
+
+%description dri-driver-ffb -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart SUN Creator3D and Elite3D.
+
+%package dri-driver-glint
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-glint
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-glint-dri
+
+%description dri-driver-glint
+X.org DRI drivers for GLINT/Permedia card family.
+
+%description dri-driver-glint -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart GLINT/Permedia.
+
+%package dri-driver-intel-i810
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-i810
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-i810-dri
+
+%description dri-driver-intel-i810
+X.org DRI drivers for Intel i810 card family.
+
+%description dri-driver-intel-i810 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart i810.
+
+%package dri-driver-intel-i915
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-i810
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: Mesa-dri-driver-intel-i830
+Obsoletes: X11-driver-i810-dri
+
+%description dri-driver-intel-i915
+X.org DRI drivers for Intel i915 card family.
+
+%description dri-driver-intel-i915 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart i915.
+
+%package dri-driver-intel-i965
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-i810
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: Mesa-dri-driver-intel-i830
+Obsoletes: Mesa-dri-driver-intel-i915
+Obsoletes: X11-driver-i810-dri
+
+%description dri-driver-intel-i965
+X.org DRI drivers for Intel i965 card family.
+
+%description dri-driver-intel-i965 -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart i965.
+
+%package dri-driver-matrox
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-mga
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-mga-dri
+
+%description dri-driver-matrox
+X.org DRI drivers for Matrox G card family.
+
+%description dri-driver-matrox -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart Matrox G.
+
+%package dri-driver-nouveau
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-nouveau
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+
+%description dri-driver-nouveau
+X.org DRI drivers for NVidia adapters.
+
+%description dri-driver-nouveau -l pl.UTF-8
+Sterowniki X.org DRI dla kart NVidia.
+
+%package dri-driver-s3virge
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-s3virge
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+
+%description dri-driver-s3virge
+X.org DRI drivers for S3 Virge card family.
+
+%description dri-driver-s3virge -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart S3 Virge.
+
+%package dri-driver-savage
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-savage
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+
+%description dri-driver-savage
+X.org DRI drivers for S3 Savage card family.
+
+%description dri-driver-savage -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart S3 Savage.
+
+%package dri-driver-sis
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-sis
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-sis-dri
+
+%description dri-driver-sis
+X.org DRI drivers for SiS card family.
+
+%description dri-driver-sis -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart SiS.
+
+%package dri-driver-tdfx
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: Glide3-DRI
+Requires: xorg-driver-video-tdfx
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+Obsoletes: X11-driver-tdfx-dri
+
+%description dri-driver-tdfx
+X.org DRI drivers for 3DFX Voodoo card family (Voodoo 3,4,5, Banshee
+and Velocity 100/200).
+
+%description dri-driver-tdfx -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart 3DFX Voodoo. (Voodoo 3,4,5,
+Banshee and Velocity 100/200).
+
+%package dri-driver-trident
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-trident
+Requires: xorg-xserver-libglx(glapi) = %{version}
Requires: xorg-xserver-server
-%description dri
-X.org DRI drivers.
+%description dri-driver-trident
+X.org DRI drivers for Trident card family.
-%description dri -l pl
-Sterowniki DRI dla X.org.
+%description dri-driver-trident -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart Trident.
-#%package dri-driver-ffb ...
+%package dri-driver-via-unichrome
+Summary: X.org DRI drivers
+Summary(pl.UTF-8): Sterowniki DRI dla X.org
+Group: X11/Libraries
+Requires: xorg-driver-video-via
+Requires: xorg-xserver-libglx(glapi) = %{version}
+Requires: xorg-xserver-server
+
+%description dri-driver-via-unichrome
+X.org DRI drivers for VIA Unichrome card family.
+
+%description dri-driver-via-unichrome -l pl.UTF-8
+Sterowniki X.org DRI dla rodziny kart VIA Unichrome.
%prep
-%setup -q -n Mesa-%{version} -b 1
+%setup -q -b1
+#%setup -q -n %{name}
+%patch0 -p0
+
+# until new libdrm release
+cp %{SOURCE2} src/mesa/drivers/dri/nouveau
# fix demos
find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
%ifnarch sparc sparcv9 sparc64
# for sunffb driver - useful on sparc only
-sed -i -e 's/ ffb$//' configs/linux-dri
+sed -i -e 's/ ffb / /' configs/linux-dri
+%endif
+
+%ifnarch %{ix86} %{x8664}
+# sis needs write-memory barrier
+sed -i -e 's/ sis / /' configs/linux-dri
%endif
%build
SRC_DIRS="mesa glu glw" \
PROGRAM_DIRS=
mv -f lib lib-static
-%{__make} clean
+%{__make} realclean
%{__make} linux-dri${targ} \
CC="%{__cc}" \
MKDEP=makedepend \
OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
XLIB_DIR=%{_libdir} \
+ DRI_DRIVER_SEARCH_DIR=%{_libdir}/xorg/modules/dri \
SRC_DIRS="glx/x11 mesa glu glw" \
PROGRAM_DIRS=
-mv -f lib lib-dri
-%{__make} clean \
- MKDEP=makedepend
-
-%{__make} linux${targ} \
- CC="%{__cc}" \
- CXX="%{__cxx}" \
- OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
- XLIB_DIR=%{_libdir} \
- SRC_DIRS="mesa" \
- PROGRAM_DIRS=
%{__make} -C progs/xdemos \
CC="%{__cc}" \
OPT_FLAGS="%{rpmcflags}" \
XLIB_DIR=%{_libdir} \
PROGS="glxgears" \
- APP_LIB_DEPS="-L\$(LIB_DIR) -lGL"
+ APP_LIB_DEPS="-L../../lib -lGL"
%{__make} -C progs/xdemos \
CC="%{__cc}" \
OPT_FLAGS="%{rpmcflags}" \
XLIB_DIR=%{_libdir} \
PROGS="glxinfo" \
- APP_LIB_DEPS="-L\$(LIB_DIR) -lGLU -lGL"
+ APP_LIB_DEPS="-L../../lib -lGL -L../../lib-dri -lGLU"
+
+mv -f lib lib-dri
+%{__make} clean \
+ MKDEP=makedepend
+%{__make} realclean
+
+%{__make} linux${targ} \
+ CC="%{__cc}" \
+ CXX="%{__cxx}" \
+ OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
+ XLIB_DIR=%{_libdir} \
+ SRC_DIRS="mesa" \
+ PROGRAM_DIRS=
%install
rm -rf $RPM_BUILD_ROOT
cp -rf include/GL/{gl[!u]*,glu.h,glu_*,osmesa.h,xmesa*} src/glw/GLw*.h $RPM_BUILD_ROOT%{_includedir}/GL
cp -df lib-dri/*_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri
+# keep for -bi --short-circuit
+cp -a progs progs.org
install progs/xdemos/{glxgears,glxinfo} $RPM_BUILD_ROOT%{_bindir}
for l in demos redbook samples xdemos ; do
%{__make} -C progs/$l clean
for l in demos redbook samples util xdemos images ; do
cp -Rf progs/$l $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$l
done
+rm -rf progs && mv -f progs.org progs
rm -rf $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}}
%clean
%files libGL
%defattr(644,root,root,755)
-%doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS,X11},RELNOTES*,VERSIONS}
-%attr(755,root,root) %{_libdir}/libGL.so.*.*
-%attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
+%doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS},RELNOTES*}
+%attr(755,root,root) %{_libdir}/libGL.so.*
+%attr(755,root,root) %{_libdir}/libOSMesa.so.*
# symlink for binary apps which fail to conform Linux OpenGL ABI
# (and dlopen libGL.so instead of libGL.so.1)
%attr(755,root,root) %{_libdir}/libGL.so
%dir %{_includedir}/GL
%{_includedir}/GL/gl.h
%{_includedir}/GL/glext.h
+%{_includedir}/GL/glfbdev.h
%{_includedir}/GL/gl_mangle.h
%{_includedir}/GL/glx.h
%{_includedir}/GL/glxext.h
%files libGLU
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libGLU.so.*.*
+%attr(755,root,root) %{_libdir}/libGLU.so.*
%files libGLU-devel
%defattr(644,root,root,755)
%files libGLw
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libGLw.so.*.*
+%attr(755,root,root) %{_libdir}/libGLw.so.*
%files libGLw-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/glxgears
%attr(755,root,root) %{_bindir}/glxinfo
-%files dri
+%files dri-driver-ati-mach64
%defattr(644,root,root,755)
-%dir %{_libdir}/xorg/modules/dri
-# XXX: split
-%ifarch sparc sparcv9 sparc64
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/mach64_dri.so
+
+%files dri-driver-ati-radeon-R100
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/radeon_dri.so
+
+%files dri-driver-ati-radeon-R200
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/r200_dri.so
+
+%files dri-driver-ati-radeon-R300
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/r300_dri.so
+
+%files dri-driver-ati-rage128
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/r128_dri.so
+
# sunffb (sparc only)
+%ifarch sparc sparcv9 sparc64
+%files dri-driver-ffb
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/ffb_dri.so
%endif
-# i810
+
+# glint (requires update)
+%if 0
+%files dri-driver-glint
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/gamma_dri.so
+%endif
+
+%files dri-driver-intel-i810
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/i810_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/i830_dri.so
+
+%files dri-driver-intel-i915
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
-# ati
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/mach64_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/r128_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/r200_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/r300_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/radeon_dri.so
-# glint (requires update)
-#%attr(755,root,root) %{_libdir}/xorg/modules/dri/gamma_dri.so
-# mga
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915tex_dri.so
+
+%files dri-driver-intel-i965
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/i965_dri.so
+
+%files dri-driver-matrox
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/mga_dri.so
-# s3virge (but driver not ready?)
+
+%files dri-driver-nouveau
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
+
+%files dri-driver-s3virge
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/s3v_dri.so
-# savage
+
+%files dri-driver-savage
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/savage_dri.so
-# sis
+
+%ifarch %{ix86} %{x8664}
+%files dri-driver-sis
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/sis_dri.so
-# tdfx
+%endif
+
+%files dri-driver-tdfx
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/tdfx_dri.so
-# trident
+
+%files dri-driver-trident
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/trident_dri.so
-# via
+
+%files dri-driver-via-unichrome
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/unichrome_dri.so
%files demos
projects / packages / Mesa.git / blobdiff