packages: Mesa/Mesa-selinux.patch, Mesa/Mesa.spec, Mesa/Mesa-nouveau-classi...
arekm
arekm at pld-linux.org
Mon Aug 1 09:13:05 CEST 2011
Author: arekm Date: Mon Aug 1 07:13:05 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- move to 7.11 from DEVEL to HEAD
---- Files affected:
packages/Mesa:
Mesa-selinux.patch (1.3 -> 1.4) , Mesa.spec (1.278 -> 1.279) , Mesa-nouveau-classic-libdrm.patch (1.1 -> NONE) (REMOVED), Mesa-nouveau-revert.patch (1.1 -> NONE) (REMOVED), Mesa-nouveau-updates.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa-selinux.patch
diff -u packages/Mesa/Mesa-selinux.patch:1.3 packages/Mesa/Mesa-selinux.patch:1.4
--- packages/Mesa/Mesa-selinux.patch:1.3 Tue Mar 15 21:24:58 2011
+++ packages/Mesa/Mesa-selinux.patch Mon Aug 1 09:13:00 2011
@@ -1,37 +1,11 @@
---- Mesa-7.10/configure.ac.orig 2010-10-05 03:58:00.000000000 +0200
-+++ Mesa-7.10/configure.ac 2010-10-27 08:04:55.739734339 +0200
-@@ -667,8 +667,9 @@
- fi
-
- # need DRM libs, -lpthread, etc.
-- GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
-- GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
-+ GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
-+ GL_PC_LIB_PRIV="$SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS"
-+ EGL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
- GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
- GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
- GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
-@@ -786,6 +787,7 @@
- AC_SUBST([GL_PC_LIB_PRIV])
- AC_SUBST([GL_PC_CFLAGS])
- AC_SUBST([DRI_PC_REQ_PRIV])
-+AC_SUBST([EGL_PC_LIB_PRIV])
- AC_SUBST([GLESv1_CM_LIB_DEPS])
- AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
+--- Mesa-7.11/configure.ac~ 2011-07-12 12:57:43.000000000 +0200
++++ Mesa-7.11/configure.ac 2011-07-18 19:40:58.701272226 +0200
+@@ -908,7 +908,7 @@
AC_SUBST([GLESv2_LIB_DEPS])
---- Mesa-7.10.1/configs/autoconf.in.orig 2011-02-11 23:49:47.000000000 +0100
-+++ Mesa-7.10.1/configs/autoconf.in 2011-03-15 18:07:32.323409590 +0100
-@@ -176,9 +176,9 @@
- OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
- GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@
- GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
--EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
--EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
--EGL_PC_CFLAGS = @GL_PC_CFLAGS@
-+EGL_PC_REQ_PRIV =
-+EGL_PC_LIB_PRIV = @EGL_PC_LIB_PRIV@
-+EGL_PC_CFLAGS =
+ AC_SUBST([GLESv2_PC_LIB_PRIV])
+
+-GLAPI_LIB_DEPS="-lpthread"
++GLAPI_LIB_DEPS="-lpthread $SELINUX_LIBS"
+ AC_SUBST([GLAPI_LIB_DEPS])
+
- XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
- XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.278 packages/Mesa/Mesa.spec:1.279
--- packages/Mesa/Mesa.spec:1.278 Thu Jun 30 19:04:32 2011
+++ packages/Mesa/Mesa.spec Mon Aug 1 09:13:00 2011
@@ -22,37 +22,38 @@
# (until they start to be somehow versioned themselves)
%define glapi_ver 7.1.0
#
-%define libdrm_ver 2.4.24
-%define dri2proto_ver 2.1
+%define libdrm_ver 2.4.25
+%define dri2proto_ver 2.6
%define glproto_ver 1.4.11
#
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 7.10.3
+Version: 7.11
Release: 1%{?with_multigl:.mgl}
License: MIT (core), SGI (GLU,libGLw) and others - see license.html file
Group: X11/Libraries
Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: 8c38fe8266be8e1ed1d84076ba5a703b
+# Source0-md5: ff03aca82d0560009a076a87c888cf13
Patch0: %{name}-realclean.patch
-Patch1: %{name}-selinux.patch
-Patch2: %{name}-git.patch
-Patch3: %{name}-nouveau-updates.patch
-Patch4: %{name}-nouveau-revert.patch
-Patch5: %{name}-nouveau-classic-libdrm.patch
+Patch1: %{name}-git.patch
+Patch2: %{name}-selinux.patch
URL: http://www.mesa3d.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: expat-devel
BuildRequires: libdrm-devel >= %{libdrm_ver}
+# drop when 2.4.24 is released
+%{?with_nouveau:BuildRequires: libdrm-devel >= 2.4.24}
BuildRequires: libselinux-devel
BuildRequires: libstdc++-devel >= 5:3.3.0
BuildRequires: libtalloc-devel >= 2:2.0.1
BuildRequires: libtool >= 2:1.4d
+BuildRequires: llvm-devel >= 2.9
%{?with_motif:BuildRequires: motif-devel}
BuildRequires: pixman-devel
BuildRequires: pkgconfig
+BuildRequires: pkgconfig(talloc) >= 2.0.1
BuildRequires: python
BuildRequires: python-libxml2
BuildRequires: python-modules
@@ -81,6 +82,9 @@
%undefine with_gallium_radeon
%endif
+# unresolved symbol _glapi_tls_Dispatch
+%define skip_post_check_so libGLESv1_CM.so.1.* libGLESv2.so.2.*
+
%description
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL(R). To the extent that Mesa utilizes the OpenGL command
@@ -133,8 +137,8 @@
Pliki nagłówkowe implementacji Mesa biblioteki EGL.
%package libEGL-static
-Summary: Static Mesa libEGL library
-Summary(pl.UTF-8): Statyczna biblioteka Mesa libEGL
+Summary: Static SGI libEGL library
+Summary(pl.UTF-8): Statyczna biblioteka SGI libEGL
License: MIT
Group: Development/Libraries
Requires: %{name}-libEGL-devel = %{version}-%{release}
@@ -146,6 +150,27 @@
%description libEGL-static -l pl.UTF-8
Statyczna biblioteka Mesa libEGL.
+%package libGLES
+Summary: Mesa libGLES runtime libraries
+Group: Libraries
+
+%description libGLES
+Mesa GLES runtime libraries.
+
+%description libGLES -l pl.UTF-8
+Biblioteka Mesa GLES.
+
+%package libGLES-devel
+Summary: Header files for libGLES library
+Group: Development/Libraries
+Requires: %{name}-libGLES = %{version}-%{release}
+
+%description libGLES-devel
+Header files for libGLES library.
+
+%description libGLES-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libGLES.
+
%package libGL
Summary: Free Mesa3D implementation of libGL OpenGL library
Summary(pl.UTF-8): Wolnodostępna implementacja Mesa3D biblioteki libGL ze standardu OpenGL
@@ -365,6 +390,34 @@
%description libOSMesa-static -l pl.UTF-8
Biblioteka statyczna OSMesa (renderująca bitmapy w pamięci).
+%package libOpenVG
+Summary: OpenVG API implementation
+Summary(pl.UTF-8): Implementacja API OpenVG
+License: MIT
+Group: Libraries
+# doesn't require base
+
+%description libOpenVG
+OpenVG API implementation.
+
+%description libOpenVG -l pl.UTF-8
+Implementacja API OpenVG.
+
+%package libOpenVG-devel
+Summary: Header file for libOpenVG library
+Summary(pl.UTF-8): Plik nagłówkowy biblioteki libOpenVG
+License: MIT
+Group: Development/Libraries
+# for <KHR/khrplatform.h>
+Requires: %{name}-libEGL-devel = %{version}-%{release}
+Requires: %{name}-libOpenVG = %{version}-%{release}
+
+%description libOpenVG-devel
+Header file for libOpenVG library.
+
+%description libOpenVG-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki libOpenVG.
+
%package utils
Summary: OpenGL utilities from Mesa3D
Summary(pl.UTF-8): Programy narzędziowe OpenGL z projektu Mesa3D
@@ -682,22 +735,19 @@
%setup -q
%patch0 -p0
%patch1 -p1
-#patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch2 -p1
%build
%{__aclocal}
%{__autoconf}
-dri_drivers="i810 i965 mach64 mga r128 \
+dri_drivers="i810 mach64 mga r128 r200 radeon \
%if %{without gallium_radeon}
-r200 r300 r600 radeon \
+r300 r600 \
%endif
savage \
%if %{without gallium_intel}
-i915 \
+i915 i965 \
%endif
%ifarch sparc sparcv9 sparc64
ffb \
@@ -709,49 +759,54 @@
dri_drivers=$(echo $dri_drivers | xargs | tr ' ' ',')
+gallium_drivers="svga swrast \
+%if %{with gallium_intel}
+i915 \
+i965 \
+%endif
+%if %{with gallium_radeon}
+radeon \
+r600 \
+%endif
+%if %{with gallium_nouveau}
+nouveau \
+%endif
+"
+
+gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
+
common_flags="\
--enable-shared \
--enable-selinux \
--enable-pic \
--enable-glx-tls \
--disable-glut \
- --disable-os-mesa \
- --%{?with_egl:en}%{!?with_egl:dis}able-egl"
+%if %{with egl}
+ --enable-egl \
+ --enable-gles1 \
+ --enable-gles2 \
+%endif
+"
osmesa_common_flags="\
--with-driver=osmesa \
--disable-asm \
- --disable-glu"
+ --disable-glu \
+ --disable-egl"
%if %{with osmesa}
-# osmesa variants
%configure $common_flags $osmesa_common_flags \
--with-osmesa-bits=8
%{__make}
mv %{_lib} osmesa8
%{__make} clean
-
-%configure $common_flags $osmesa_common_flags \
- --with-osmesa-bits=16
-%{__make}
-mv %{_lib} osmesa16
-%{__make} clean
-
-%configure $common_flags $osmesa_common_flags \
- --with-osmesa-bits=32
-%{__make}
-mv %{_lib} osmesa32
-%{__make} clean
%endif
%configure $common_flags \
%if %{with gallium}
- --enable-gallium \
- --%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
- --%{?with_gallium_radeon:en}%{!?with_gallium_radeon:dis}able-gallium-radeon \
- --enable-gallium-svga \
- %{?with_gallium_nouveau:--enable-gallium-nouveau} \
- --with-state-trackers=dri,glx \
+ --enable-openvg \
+ --enable-gallium-egl \
+ --with-gallium-drivers=${gallium_drivers} \
%else
--disable-gallium \
%endif
@@ -771,7 +826,7 @@
DESTDIR=$RPM_BUILD_ROOT
%if %{with osmesa}
-install osmesa*/*OSMesa* $RPM_BUILD_ROOT%{_libdir}
+cp -Pp osmesa*/*OSMesa* $RPM_BUILD_ROOT%{_libdir}
%endif
rm -rf $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}}
@@ -783,6 +838,11 @@
cd $RPM_BUILD_ROOT%{_libdir}
cd $olddir
+%if %{with gallium}
+# use gallium swrastg as swrast
+mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrastg_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrast_dri.so
+%endif
+
%if %{with multigl}
install -d $RPM_BUILD_ROOT{%{_libdir}/Mesa,%{_sysconfdir}/ld.so.conf.d}
@@ -801,24 +861,46 @@
%post libGL -p /sbin/ldconfig
%postun libGL -p /sbin/ldconfig
+%post libGLES -p /sbin/ldconfig
+%postun libGLES -p /sbin/ldconfig
+
%post libGLU -p /sbin/ldconfig
%postun libGLU -p /sbin/ldconfig
%post libGLw -p /sbin/ldconfig
%postun libGLw -p /sbin/ldconfig
+%post libOSMesa -p /sbin/ldconfig
+%postun libOSMesa -p /sbin/ldconfig
+
+%post libOpenVG -p /sbin/ldconfig
+%postun libOpenVG -p /sbin/ldconfig
+
%if %{with egl}
%files libEGL
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libEGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libEGL.so.1
+%attr(755,root,root) %{_libdir}/libglapi.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglapi.so.0
+%if %{with gallium}
%dir %{_libdir}/egl
-%attr(755,root,root) %{_libdir}/egl/egl_dri2.so
-%attr(755,root,root) %{_libdir}/egl/egl_glx.so
+%attr(755,root,root) %{_libdir}/egl/egl_gallium.so
+%attr(755,root,root) %{_libdir}/egl/st_GL.so
+%if %{with gallium_radeon}
+%attr(755,root,root) %{_libdir}/egl/pipe_r300.so
+%attr(755,root,root) %{_libdir}/egl/pipe_r600.so
+%endif
+%if %{with gallium_intel}
+%attr(755,root,root) %{_libdir}/egl/pipe_i915.so
+%attr(755,root,root) %{_libdir}/egl/pipe_i965.so
+%endif
+%endif
%files libEGL-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libEGL.so
+%attr(755,root,root) %{_libdir}/libglapi.so
%dir %{_includedir}/EGL
%{_includedir}/EGL/egl.h
%{_includedir}/EGL/eglext.h
@@ -868,6 +950,18 @@
%{_pkgconfigdir}/dri.pc
%{_pkgconfigdir}/gl.pc
+%files libGLES
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libGLES*.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGLES*.so.[0-9]
+
+%files libGLES-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libGLES*.so
+%{_includedir}/GLES
+%{_includedir}/GLES2
+%{_pkgconfigdir}/gles*.pc
+
%if %{with static}
%files libGL-static
%defattr(644,root,root,755)
@@ -930,6 +1024,19 @@
%endif
%endif
+%if %{with gallium}
+%files libOpenVG
+%defattr(644,root,root,755)
+%attr(755,root,root) %ghost %{_libdir}/libOpenVG.so.1
+%attr(755,root,root) %{_libdir}/libOpenVG.so.1.0.0
+
+%files libOpenVG-devel
+%defattr(644,root,root,755)
+%{_includedir}/VG
+%{_libdir}/libOpenVG.so
+%{_pkgconfigdir}/vg.pc
+%endif
+
%files dri-driver-ati-mach64
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/mach64_dri.so
@@ -979,6 +1086,9 @@
%files dri-driver-intel-i965
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/i965_dri.so
+%if %{with gallium_intel}
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/i965g_drv.so
+%endif
%files dri-driver-matrox
%defattr(644,root,root,755)
@@ -988,7 +1098,6 @@
%if %{with gallium_nouveau}
%files dri-driver-nouveau
%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/xorg/modules/drivers/modesetting_drv.so
%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
%endif
%endif
@@ -1006,7 +1115,6 @@
%files dri-driver-swrast
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/swrastg_dri.so
%files dri-driver-tdfx
%defattr(644,root,root,755)
@@ -1028,53 +1136,87 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.278 2011/06/30 17:04:32 qboosh
-- updated libdrm version
+Revision 1.279 2011/08/01 07:13:00 arekm
+- move to 7.11 from DEVEL to HEAD
-Revision 1.277 2011/06/17 04:54:40 arekm
-- up to 7.10.3
+Revision 1.263.2.25 2011/08/01 07:05:25 arekm
+- up to final 7.11
-Revision 1.276 2011/04/15 05:03:46 arekm
-- up to 7.10.2
+Revision 1.263.2.24 2011/07/26 06:20:26 arekm
+- up to 20110726 (rc3; almost final)
-Revision 1.275 2011/04/05 09:16:57 baggins
-- updated BR
+Revision 1.263.2.23 2011/07/18 18:10:56 arekm
+- selinux patch is back; skip_post_check_so only for LIBGLESxx libs
-Revision 1.274 2011/03/15 20:24:58 qboosh
-- updated selinux patch not to add -lselinux to libEGL Libs.private
+Revision 1.263.2.22 2011/07/17 16:21:20 arekm
+- previous comment fixed
-Revision 1.273 2011/03/15 16:31:41 qboosh
-- fixed libEGL* description and license information
-- changed virtual provides to EGL (it's not part of OpenGL specs)
-- fixed virtual provides version: currently Mesa implements EGL 1.4, not 1.0
+Revision 1.263.2.21 2011/07/17 16:20:19 arekm
+- up to 20110717; gallium swrast again as swrastg
-Revision 1.272 2011/03/14 11:15:50 baggins
-- nouveau updates wrt libdrm 2.4.24
+Revision 1.263.2.20 2011/07/14 11:29:14 patrys
+- 20110714
+- swrastg is now swrast
-Revision 1.271 2011/03/14 11:04:40 baggins
-- 7.10.1
-- disabled git patch
+Revision 1.263.2.19 2011/07/05 17:06:05 arekm
+- dri2proto >= 2.6 (fixed struct field names); drop hacks (check_so, filterout_ld)
-Revision 1.270 2011/02/13 12:32:48 wiget
-- typo in BR
+Revision 1.263.2.18 2011/06/29 17:15:06 arekm
+- up to 20110629
-Revision 1.269 2011/02/04 23:36:51 sparky
-- %description <name> for correct %package
+Revision 1.263.2.17 2011/06/04 20:29:31 arekm
+- up to 20110604
-Revision 1.268 2011/01/16 08:07:37 qboosh
-- updated BRs
+Revision 1.263.2.16 2011/05/26 07:34:56 arekm
+- up to 20110526; -Wl,--as-needed build broken (workaround for now)
+
+Revision 1.263.2.15 2011/05/04 13:03:06 arekm
+- up to 20110504
+
+Revision 1.263.2.14 2011/04/15 05:39:24 arekm
+- up to 20110415
+
+Revision 1.263.2.13 2011/03/31 20:49:33 patrys
+- current snap
-Revision 1.267 2011/01/15 10:36:17 arekm
-- force libdrm >= 2.4.23
+Revision 1.263.2.12 2011/03/24 13:19:13 arekm
+- up to 20110324
-Revision 1.266 2011/01/15 10:35:50 arekm
-- up to 7.10
+Revision 1.263.2.11 2011/03/24 12:46:17 wiget
+- fix build without gallium
-Revision 1.265 2011/01/15 09:13:40 arekm
-- up to 7.9.1
+Revision 1.263.2.10 2011/03/13 20:55:56 wiget
+- build OpenVG
+- more BRs with egl and gallium bconds
+- allways build r200 and radeon drivers
+- build gallium i965 driver
+- build xorg and vega state trackers
-Revision 1.264 2010/12/12 16:57:55 arekm
-- rel 8; fix nouveau segfaults with libdrm 2.4.23 (from gentoo)
+Revision 1.263.2.9 2011/03/13 14:16:05 pluto
+- build classic radeon/r200 dri for gallium-enabled build (gallium supports r300+).
+- pack some EGL gallium files.
+
+Revision 1.263.2.7 2011/03/10 19:55:03 arekm
+- up to 20110310; BR libdrm 2.4.24 (for nouveau)
+
+Revision 1.263.2.6 2011/02/27 10:35:23 arekm
+- up to 20110227 snap
+
+Revision 1.263.2.5 2011/02/21 14:00:32 arekm
+20110221
+
+Revision 1.263.2.4 2011/02/16 19:40:32 arekm
+- new libGLES; use gallium swrastg as swrast; drop osmesa{16,32} (nothing uses these); not sure if libglapi, pipe_xx.so and st_GL are properly placed
+
+Revision 1.263.2.3 2011/02/16 17:59:51 arekm
+- sync with HEAD; new snap (build broken)
+
+Revision 1.263.2.2 2011/02/16 17:22:22 arekm
+- sync with HEAD; new snap (build broken)
+
+Revision 1.263.2.1 2010/12/12 16:47:14 patrys
+- current snap
+- stable dri drivers crash on recent libdrm
Revision 1.263 2010/12/07 18:49:10 arekm
- rel 7; branch diff updated
@@ -1304,3 +1446,4 @@
Revision 1.168.2.4 2009/04/03 21:51:03 arekm
- 7.5 snap
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa-selinux.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.278&r2=1.279&f=u
More information about the pld-cvs-commit
mailing list