metalefty/mesa
1
0
Fork 0
forked from rpms/mesa
Code Pull Requests Activity
22addccfb6
mesa/mesa-7.1-link-shared.patch

102 lines
3.7 KiB
Diff
Raw Normal View History

- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
--- mesa-20091221/src/mesa/drivers/dri/Makefile.da 2009-12-21 08:09:11.000000000 +1000
+++ mesa-20091221/src/mesa/drivers/dri/Makefile 2009-12-21 08:43:03.000000000 +1000
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
- bump to snapshot of mesa master - mainly has intel dri2 tfp fixes + radeon rewrite patch
2009-03-22 02:39:21 +00:00
-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
$(TOP)/$(LIB_DIR):
-mkdir $(TOP)/$(LIB_DIR)
+libdricore.so:
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
+
+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
subdirs:
@for dir in $(DRI_DIRS) ; do \
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
- latest Mesa snapshot - re-enable tex offset - add r300 command buffer support on top of snapshot - disable osmesa version patch -- (ajax???)
2008-08-14 06:35:21 +00:00
$(pcedit) $< > $@
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
- latest Mesa snapshot - re-enable tex offset - add r300 command buffer support on top of snapshot - disable osmesa version patch -- (ajax???)
2008-08-14 06:35:21 +00:00
-install: dri.pc
+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
@for dir in $(DRI_DIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE) install) || exit 1 ; \
fi \
done
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- latest Mesa snapshot - re-enable tex offset - add r300 command buffer support on top of snapshot - disable osmesa version patch -- (ajax???)
2008-08-14 06:35:21 +00:00
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
$(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
@@ -51,5 +58,6 @@ clean:
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
(cd $$dir && $(MAKE) clean) ; \
fi \
done
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
-rm -f common/*.o
- latest Mesa snapshot - re-enable tex offset - add r300 command buffer support on top of snapshot - disable osmesa version patch -- (ajax???)
2008-08-14 06:35:21 +00:00
-rm -f *.pc
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da 2009-12-21 08:09:11.000000000 +1000
+++ mesa-20091221/src/mesa/drivers/dri/Makefile.template 2009-12-21 08:43:40.000000000 +1000
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
@@ -1,6 +1,6 @@
# -*-makefile-*-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
COMMON_GALLIUM_SOURCES = \
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
../common/utils.c \
- mesa fix link shared to actually link
2009-12-21 02:48:56 +00:00
@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
$(TOP)/src/mesa/drivers/dri/Makefile.template
- latest Mesa snapshot - re-enable tex offset - add r300 command buffer support on top of snapshot - disable osmesa version patch -- (ajax???)
2008-08-14 06:35:21 +00:00
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
+ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
- mesa fix link shared to actually link
2009-12-21 02:54:05 +00:00
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
$(DRI_LIB_DEPS)
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
- resnapshot from upstream for libdrm_radeon changes
2009-12-20 22:50:28 +00:00
diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da 2009-12-21 08:09:11.000000000 +1000
+++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S 2009-12-21 08:43:03.000000000 +1000
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
@@ -77,7 +77,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
@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
*/
.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
@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
.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
@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
.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:
Copy Permalink