[meego-commits] 7520: Changes to Trunk/mesa
Peter Zhu
no_reply at build.meego.com
Wed Sep 15 07:04:51 UTC 2010
Hi,
I have made the following changes to mesa in project Trunk. Please review and accept ASAP.
Thank You,
Peter Zhu
[This message was auto-generated]
---
Request #7520:
submit: Trunk:Testing/mesa(r25) -> Trunk/mesa
Message:
Move to Trunk
State: new 2010-09-15T00:04:51 peter
Comment: None
changes files:
--------------
--- mesa.changes
+++ mesa.changes
@@ -0,0 +1,8 @@
+* Wed Sep 08 2010 Li Peng <peng.li at intel.com> - 7.8.99.1~gitb018ea19a3
+- handset driver reuse the devel packages of EGL, OpenVG and GLES,
+ remove devel package dependency on mesa lib package.
+
+* Mon Sep 06 2010 Li Peng <peng.li at intel.com> - 7.8.99.1~gitb018ea19a3
+- Add new package mesa-libOSMesa
+- Remove unnecessary dependency of mesa-dri-drivers
+
old:
----
when-creating-pbuffer-create-pixmap-to-avoid-X-compl.patch
spec files:
-----------
--- mesa.spec
+++ mesa.spec
@@ -84,7 +84,6 @@
%package libGLESv1
Summary: Mesa libGLESv1 runtime libraries
Group: System/Libraries
-Requires: mesa-dri-drivers = %{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides: libGLESv1 = %{version}-%{release}
@@ -95,7 +94,6 @@
%package libGLESv2
Summary: Mesa libGLESv2 runtime libraries
Group: System/Libraries
-Requires: mesa-dri-drivers = %{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides: libGLESv2 = %{version}-%{release}
@@ -117,7 +115,6 @@
%package libEGL
Summary: Mesa libEGL runtime libraries and DRI drivers
Group: System/Libraries
-Requires: mesa-dri-drivers = %{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides: libEGL = %{version}-%{release}
@@ -166,6 +163,15 @@
%description libGLUT
Mesa libGLUT runtime library.
+%package libOSMesa
+Summary: Mesa offscreen rendering libraries
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description libOSMesa
+Mesa offscreen rendering libraries
+
%package libGL-devel
Summary: Mesa libGL development package
Group: Development/Libraries
@@ -178,7 +184,6 @@
%package libGLESv1-devel
Summary: Mesa libGLESv1 development package
Group: Development/Libraries
-Requires: mesa-libGLESv1 = %{version}-%{release}
Provides: libGLESv1-devel
%description libGLESv1-devel
@@ -187,7 +192,6 @@
%package libGLESv2-devel
Summary: Mesa libGLESv2 development package
Group: Development/Libraries
-Requires: mesa-libGLESv2 = %{version}-%{release}
Provides: libGLESv2-devel
Obsoletes: mesa-libGLESv2-compat
@@ -197,7 +201,6 @@
%package libEGL-devel
Summary: Mesa libEGL development package
Group: Development/Libraries
-Requires: mesa-libEGL = %{version}-%{release}
Provides: libEGL-devel
Obsoletes: mesa-libEGL-compat
@@ -207,7 +210,6 @@
%package libOpenVG-devel
Summary: Mesa libOpenVG development package
Group: Development/Libraries
-Requires: mesa-libOpenVG = %{version}-%{release}
Provides: libOpenVG-devel
%description libOpenVG-devel
@@ -233,6 +235,14 @@
%description libGLUT-devel
Mesa libGLUT development package
+%package libOSMesa-devel
+Summary: Mesa offscreen rendering development package
+Group: Development/Libraries
+Requires: mesa-libOSMesa = %{version}-%{release}
+
+%description libOSMesa-devel
+Mesa offscreen rendering development package
+
%prep
%setup -q -n %{name}-%{version}
@@ -244,6 +254,16 @@
%build
# >> build pre
+
+# build mesa-libOSMesa
+%define osmesa_flags --with-driver=osmesa --disable-gallium --with-dri-drivers="" --disable-glu --disable-glw --disable-glut --disable-egl
+%reconfigure %{osmesa_flags} --with-osmesa-bits=32
+make %{?jobs:-j%jobs}
+mv %{_lib} osmesa32
+make clean
+# just to be sure...
+[ `find . -name \*.o | wc -l` -eq 0 ] || exit 1
+
# << build pre
%reconfigure --disable-static \
@@ -272,13 +292,17 @@
# strip out undesirable headers
pushd $RPM_BUILD_ROOT%{_includedir}/GL
-rm [a-fh-np-wyz]*.h glf*.h osmesa.h
+rm [a-fh-np-wyz]*.h glf*.h
popd
#remove egl_glx.so, which is broken
pushd $RPM_BUILD_ROOT%{_libdir}
rm -f egl/egl_glx.so
popd
+
+# and osmesa
+mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir}
+
# << install post
@@ -344,6 +368,14 @@
%postun libGLUT -p /sbin/ldconfig
+%post libOSMesa -p /sbin/ldconfig
+
+%postun libOSMesa -p /sbin/ldconfig
+
+
+
+
+
@@ -453,6 +485,12 @@
%{_libdir}/libglut.so.3.7.1
# << files libGLUT
+%files libOSMesa
+%defattr(-,root,root,-)
+# >> files libOSMesa
+%{_libdir}/libOSMesa32.so.7*
+# << files libOSMesa
+
%files libGL-devel
%defattr(-,root,root,-)
# >> files libGL-devel
@@ -531,3 +569,10 @@
%{_includedir}/GL/glutf90.h
# << files libGLUT-devel
+%files libOSMesa-devel
+%defattr(-,root,root,-)
+# >> files libOSMesa-devel
+%{_includedir}/GL/osmesa.h
+%{_libdir}/libOSMesa32.so
+# << files libOSMesa-devel
+
other changes:
--------------
++++++ mesa.yaml
--- mesa.yaml
+++ mesa.yaml
@@ -84,8 +84,6 @@
Summary: Mesa libGLESv1 runtime libraries
Group: System/Libraries
Description: Mesa libGLESv1 runtime library.
- Requires:
- - mesa-dri-drivers = %{version}-%{release}
Provides:
- libGLESv1 = %{version}-%{release}
@@ -93,8 +91,6 @@
Summary: Mesa libGLESv2 runtime libraries
Group: System/Libraries
Description: Mesa libGLESv2 runtime library.
- Requires:
- - mesa-dri-drivers = %{version}-%{release}
Provides:
- libGLESv2 = %{version}-%{release}
@@ -111,8 +107,6 @@
Summary: Mesa libEGL runtime libraries and DRI drivers
Group: System/Libraries
Description: Mesa libEGL runtime library.
- Requires:
- - mesa-dri-drivers = %{version}-%{release}
Provides:
- libEGL = %{version}-%{release}
@@ -146,6 +140,11 @@
Obsoletes:
- freeglut
+ - Name: libOSMesa
+ Summary: Mesa offscreen rendering libraries
+ Group: System/Libraries
+ Description: Mesa offscreen rendering libraries
+
- Name: libGL-devel
Summary: Mesa libGL development package
Group: Development/Libraries
@@ -159,8 +158,6 @@
Summary: Mesa libGLESv1 development package
Group: Development/Libraries
Description: Mesa libGLESv1 development package
- Requires:
- - mesa-libGLESv1 = %{version}-%{release}
Provides:
- libGLESv1-devel
@@ -168,8 +165,6 @@
Summary: Mesa libGLESv2 development package
Group: Development/Libraries
Description: Mesa libGLESv2 development package
- Requires:
- - mesa-libGLESv2 = %{version}-%{release}
Provides:
- libGLESv2-devel
Obsoletes:
@@ -179,8 +174,6 @@
Summary: Mesa libEGL development package
Group: Development/Libraries
Description: Mesa libEGL development package
- Requires:
- - mesa-libEGL = %{version}-%{release}
Provides:
- libEGL-devel
Obsoletes:
@@ -190,8 +183,6 @@
Summary: Mesa libOpenVG development package
Group: Development/Libraries
Description: Mesa libOpenVG development package
- Requires:
- - mesa-libOpenVG = %{version}-%{release}
Provides:
- libOpenVG-devel
@@ -215,3 +206,10 @@
- libGLUT-devel
Obsoletes:
- freeglut-devel
+
+ - Name: libOSMesa-devel
+ Summary: Mesa offscreen rendering development package
+ Group: Development/Libraries
+ Description: Mesa offscreen rendering development package
+ Requires:
+ - mesa-libOSMesa = %{version}-%{release}
++++++ deleted files:
--- when-creating-pbuffer-create-pixmap-to-avoid-X-compl.patch
More information about the MeeGo-commits
mailing list