/[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 1217642 by tv, Wed Apr 11 20:34:11 2018 UTC revision 1333397 by tmb, Thu Nov 22 20:26:18 2018 UTC
# Line 1  Line 1 
 %bcond_with wayland  
   
1  # (cg) Cheater...  # (cg) Cheater...
2  %define Werror_cflags %nil  %define Werror_cflags %nil
3    
# Line 13  Line 11 
11  %define opengl_ver 4.5  %define opengl_ver 4.5
12    
13  # define version, RC & release  # define version, RC & release
14  %define main_version            18.0.0  %define main_version            18.3.0
15  #define relc                    5  %define relc                    4
16  %define rel                     5  %define rel                     1
17    
18  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}
19    
# Line 106  Line 104 
104  %define platform_drivers ,i915,i965  %define platform_drivers ,i915,i965
105  %define gallium_platform_drivers ,svga  %define gallium_platform_drivers ,svga
106  %endif  %endif
107    
108    %define with_wayland_egl 0
109    
110  %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}  %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
111    
112  Name:           mesa  Name:           mesa
# Line 132  BuildRequires: pkgconfig(xcb-present)  > Line 133  BuildRequires: pkgconfig(xcb-present)  >
133  BuildRequires:  pkgconfig(xext)         >= 1.1.1  BuildRequires:  pkgconfig(xext)         >= 1.1.1
134  BuildRequires:  pkgconfig(xxf86vm)      >= 1.1.0  BuildRequires:  pkgconfig(xxf86vm)      >= 1.1.0
135  BuildRequires:  pkgconfig(xi)           >= 1.3  BuildRequires:  pkgconfig(xi)           >= 1.3
136    BuildRequires:  pkgconfig(xrandr)
137  BuildRequires:  pkgconfig(talloc)  BuildRequires:  pkgconfig(talloc)
138    BuildRequires:  python2-libxml2
139    BuildRequires:  python2-mako
140  BuildRequires:  python3-libxml2  BuildRequires:  python3-libxml2
141  BuildRequires:  python3-mako  BuildRequires:  python3-mako
142  BuildRequires:  makedepend  BuildRequires:  makedepend
# Line 145  BuildRequires:  pkgconfig(libudev) Line 149  BuildRequires:  pkgconfig(libudev)
149  BuildRequires:  pkgconfig(libva)  BuildRequires:  pkgconfig(libva)
150  %endif  %endif
151  BuildRequires:  pkgconfig(vdpau)  BuildRequires:  pkgconfig(vdpau)
 %if %{with wayland}  
152  BuildRequires: pkgconfig(wayland-client)  BuildRequires: pkgconfig(wayland-client)
153  BuildRequires: pkgconfig(wayland-server)  BuildRequires: pkgconfig(wayland-server)
154  BuildRequires: pkgconfig(wayland-protocols)  BuildRequires: pkgconfig(wayland-protocols)
 %endif  
155  %if %{enable_vulkan}  %if %{enable_vulkan}
156  BuildRequires:  libgcrypt-devel  BuildRequires:  libgcrypt-devel
157  %endif  %endif
# Line 165  Source0:       https://mesa.freedesktop.org/ar Line 167  Source0:       https://mesa.freedesktop.org/ar
167  %endif  %endif
168  Source3:        make-git-snapshot.sh  Source3:        make-git-snapshot.sh
169    
170  # Instructions to setup your repository clone  Patch000:       fix-linking.patch
 # git://git.freedesktop.org/git/mesa/mesa  
 # git checkout mesa_7_5_branch  
 # git branch mdv-cherry-picks  
 # git am ../02??-*.patch  
 # git branch mdv-redhat  
 # git am ../03??-*.patch  
 # git branch mdv-patches  
 # git am ../09??-*.patch  
 # In order to update to the branch via patches, issue this command:  
 # git format-patch --start-number 100 mesa_7_5_1..mesa_7_5_branch | sed 's/^0\([0-9]\+\)-/Patch\1: 0\1-/'  
   
 # Cherry picks  
 # git format-patch --start-number 200 mesa_7_5_branch..mdv-cherry-picks  
   
 # Patches "liberated" from Fedora:  
 # http://pkgs.fedoraproject.org/cgit/rpms/mesa.git/  
 # git format-patch --start-number 300 mdv-cherry-picks..mdv-redhat  
171    
172  # https://cgit.freedesktop.org/~ajax/mesa/log/?h=mesa-17.2-s3tc  # mesa staging/18.3 branch from 1
173    Patch001:       winsys-amdgpu-fix-a-buffer-leak-in-amdgpu_bo_from_handle.patch
174    
175  # Patches from ChromiumOS  # mesa master branch from 101
 # http://git.chromium.org/gitweb/?p=chromiumos/overlays/chromiumos-overlay.git;a=tree;f=media-libs/mesa/files;hb=HEAD  
