KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert libGL and DRI drivers to require libdrm. 

libdrm can be had from:

http://people.freedesktop.org/~ajax/libdrm/
This commit is contained in:
Adam Jackson 2005-08-19 20:20:03 +00:00
parent 2ae5645115
commit 8fcd1e0287
7 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/default
View File

@ -10,7 +10,7 @@ MESA_MAJOR=6
MESA_MINOR=3 MESA_MINOR=3
MESA_TINY=2 MESA_TINY=2
# external projects # external projects. This should be useless now that we use libdrm.
DRM_SOURCE_PATH=$(TOP)/../drm DRM_SOURCE_PATH=$(TOP)/../drm
# Compiler and flags # Compiler and flags

7
configs/freebsd-dri
View File

@ -22,8 +22,9 @@ CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
ASM_SOURCES = ASM_SOURCES =
# Library/program dependencies # Library/program dependencies
DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
@ -39,6 +40,6 @@ DRM_SOURCE_PATH=$(TOP)/../drm
# ffb and gamma are missing because they have not been converted to use the new # ffb and gamma are missing because they have not been converted to use the new
# interface. # interface.
DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 r300 radeon tdfx \ DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon tdfx \
unichrome savage sis unichrome savage sis

8
configs/linux-dri
View File

@ -38,8 +38,10 @@ ASM_SOURCES =
# Library/program dependencies # Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib EXTRA_LIB_PATH=-L/usr/X11R6/lib
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
$(LIBDRM_LIB)
# This is now 0 by default since it seems to confuse the hell out of people # This is now 0 by default since it seems to confuse the hell out of people
@ -62,5 +64,5 @@ WINDOW_SYSTEM=dri
# gamma are missing because they have not been converted to use the new # gamma are missing because they have not been converted to use the new
# interface. # interface.
DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v \ DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v \
savage sis tdfx trident unichrome ffb savage sis tdfx trident unichrome ffb

2
configs/linux-dri-ppc
View File

@ -13,5 +13,5 @@ ASM_SOURCES = $(PPC_SOURCES)
# Build only the drivers for cards that exist on PowerPC. At some point MGA # Build only the drivers for cards that exist on PowerPC. At some point MGA
# will be added, but not yet. # will be added, but not yet.
DRI_DIRS = dri_client mach64 r128 r200 r300 radeon tdfx DRI_DIRS = mach64 r128 r200 r300 radeon tdfx

2
configs/linux-dri-x86-64
View File

@ -19,5 +19,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64
# the new interface. i810 and i830 are missing because there is no x86-64 # the new interface. i810 and i830 are missing because there is no x86-64
# system where they could *ever* be used. # system where they could *ever* be used.
# #
DRI_DIRS = dri_client i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300 DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300

7
src/glx/x11/Makefile
View File

@ -8,10 +8,6 @@ C_SOURCES = \
$(TOP)/src/mesa/glapi/glthread.c \ $(TOP)/src/mesa/glapi/glthread.c \
$(TOP)/src/mesa/main/dispatch.c \ $(TOP)/src/mesa/main/dispatch.c \
glcontextmodes.c \ glcontextmodes.c \
$(DRM_SOURCE_PATH)/libdrm/xf86drm.c \
$(DRM_SOURCE_PATH)/libdrm/xf86drmHash.c \
$(DRM_SOURCE_PATH)/libdrm/xf86drmRandom.c \
$(DRM_SOURCE_PATH)/libdrm/xf86drmSL.c \
clientattrib.c \ clientattrib.c \
compsize.c \ compsize.c \
eval.c \ eval.c \
@ -53,8 +49,7 @@ INCLUDES = -I. \
-I$(TOP)/src/mesa/main \ -I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \ -I$(TOP)/src/mesa/glapi \
-I$(TOP)/src/mesa/drivers/dri/common \ -I$(TOP)/src/mesa/drivers/dri/common \
-I$(DRM_SOURCE_PATH)/libdrm \ `pkg-config --cflags libdrm` \
-I$(DRM_SOURCE_PATH)/shared-core \
$(X11_INCLUDES) $(X11_INCLUDES)

5
src/mesa/drivers/dri/Makefile.template
View File

@ -13,11 +13,10 @@ COMMON_SOURCES = \
../common/drirenderbuffer.c ../common/drirenderbuffer.c
ifeq ($(WINDOW_SYSTEM),dri) ifeq ($(WINDOW_SYSTEM),dri)
WINOBJ=../dri_client/dri.a WINOBJ=
WINLIB= WINLIB=
INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) \ INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) \
-I../dri_client \ `pkg-config --cflags libdrm`
-I../dri_client/imports
OBJECTS = $(C_SOURCES:.c=.o) \ OBJECTS = $(C_SOURCES:.c=.o) \
$(ASM_SOURCES:.S=.o) $(ASM_SOURCES:.S=.o)