From: Wang Quanxian Date: Tue, 25 Dec 2012 07:57:33 +0000 (+0800) Subject: update to 9.0.1 X-Git-Tag: accepted/2.0alpha/20121230.012009~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=733ac412a0af69c63407b81ee1ae32bb707774b1;p=profile%2Fivi%2Fmesa.git update to 9.0.1 --- diff --git a/packaging/mesa.spec b/packaging/mesa.spec index fab3142..7bac81d 100644 --- a/packaging/mesa.spec +++ b/packaging/mesa.spec @@ -1,8 +1,6 @@ -%define mesa_libversion 8.1.0 - Name: mesa Summary: Mesa graphics libraries -Version: 8.1.0.1.g6cb9e9 +Version: 9.0.1 Release: 1 Group: System/Libraries License: MIT @@ -11,7 +9,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: mesa-rpmlintrc #BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(libdrm) -#BuildRequires: pkgconfig(glproto) +BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(dri2proto) BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xxf86vm) @@ -130,25 +128,6 @@ Provides: libgbm-devel %description libgbm-devel Mesa libgbm library development package -%package libwayland-egl -Summary: Wayland EGL library -Group: System/Libraries -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Provides: libwayland-egl = %{version}-%{release} - -%description libwayland-egl -Wayland EGL library - -%package libwayland-egl-devel -Summary: Mesa libwayland-egl development package -Group: Development/Libraries -Requires: libwayland-egl = %{version}-%{release} -Provides: libwayland-egl-devel - -%description libwayland-egl-devel -Mesa libwayland-egl library development package - %package libEGL Summary: Mesa libEGL runtime libraries and DRI drivers Group: System/Libraries @@ -170,15 +149,6 @@ Requires(postun): /sbin/ldconfig %description libEGL-compat Mesa libEGL runtime compatibility library. -%package libGLU -Summary: Mesa libGLU runtime library -Group: System/Libraries -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%description libGLU -Mesa OpenGL library Utility runtime library - %package libGL-devel Summary: Mesa libGL development package Group: Development/Libraries @@ -195,7 +165,7 @@ Summary: Mesa libGLESv2 development package Group: Development/Libraries Requires: mesa-libGLESv2 = %{version}-%{release} Provides: libGLESv2-devel -Obsoletes: mesa-libGLESv2-compat +Obsoletes: mesa-libGLESv2-compat %description libGLESv2-devel Mesa OpenGLESv2 library development package @@ -220,16 +190,6 @@ Obsoletes: mesa-libEGL-compat %description libEGL-devel Mesa EGL library development package -%package libGLU-devel -Summary: Mesa libGLU development package -Group: Development/Libraries -Requires: mesa-libGLU = %{version}-%{release} -Requires: libGL-devel -Provides: libGLU-devel - -%description libGLU-devel -Mesa OpenGL library Utility development package - %prep %setup -q -n %{name}-%{version} -b1 @@ -239,9 +199,10 @@ Mesa OpenGL library Utility development package --disable-gallium-egl \ --enable-gles1 \ --enable-gles2 \ - --with-egl-platforms=wayland,drm,x11 \ + --with-egl-platforms=drm,x11 \ --enable-gbm \ - --enable-gallium-gbm \ + --without-gallium-drivers \ + --disable-gallium-gbm \ --enable-shared-glapi \ --with-dri-drivers=swrast,i915,i965 make %{?jobs:-j%jobs} @@ -259,7 +220,7 @@ rm -rf %{buildroot} %post libgbm -p /sbin/ldconfig rm -rf /usr/lib/libdricore.so -ln -sf /usr/lib/libdricore%{mesa_libversion}.so /usr/lib/libdricore.so +ln -sf /usr/lib/libdricore%{version}.so /usr/lib/libdricore.so %postun libgbm -p /sbin/ldconfig rm -rf /usr/lib/libdricore.so @@ -278,26 +239,14 @@ rm -rf /usr/lib/libdricore.so %postun libEGL -p /sbin/ldconfig -%post libwayland-egl -p /sbin/ldconfig - -%postun libwayland-egl -p /sbin/ldconfig - %post libEGL-compat -p /sbin/ldconfig %postun libEGL-compat -p /sbin/ldconfig - -%post libGLU -p /sbin/ldconfig - -%postun libGLU -p /sbin/ldconfig - %ifarch %ix86 %files dri-drivers-devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/dri.pc -/usr/lib/dri/r300_dri.so -/usr/lib/dri/r600_dri.so -/usr/lib/dri/vmwgfx_dri.so %files dri-i965-driver %defattr(-,root,root,-) @@ -333,9 +282,9 @@ rm -rf /usr/lib/libdricore.so %files libgbm %defattr(-,root,root,-) %{_libdir}/libgbm.so.* -%{_libdir}/gbm/* +#%{_libdir}/gbm/* /etc/drirc -%{_libdir}/libdricore%{mesa_libversion}.so* +%{_libdir}/libdricore%{version}.so* %files libgbm-devel %defattr(-,root,root,-) @@ -343,15 +292,6 @@ rm -rf /usr/lib/libdricore.so %{_libdir}/libgbm.so %{_libdir}/pkgconfig/gbm.pc -%files libwayland-egl -%defattr(-,root,root,-) -%{_libdir}/libwayland-egl.so.* - -%files libwayland-egl-devel -%defattr(-,root,root,-) -%{_libdir}/libwayland-egl.so -%{_libdir}/pkgconfig/wayland-egl.pc - %files libEGL %defattr(-,root,root,-) %{_libdir}/libEGL.so.* @@ -360,10 +300,6 @@ rm -rf /usr/lib/libdricore.so %defattr(-,root,root,-) %{_libdir}/libEGL.so -%files libGLU -%defattr(-,root,root,-) -%{_libdir}/libGLU.so.* - %files libGL-devel %defattr(-,root,root,-) %{_includedir}/GL/gl.h @@ -415,10 +351,3 @@ rm -rf /usr/lib/libdricore.so %dir %{_includedir}/KHR %{_includedir}/KHR/khrplatform.h %{_libdir}/pkgconfig/egl.pc - -%files libGLU-devel -%defattr(-,root,root,-) -%{_libdir}/libGLU.so -%{_libdir}/pkgconfig/glu.pc -%{_includedir}/GL/glu.h -%{_includedir}/GL/glu_mangle.h