176    
 # Mageia/Mandriva patches  
 # git format-patch --start-number 900 mdv-redhat..mdv-patches  
177    
178  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
179    
# Line 326  Requires:      %{libgbmname} = %{version}-%{r Line 309  Requires:      %{libgbmname} = %{version}-%{r
309  Provides:       lib%{gbmname}-devel  Provides:       lib%{gbmname}-devel
310  Provides:       %{gbmname}-devel  Provides:       %{gbmname}-devel
311    
312  %if %{with wayland}  %if %{?with_wayland_egl}
313  %package -n     %{libwaylandeglname}  %package -n     %{libwaylandeglname}
314  Summary:        Files for Mesa (Wayland EGL libs)  Summary:        Files for Mesa (Wayland EGL libs)
315  Group:          System/Libraries  Group:          System/Libraries
# Line 482  GBM (Graphics Buffer Manager) parts. Line 465  GBM (Graphics Buffer Manager) parts.
465  Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.  Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.
466  GBM (Graphics Buffer Manager) development parts.  GBM (Graphics Buffer Manager) development parts.
467    
468  %if %{with wayland}  %if %{?with_wayland_egl}
469  %description -n %{libwaylandeglname}  %description -n %{libwaylandeglname}
470  Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.  Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.
471  Wayland EGL platform parts.  Wayland EGL platform parts.
# Line 549  automake --add-missing Line 532  automake --add-missing
532                  --disable-xvmc \                  --disable-xvmc \
533                  --enable-vdpau \                  --enable-vdpau \
534                  %{?with_vaapi:--enable-va} \                  %{?with_vaapi:--enable-va} \
535                  --with-platforms=x11,drm,surfaceless%{?with_wayland:,wayland} \                  --with-platforms=x11,drm,surfaceless,wayland \
536                  --enable-shared-glapi \                  --enable-shared-glapi \
537                  --enable-gbm \                  --enable-gbm \
538                  --enable-glx \                  --enable-glx \
# Line 590  rm -f %{buildroot}%{_includedir}/GL/w*.h Line 573  rm -f %{buildroot}%{_includedir}/GL/w*.h
573  # remove .la files  # remove .la files
574  find %{buildroot} -name '*.la' -delete  find %{buildroot} -name '*.la' -delete
575    
576    # remove libwayland-egl on F28+ where it's built as part of wayland source package
577    %if !%{?with_wayland_egl}
578    rm -f %{buildroot}%{_libdir}/libwayland-egl.so*
579    rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
580    %endif
581    
582  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
583    
584  %files  %files
585  %config(noreplace) %{_sysconfdir}/drirc  /usr/share/drirc.d/
586    
587  %files -n %{dridrivers}  %files -n %{dridrivers}
588  %dir %{_libdir}/dri  %dir %{_libdir}/dri
# Line 627  find %{buildroot} -name '*.la' -delete Line 616  find %{buildroot} -name '*.la' -delete
616  %{_libdir}/libgbm.so.%{gbmmajor}  %{_libdir}/libgbm.so.%{gbmmajor}
617  %{_libdir}/libgbm.so.%{gbmmajor}.*  %{_libdir}/libgbm.so.%{gbmmajor}.*
618    
619  %if %{with wayland}  %if %{?with_wayland_egl}
620  %files -n %{libwaylandeglname}  %files -n %{libwaylandeglname}
621  %{_libdir}/libwayland-egl.so.%{waylandeglmajor}  %{_libdir}/libwayland-egl.so.%{waylandeglmajor}
622  %{_libdir}/libwayland-egl.so.%{waylandeglmajor}.*  %{_libdir}/libwayland-egl.so.%{waylandeglmajor}.*
# Line 689  find %{buildroot} -name '*.la' -delete Line 678  find %{buildroot} -name '*.la' -delete
678  %{_includedir}/gbm.h  %{_includedir}/gbm.h
679  %{_libdir}/pkgconfig/gbm.pc  %{_libdir}/pkgconfig/gbm.pc
680    
681  %if %{with wayland}  %if %{?with_wayland_egl}
682  %files -n %{libwaylandeglname}-devel  %files -n %{libwaylandeglname}-devel
683  %{_libdir}/libwayland-egl.so  %{_libdir}/libwayland-egl.so
684  %{_libdir}/pkgconfig/wayland-egl.pc  %{_libdir}/pkgconfig/wayland-egl.pc

Legend:
Removed from v.1217642  
changed lines
  Added in v.1333397

  ViewVC Help
Powered by ViewVC 1.1.30