From 8a70c35c1307f0e338002aa3740f73f640b10b70b6c51040f05031ef96132915 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 17 May 2007 09:44:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=13 --- Mesa.changes | 7 +++++++ Mesa.spec | 13 ++++++++++++- link-shared.diff | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 link-shared.diff diff --git a/Mesa.changes b/Mesa.changes index 4af6846..c853fbb 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -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 diff --git a/Mesa.spec b/Mesa.spec index b1f233b..248cc5d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -19,7 +19,7 @@ Provides: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa Autoreqprov: on 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.* Source: MesaLib-%{version}.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2 @@ -32,6 +32,7 @@ Patch1: dri_driver_dir.diff Patch2: i915-crossbar.diff Patch4: libIndirectGL.diff Patch5: static.diff +Patch6: link-shared.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -115,6 +116,9 @@ rm -rf src/glw/ %patch1 %patch2 %patch5 +%ifarch %ix86 x86_64 ppc +%patch6 +%endif %build @@ -216,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT /usr/include/GL/ /usr/%{_lib}/libGL.so /usr/%{_lib}/lib*.so.* +%ifarch %ix86 x86_64 ppc +/usr/%{_lib}/libmesa_private.so +%endif %ifnarch s390 s390x ppc64 /usr/%{_lib}/dri/ %endif @@ -233,6 +240,10 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libMesaGL.a %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 - updated to Mesa 6.5.3 - obsoletes the following patches: diff --git a/link-shared.diff b/link-shared.diff new file mode 100644 index 0000000..dfdb8aa --- /dev/null +++ b/link-shared.diff @@ -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