X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=Mesa.spec;h=425df98e10b10cbc99d2759f604fc839e484c588;hb=5f1a5ef2d46deb415957b346ee232faa223908e6;hp=bd2b807e03221011b821a99148d42b86b8f38ff2;hpb=ac90046ff607bb2937dd397a6a7d9149fffef28e;p=packages%2FMesa.git diff --git a/Mesa.spec b/Mesa.spec index bd2b807..425df98 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -5,40 +5,43 @@ # # Conditional build: %bcond_without motif # build static libGLw without Motif interface -# -#%define snap 20061103 +%bcond_with multigl # package libGL in a way allowing concurrent install with nvidia/fglrx drivers +%bcond_with nouveau # build nouveau DRI driver # Summary: Free OpenGL implementation -Summary(pl): Wolnodostêpna implementacja standardu OpenGL +Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL Name: Mesa -Version: 6.5.2 -Release: 0.3 -License: MIT (core), SGI (GLU,libGLw) and others - see COPYRIGHT file +Version: 7.0.2 +Release: 6%{?with_multigl:.mgl} +License: MIT (core), SGI (GLU,libGLw) and others - see license.html file Group: X11/Libraries Source0: http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2 -# Source0-md5: e4d894181f1859651658b3704633e10d -# Source0: %{name}-%{snap}.tar.gz +# Source0-md5: 93e6ed7924ff069a4f883b4fce5349dc Source1: http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2 -# Source1-md5: e870efe98d3a50be01ab211b9b2e25d9 +# Source1-md5: 11a10410bae7be85cf25bc7119966468 +Source2: nouveau_drm.h Patch0: %{name}-realclean.patch +Patch1: %{name}-dri.patch URL: http://www.mesa3d.org/ BuildRequires: expat-devel -BuildRequires: libdrm-devel >= 2.2.0 +#%if %{with nouveau} +# needs nouveau_drm.h patchlevel=6 and matching kernel driver +#BuildRequires: libdrm-devel = 2.3.1.xxxxxxxx +#%else +BuildRequires: libdrm-devel >= 2.3.0 +#%endif BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.4d %{?with_motif:BuildRequires: motif-devel} BuildRequires: sed >= 4.0 +BuildRequires: xorg-lib-libXdamage-devel 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 -%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.4 - -%define _sysconfdir /etc/X11 - %description Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL(R). To the extent that Mesa utilizes the OpenGL command @@ -47,26 +50,26 @@ Silicon Graphics, Inc. However, the author does not possess an OpenGL 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 Requires: libdrm >= 2.2.0 -Provides: OpenGL = 1.5 +Provides: OpenGL = 2.1 # reports version 1.3, but supports glXGetProcAddress() from 1.4 Provides: OpenGL-GLX = 1.4 Obsoletes: Mesa Obsoletes: Mesa-dri -Obsoletes: X11-OpenGL-libGL -Obsoletes: XFree86-OpenGL-libGL +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 @@ -79,79 +82,79 @@ compatible replacement for OpenGL or associated with SGI. 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: X11-OpenGL-devel -Obsoletes: X11-OpenGL-devel-base -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 -Obsoletes: XFree86-OpenGL-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: X11-OpenGL-libs -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} @@ -162,12 +165,12 @@ Provides: OpenGL-GLU-devel = 1.3 %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} @@ -176,12 +179,12 @@ Provides: OpenGL-GLU-static = 1.3 %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 @@ -191,13 +194,13 @@ Provides: OpenGL-GLw %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 -License: SGI Free Software License B v1.1 +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki SGI libGLw +License: SGI MIT-like Group: Development/Libraries Requires: %{name}-libGLw = %{version}-%{release} Requires: OpenGL-devel >= 1.2 @@ -206,13 +209,13 @@ Provides: OpenGL-GLw-devel %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 -License: SGI Free Software License B v1.1 +Summary(pl.UTF-8): Statyczna biblioteka SGI libGLw +License: SGI MIT-like Group: Development/Libraries Requires: %{name}-libGLw-devel = %{version}-%{release} Provides: OpenGL-GLw-static @@ -220,284 +223,385 @@ Provides: OpenGL-GLw-static %description libGLw-static Static SGI libGLw library. -%description libGLw-static -l pl +%description libGLw-static -l pl.UTF-8 Statyczna biblioteka SGI libGLw. +%package libOSMesa +Summary: OSMesa (off-screen renderer) library +Summary(pl.UTF-8): Biblioteka OSMesa (renderująca bitmapy w pamięci) +License: MIT +Group: Libraries +# doesn't require base + +%description libOSMesa +OSMesa (off-screen renderer) library. + +%description libOSMesa -l pl.UTF-8 +Biblioteka OSMesa (renderująca bitmapy w pamięci). + +%package libOSMesa-devel +Summary: Header file for OSMesa (off-screen renderer) library +Summary(pl.UTF-8): Plik nagłówkowy biblioteki OSMesa (renderującej bitmapy w pamięci) +License: MIT +Group: Development/Libraries +Requires: %{name}-libOSMesa = %{version}-%{release} +# for only +Requires: OpenGL-devel + +%description libOSMesa-devel +Header file for OSMesa (off-screen renderer) library. + +%description libOSMesa-devel -l pl.UTF-8 +Plik nagłówkowy biblioteki OSMesa (renderującej bitmapy w pamięci). + +%package libOSMesa-static +Summary: Static OSMesa (off-screen renderer) library +Summary(pl.UTF-8): Biblioteka statyczna OSMesa (renderująca bitmapy w pamięci) +License: MIT +Group: Development/Libraries +Requires: %{name}-libOSMesa-devel = %{version}-%{release} +# this static build of OSMesa needs static non-dri Mesa implementation +Requires: %{name}-libGL-static = %{version}-%{release} + +%description libOSMesa-static +Static OSMesa (off-screen renderer) library. + +%description libOSMesa-static -l pl.UTF-8 +Biblioteka statyczna OSMesa (renderująca bitmapy w pamięci). + %package utils Summary: OpenGL utilities from Mesa3D -Summary(pl): Programy narzêdziowe OpenGL z projektu Mesa3D +Summary(pl.UTF-8): Programy narzędziowe OpenGL z projektu Mesa3D +License: MIT 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: Mesa Demos source code +Summary(pl.UTF-8): Kod źródłowy programów demonstrujących dla bibliotek Mesa +License: various (MIT, SGI, GPL - see copyright notes in sources) Group: Development/Libraries Requires: OpenGL-devel %description demos -Demonstration programs for the Mesa libraries. +Demonstration programs for the Mesa libraries in source code form. -%description demos -l pl -Programy demonstracyjne dla bibliotek Mesa. +%description demos -l pl.UTF-8 +Kod źródłowy programów demonstracyjnych dla bibliotek Mesa. %package dri-driver-ati-mach64 Summary: X.org DRI drivers -Summary(pl): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-ati Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-radeon-dri < 1:7.0.0 %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 +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-ati Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-radeon-dri < 1:7.0.0 %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 +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-ati Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-radeon-dri < 1:7.0.0 %description dri-driver-ati-radeon-R300 X.org DRI drivers for ATI R300 card family. -%description dri-driver-ati-radeon-R300 -l pl +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-ati Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-r128-dri < 1:7.0.0 %description dri-driver-ati-rage128 X.org DRI drivers for ATI rage128 card family. -%description dri-driver-ati-rage128 -l pl +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-glint Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-glint-dri < 1:7.0.0 %description dri-driver-glint X.org DRI drivers for GLINT/Permedia card family. -%description dri-driver-glint -l pl +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-i810 Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-i810-dri < 1:7.0.0 %description dri-driver-intel-i810 X.org DRI drivers for Intel i810 card family. -%description dri-driver-intel-i810 -l pl +%description dri-driver-intel-i810 -l pl.UTF-8 Sterowniki X.org DRI dla rodziny kart i810. -%package dri-driver-intel-i830 -Summary: X.org DRI drivers -Summary(pl): Sterowniki DRI dla X.org -Group: X11/Libraries -Requires: xorg-xserver-libglx(glapi) = %{version} -Requires: xorg-xserver-server - -%description dri-driver-intel-i830 -X.org DRI drivers for Intel i830 card family. - -%description dri-driver-intel-i830 -l pl -Sterowniki X.org DRI dla rodziny kart i830. - %package dri-driver-intel-i915 Summary: X.org DRI drivers -Summary(pl): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 < 1:7.0.0 %description dri-driver-intel-i915 X.org DRI drivers for Intel i915 card family. -%description dri-driver-intel-i915 -l pl +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 < 1:7.0.0 %description dri-driver-intel-i965 X.org DRI drivers for Intel i965 card family. -%description dri-driver-intel-i965 -l pl +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-mga Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-mga-dri < 1:7.0.0 %description dri-driver-matrox X.org DRI drivers for Matrox G card family. -%description dri-driver-matrox -l pl +%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 +License: MIT +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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-sis Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server +Obsoletes: X11-driver-sis-dri < 1:7.0.0 %description dri-driver-sis X.org DRI drivers for SiS card family. -%description dri-driver-sis -l pl +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 < 1:7.0.0 %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 +%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): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT Group: X11/Libraries +Requires: xorg-driver-video-trident Requires: xorg-xserver-libglx(glapi) = %{version} Requires: xorg-xserver-server %description dri-driver-trident X.org DRI drivers for Trident card family. -%description dri-driver-trident -l pl +%description dri-driver-trident -l pl.UTF-8 Sterowniki X.org DRI dla rodziny kart Trident. %package dri-driver-via-unichrome Summary: X.org DRI drivers -Summary(pl): Sterowniki DRI dla X.org +Summary(pl.UTF-8): Sterowniki DRI dla X.org +License: MIT 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 +%description dri-driver-via-unichrome -l pl.UTF-8 Sterowniki X.org DRI dla rodziny kart VIA Unichrome. %prep %setup -q -b1 -#%setup -q -n %{name} %patch0 -p0 +%patch1 -p1 + +# until new libdrm release and Mesa update for nouveau_drm patchlevel +cp %{SOURCE2} src/mesa/drivers/dri/nouveau # fix demos find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g" +# s3v, sis, trident missing there - don't override list from linux-dri +sed -i -e '/^DRI_DIRS/d' configs/linux-dri-x86-64 + +%if %{with nouveau} +sed -i -e 's/ ffb$/ ffb nouveau/' configs/linux-dri +%endif + %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} @@ -506,11 +610,18 @@ sed -i -e 's/ sis / /' configs/linux-dri %endif %build +# use $lib, not %{_lib} as Mesa uses lib64 only for *-x86-64* targets +%ifarch %{x8664} +targ=-x86-64 +lib=lib64 +%else +lib=lib %ifarch %{ix86} targ=-x86 %else targ="" %endif +%endif %{__make} linux${targ}-static \ CC="%{__cc}" \ @@ -520,7 +631,17 @@ targ="" GLW_SOURCES="GLwDrawA.c%{?with_motif: GLwMDrawA.c}" \ SRC_DIRS="mesa glu glw" \ PROGRAM_DIRS= -mv -f lib lib-static +mv -f ${lib} lib-static +%{__make} realclean + +%{__make} linux-osmesa \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ + OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \ + XLIB_DIR=%{_libdir} \ + SRC_DIRS="mesa" \ + PROGRAM_DIRS= +mv -f lib lib-osmesa %{__make} realclean %{__make} linux-dri${targ} \ @@ -539,7 +660,7 @@ mv -f lib lib-static OPT_FLAGS="%{rpmcflags}" \ XLIB_DIR=%{_libdir} \ PROGS="glxgears" \ - APP_LIB_DEPS="-L../../lib -lGL" + APP_LIB_DEPS="-L../../${lib} -lGL" %{__make} -C progs/xdemos \ CC="%{__cc}" \ @@ -547,44 +668,56 @@ mv -f lib lib-static OPT_FLAGS="%{rpmcflags}" \ XLIB_DIR=%{_libdir} \ PROGS="glxinfo" \ - APP_LIB_DEPS="-L../../lib -lGL -L../../lib-dri -lGLU" + APP_LIB_DEPS="-L../../${lib} -lGL -lGLU" -mv -f lib lib-dri -%{__make} clean \ - MKDEP=makedepend -%{__make} realclean +mv -f ${lib} lib-dri -%{__make} linux${targ} \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ - OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \ - XLIB_DIR=%{_libdir} \ - SRC_DIRS="mesa" \ - PROGRAM_DIRS= +# TODO: glw.pc (missing in 7.0.2 tarball) +for d in mesa glu ; do + %{__make} -C src/$d `basename src/$d/*.pc.in .in` \ + INSTALL_DIR=%{_prefix} \ + LIB_DIR=%{_lib} +done %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/GL,%{_examplesdir}/%{name}-%{version}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/GL,%{_pkgconfigdir},%{_examplesdir}/%{name}-%{version}} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri cp -df lib-static/lib* $RPM_BUILD_ROOT%{_libdir} +cp -df lib-osmesa/libOSMesa* $RPM_BUILD_ROOT%{_libdir} cp -df lib-dri/lib* $RPM_BUILD_ROOT%{_libdir} -cp -df lib/libOSMesa* $RPM_BUILD_ROOT%{_libdir} -cp -rf include/GL/{gl[!u]*,glu.h,glu_*,osmesa.h,xmesa*} src/glw/GLw*.h $RPM_BUILD_ROOT%{_includedir}/GL +cp -rf include/GL/{gl[!f]*,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 src/mesa/gl.pc $RPM_BUILD_ROOT%{_pkgconfigdir} +install src/glu/glu.pc $RPM_BUILD_ROOT%{_pkgconfigdir} +#install src/glw/glw.pc $RPM_BUILD_ROOT%{_pkgconfigdir} + install progs/xdemos/{glxgears,glxinfo} $RPM_BUILD_ROOT%{_bindir} -for l in demos redbook samples xdemos ; do - %{__make} -C progs/$l clean +# work on copy to keep -bi --short-circuit working +rm -rf progs-clean +install -d progs-clean +for l in demos glsl osdemos redbook samples xdemos ; do + cp -a progs/$l progs-clean/$l + %{__make} -C progs-clean/$l clean + cp -Rf progs-clean/$l $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$l done -for l in demos redbook samples util xdemos images ; do +rm -rf progs-clean +for l in util 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}} +%if %{with multigl} +install -d $RPM_BUILD_ROOT{%{_libdir}/Mesa,%{_sysconfdir}/ld.so.conf.d} + +mv -f $RPM_BUILD_ROOT%{_libdir}/libGL.so.* $RPM_BUILD_ROOT%{_libdir}/Mesa +ln -sf Mesa/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so + +echo %{_libdir}/Mesa >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/Mesa.conf +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -600,43 +733,53 @@ rm -rf $RPM_BUILD_ROOT %files libGL %defattr(644,root,root,755) %doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS},RELNOTES*} +%if %{with multigl} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/Mesa.conf +%dir %{_libdir}/Mesa +%attr(755,root,root) %{_libdir}/Mesa/libGL.so.*.* +%attr(755,root,root) %ghost %{_libdir}/Mesa/libGL.so.1 +%else %attr(755,root,root) %{_libdir}/libGL.so.*.* -%attr(755,root,root) %{_libdir}/libOSMesa.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libGL.so.1 # 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 +%endif %files libGL-devel %defattr(644,root,root,755) %doc docs/*.spec -%attr(755,root,root) %{_libdir}/libOSMesa.so +%if %{with multigl} +%attr(755,root,root) %{_libdir}/libGL.so +%endif %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 %{_includedir}/GL/glx_mangle.h -%{_includedir}/GL/osmesa.h -%{_includedir}/GL/xmesa.h -%{_includedir}/GL/xmesa_x.h -%{_includedir}/GL/xmesa_xf86.h +%{_pkgconfigdir}/gl.pc %files libGL-static %defattr(644,root,root,755) %{_libdir}/libGL.a -%{_libdir}/libOSMesa.a +# x11 (non-dri) Mesa API +%{_includedir}/GL/xmesa.h +%{_includedir}/GL/xmesa_x.h +%{_includedir}/GL/xmesa_xf86.h %files libGLU %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libGLU.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libGLU.so.1 %files libGLU-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libGLU.so %{_includedir}/GL/glu.h %{_includedir}/GL/glu_mangle.h +%{_pkgconfigdir}/glu.pc %files libGLU-static %defattr(644,root,root,755) @@ -645,6 +788,7 @@ rm -rf $RPM_BUILD_ROOT %files libGLw %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libGLw.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libGLw.so.1 %files libGLw-devel %defattr(644,root,root,755) @@ -653,11 +797,26 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/GL/GLwDrawAP.h %{_includedir}/GL/GLwMDrawA.h %{_includedir}/GL/GLwMDrawAP.h +#%{_pkgconfigdir}/glw.pc %files libGLw-static %defattr(644,root,root,755) %{_libdir}/libGLw.a +%files libOSMesa +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libOSMesa.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libOSMesa.so.6 + +%files libOSMesa-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libOSMesa.so +%{_includedir}/GL/osmesa.h + +%files libOSMesa-static +%defattr(644,root,root,755) +%{_libdir}/libOSMesa.a + %files utils %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/glxgears @@ -701,12 +860,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/dri/i810_dri.so -%if 0 -%files dri-driver-intel-i830 -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/xorg/modules/dri/i830_dri.so -%endif - %files dri-driver-intel-i915 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so @@ -720,6 +873,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/dri/mga_dri.so +%if %{with nouveau} +%files dri-driver-nouveau +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so +%endif + %files dri-driver-s3virge %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/dri/s3v_dri.so