SHA256
1
0
forked from pool/Mesa
OBS User unknown 2007-05-17 09:44:57 +00:00 committed by Git OBS Bridge
parent bf44f33d5d
commit 8a70c35c13
3 changed files with 52 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 14 20:45:34 CEST 2007 - sndirsch@suse.de
- link-shared.diff:
* use shared lib for DRI drivers to save a lot of space (Bug
#272875)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 30 22:26:51 CEST 2007 - sndirsch@suse.de Mon Apr 30 22:26:51 CEST 2007 - sndirsch@suse.de

View File

@ -19,7 +19,7 @@ Provides: xorg-x11-Mesa
Obsoletes: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa
Autoreqprov: on Autoreqprov: on
Version: 6.5.3 Version: 6.5.3
Release: 6 Release: 11
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.*
Source: MesaLib-%{version}.tar.bz2 Source: MesaLib-%{version}.tar.bz2
Source1: MesaDemos-%{version}.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2
@ -32,6 +32,7 @@ Patch1: dri_driver_dir.diff
Patch2: i915-crossbar.diff Patch2: i915-crossbar.diff
Patch4: libIndirectGL.diff Patch4: libIndirectGL.diff
Patch5: static.diff Patch5: static.diff
Patch6: link-shared.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -115,6 +116,9 @@ rm -rf src/glw/
%patch1 %patch1
%patch2 %patch2
%patch5 %patch5
%ifarch %ix86 x86_64 ppc
%patch6
%endif
%build %build
@ -216,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/include/GL/ /usr/include/GL/
/usr/%{_lib}/libGL.so /usr/%{_lib}/libGL.so
/usr/%{_lib}/lib*.so.* /usr/%{_lib}/lib*.so.*
%ifarch %ix86 x86_64 ppc
/usr/%{_lib}/libmesa_private.so
%endif
%ifnarch s390 s390x ppc64 %ifnarch s390 s390x ppc64
/usr/%{_lib}/dri/ /usr/%{_lib}/dri/
%endif %endif
@ -233,6 +240,10 @@ rm -rf $RPM_BUILD_ROOT
/usr/%{_lib}/libMesaGL.a /usr/%{_lib}/libMesaGL.a
%changelog %changelog
* Mon May 14 2007 - sndirsch@suse.de
- link-shared.diff:
* use shared lib for DRI drivers to save a lot of space (Bug
[#272875])
* Mon Apr 30 2007 - sndirsch@suse.de * Mon Apr 30 2007 - sndirsch@suse.de
- updated to Mesa 6.5.3 - updated to Mesa 6.5.3
- obsoletes the following patches: - obsoletes the following patches:

33
link-shared.diff Normal file
View File

@ -0,0 +1,33 @@
--- 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 @@
mimeset -f "$@" ; \
fi
-linux-solo: depend subdirs libmesa.a
+$(TOP)/$(LIB_DIR)/libmesa_private.so: $(SOLO_OBJECTS)
+ @ $(TOP)/bin/mklib -o mesa_private \
+ -install $(TOP)/$(LIB_DIR) $(SOLO_OBJECTS)
+
+linux-solo: depend subdirs libmesa.a $(TOP)/$(LIB_DIR)/libmesa_private.so
cd drivers/dri ; $(MAKE)
@@ -161,6 +165,7 @@
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
cd drivers/dri ; $(MAKE) install ; \
fi
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libmesa_private.* $(INSTALL_DIR)/$(LIB_DIR)
## NOT INSTALLED YET:
## $(INSTALL) -d $(INSTALL_DIR)/include/GLES