Mailinglist Archive: opensuse-commit (1082 mails)
| < Previous | Next > |
commit Mesa
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 22 May 2007 17:09:01 +0200
- Message-id: <20070522150901.A3300678171@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package Mesa
checked in at Tue May 22 17:09:01 CEST 2007.
--------
--- Mesa/Mesa.changes 2007-05-14 21:23:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2007-05-22 15:56:37.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 22 15:56:20 CEST 2007 - dmueller@xxxxxxx
+
+- fix various undefined symbols in dri drivers (#272875)
+- build parallel
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.m23560/_old 2007-05-22 17:08:16.000000000 +0200
+++ /var/tmp/diff_new_pack.m23560/_new 2007-05-22 17:08:16.000000000 +0200
@@ -19,7 +19,7 @@
Obsoletes: xorg-x11-Mesa
Autoreqprov: on
Version: 6.5.3
-Release: 11
+Release: 14
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.*
Source: MesaLib-%{version}.tar.bz2
Source1: MesaDemos-%{version}.tar.bz2
@@ -144,32 +144,32 @@
make realclean
%ifarch %ix86 ppc x86_64
%ifarch %ix86
-make linux-dri-x86 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
-make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri
+make linux-dri-x86 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs}
+make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs}
make realclean
-make linux-x86-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make linux-x86-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
%ifarch ppc
-make linux-dri-ppc OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
-make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri
+make linux-dri-ppc OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs}
+make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs}
make realclean
-make linux-ppc-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make linux-ppc-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
%ifarch x86_64
-make linux-dri-x86-64 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
-make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri
+make linux-dri-x86-64 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs}
+make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs}
make realclean
-make linux-x86-64-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make linux-x86-64-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
%else
%ifnarch s390 s390x ppc64
-make linux-dri OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'"
+make linux-dri OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs}
%else
make linux OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri
make realclean
-make linux-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make linux-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
%ifarch ppc64 s390x
mv $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/%{_lib}
@@ -183,7 +183,7 @@
rm -f $RPM_BUILD_ROOT/usr/%{_lib}/libOSMesa.a
# build and install OffScreen Mesa library
make realclean
-make linux-osmesa OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make linux-osmesa OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
cp -a lib/libOSMesa.so* $RPM_BUILD_ROOT/usr/%{_lib}
# create dummy nvidia libGLcore.so.1 for applications, which are still
# linked against libGL.so.1 of older nvidia driver releases
@@ -240,6 +240,9 @@
/usr/%{_lib}/libMesaGL.a
%changelog
+* Tue May 22 2007 - dmueller@xxxxxxx
+- fix various undefined symbols in dri drivers (#272875)
+- build parallel
* Mon May 14 2007 - sndirsch@xxxxxxx
- link-shared.diff:
* use shared lib for DRI drivers to save a lot of space (Bug
++++++ link-shared.diff ++++++
--- /var/tmp/diff_new_pack.m23560/_old 2007-05-22 17:08:16.000000000 +0200
+++ /var/tmp/diff_new_pack.m23560/_new 2007-05-22 17:08:16.000000000 +0200
@@ -1,13 +1,3 @@
---- src/mesa/drivers/dri/Makefile.template
-+++ src/mesa/drivers/dri/Makefile.template
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libmesa_private.so
-
- COMMON_SOURCES = \
- ../../common/driverfuncs.c \
--- src/mesa/Makefile
+++ src/mesa/Makefile
@@ -57,7 +57,11 @@
@@ -15,9 +5,9 @@
fi
-linux-solo: depend subdirs libmesa.a
-+$(TOP)/$(LIB_DIR)/libmesa_private.so: $(SOLO_OBJECTS)
++$(TOP)/$(LIB_DIR)/libmesa_private.so: $(CORE_OBJECTS)
+ @ $(TOP)/bin/mklib -o mesa_private \
-+ -install $(TOP)/$(LIB_DIR) $(SOLO_OBJECTS)
++ -install $(TOP)/$(LIB_DIR) $(CORE_OBJECTS)
+
+linux-solo: depend subdirs libmesa.a $(TOP)/$(LIB_DIR)/libmesa_private.so
cd drivers/dri ; $(MAKE)
@@ -31,3 +21,68 @@
## NOT INSTALLED YET:
## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
+--- src/mesa/drivers/dri/Makefile.template
++++ src/mesa/drivers/dri/Makefile.template
+@@ -1,6 +1,6 @@
+ # -*-makefile-*-
+
+-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
++MESA_MODULES = $(TOP)/$(LIB_DIR)/libmesa_private.so
+
+ COMMON_SOURCES = \
+ ../../common/driverfuncs.c \
+@@ -77,7 +77,7 @@
+
+ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+ $(TOP)/bin/mklib -noprefix -o $@ \
+- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
++ $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -Wl,--no-undefined
+
+
+ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
+--- src/mesa/drivers/dri/s3v/s3v_context.c
++++ src/mesa/drivers/dri/s3v/s3v_context.c
+@@ -177,7 +177,8 @@
+ s3vInitExtensions( ctx );
+ s3vInitDriverFuncs( ctx );
+ s3vInitStateFuncs( ctx );
+- s3vInitSpanFuncs( ctx );
++ /* ???! not defined anywhere. WTF ?! */
++ /*s3vInitSpanFuncs( ctx );*/
+ s3vInitTextureFuncs( ctx );
+ s3vInitTriFuncs( ctx );
+ s3vInitState( vmesa );
+--- src/mesa/x86/read_rgba_span_x86.S
++++ src/mesa/x86/read_rgba_span_x86.S
+@@ -91,7 +91,6 @@
+ */
+
+ .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
+ .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
+ _generic_read_RGBA_span_BGRA8888_REV_MMX:
+ pushl %ebx
+@@ -191,7 +190,6 @@
+ */
+
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
+ .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE:
+ pushl %esi
+@@ -358,7 +356,6 @@
+
+ .text
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
+ .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
+ pushl %esi
+@@ -568,7 +565,6 @@
+
+ .text
+ .globl _generic_read_RGBA_span_RGB565_MMX
+- .hidden _generic_read_RGBA_span_RGB565_MMX
+ .type _generic_read_RGBA_span_RGB565_MMX, @function
+
+ _generic_read_RGBA_span_RGB565_MMX:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |