Changes - SailfishOS Open Build Service

Difference Between Revision 10 and home:cxl000:branches:mer-core:devel / mesa

[-] [+]	Changed	mesa-llvmpipe.spec
@@ -43,7 +43,7 @@ BuildRequires: flex BuildRequires: gettext BuildRequires: makedepend -BuildRequires: llvm-devel +#BuildRequires: llvm-devel %description Mesa is an open-source implementation of the OpenGL specification - @@ -185,7 +185,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: mesa-llvmpipe-libGL = %{version}-%{release} -Requires: libX11-devel +#Requires: libX11-devel Provides: libGL-devel %description libGL-devel @@ -205,11 +205,33 @@ Requires: %{name} = %{version}-%{release} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Provides: mesa-llvmpipe-dri-drivers = %{version}-%{release} +Provides: mesa-dri-drivers = %{version}-%{release} %description dri-swrast-driver Mesa-based swrast DRI driver. +%package dri-kgsl-driver +Summary: Mesa-based freedreno DRI drivers +Group: Graphics/Display and Graphics Adaptation +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Provides: mesa-dri-drivers = %{version}-%{release} + +%description dri-kgsl-driver +Mesa-based freedreno DRI driver. + +%package dri-msm-driver +Summary: Mesa-based MSM DRI drivers +Group: Graphics/Display and Graphics Adaptation +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Provides: mesa-dri-drivers = %{version}-%{release} + +%description dri-msm-driver +Mesa-based msm DRI driver. + %package libwayland-egl-devel Summary: Mesa libwayland-egl development package Group: Development/Libraries @@ -230,6 +252,27 @@ %description libwayland-egl Mesa libwayland-egl runtime libraries +%package libgbm-devel +Summary: Mesa libgbm development package +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: mesa-llvmpipe-libgbm = %{version}-%{release} +Provides: libgbm-devel + +%description libgbm-devel +libgbm development packages + +%package libgbm +Summary: Mesa libgbm runtime library +Group: System/Libraries +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Provides: libgbm + +%description libgbm +libgbm runtime libraries + %prep %setup -q -n Mesa-%{version} -b1 @@ -248,8 +291,7 @@ %reconfigure --disable-static \ --with-x \ --enable-gallium-llvm \ - --with-dri-drivers=swrast \ - --with-state-trackers=egl \ + --with-dri-drivers= \ --enable-glew=no \ --enable-glw=no \ --enable-glut=no \ @@ -257,11 +299,14 @@ --enable-gles2=yes \ --enable-egl=yes \ --enable-gallium-egl \ + --enable-gallium-llvm=no \ --enable-osmesa=no \ - --with-gallium-drivers=swrast \ - --with-egl-platforms=x11,fbdev,wayland \ - --enable-glx-tls \ - --enable-glx=yes \ + --enable-gbm \ + --with-gallium-drivers=freedreno \ + --with-egl-platforms=drm,wayland \ + --enable-xa=yes \ + --enable-dri3=no \ + --enable-debug=yes \ --enable-dri make %{?_smp_mflags} @@ -322,15 +367,30 @@ %postun dri-swrast-driver -p /sbin/ldconfig +%post dri-kgsl-driver -p /sbin/ldconfig + +%postun dri-kgsl-driver -p /sbin/ldconfig + +%post dri-msm-driver -p /sbin/ldconfig + +%postun dri-msm-driver -p /sbin/ldconfig + %post libwayland-egl -p /sbin/ldconfig %postun libwayland-egl -p /sbin/ldconfig +%post libgbm -p /sbin/ldconfig + +%postun libgbm -p /sbin/ldconfig + %files %defattr(-,root,root,-) # >> files %{_sysconfdir}/drirc %{_libdir}/egl/egl_gallium.so +%{_includedir}/xa_composite.h +%{_includedir}/xa_context.h +%{_includedir}/xa_tracker.h # << files %files libglapi @@ -446,17 +506,30 @@ %files dri-drivers-devel %defattr(-,root,root,-) # >> files dri-drivers-devel -%{_libdir}/libdricore%{version}.so +#%{_libdir}/libdricore%{version}.so %{_libdir}/pkgconfig/dri.pc # << files dri-drivers-devel %files dri-swrast-driver %defattr(-,root,root,-) # >> files dri-swrast-driver -%{_libdir}/libdricore%{version}.so.* -%{_libdir}/dri/swrast_dri.so +#%{_libdir}/libdricore%{version}.so.* +#%{_libdir}/dri/swrast_dri.so # << files dri-swrast-driver +%files dri-kgsl-driver +%defattr(-,root,root,-) +# >> files dri-kgsl-driver +%{_libdir}/dri/kgsl_dri.so +# << files dri-kgsl-driver + +%files dri-msm-driver +%defattr(-,root,root,-) +# >> files dri-msm-driver +%{_libdir}/dri/msm_dri.so +# << files dri-msm-driver + +%files libwayland-egl-devel %files libwayland-egl-devel %defattr(-,root,root,-) # >> files libwayland-egl-devel @@ -470,3 +543,19 @@ %{_libdir}/libwayland-egl.so.1 %{_libdir}/libwayland-egl.so.1.* # << files libwayland-egl + +%files libgbm +%defattr(-,root,root,-) +%{_libdir}/libgbm.so.* +%{_libdir}/gbm/gbm_gallium_drm.so +# >> files +# << files + +%files libgbm-devel +%defattr(-,root,root,-) +%{_includedir}/gbm.h +%{_libdir}/libgbm.so +%{_libdir}/pkgconfig/gbm.pc +# >> files devel +# << files devel +