- up to 8.0.2 + git fixes

[packages/Mesa.git] / Mesa.spec

diff --git a/Mesa.spec b/Mesa.spec
index 1555b50cd2504265d97e5f5fcd117ee290305591..0f486ab8466da77b92c008fd320ab9a363908465 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -12,7 +12,8 @@
 %bcond_without gallium_nouveau # gallium nouveau driver
 %bcond_without osmesa          # OSMesa libraries
 %bcond_without gbm             # Graphics Buffer Manager
 %bcond_without gallium_nouveau # gallium nouveau driver
 %bcond_without osmesa          # OSMesa libraries
 %bcond_without gbm             # Graphics Buffer Manager

-%bcond_with    xa              # XA state tracker (for future vmwgfx xorg driver)
+%bcond_without wayland         # Wayland EGL
+%bcond_without xa              # XA state tracker (for vmwgfx xorg driver)

 %bcond_with    static_libs     # static libraries [not supported for DRI, thus broken currently]
 #
 # minimal supported xserver version
 %bcond_with    static_libs     # static libraries [not supported for DRI, thus broken currently]
 #
 # minimal supported xserver version


@@ -29,14 +30,16 @@
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa

-Version:       8.0.1
+Version:       8.0.2

 Release:       1
 License:       MIT (core), SGI (GLU) and others - see license.html file
 Group:         X11/Libraries
 Source0:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
 Release:       1
 License:       MIT (core), SGI (GLU) and others - see license.html file
 Group:         X11/Libraries
 Source0:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2

-# Source0-md5: 24eeebf66971809d8f40775a379b36c9
+# Source0-md5: a368104e5700707048dc3e8691a9a7a1
+Patch100:      %{name}-git.patch

 Patch0:                %{name}-realclean.patch
 Patch1:                %{name}-link.patch
 Patch0:                %{name}-realclean.patch
 Patch1:                %{name}-link.patch

+Patch2:                %{name}-wayland.patch

 URL:           http://www.mesa3d.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 URL:           http://www.mesa3d.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake


@@ -57,6 +60,8 @@ BuildRequires:        python-libxml2
 BuildRequires: python-modules
 BuildRequires: rpmbuild(macros) >= 1.470
 BuildRequires: sed >= 4.0
 BuildRequires: python-modules
 BuildRequires: rpmbuild(macros) >= 1.470
 BuildRequires: sed >= 4.0

+# wayland-{client,server}
+%{?with_wayland:BuildRequires: wayland-devel}

 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXext-devel >= 1.0.5
 BuildRequires: xorg-lib-libXfixes-devel
 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXext-devel >= 1.0.5
 BuildRequires: xorg-lib-libXfixes-devel


@@ -85,6 +90,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{without egl}
 %undefine      with_gbm
 
 %if %{without egl}
 %undefine      with_gbm

+%undefine      with_wayland

 %endif
 
 # _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)
 %endif
 
 # _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)


@@ -122,6 +128,9 @@ Requires:   libdrm >= %{libdrm_ver}
 Requires:      %{name}-libOpenVG = %{version}-%{release}
 Requires:      udev-libs >= 1:150
 %endif
 Requires:      %{name}-libOpenVG = %{version}-%{release}
 Requires:      udev-libs >= 1:150
 %endif

+%if %{with gbm}
+Requires:      %{name}-libgbm = %{version}-%{release}
+%endif

 Provides:      EGL = 1.4
 
 %description libEGL
 Provides:      EGL = 1.4
 
 %description libEGL


@@ -140,6 +149,7 @@ Summary:    Header files for Mesa implementation of EGL library
 Summary(pl.UTF-8):     Pliki nagłówkowe implementacji Mesa biblioteki EGL
 License:       MIT
 Group:         Development/Libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe implementacji Mesa biblioteki EGL
 License:       MIT
 Group:         Development/Libraries

+Requires:      %{name}-khrplatform-devel = %{version}-%{release}

 Requires:      %{name}-libEGL = %{version}-%{release}
 Requires:      libdrm-devel >= %{libdrm_ver}
 Requires:      xorg-lib-libX11-devel
 Requires:      %{name}-libEGL = %{version}-%{release}
 Requires:      libdrm-devel >= %{libdrm_ver}
 Requires:      xorg-lib-libX11-devel


@@ -278,7 +288,8 @@ ES 1.1 i 2.0.
 Summary:       Header files for Mesa GLES libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek Mesa GLES
 Group:         Development/Libraries
 Summary:       Header files for Mesa GLES libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek Mesa GLES
 Group:         Development/Libraries

