summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Wereski <m.wereski@partner.samsung.com>2016-10-03 17:23:03 +0200
committerMaciej Wereski <m.wereski@partner.samsung.com>2016-10-03 17:23:03 +0200
commit8e88a9b1f07fc05f0fad81938e767544082b3d3a (patch)
tree700d60fd8f5c1445217d3770aa598b91a5514336
parentbbcf50ea8cffb9d3c28f557a1341078e8c2ce97d (diff)
downloadmesa-8e88a9b1f07fc05f0fad81938e767544082b3d3a.tar.gz
mesa-8e88a9b1f07fc05f0fad81938e767544082b3d3a.tar.bz2
mesa-8e88a9b1f07fc05f0fad81938e767544082b3d3a.zip
Cleanup: remove X/Wayland switches
Tizen uses only wayland so these are useless. Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
-rw-r--r--packaging/mesa.spec32
1 files changed, 0 insertions, 32 deletions
diff --git a/packaging/mesa.spec b/packaging/mesa.spec
index d7f8d8343ec..df7738ad59a 100644
--- a/packaging/mesa.spec
+++ b/packaging/mesa.spec
@@ -1,6 +1,4 @@
%define glamor 1
-%bcond_with x
-%bcond_with wayland
Name: mesa
Version: 10.3
@@ -24,17 +22,6 @@ BuildRequires: gcc-c++
BuildRequires: gettext-tools
BuildRequires: libtool
BuildRequires: libxml2-python
-%if %{with x}
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(x11-xcb)
-BuildRequires: pkgconfig(xext)
-BuildRequires: pkgconfig(xdamage)
-BuildRequires: pkgconfig(xfixes)
-BuildRequires: pkgconfig(dri2proto)
-BuildRequires: pkgconfig(glproto)
-BuildRequires: pkgconfig(xcb-dri2)
-BuildRequires: pkgconfig(xcb-glx)
-%endif
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: python-lxml
@@ -45,10 +32,8 @@ BuildRequires: pkgconfig(libdrm) >= 2.4.24
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.24
%endif
BuildRequires: pkgconfig(libudev) > 150
-%if %{with wayland}
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-server)
-%endif
Provides: Mesa = %{version}
%if "%{_with_emulator}" == "1"
@@ -114,21 +99,8 @@ rm -f src/mesa/depend
%reconfigure --enable-gles1 \
--enable-gles2 \
--disable-dri3 \
-%if %{with x}
-%if %{with wayland}
- --with-egl-platforms=drm,wayland,x11 \
-%else
- --with-egl-platforms=drm,x11 \
-%endif
-%else
-%if %{with wayland}
--with-egl-platforms=drm,wayland \
--disable-glx \
-%else
- --with-egl-platforms=drm \
- --disable-glx \
-%endif
-%endif
--enable-shared-glapi \
--enable-texture-float \
%if %glamor
@@ -155,10 +127,8 @@ rm -f src/mesa/depend
%install
%make_install
-%if !%{with x}
rm -rf %{buildroot}%{_includedir}/GL
rm -f %{buildroot}%{_libdir}/pkgconfig/gl.pc
-%endif
# DRI driver update mechanism
mkdir -p %{buildroot}%{_libdir}/dri/updates
@@ -225,7 +195,6 @@ mv %{buildroot}%{_libdir}/libGLES* %{buildroot}%{_libdir}/driver/
%{_libdir}/libglapi.so
%{_libdir}/libglapi.so.0*
-%if %{with wayland}
%files -n libwayland-egl
%manifest %{name}.manifest
%defattr(-,root,root)
@@ -235,4 +204,3 @@ mv %{buildroot}%{_libdir}/libGLES* %{buildroot}%{_libdir}/driver/
%files -n libwayland-egl-devel
%defattr(-,root,root)
%{_libdir}/pkgconfig/wayland-egl.pc
-%endif