summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
Diffstat (limited to 'rules')
-rw-r--r--rules/xorg-driver-video-ati.in14
-rw-r--r--rules/xorg-driver-video-ati.make10
2 files changed, 15 insertions, 9 deletions
diff --git a/rules/xorg-driver-video-ati.in b/rules/xorg-driver-video-ati.in
index 0f5ae2f4e..bd7517996 100644
--- a/rules/xorg-driver-video-ati.in
+++ b/rules/xorg-driver-video-ati.in
@@ -3,7 +3,6 @@
menuconfig XORG_DRIVER_VIDEO_ATI
bool
depends on XORG_DRIVER_VIDEO
- depends on BROKEN
select XORG_SERVER
select XORG_PROTO_X
select XORG_PROTO_FONTS
@@ -15,15 +14,16 @@ comment "X.org ATI Driver"
depends on XORG_DRIVER_VIDEO_ATI
config XORG_DRIVER_VIDEO_ATI_DRI
- bool
- depends on XORG_DRIVER_VIDEO_ATI
+ bool
+ depends on XORG_DRIVER_VIDEO_ATI
select LIBDRM
+ select MESALIB
+ select XORG_PROTO_GL
+ select XORG_SERVER_EXT_GLX
+ select XORG_SERVER_EXT_DRI
+ select XORG_PROTO_XF86DRI
prompt "Enable DRI"
help
--enable-dri
-comment "driver-video-ati is broken, please send a patch"
- depends on !BROKEN
- depends on XORG_DRIVER_VIDEO
-
diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make
index a68f68f31..922e847e7 100644
--- a/rules/xorg-driver-video-ati.make
+++ b/rules/xorg-driver-video-ati.make
@@ -67,7 +67,7 @@ XORG_DRIVER_VIDEO_ATI_ENV := $(CROSS_ENV)
#
XORG_DRIVER_VIDEO_ATI_AUTOCONF := $(CROSS_AUTOCONF_USR)
-ifdef PTXCONF_XORG_DRIVER_VIDEO_ATI_DRI
+ifdef PTXCONF_XORG_DRIVER_VIDEO_ATI_DRI
XORG_DRIVER_VIDEO_ATI_AUTOCONF += --enable-dri
else
XORG_DRIVER_VIDEO_ATI_AUTOCONF += --disable-dri
@@ -121,7 +121,13 @@ $(STATEDIR)/xorg-driver-video-ati.targetinstall: $(xorg-driver-video-ati_targeti
@$(call install_fixup, xorg-driver-video-ati,DEPENDS,)
@$(call install_fixup, xorg-driver-video-ati,DESCRIPTION,missing)
-#FIXME
+ @$(call install_copy, xorg-driver-video-ati, 0, 0, 0755, $(XORG_DRIVER_VIDEO_ATI_DIR)/src/.libs/ati_drv.so, /usr/lib/xorg/modules/ati_drv.so)
+ @$(call install_copy, xorg-driver-video-ati, 0, 0, 0755, $(XORG_DRIVER_VIDEO_ATI_DIR)/src/.libs/atimisc_drv.so, /usr/lib/xorg/modules/atimisc_drv.so)
+ @$(call install_copy, xorg-driver-video-ati, 0, 0, 0755, $(XORG_DRIVER_VIDEO_ATI_DIR)/src/.libs/r128_drv.so, /usr/lib/xorg/modules/r128_drv.so)
+ @$(call install_copy, xorg-driver-video-ati, 0, 0, 0755, $(XORG_DRIVER_VIDEO_ATI_DIR)/src/.libs/radeon_drv.so, /usr/lib/xorg/modules/radeon_drv.so)
+ @$(call install_copy, xorg-driver-video-ati, 0, 0, 0755, $(XORG_DRIVER_VIDEO_ATI_DIR)/src/.libs/theatre200_drv.so, /usr/lib/xorg/modules/theatre200_drv.so)
+ @$(call install_copy, xorg-driver-video-ati, 0, 0, 0755, $(XORG_DRIVER_VIDEO_ATI_DIR)/src/.libs/theatre_detect_drv.so, /usr/lib/xorg/modules/theatre_detect_drv.so)
+ @$(call install_copy, xorg-driver-video-ati, 0, 0, 0755, $(XORG_DRIVER_VIDEO_ATI_DIR)/src/.libs/theatre_drv.so, /usr/lib/xorg/modules/theatre_drv.so)
@$(call install_finish, xorg-driver-video-ati)