/[packages]/cauldron/mesa/current/SPECS/mesa.spec
ViewVC logotype

Diff of /cauldron/mesa/current/SPECS/mesa.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 289354 by blino, Fri Sep 7 17:58:33 2012 UTC revision 289355 by blino, Fri Sep 7 17:59:23 2012 UTC
# Line 48  Line 48 
48  %define dricorename             dricore  %define dricorename             dricore
49  %define eglname                 mesaegl  %define eglname                 mesaegl
50  %define glname                  mesagl  %define glname                  mesagl
 %define gluname                 mesaglu  
51  %define glwname                 mesaglw  %define glwname                 mesaglw
52  %define glesv1name              mesaglesv1  %define glesv1name              mesaglesv1
53  %define glesv2name              mesaglesv2  %define glesv2name              mesaglesv2
# Line 60  Line 59 
59  %define dricoremajor            1  %define dricoremajor            1
60  %define eglmajor                1  %define eglmajor                1
61  %define glmajor                 1  %define glmajor                 1
 %define glumajor                1  
62  %define glwmajor                1  %define glwmajor                1
63  %define glesv1major             1  %define glesv1major             1
64  %define glesv2major             2  %define glesv2major             2
# Line 73  Line 71 
71  %define libdricorename          %mklibname %{dricorename} %{dricoremajor}  %define libdricorename          %mklibname %{dricorename} %{dricoremajor}
72  %define libeglname              %mklibname %{eglname} %{eglmajor}  %define libeglname              %mklibname %{eglname} %{eglmajor}
73  %define libglname               %mklibname %{glname} %{glmajor}  %define libglname               %mklibname %{glname} %{glmajor}
 %define libgluname              %mklibname %{gluname} %{glumajor}  
74  %define libglwname              %mklibname %{glwname} %{glwmajor}  %define libglwname              %mklibname %{glwname} %{glwmajor}
75  %define libglesv1name           %mklibname %{glesv1name}_ %{glesv1major}  %define libglesv1name           %mklibname %{glesv1name}_ %{glesv1major}
76  %define libglesv2name           %mklibname %{glesv2name}_ %{glesv2major}  %define libglesv2name           %mklibname %{glesv2name}_ %{glesv2major}
# Line 91  Line 88 
88  %define libdricorename_virt     lib%{dricorename}  %define libdricorename_virt     lib%{dricorename}
89  %define libeglname_virt         lib%{eglname}  %define libeglname_virt         lib%{eglname}
90  %define libglname_virt          lib%{glname}  %define libglname_virt          lib%{glname}
 %define libgluname_virt         lib%{gluname}  
91  %define libglwname_virt         lib%{glwname}  %define libglwname_virt         lib%{glwname}
92  %define libglesv1name_virt      lib%{glesv1name}  %define libglesv1name_virt      lib%{glesv1name}
93  %define libglesv2name_virt      lib%{glesv2name}  %define libglesv2name_virt      lib%{glesv2name}
# Line 101  Line 97 
97  %define libwaylandeglname_virt  lib%{waylandeglname}  %define libwaylandeglname_virt  lib%{waylandeglname}
98    
99  %define oldlibglname            %mklibname MesaGL 1  %define oldlibglname            %mklibname MesaGL 1
 %define oldlibgluname           %mklibname MesaGLU 1  
100    
101  %define mesasrcdir              %{_prefix}/src/Mesa/  %define mesasrcdir              %{_prefix}/src/Mesa/
102  %define driver_dir              %{_libdir}/dri  %define driver_dir              %{_libdir}/dri
# Line 181  Patch001: 0001-Fix-undefined-symbols-in- Line 176  Patch001: 0001-Fix-undefined-symbols-in-
176  Patch201: 0201-revert-fix-glxinitializevisualconfigfromtags-handling.patch  Patch201: 0201-revert-fix-glxinitializevisualconfigfromtags-handling.patch
177  # (blino) should be pushed to 9.0 branch upstream  # (blino) should be pushed to 9.0 branch upstream
178  Patch202: 0202-radeon-llvm-Cleanup-makefile.patch  Patch202: 0202-radeon-llvm-Cleanup-makefile.patch
179    Patch203: 0203-radeon-llvm-Remove-R600InstrInfo.td-from-TD_FILES.patch
180    
181  # Patches "liberated" from Fedora:  # Patches "liberated" from Fedora:
182  # http://cvs.fedoraproject.org/viewvc/rpms/mesa/devel/  # http://cvs.fedoraproject.org/viewvc/rpms/mesa/devel/
# Line 255  Provides:      libMesaGL-devel = %{version}-% Line 251  Provides:      libMesaGL-devel = %{version}-%
251  Provides:       MesaGL-devel = %{version}-%{release}  Provides:       MesaGL-devel = %{version}-%{release}
252  Provides:       libgl-devel  Provides:       libgl-devel
253    
 %package -n     %{libgluname}  
 Summary:        Files for Mesa (GLU libs)  
 Group:          System/Libraries  
 Obsoletes:      %{oldlibgluname} < 6.4  
 Provides:       %{oldlibgluname} = %{version}-%{release}  
 Provides:       %{libgluname_virt} = %{version}-%{release}  
   
 %package -n     %{libgluname}-devel  
 Summary:        Development files for GLU libs  
 Group:          Development/C  
 Requires:       %{libgluname} = %{version}-%{release}  
 Provides:       lib%{gluname}-devel = %{version}-%{release}  
 Provides:       %{gluname}-devel = %{version}-%{release}  
 Obsoletes:      %{oldlibgluname}-devel < 6.4  
 Provides:       %{oldlibgluname}-devel = %{version}-%{release}  
 Provides:       libMesaGLU-devel = %{version}-%{release}  
 Provides:       MesaGLU-devel = %{version}-%{release}  
 Provides:       libglu-devel  
 # pkgconfig files moved from libgl-devel:  
 Conflicts:      %{libglname}-devel < 7.10.2-4  
   
