rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 42715 from X11:XOrg

Browse Source 
checked in (request 42715)

OBS-URL: https://build.opensuse.org/request/show/42715
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=117
This commit is contained in:
OBS User autobuild 2010-07-19 11:29:58 +00:00 committed by Git OBS Bridge
parent bab108068b
commit 999d4bf676
4 changed files with 44 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mesa.changes
View File

@ -1,12 +1,3 @@
-------------------------------------------------------------------
Wed Jul 7 00:00:00 CEST 2010 - johannesobermayr@gmx.de
- bnc #620037
* create nouveau_vieux_dri.so
* add libdrm_nouveau.diff
* separate Mesa-nouveau3d package
- fix some RPMLINT warnings
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 25 11:15:20 CEST 2010 - sndirsch@suse.de Fri Jun 25 11:15:20 CEST 2010 - sndirsch@suse.de

122
Mesa.spec
View File

@ -19,28 +19,24 @@
%define enable_nouveau 1 %define enable_nouveau 1
%define _version 7.8.2
Version: 7.8.2
Release: 2
Name: Mesa Name: Mesa
BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
Url: http://www.mesa3d.org Url: http://www.mesa3d.org
License: MIT License (or similar) License: MIT License (or similar)
Group: System/Libraries Group: System/Libraries
Provides: xorg-x11-Mesa = %{version} intel-i810-Mesa = %{version} Mesa7 = %{version} Provides: xorg-x11-Mesa intel-i810-Mesa Mesa7
Obsoletes: xorg-x11-Mesa < %{version} intel-i810-Mesa < %{version} Mesa7 < %{version} Obsoletes: xorg-x11-Mesa intel-i810-Mesa Mesa7
AutoReqProv: on AutoReqProv: on
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: XFree86-Mesa-64bit < %{version} Mesa-64bit < %{version} Obsoletes: XFree86-Mesa-64bit
Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} Obsoletes: Mesa-64bit
%endif %endif
# #
Summary: System for rendering interactive 3-D graphics %define _version 7.8.2
Version: 7.8.2
Release: 1
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
Source: MesaLib-%{_version}.tar.bz2 Source: MesaLib-%{_version}.tar.bz2
Source1: MesaDemos-%{_version}.tar.bz2 Source1: MesaDemos-%{_version}.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
@ -53,7 +49,6 @@ Patch1: dri_driver_dir.diff
Patch8: egl-buildfix.diff Patch8: egl-buildfix.diff
Patch9: Mesa_indirect_old_xserver_compatibility.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff
Patch10: mesa-commit-06c72da.diff Patch10: mesa-commit-06c72da.diff
Patch11: libdrm_nouveau.diff.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -81,15 +76,15 @@ Authors:
License: MIT License (or similar) License: MIT License (or similar)
Requires: Mesa = %version xorg-x11-devel libdrm-devel Requires: Mesa = %version xorg-x11-devel libdrm-devel
Summary: Libraries, includes and more to develop Mesa applications Summary: Libraries, includes and more to develop Mesa applications
Group: Development/Libraries/X11 Group: System/Libraries
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: XFree86-Mesa-devel-64bit < %{version} Mesa-devel-64bit < %{version} Obsoletes: XFree86-Mesa-devel-64bit
Provides: XFree86-Mesa-devel-64bit = %{version} Mesa-devel-64bit = %{version} Obsoletes: Mesa-devel-64bit
%endif %endif
# #
Provides: xorg-x11-Mesa-devel = %{version} Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel Mesa-devel-static
Obsoletes: xorg-x11-Mesa-devel < %{version} Mesa-devel-static < %{version} Obsoletes: xorg-x11-Mesa-devel Mesa-devel-static
%description devel %description devel
Mesa is a 3-D graphics library with an API which is very similar to Mesa is a 3-D graphics library with an API which is very similar to
@ -112,40 +107,18 @@ Authors:
-------- --------
Brian Paul Brian Paul
%package nouveau3d
Requires: Mesa = %version xorg-x11-driver-video-nouveau
Summary: Experimental 3D driver for nouveau driver
Group: System/Libraries
%description nouveau3d
This is the 3D driver for open source nouveau driver. It uses Gallium3d architecture within Mesa.
Note:
This driver is in a very experimental state. So it is not recommend that you use it.
Bug reports using this driver are not supported by developers.
Authors:
--------
Brian Paul
Pekka Paalanen
Ben Skeggs
Francisco Jerez
%prep %prep
%setup -n %{name}-%{_version} -b1 -b4 -q %setup -n %{name}-%{_version} -b1 -b4 -q
# no need to build (GLUT-)Demos # no need to build (GLUT-)Demos
rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
# we use freeglut # we use freeglut
rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
# remove some docs
rm -rf docs/README.{VMS,WIN32,OS2}
%patch1 %patch1
sed -i 's/REPLACE/%_lib/g' src/glx/Makefile sed -i 's/REPLACE/%_lib/g' src/glx/Makefile
sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
%patch8 %patch8
%patch9 -p0 %patch9 -p0
%patch10 -p1 %patch10 -p1
%patch11 -p1
%build %build
@ -156,22 +129,14 @@ autoreconf -fi
%configure --disable-glw \ %configure --disable-glw \
--with-driver=dri \ --with-driver=dri \
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%if 0%{?suse_version} >= 1130
--with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast,nouveau \
%else
--with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast \ --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast \
%endif
%if %enable_nouveau %if %enable_nouveau
--enable-gallium-nouveau \ --enable-gallium-nouveau \
%endif %endif
%endif %endif
%ifarch ppc %sparc hppa %ifarch ppc %sparc hppa
%if 0%{?suse_version} >= 1130
--with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast,nouveau \
%else
--with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast \ --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast \
%endif %endif
%endif
%ifarch s390 s390x %ifarch s390 s390x
--with-dri-drivers=swrast \ --with-dri-drivers=swrast \
%endif %endif
@ -208,9 +173,6 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
# global drirc file # global drirc file
mkdir -p $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/etc
install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%if 0%{?suse_version} > 1020
%fdupes -s $RPM_BUILD_ROOT/%_mandir
%endif
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -223,37 +185,41 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%doc docs/README* docs/COPYING %doc docs/README* docs/COPYING
%config /etc/drirc %config /etc/drirc
%{_libdir}/lib*.so.* /usr/include/GL/gl.h
%{_libdir}/dri/ /usr/include/GL/glext.h
%{_libdir}/egl/ /usr/include/GL/glx.h
%exclude %{_libdir}/dri/nouveau_dri.so /usr/include/GL/glxext.h
%if 0%{?suse_version} >= 1130 /usr/%{_lib}/libGL.so
%exclude %{_libdir}/dri/nouveau_vieux_dri.so /usr/%{_lib}/lib*.so.*
%endif /usr/%{_lib}/dri/
/usr/%{_lib}/egl/
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc docs/*.html docs/*.spec %doc docs/*.html docs/*.spec
%{_includedir}/GL /usr/include/GL/gl_mangle.h
%{_includedir}/EGL /usr/include/GL/glfbdev.h
%{_includedir}/KHR /usr/include/GL/glu.h
%exclude %{_includedir}/GL/glew.h /usr/include/GL/glu_mangle.h
%exclude %{_includedir}/GL/glxew.h /usr/include/GL/glx_mangle.h
%exclude %{_includedir}/GL/wglew.h /usr/include/GL/mesa_wgl.h
%{_libdir}/libGL.so /usr/include/GL/mglmesa.h
%{_libdir}/libGLU.so /usr/include/GL/osmesa.h
%{_libdir}/libOSMesa.so /usr/include/GL/vms_x_fix.h
%{_libdir}/libEGL.so /usr/include/GL/wmesa.h
%{_libdir}/pkgconfig/dri.pc /usr/include/GL/internal/dri_interface.h
%{_libdir}/pkgconfig/gl.pc /usr/include/GL/wglext.h
%{_libdir}/pkgconfig/glu.pc /usr/include/EGL
/usr/include/KHR
%exclude /usr/include/GL/glew.h
%exclude /usr/include/GL/glxew.h
%exclude /usr/include/GL/wglew.h
/usr/%{_lib}/libGLU.so
/usr/%{_lib}/libOSMesa.so
/usr/%{_lib}/libEGL.so
/usr/%{_lib}/pkgconfig/dri.pc
/usr/%{_lib}/pkgconfig/gl.pc
/usr/%{_lib}/pkgconfig/glu.pc
%{_mandir}/man3/* %{_mandir}/man3/*
%files nouveau3d
%defattr(-,root,root)
%{_libdir}/dri/nouveau_dri.so
%if 0%{?suse_version} >= 1130
%{_libdir}/dri/nouveau_vieux_dri.so
%endif
%changelog %changelog

1
baselibs.conf
View File

@ -5,4 +5,3 @@ Mesa
Mesa-devel Mesa-devel
obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>" obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
provides "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>" provides "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
Mesa-nouveau3d

3
libdrm_nouveau.diff.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0490134931762050b739cd735ea70e2605c53b1031e580a2d0092abd05583704
size 38449