-# EGL for <KHR/khrplatform.h> always required, <EGL/egl.h> for <GLES/egl.h>
+Requires:      %{name}-khrplatform-devel = %{version}-%{release}
+# <EGL/egl.h> for <GLES/egl.h>

 Requires:      %{name}-libEGL-devel = %{version}-%{release}
 Requires:      %{name}-libGLES = %{version}-%{release}
 
 Requires:      %{name}-libEGL-devel = %{version}-%{release}
 Requires:      %{name}-libGLES = %{version}-%{release}
 


@@ -407,8 +418,7 @@ Summary:    Header file for Mesa OpenVG library
 Summary(pl.UTF-8):     Plik nagłówkowy biblioteki Mesa OpenVG
 License:       MIT
 Group:         Development/Libraries
 Summary(pl.UTF-8):     Plik nagłówkowy biblioteki Mesa OpenVG
 License:       MIT
 Group:         Development/Libraries

-# EGL headers for <KHR/khrplatform.h>
-Requires:      %{name}-libEGL-devel = %{version}-%{release}
+Requires:      %{name}-khrplatform-devel = %{version}-%{release}

 Requires:      %{name}-libOpenVG = %{version}-%{release}
 
 %description libOpenVG-devel
 Requires:      %{name}-libOpenVG = %{version}-%{release}
 
 %description libOpenVG-devel


@@ -486,6 +496,7 @@ Summary:    Mesa Graphics Buffer Manager library
 Summary(pl.UTF-8):     Biblioteka Mesa Graphics Buffer Manager
 Group:         Libraries
 Requires:      udev-libs >= 1:150
 Summary(pl.UTF-8):     Biblioteka Mesa Graphics Buffer Manager
 Group:         Libraries
 Requires:      udev-libs >= 1:150

+Conflicts:     Mesa-libEGL < 8.0.1-2

 
 %description libgbm
 Mesa Graphics Buffer Manager library.
 
 %description libgbm
 Mesa Graphics Buffer Manager library.


@@ -584,6 +595,7 @@ bufora graficznego). Obsługuje wirtualną kartę graficzną VMware.
 Summary:       Mesa GL API shared library
 Summary(pl.UTF-8):     Biblioteka współdzielona Mesa GL API
 Group:         Libraries
 Summary:       Mesa GL API shared library
 Summary(pl.UTF-8):     Biblioteka współdzielona Mesa GL API
 Group:         Libraries

+Conflicts:     Mesa-libEGL < 8.0.1-2

 
 %description libglapi
 Mesa GL API shared library, common for various APIs (EGL, GL, GLES).
 
 %description libglapi
 Mesa GL API shared library, common for various APIs (EGL, GL, GLES).


@@ -592,6 +604,32 @@ Mesa GL API shared library, common for various APIs (EGL, GL, GLES).
 Biblioteka współdzielona Mesa GL API, wspólna dla różnych API (EGL,
 GL, GLES).
 
 Biblioteka współdzielona Mesa GL API, wspólna dla różnych API (EGL,
 GL, GLES).
 

+%package libwayland-egl
+Summary:       Wayland EGL library
+Summary(pl.UTF-8):     Biblioteka Wayland EGL
+Group:         Libraries
+Requires:      libdrm >= %{libdrm_ver}
+
+%description libwayland-egl
+Wayland EGL platform library.
+
+%description libwayland-egl -l pl.UTF-8
+Biblioteka platformy EGL Wayland.
+
+%package libwayland-egl-devel
+Summary:       Development files for Wayland EGL library
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki Wayland EGL
+Group:         Development/Libraries
+Requires:      %{name}-libwayland-egl = %{version}-%{release}
+Requires:      libdrm-devel >= %{libdrm_ver}
+Requires:      wayland-devel
+
+%description libwayland-egl-devel
+Development files for Wayland EGL platform library.
+
+%description libwayland-egl-devel -l pl.UTF-8
+Pliki programistyczne biblioteki platformy EGL Wayland.
+

 %package libxatracker
 Summary:       Xorg Gallium3D accelleration library
 Summary(pl.UTF-8):     Biblioteka akceleracji Gallium3D dla Xorg
 %package libxatracker
 Summary:       Xorg Gallium3D accelleration library
 Summary(pl.UTF-8):     Biblioteka akceleracji Gallium3D dla Xorg


@@ -618,6 +656,18 @@ Header files for Xorg Gallium3D accelleration library.
 %description libxatracker-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg.
 
 %description libxatracker-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg.
 