254  %if %{enable_egl}  %if %{enable_egl}
255  %package -n     %{libeglname}  %package -n     %{libeglname}
256  Summary:        Files for Mesa (EGL libs)  Summary:        Files for Mesa (EGL libs)
# Line 409  Provides:      hackMesa-common-devel = %{vers Line 384  Provides:      hackMesa-common-devel = %{vers
384  Obsoletes:      Mesa-common-devel < %{version}  Obsoletes:      Mesa-common-devel < %{version}
385  Obsoletes:      hackMesa-common-devel < %{version}  Obsoletes:      hackMesa-common-devel < %{version}
386  Requires:       %{libglname}-devel = %{version}  Requires:       %{libglname}-devel = %{version}
387  Requires:       %{libgluname}-devel = %{version}  Requires:       mesaglu-devel
388  Requires:       freeglut-devel  Requires:       freeglut-devel
389  Requires:       %{libeglname}-devel = %{version}  Requires:       %{libeglname}-devel = %{version}
390  Requires:       %{libglesv1name}-devel = %{version}  Requires:       %{libglesv1name}-devel = %{version}
# Line 465  Mesa is an OpenGL 2.1 compatible 3D grap Line 440  Mesa is an OpenGL 2.1 compatible 3D grap
440    
441  This package contains the headers needed to compile Mesa programs.  This package contains the headers needed to compile Mesa programs.
442    
 %description -n %{libgluname}  
 GLU is the OpenGL Utility Library.  
 It provides a number of functions upon the base OpenGL library to provide  
 higher-level drawing routines from the more primitive routines provided by  
 OpenGL.  
   
 %description -n %{libgluname}-devel  
 This package contains the headers needed to compile programs with GLU.  
   
443  %description -n %{libglesv1name}  %description -n %{libglesv1name}
444  OpenGL ES is a low-level, lightweight API for advanced embedded graphics using  OpenGL ES is a low-level, lightweight API for advanced embedded graphics using
445  well-defined subset profiles of OpenGL.  well-defined subset profiles of OpenGL.
# Line 661  find %{buildroot} -name '*.la' -exec rm Line 627  find %{buildroot} -name '*.la' -exec rm
627  %dir %{_libdir}/mesa  %dir %{_libdir}/mesa
628  %{_libdir}/mesa/libGL.so.%{glmajor}*  %{_libdir}/mesa/libGL.so.%{glmajor}*
629    
 %files -n %{libgluname}  
 %defattr(-,root,root)  
 %doc docs/COPYING  
 %{_libdir}/libGLU.so.%{glumajor}*  
   
630  %if %{enable_egl}  %if %{enable_egl}
631  %files -n %{libeglname}  %files -n %{libeglname}
632  %defattr(-,root,root)  %defattr(-,root,root)
# Line 736  find %{buildroot} -name '*.la' -exec rm Line 697  find %{buildroot} -name '*.la' -exec rm
697  %dir %{_includedir}/GL/internal  %dir %{_includedir}/GL/internal
698  %{_includedir}/GL/internal/dri_interface.h  %{_includedir}/GL/internal/dri_interface.h
699    
 %files -n %{libgluname}-devel  
 %defattr(-,root,root)  
 %doc docs/COPYING  
 %dir %{_includedir}/GL  
 %{_includedir}/GL/glu.h  
 %{_includedir}/GL/glu_mangle.h  
 %{_libdir}/libGLU.so  
 %{_libdir}/pkgconfig/glu.pc  
   
700  %files common-devel  %files common-devel
701  %defattr(-,root,root)  %defattr(-,root,root)
702    

Legend:
Removed from v.289354  
changed lines
  Added in v.289355

  ViewVC Help
Powered by ViewVC 1.1.26