Attachment 2355 Details for Bug 12036 – Обновлённый Mesa-7.0.2-alt-make.patch.

[patch] Обновлённый Mesa-7.0.2-alt-make.patch.

Mesa-7.0.2-alt-make.patch (text/plain), 5.52 KB, created by Kirill A. Shutemov on 2008-01-05 03:08:23 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Kirill A. Shutemov

Created: 2008-01-05 03:08:23 MSK

Size: 5.52 KB

patch

obsolete

>diff -uNr Mesa-7.0.2.orig/Makefile Mesa-7.0.2/Makefile
>--- Mesa-7.0.2.orig/Makefile	2007-11-10 19:41:24 +0300
>+++ Mesa-7.0.2/Makefile	2008-01-05 01:36:00 +0300
>@@ -104,6 +104,7 @@
> linux-dri \
> linux-dri-debug \
> linux-dri-x86 \
>+linux-dri-x86-32 \
> linux-dri-x86-64 \
> linux-dri-ppc \
> linux-dri-xcb \
>diff -uNr Mesa-7.0.2.orig/configs/default Mesa-7.0.2/configs/default
>--- Mesa-7.0.2.orig/configs/default	2007-11-01 18:30:52 +0300
>+++ Mesa-7.0.2/configs/default	2008-01-05 01:34:58 +0300
>@@ -25,8 +25,8 @@
> 
> # Misc tools and flags
> MKLIB_OPTIONS = 
>-MKDEP = makedepend
>-MKDEP_OPTIONS = -fdepend
>+MKDEP = true
>+MKDEP_OPTIONS =
> MAKE = make
> INSTALL = $(TOP)/bin/minstall
> 
>@@ -81,8 +81,8 @@
> 
> 
> # Installation directories (for make install)
>-INSTALL_DIR = /usr/local
>-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
>+INSTALL_DIR = /usr
>+DRI_DRIVER_INSTALL_DIR = /usr/$(LIB_DIR)/X11/modules/dri
> 
> # Where libGL will look for DRI hardware drivers
> DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
>diff -uNr Mesa-7.0.2.orig/configs/linux Mesa-7.0.2/configs/linux
>--- Mesa-7.0.2.orig/configs/linux	2007-11-01 22:09:01 +0300
>+++ Mesa-7.0.2/configs/linux	2008-01-05 01:34:58 +0300
>@@ -8,7 +8,7 @@
> CC = gcc
> CXX = g++
> 
>-OPT_FLAGS  = -O3 -g
>+OPT_FLAGS  = -pipe -O3
> PIC_FLAGS  = -fPIC
> 
> # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
>@@ -20,7 +20,7 @@
> 	-D_BSD_SOURCE -D_GNU_SOURCE \
> 	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
> 
>-X11_INCLUDES = -I/usr/X11R6/include
>+X11_INCLUDES =
> 
> CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
> 	$(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math 
>diff -uNr Mesa-7.0.2.orig/configs/linux-dri Mesa-7.0.2/configs/linux-dri
>--- Mesa-7.0.2.orig/configs/linux-dri	2007-11-01 22:09:01 +0300
>+++ Mesa-7.0.2/configs/linux-dri	2008-01-05 01:34:58 +0300
>@@ -13,7 +13,7 @@
> #MKDEP = gcc -M
> #MKDEP_OPTIONS = -MF depend
> 
>-OPT_FLAGS  = -O -g
>+OPT_FLAGS  = -pipe -O3
> PIC_FLAGS  = -fPIC
> 
> # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
>@@ -25,7 +25,7 @@
> 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
> 	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
> 
>-X11_INCLUDES = -I/usr/X11R6/include
>+X11_INCLUDES =
> 
> CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
> 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
>@@ -41,7 +41,7 @@
> ASM_SOURCES = 
> 
> # Library/program dependencies
>-EXTRA_LIB_PATH=-L/usr/X11R6/lib
>+EXTRA_LIB_PATH=
> 
> LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
> LIBDRM_LIB = `pkg-config --libs libdrm`
>@@ -71,5 +71,5 @@
> 
> # gamma are missing because they have not been converted to use the new
> # interface.
>-DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
>-	savage sis tdfx trident unichrome ffb
>+DRI_DIRS = mach64 mga nouveau r128 r200 r300 radeon savage tdfx
>+
>diff -uNr Mesa-7.0.2.orig/configs/linux-dri-x86 Mesa-7.0.2/configs/linux-dri-x86
>--- Mesa-7.0.2.orig/configs/linux-dri-x86	2007-11-01 22:09:01 +0300
>+++ Mesa-7.0.2/configs/linux-dri-x86	2008-01-05 01:34:58 +0300
>@@ -1,14 +1,7 @@
> # -*-makefile-*-
> # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
>-
> include $(TOP)/configs/linux-dri
> 
> CONFIG_NAME = linux-dri-x86
> 
>-# Add -m32 to CFLAGS:
>-ARCH_FLAGS = -m32
>-
>-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
>-ASM_SOURCES = $(X86_SOURCES)
>-ASM_API = $(X86_API)
>-
>+DRI_DIRS += i915 i965 sis unichrome
>diff -uNr Mesa-7.0.2.orig/configs/linux-dri-x86-32 Mesa-7.0.2/configs/linux-dri-x86-32
>--- Mesa-7.0.2.orig/configs/linux-dri-x86-32	1970-01-01 03:00:00 +0300
>+++ Mesa-7.0.2/configs/linux-dri-x86-32	2008-01-05 01:34:58 +0300
>@@ -0,0 +1,15 @@
>+# -*-makefile-*-
>+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
>+
>+include $(TOP)/configs/linux-dri-x86
>+
>+CONFIG_NAME = linux-dri-x86-32
>+
>+# Add -m32 to CFLAGS:
>+ARCH_FLAGS = -m32 -DGLX_USE_TLS
>+
>+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
>+ASM_SOURCES = $(X86_SOURCES)
>+ASM_API = $(X86_API)
>+
>+DRI_DIRS += i810
>diff -uNr Mesa-7.0.2.orig/configs/linux-dri-x86-64 Mesa-7.0.2/configs/linux-dri-x86-64
>--- Mesa-7.0.2.orig/configs/linux-dri-x86-64	2007-06-22 02:10:53 +0400
>+++ Mesa-7.0.2/configs/linux-dri-x86-64	2008-01-05 01:34:58 +0300
>@@ -1,24 +1,14 @@
> # -*-makefile-*-
> # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
> 
>-include $(TOP)/configs/linux-dri
>+include $(TOP)/configs/linux-dri-x86
> 
> CONFIG_NAME = linux-dri-x86-64
> 
>-ARCH_FLAGS = -m64
>+ARCH_FLAGS = -m64 -DGLX_USE_TLS
> 
> ASM_FLAGS = -DUSE_X86_64_ASM
> ASM_SOURCES = $(X86-64_SOURCES)
> ASM_API = $(X86-64_API)
> 
> LIB_DIR = lib64
>-
>-# Library/program dependencies
>-EXTRA_LIB_PATH=-L/usr/X11R6/lib64
>-
>-# ffb, gamma, and sis are missing because they have not be converted to use
>-# the new interface.  i810 are missing because there is no x86-64
>-# system where they could *ever* be used.
>-#
>-DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
>-
>diff -uNr Mesa-7.0.2.orig/src/mesa/drivers/dri/Makefile.template Mesa-7.0.2/src/mesa/drivers/dri/Makefile.template
>--- Mesa-7.0.2.orig/src/mesa/drivers/dri/Makefile.template	2007-11-01 18:30:52 +0300
>+++ Mesa-7.0.2/src/mesa/drivers/dri/Makefile.template	2008-01-05 01:34:58 +0300
>@@ -75,7 +75,7 @@
> 
> $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
> 	$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
>-		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
>+		$(OBJECTS) $(MESA_MODULES) -L$(TOP)/$(LIB_DIR) -lGL $(WINOBJ) $(DRI_LIB_DEPS)
> 
> 
> $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)

Actions: View | Diff

Attachments on bug 12036: 2020 | 2021 | 2022 | 2355 | 2356