+%package khrplatform-devel
+Summary:       Khronos platform header file
+Summary(pl.UTF-8):     Plik nagłówkowy platformy Khronos
+Group:         Development/Libraries
+Conflicts:     Mesa-libEGL-devel < 8.0.1-2
+
+%description khrplatform-devel
+Khronos platform header file.
+
+%description khrplatform-devel -l pl.UTF-8
+Plik nagłówkowy platformy Khronos.
+

 %package dri-driver-ati-radeon-R100
 Summary:       X.org DRI driver for ATI R100 card family
 Summary(pl.UTF-8):     Sterownik X.org DRI dla rodziny kart ATI R100
 %package dri-driver-ati-radeon-R100
 Summary:       X.org DRI driver for ATI R100 card family
 Summary(pl.UTF-8):     Sterownik X.org DRI dla rodziny kart ATI R100


@@ -832,8 +882,10 @@ Sterownik Mesa softpipe dla API vdpau.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

+%patch100 -p1

 %patch0 -p0
 %patch1 -p1
 %patch0 -p0
 %patch1 -p1

+%patch2 -p1

 
 %build
 %{__aclocal}
 
 %build
 %{__aclocal}


@@ -895,12 +947,13 @@ cp -p src/mesa/osmesa.pc osmesa8
        --enable-egl \
        --enable-gles1 \
        --enable-gles2 \
        --enable-egl \
        --enable-gles1 \
        --enable-gles2 \

+       --with-egl-platforms=x11%{?with_gbm:,drm}%{?with_wayland:,wayland} \

 %endif
 %if %{with gallium}
        --enable-gallium-llvm \
        %{__enable egl gallium-egl} \
        %{__enable gbm gallium-gbm} \
 %endif
 %if %{with gallium}
        --enable-gallium-llvm \
        %{__enable egl gallium-egl} \
        %{__enable gbm gallium-gbm} \

-       --enable-openvg \
+       %{?with_egl:--enable-openvg} \

        --enable-vdpau \
        %{?with_xa:--enable-xa} \
        --enable-xvmc \
        --enable-vdpau \
        %{?with_xa:--enable-xa} \
        --enable-xvmc \


@@ -972,6 +1025,9 @@ rm -rf $RPM_BUILD_ROOT
 %post  libglapi -p /sbin/ldconfig
 %postun        libglapi -p /sbin/ldconfig
 
 %post  libglapi -p /sbin/ldconfig
 %postun        libglapi -p /sbin/ldconfig
 

+%post  libwayland-egl -p /sbin/ldconfig
+%postun        libwayland-egl -p /sbin/ldconfig
+

 %post  libxatracker -p /sbin/ldconfig
 %postun        libxatracker -p /sbin/ldconfig
 
 %post  libxatracker -p /sbin/ldconfig
 %postun        libxatracker -p /sbin/ldconfig
 


@@ -993,8 +1049,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/EGL/eglext.h
 %{_includedir}/EGL/eglmesaext.h
 %{_includedir}/EGL/eglplatform.h
 %{_includedir}/EGL/eglext.h
 %{_includedir}/EGL/eglmesaext.h
 %{_includedir}/EGL/eglplatform.h

-%dir %{_includedir}/KHR
-%{_includedir}/KHR/khrplatform.h

 %{_pkgconfigdir}/egl.pc
 
 %if %{with static_libs}
 %{_pkgconfigdir}/egl.pc
 
 %if %{with static_libs}


@@ -1087,7 +1141,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
 %endif
 %endif
 

-%if %{with gallium}
+%if %{with egl} && %{with gallium}

 %files libOpenVG
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOpenVG.so.*.*.*
 %files libOpenVG
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOpenVG.so.*.*.*


@@ -1174,6 +1228,18 @@ rm -rf $RPM_BUILD_ROOT
 # libglapi-devel? nothing seems to need it atm.
 #%attr(755,root,root) %{_libdir}/libglapi.so
 
 # libglapi-devel? nothing seems to need it atm.
 #%attr(755,root,root) %{_libdir}/libglapi.so
 

+%if %{with wayland}
+%files libwayland-egl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libwayland-egl.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwayland-egl.so.1
+
+%files libwayland-egl-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libwayland-egl.so
+%{_pkgconfigdir}/wayland-egl.pc
+%endif
+

 %if %{with xa}
 %files libxatracker
 %defattr(644,root,root,755)
 %if %{with xa}
 %files libxatracker
 %defattr(644,root,root,755)


@@ -1189,6 +1255,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/xatracker.pc
 %endif
 
 %{_pkgconfigdir}/xatracker.pc
 %endif
 

+%if %{with egl}
+%files khrplatform-devel
+%defattr(644,root,root,755)
+%dir %{_includedir}/KHR
+%{_includedir}/KHR/khrplatform.h
+%endif
+

 %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-R100
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/radeon_dri.so