7
- PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
8
+ PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau1 >= $LIBDRM_NOUVEAU_REQUIRED])
13
gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600"
16
- PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
17
+ PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau1 >= $LIBDRM_NOUVEAU_REQUIRED])
18
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"
19
gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "" "xvmc-nouveau" "vdpau-nouveau"
21
--- a/configs/linux-dri
22
+++ b/configs/linux-dri
24
INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
25
INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
27
-NOUVEAU_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_nouveau)
28
-NOUVEAU_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_nouveau)
29
+NOUVEAU_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_nouveau1)
30
+NOUVEAU_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_nouveau1)
32
RADEON_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_radeon)
33
RADEON_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_radeon)
34
--- a/src/egl/main/Android.mk
35
+++ b/src/egl/main/Android.mk
40
-LOCAL_SHARED_LIBRARIES += libdrm_nouveau
41
+LOCAL_SHARED_LIBRARIES += libdrm_nouveau1
45
--- a/src/gallium/drivers/nouveau/Makefile
46
+++ b/src/gallium/drivers/nouveau/Makefile
49
-I$(TOP)/src/gallium/drivers/nouveau/include
51
-LIBRARY_INCLUDES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-I)
52
-LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-other)
53
+LIBRARY_INCLUDES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau1 --cflags-only-I)
54
+LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau1 --cflags-only-other)
57
include Makefile.sources
58
--- a/src/gallium/targets/dri-nouveau/Makefile
59
+++ b/src/gallium/targets/dri-nouveau/Makefile
62
include ../Makefile.dri
64
-DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
65
+DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau1 --libs)
68
--- a/src/gallium/targets/vdpau-nouveau/Makefile
69
+++ b/src/gallium/targets/vdpau-nouveau/Makefile
71
$(COMMON_GALLIUM_SOURCES) \
74
-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
75
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau1 --libs) -lXfixes
79
--- a/src/gallium/targets/xorg-nouveau/Makefile
80
+++ b/src/gallium/targets/xorg-nouveau/Makefile
82
$(TOP)/src/gallium/drivers/rbug/librbug.a
85
- $(shell $(PKG_CONFIG) --libs libdrm libdrm_nouveau)
86
+ $(shell $(PKG_CONFIG) --libs libdrm libdrm_nouveau1)
89
- $(shell $(PKG_CONFIG) --cflags-only-I libdrm libdrm_nouveau xf86driproto)
90
+ $(shell $(PKG_CONFIG) --cflags-only-I libdrm libdrm_nouveau1 xf86driproto)
94
--- a/src/gallium/targets/xvmc-nouveau/Makefile
95
+++ b/src/gallium/targets/xvmc-nouveau/Makefile
97
$(COMMON_GALLIUM_SOURCES) \
100
-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
101
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau1 --libs) -lXfixes
105
--- a/src/gallium/winsys/nouveau/drm/Makefile
106
+++ b/src/gallium/winsys/nouveau/drm/Makefile
109
C_SOURCES = nouveau_drm_winsys.c
111
-LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-I)
112
-LIBRARY_DEFINES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-other)
113
+LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau1 --cflags-only-I)
114
+LIBRARY_DEFINES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau1 --cflags-only-other)
116
include ../../../Makefile.template
117
--- a/src/gallium/targets/egl-static/Makefile
118
+++ b/src/gallium/targets/egl-static/Makefile
120
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
121
$(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
122
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
123
-egl_SYS += -ldrm_nouveau
124
+egl_SYS += -ldrm_nouveau1
128
--- a/src/gallium/targets/gbm/Makefile
129
+++ b/src/gallium/targets/gbm/Makefile
131
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
132
$(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
133
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
134
-nouveau_SYS = -ldrm_nouveau
135
+nouveau_SYS = -ldrm_nouveau1