Author: qboosh Date: Sat Oct 22 23:04:47 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - don't build glut (we have it in glut.spec) - build glxgears,glxinfo demos, don't link them with glut (not needed) - unified examples dir - package shared libGLw (built without Motif interface) - BR: expat-devel (for dri drivers)
---- Files affected: SPECS: Mesa.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: SPECS/Mesa.spec diff -u SPECS/Mesa.spec:1.88 SPECS/Mesa.spec:1.89 --- SPECS/Mesa.spec:1.88 Fri Oct 21 13:36:07 2005 +++ SPECS/Mesa.spec Sun Oct 23 01:04:41 2005 @@ -1,8 +1,11 @@ # $Revision$, $Date$ # +# TODO: +# - separate libGL/libGLU/libGLw,progs? +# # Conditional build: %bcond_with glide # with GLIDE (broken now) -%bcond_without motif # without libGLw Motif interface +%bcond_without motif # build static libGLw without Motif interface # Summary: Free OpenGL implementation Summary(pl): Wolnodostępna implementacja standardu OpenGL @@ -19,6 +22,7 @@ # http://www.gentoo.org/cgi-bin/viewcvs.cgi/media-libs/mesa/files/mesa-add-dri-asm-files.patch?rev=1.1&content-type=text/vnd.viewcvs-markup Patch0: %{name}-dri-asm.patch URL: http://www.mesa3d.org/ +BuildRequires: expat-devel BuildRequires: libdrm-devel BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.4d @@ -126,7 +130,7 @@ %patch0 -p1 # fix demos -find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/Mesa/images/,g" +find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g" %build %ifarch %{ix86} @@ -141,43 +145,66 @@ OPT_FLAGS="%{rpmcflags}" \ XLIB_DIR=%{_libdir} \ GLW_SOURCES="GLwDrawA.c%{?with_motif: GLwMDrawA.c}" \ - PROGRAM_DIRS="" + SRC_DIRS="mesa glu glw" \ + PROGRAM_DIRS= mv -f lib lib-static %{__make} clean + %{__make} linux-dri${targ} \ CC="%{__cc}" \ CXX="%{__cxx}" \ MKDEP=makedepend \ OPT_FLAGS="%{rpmcflags}" \ XLIB_DIR=%{_libdir} \ - PROGRAM_DIRS="" + SRC_DIRS="glx/x11 mesa glu glw" \ + PROGRAM_DIRS= mv -f lib lib-dri -%{__make} clean +%{__make} clean \ + MKDEP=makedepend + %{__make} linux${targ} \ CC="%{__cc}" \ CXX="%{__cxx}" \ OPT_FLAGS="%{rpmcflags}" \ - XLIB_DIR=%{_libdir} - PROGRAM_DIRS="" + XLIB_DIR=%{_libdir} \ + SRC_DIRS="mesa glu glw" \ + PROGRAM_DIRS= + +%{__make} -C progs/xdemos \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ + OPT_FLAGS="%{rpmcflags}" \ + XLIB_DIR=%{_libdir} \ + PROGS="glxgears" \ + APP_LIB_DEPS="-L\$(LIB_DIR) -lGL" + +%{__make} -C progs/xdemos \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ + OPT_FLAGS="%{rpmcflags}" \ + XLIB_DIR=%{_libdir} \ + PROGS="glxinfo" \ + APP_LIB_DEPS="-L\$(LIB_DIR) -lGLU -lGL" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/GL,%{_mandir}/man3,%{_examplesdir}/Mesa} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/GL,%{_examplesdir}/%{name}-%{version}} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri cp -df lib-static/lib* $RPM_BUILD_ROOT%{_libdir} cp -df lib-dri/lib* $RPM_BUILD_ROOT%{_libdir} cp -df lib/libOS* $RPM_BUILD_ROOT%{_libdir} -cp -rf include/GL/{gl*,osmesa.h,xmesa*} src/glw/GLw*.h $RPM_BUILD_ROOT%{_includedir}/GL +cp -rf include/GL/{gl[!u]*,glu.h,glu_*,osmesa.h,xmesa*} src/glw/GLw*.h $RPM_BUILD_ROOT%{_includedir}/GL cp -df lib-dri/*_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri +install progs/xdemos/{glxgears,glxinfo} $RPM_BUILD_ROOT%{_bindir} for l in demos redbook samples xdemos ; do %{__make} -C progs/$l clean done for l in demos redbook samples util xdemos images ; do - cp -Rf progs/$l $RPM_BUILD_ROOT%{_examplesdir}/Mesa/$l + cp -Rf progs/$l $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$l done -rm -rf $RPM_BUILD_ROOT%{_examplesdir}/Mesa/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}} +rm -rf $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/*/{.deps,CVS,Makefile.{BeOS*,win,cygnus,DJ,dja}} %clean rm -rf $RPM_BUILD_ROOT @@ -188,19 +215,21 @@ %files %defattr(644,root,root,755) %doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS,X11},RELNOTES*,VERSIONS} -%attr(755,root,root) %{_libdir}/libGL.so +%attr(755,root,root) %{_bindir}/glx* %attr(755,root,root) %{_libdir}/libGL.so.*.* %attr(755,root,root) %{_libdir}/libGLU.so.*.* -%attr(755,root,root) %{_libdir}/libglut.so.*.* +%attr(755,root,root) %{_libdir}/libGLw.so.*.* %attr(755,root,root) %{_libdir}/libOSMesa.so.*.* +# symlink for binary apps which fail to conform Linux OpenGL ABI +# (and dlopen libGL.so instead of libGL.so.1) +%attr(755,root,root) %{_libdir}/libGL.so %files devel %defattr(644,root,root,755) %doc docs/*.spec %attr(755,root,root) %{_libdir}/libGLU.so -%attr(755,root,root) %{_libdir}/libglut.so +%attr(755,root,root) %{_libdir}/libGLw.so %attr(755,root,root) %{_libdir}/libOSMesa.so -%{_libdir}/libGLw.a %dir %{_includedir}/GL %{_includedir}/GL/GLwDrawA.h %{_includedir}/GL/GLwDrawAP.h @@ -223,12 +252,12 @@ %defattr(644,root,root,755) %{_libdir}/libGL.a %{_libdir}/libGLU.a -%{_libdir}/libglut.a +%{_libdir}/libGLw.a %{_libdir}/libOSMesa.a %files demos %defattr(644,root,root,755) -%{_examplesdir}/Mesa +%{_examplesdir}/%{name}-%{version} %files dri %defattr(644,root,root,755) @@ -241,6 +270,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.89 2005/10/22 23:04:41 qboosh +- don't build glut (we have it in glut.spec) +- build glxgears,glxinfo demos, don't link them with glut (not needed) +- unified examples dir +- package shared libGLw (built without Motif interface) +- BR: expat-devel (for dri drivers) + Revision 1.88 2005/10/21 11:36:07 qboosh - BR: libXxf86vm-devel,glproto,makedepend (for dri build) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Mesa.spec?r1=1.88&r2=1.89&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
