[meego-commits] 8184: Changes to Trunk:non-oss/pvr-bin

[Li Peng]

Hi,
I have made the following changes to pvr-bin in project Trunk:non-oss. Please review and accept ASAP.

Thank You,
Li Peng

[This message was auto-generated]

---

Request #8184:

  submit:   devel:x11:Trunk/pvr-bin(r36) -> Trunk:non-oss/pvr-bin


Message:
    add pvr-bin-devel package containing EGL, GLESv1/v2 and OpenVG, development headers from mesa, fix BMC #7530, #7633, #7635

State:   new          2010-10-07T23:59:01 pli1
Comment: None



changes files:
--------------
--- pvr-bin.changes
+++ pvr-bin.changes
@@ -0,0 +1,4 @@
+* Wed Sep 29 2010 Li Peng <peng.li at intel.com> - 5.3.0.0016
+- add pvr-bin-devel package containing EGL, GLESv1/v2 and OpenVG 
+  development headers from mesa, fix BMC #7530, #7633, #7635
+

new:
----
  pvr-header.tar.bz2

spec files:
-----------
--- pvr-bin.spec
+++ pvr-bin.spec
@@ -9,21 +9,38 @@
 ExclusiveArch: %{ix86}
 Source0: pvr-bin-5.3.0.0016.tar.bz2
 Source1: pvr-bin-5.3.0.0016.1.tar.bz2
-Source2: license.txt
-Source3: pvr-switch
-Source4: pvr-bin.init
+Source2: pvr-header.tar.bz2
+Source3: license.txt
+Source4: pvr-switch
+Source5: pvr-bin.init
 Source100: pvr-bin-rpmlintrc
 BuildRoot: %{_tmppath}/%{name}-%{version}-build     
 Requires: mesa-libGL libdrm libwsbm libtalloc pciutils chkconfig
+Provides:  libGLES_CM.so
+Conflicts: mesa-libEGL mesa-libGLESv1 mesa-libGLESv2 mesa-libOpenVG
 AutoReqProv: no
 
 %description
 PowerVR graphics driver and runtime library.
 
+%package devel
+Summary:    pvr-bin development package
+Group:      Development/Libraries
+Requires:   pvr-bin = %{version}-%{release}
+Provides:   libEGL.so
+Provides:   libGLESv1_CM.so
+Provides:   libGLESv2.so
+Provides:   libOpenVG.so
+Conflicts:  mesa-libEGL-devel mesa-libGLESv1-devel mesa-libGLESv2-devel mesa-libOpenVG-devel
+
+%description devel
+pvr-bin development package
+
 %prep
 %setup -q -T -c -n pvr-bin
 %setup -q -T -c -n pvr-bin/mrst -a 0
 %setup -q -T -c -n pvr-bin/mdfld -a 1
+%setup -q -T -D -n pvr-bin -a 2
 %setup -q -T -D -n pvr-bin
 
 
@@ -33,9 +50,9 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/license.txt
-install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_initddir}/pvr-bin
-install -m 755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/pvr-switch
+install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/license.txt
+install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/pvr-switch
+install -m 755 -D %{SOURCE5} $RPM_BUILD_ROOT%{_initddir}/pvr-bin
 
 install -d $RPM_BUILD_ROOT%{_libdir}
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
@@ -85,6 +102,17 @@
 install -m 0755 mdfld/usr/lib/dri/pvr_dri.so $RPM_BUILD_ROOT%{_libdir}/pvr/mdfld/dri
 install -m 0755 mdfld/usr/lib/xorg/modules/drivers/pvr_drv.so $RPM_BUILD_ROOT%{_libdir}/pvr/mdfld/xorg/modules/drivers
 
