1 Aug
2006
1 Aug
'06
14:35
Hello community,
here is the log from the commit of package Mesa
checked in at Tue Aug 1 16:35:31 CEST 2006.
--------
--- Mesa/Mesa.changes 2006-06-25 19:11:25.000000000 +0200
+++ Mesa/Mesa.changes 2006-07-31 16:09:27.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Jul 31 16:07:25 CEST 2006 - sndirsch@suse.de
+
+- updated to Mesa 6.5_20060712; required by xorg-server 1.1.99.3
+- cleanup
+
+-------------------------------------------------------------------
+Wed Jul 19 17:04:39 CEST 2006 - ro@suse.de
+
+- adapt to /usr/lib move
+
+-------------------------------------------------------------------
Old:
----
Mesa-6.5.tar.bz2
licensefix.patch
osmesa.diff
New:
----
Mesa-6.5_20060712.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.reKRzY/_old 2006-08-01 16:34:46.000000000 +0200
+++ /var/tmp/diff_new_pack.reKRzY/_new 2006-08-01 16:34:46.000000000 +0200
@@ -19,17 +19,15 @@
Obsoletes: xorg-x11-Mesa
Autoreqprov: on
Version: 6.5
-Release: 2
+Release: 5
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.*
-Source: Mesa-%{version}.tar.bz2
+Source: Mesa-%{version}_20060712.tar.bz2
Source3: README.updates
Source4: manual-pages.tar.bz2
Patch: Mesa-%{version}.diff
Patch3: GLw-motif.diff
-Patch4: osmesa.diff
Patch5: static.diff
Patch7: glxext-sgi-hyperpipe.patch
-Patch10: licensefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -100,24 +98,14 @@
%prep
%setup -n %name -b4
-# cleanup
-find . -name CVS | xargs rm -rf
# no need to build GLUT and (GLUT-)Demos
rm -rf src/glut progs/{demos,redbook,samples,xdemos}
# we use freeglut
rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
%patch
%patch3
-cp configs/linux-osmesa16 configs/linux-osmesa
-%patch4
-cp configs/linux-osmesa configs/linux-osmesa-64
-echo "LIB_DIR = \$(TOP)/lib64" >> configs/linux-osmesa-64
-echo "EXTRA_LIB_PATH = -L/usr/X11R6/lib64" >> configs/linux-osmesa-64
%patch5
%patch7 -p1
-pushd src/glu/sgi/libnurbs/internals
-%patch10
-popd
%build
for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
@@ -128,20 +116,20 @@
done
%ifarch %ix86 ppc x86_64
%ifarch %ix86
-make linux-dri-x86 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/X11R6/%{_lib}/modules/dri/updates:/usr/X11R6/%{_lib}/modules/dri'\"'"
+make linux-dri-x86 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
make linux-x86-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
%ifarch ppc
-make linux-dri-ppc OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/X11R6/%{_lib}/modules/dri/updates:/usr/X11R6/%{_lib}/modules/dri'\"'"
+make linux-dri-ppc OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
make linux-ppc-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
%ifarch x86_64
-make linux-dri-x86-64 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/X11R6/%{_lib}/modules/dri/updates:/usr/X11R6/%{_lib}/modules/dri'\"'"
+make linux-dri-x86-64 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
make linux-x86-64-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
%else
%ifnarch s390 s390x
-make linux-dri OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/X11R6/%{_lib}/modules/dri/updates:/usr/X11R6/%{_lib}/modules/dri'\"'"
+make linux-dri OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
%else
make linux OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
@@ -156,33 +144,25 @@
make install.man DESTDIR=$RPM_BUILD_ROOT MANPATH=%{_mandir} LIBMANSUFFIX=3gl
popd
done
-make install DESTDIR=$RPM_BUILD_ROOT/usr
+make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr
if [ "%{_lib}" != "lib" ]; then
mv $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/%{_lib}
fi
ln -snf libGL.a $RPM_BUILD_ROOT/usr/%{_lib}/libMesaGL.a
rm -f $RPM_BUILD_ROOT/usr/%{_lib}/libOSMesa.a
%ifnarch s390 s390x
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/modules/dri
+mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/dri
%ifarch ppc64
-install -m 755 lib/*_dri.so $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/modules/dri
+install -m 755 lib/*_dri.so $RPM_BUILD_ROOT/usr/%{_lib}/dri
%else
-install -m 755 %{_lib}/*_dri.so $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/modules/dri
+install -m 755 %{_lib}/*_dri.so $RPM_BUILD_ROOT/usr/%{_lib}/dri
%endif
%endif
# build and install OffScreen Mesa library
install -m 644 src/glw/GLw*.h $RPM_BUILD_ROOT/usr/include/GL
make realclean
-%ifarch x86_64
-make linux-osmesa-64 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-cp -a %{_lib}/libOSMesa.so* $RPM_BUILD_ROOT/usr/%{_lib}
-%else
make linux-osmesa OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
cp -a lib/libOSMesa.so* $RPM_BUILD_ROOT/usr/%{_lib}
-%endif
-#%ifarch %ix86
-#tar xvzCf $RPM_BUILD_ROOT/usr/%{_lib} %SOURCE2
-#%endif
# create dummy nvidia libGLcore.so.1 for applications, which are still
# linked against libGL.so.1 of older nvidia driver releases
> libGLcore.c
@@ -195,9 +175,9 @@
cp -a $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.* $RPM_BUILD_ROOT/usr/%{_lib}/GL
%ifnarch s390 s390x
# DRI driver update mechanism
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/modules/dri/updates
+mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/dri/updates
install -m 644 $RPM_SOURCE_DIR/README.updates \
- $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/modules/dri/updates
+ $RPM_BUILD_ROOT/usr/%{_lib}/dri/updates
%endif
%clean
@@ -214,13 +194,11 @@
/usr/%{_lib}/lib*.so.*
/usr/%{_lib}/GL/lib*.so.*
%ifnarch s390 s390x
-%dir /usr/X11R6/%{_lib}/modules
-/usr/X11R6/%{_lib}/modules/dri/
+/usr/%{_lib}/dri/
%endif
%files devel
%defattr(-,root,root)
-/usr/include/GLES/
/usr/%{_lib}/libGLU.so
/usr/%{_lib}/libGLw.so
/usr/%{_lib}/libOSMesa.so
@@ -232,6 +210,11 @@
/usr/%{_lib}/libMesaGL.a
%changelog -n Mesa
+* Mon Jul 31 2006 - sndirsch@suse.de
+- updated to Mesa 6.5_20060712; required by xorg-server 1.1.99.3
+- cleanup
+* Wed Jul 19 2006 - ro@suse.de
+- adapt to /usr/lib move
* Sun Jun 25 2006 - sndirsch@suse.de
- fixed build for X.Org 7.1
* Wed Jun 21 2006 - sndirsch@suse.de
++++++ Mesa-6.5.diff ++++++
--- /var/tmp/diff_new_pack.reKRzY/_old 2006-08-01 16:34:46.000000000 +0200
+++ /var/tmp/diff_new_pack.reKRzY/_new 2006-08-01 16:34:46.000000000 +0200
@@ -19,21 +19,3 @@
LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
---- src/glx/x11/Makefile.orig 2005-11-12 23:56:54.604338651 +0100
-+++ src/glx/x11/Makefile 2005-11-12 23:58:01.767594769 +0100
-@@ -49,6 +49,7 @@
- -I$(TOP)/src/mesa/main \
- -I$(TOP)/src/mesa/glapi \
- -I$(TOP)/src/mesa/drivers/dri/common \
-+ -I$(TOP)/src/mesa/x86 \
- `pkg-config --cflags libdrm` \
- $(X11_INCLUDES)
-
---- configs/linux-dri.orig 2006-06-21 22:32:48.348422974 +0200
-+++ configs/linux-dri 2006-06-21 22:32:58.463657093 +0200
-@@ -64,4 +64,4 @@
- # gamma are missing because they have not been converted to use the new
- # interface.
- DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
-- savage sis tdfx trident unichrome ffb
-+ savage tdfx trident unichrome ffb
++++++ static.diff ++++++
--- /var/tmp/diff_new_pack.reKRzY/_old 2006-08-01 16:34:46.000000000 +0200
+++ /var/tmp/diff_new_pack.reKRzY/_new 2006-08-01 16:34:46.000000000 +0200
@@ -1,10 +1,7 @@
-Index: configs/linux-ppc-static
-===================================================================
-RCS file: /cvs/mesa/Mesa/configs/linux-ppc-static,v
-retrieving revision 1.3
-diff -u -r1.3 linux-ppc-static
---- configs/linux-ppc-static 2 Jul 2005 07:38:40 -0000 1.3
-+++ configs/linux-ppc-static 18 Nov 2005 10:29:56 -0000
+Only in configs.orig/: linux-dri.orig
+diff -u -r configs.orig/linux-ppc-static configs/linux-ppc-static
+--- configs.orig/linux-ppc-static 2006-07-31 11:07:44.000000000 +0200
++++ configs/linux-ppc-static 2006-07-31 11:07:56.000000000 +0200
@@ -8,7 +8,3 @@
# Library names (actual file names)
@@ -13,13 +10,9 @@
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-Index: configs/linux-static
-===================================================================
-RCS file: /cvs/mesa/Mesa/configs/linux-static,v
-retrieving revision 1.3
-diff -u -r1.3 linux-static
---- configs/linux-static 2 Jul 2005 07:38:40 -0000 1.3
-+++ configs/linux-static 18 Nov 2005 10:29:56 -0000
+diff -u -r configs.orig/linux-static configs/linux-static
+--- configs.orig/linux-static 2006-07-31 11:07:44.000000000 +0200
++++ configs/linux-static 2006-07-31 11:07:56.000000000 +0200
@@ -8,14 +8,6 @@
# Library names (actual file names)
@@ -35,14 +28,10 @@
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
-Index: configs/linux-x86-64-static
-===================================================================
-RCS file: /cvs/mesa/Mesa/configs/linux-x86-64-static,v
-retrieving revision 1.6
-diff -u -r1.6 linux-x86-64-static
---- configs/linux-x86-64-static 2 Jul 2005 07:38:40 -0000 1.6
-+++ configs/linux-x86-64-static 18 Nov 2005 10:29:56 -0000
-@@ -8,14 +8,6 @@
+diff -u -r configs.orig/linux-x86-64-static configs/linux-x86-64-static
+--- configs.orig/linux-x86-64-static 2006-07-31 11:07:44.000000000 +0200
++++ configs/linux-x86-64-static 2006-07-31 11:11:08.000000000 +0200
+@@ -8,16 +8,6 @@
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -57,14 +46,12 @@
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
-Index: configs/linux-x86-static
-===================================================================
-RCS file: /cvs/mesa/Mesa/configs/linux-x86-static,v
-retrieving revision 1.5
-diff -u -r1.5 linux-x86-static
---- configs/linux-x86-static 2 Jul 2005 07:38:40 -0000 1.5
-+++ configs/linux-x86-static 18 Nov 2005 10:29:56 -0000
-@@ -8,14 +8,6 @@
+-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+- $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
+diff -u -r configs.orig/linux-x86-static configs/linux-x86-static
+--- configs.orig/linux-x86-static 2006-07-31 11:07:44.000000000 +0200
++++ configs/linux-x86-static 2006-07-31 11:11:44.000000000 +0200
+@@ -8,16 +8,6 @@
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -79,3 +66,5 @@
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
+-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+- $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
6718
Age (days ago)
6718
Last active (days ago)
0 comments
1 participants
participants (1)
-
root＠suse.de