+install -d $RPM_BUILD_ROOT%{_includedir}/EGL
+install -d $RPM_BUILD_ROOT%{_includedir}/GLES
+install -d $RPM_BUILD_ROOT%{_includedir}/GLES2
+install -d $RPM_BUILD_ROOT%{_includedir}/KHR
+install -d $RPM_BUILD_ROOT%{_includedir}/VG
+install -m 644 usr/include/EGL/*.h $RPM_BUILD_ROOT%{_includedir}/EGL
+install -m 644 usr/include/KHR/*.h $RPM_BUILD_ROOT%{_includedir}/KHR
+install -m 644 usr/include/GLES/*.h $RPM_BUILD_ROOT%{_includedir}/GLES
+install -m 644 usr/include/GLES2/*.h $RPM_BUILD_ROOT%{_includedir}/GLES2
+install -m 644 usr/include/VG/*.h $RPM_BUILD_ROOT%{_includedir}/VG
+
 pushd $RPM_BUILD_ROOT%{_libdir}
 ln -s pvr/mrst/libEGL.so.1.1.15.3106 
 ln -s pvr/mrst/libGLES_CM.so.1.1.15.3106 
@@ -105,7 +133,7 @@
 ln -s ../pvr/mrst/dri/pvr_dri.so dri
 ln -s ../../../pvr/mrst/xorg/modules/drivers/pvr_drv.so xorg/modules/drivers
 ln -s libEGL.so.1.1.15.3106 libEGL.so.1
-ln -s libGLES_CM.so.1.1.15.3106 libGLESv1_CM.so.1
+ln -s libGLES_CM.so.1.1.15.3106 libGLES_CM.so.1
 ln -s libGLESv2.so.1.1.15.3106 libGLESv2.so.2
 ln -s libOpenVG.so.1.1.15.3106 libOpenVG.so.1
 ln -s libIMGegl.so.1.1.15.3106 libIMGegl.so
@@ -120,6 +148,11 @@
 ln -s libpvrPVR2D_LINUXFBWSEGL.so.1.1.15.3106 libpvrPVR2D_LINUXFBWSEGL.so
 ln -s libsrv_init.so.1.1.15.3106 libsrv_init.so
 ln -s libsrv_um.so.1.1.15.3106 libsrv_um.so
+ln -s libEGL.so.1 libEGL.so
+ln -s libGLES_CM.so.1 libGLES_CM.so
+ln -s libGLES_CM.so libGLESv1_CM.so
+ln -s libGLESv2.so.2 libGLESv2.so
+ln -s libOpenVG.so.1 libOpenVG.so
 popd
 
 %post
@@ -138,7 +171,19 @@
 %{_docdir}/%{name}-%{version}/license.txt
 %{_initddir}/pvr-bin
 %{_sbindir}/pvr-switch
-%{_libdir}/*.so  
+%{_libdir}/libIMGegl.so
+%{_libdir}/libOpenVGU.so
+%{_libdir}/libPVROGL.so
+%{_libdir}/libPVRScopeServices.so
+%{_libdir}/libglslcompiler.so
+%{_libdir}/libpvr2d.so
+%{_libdir}/libpvrPVR2D_BLITWSEGL.so
+%{_libdir}/libpvrPVR2D_DRIWSEGL.so
+%{_libdir}/libpvrPVR2D_FLIPWSEGL.so
+%{_libdir}/libpvrPVR2D_LINUXFBWSEGL.so
+%{_libdir}/libsrv_init.so
+%{_libdir}/libsrv_um.so
+%{_libdir}/libGLES_CM.so
 %{_libdir}/*.so.*
 %{_libdir}/dri/pvr_dri.so
 %{_libdir}/xorg/modules/drivers/pvr_drv.so
@@ -149,6 +194,18 @@
 %{_libdir}/pvr/mdfld/dri/pvr_dri.so
 %{_libdir}/pvr/mdfld/xorg/modules/drivers/pvr_drv.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/EGL/*.h
+%{_includedir}/GLES/*.h
+%{_includedir}/GLES2/*.h
+%{_includedir}/KHR/*.h
+%{_includedir}/VG/*.h
+%{_libdir}/libEGL.so
+%{_libdir}/libGLESv1_CM.so
+%{_libdir}/libGLESv2.so
+%{_libdir}/libOpenVG.so
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 

other changes:
--------------

++++++ pvr-header.tar.bz2 (new)