File xf86-video-ati.randr12.diff of Package xorg-x11-driver-video

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-ati.randr12.diff of Package xorg-x11-driver-video (Revision 945a63ce422e147d8a23fc6229a8a02a)

Currently displaying revision 945a63ce422e147d8a23fc6229a8a02a , Show latest

diff -u -r -p xf86-video-ati.randr12.orig/configure.ac xf86-video-ati.randr12/configure.ac
--- xf86-video-ati.randr12.orig/configure.ac	2007-05-11 12:00:07.211272377 +0200
+++ xf86-video-ati.randr12/configure.ac	2007-05-11 12:00:56.172602790 +0200
@@ -208,7 +208,7 @@ AC_SUBST([XORG_CFLAGS])
 AC_SUBST([DRI_CFLAGS])
 AC_SUBST([moduledir])
 
-DRIVER_NAME=ati
+DRIVER_NAME=atirandr12
 AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
diff -u -r -p xf86-video-ati.randr12.orig/man/Makefile.am xf86-video-ati.randr12/man/Makefile.am
--- xf86-video-ati.randr12.orig/man/Makefile.am	2007-05-11 12:00:05.817462245 +0200
+++ xf86-video-ati.randr12/man/Makefile.am	2007-05-11 12:00:56.181601564 +0200
@@ -27,11 +27,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = @DRIVER_NAME@.man r128.man radeon.man
+driverman_PRE = @DRIVER_NAME@.man r128randr12.man radeonrandr12.man
 
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = @DRIVER_NAME@.man r128.man radeon.man
+EXTRA_DIST = @DRIVER_NAME@.man r128randr12.man radeonrandr12.man
 
 CLEANFILES = $(driverman_DATA)
 
diff -u -r -p xf86-video-ati.randr12.orig/src/Makefile.am xf86-video-ati.randr12/src/Makefile.am
 EXTRA_DIST = \
diff -u -r -p xf86-video-ati.randr12.orig/src/ati.c xf86-video-ati.randr12/src/ati.c
diff -u -r -p xf86-video-ati.randr12.orig/src/atimisc.c xf86-video-ati.randr12/src/atimisc.c
diff -u -r -p xf86-video-ati.randr12.orig/src/atimodule.c xf86-video-ati.randr12/src/atimodule.c
--- xf86-video-ati.randr12.orig/src/atimodule.c	2007-05-11 12:00:06.807327404 +0200
+++ xf86-video-ati.randr12/src/atimodule.c	2007-05-11 12:00:56.227595299 +0200
@@ -102,7 +102,7 @@ ATISetup
 }
 
 /* The following record must be called atiModuleData */
-_X_EXPORT XF86ModuleData atiModuleData =
+_X_EXPORT XF86ModuleData atirandr12ModuleData =
 {
     &ATIVersionRec,
     ATISetup,
diff -u -r -p xf86-video-ati.randr12.orig/src/ativersion.h xf86-video-ati.randr12/src/ativersion.h
--- xf86-video-ati.randr12.orig/src/ativersion.h	2007-05-11 12:00:06.897315145 +0200
+++ xf86-video-ati.randr12/src/ativersion.h	2007-05-11 12:00:56.262590532 +0200
@@ -30,8 +30,8 @@
 #undef  ATI_VERSION_STRINGIFY
 #undef  ATI_VERSION_NAME
 
-#define ATI_NAME          "ATI"
-#define ATI_DRIVER_NAME   "ati"
+#define ATI_NAME          "ATIRANDR12"
+#define ATI_DRIVER_NAME   "atirandr12"
 
 #ifndef ATI_VERSION_EXTRA
 #define ATI_VERSION_EXTRA ""
diff -u -r -p xf86-video-ati.randr12.orig/src/r128_misc.c xf86-video-ati.randr12/src/r128_misc.c
--- xf86-video-ati.randr12.orig/src/r128_misc.c	2007-05-11 12:00:06.267400953 +0200
+++ xf86-video-ati.randr12/src/r128_misc.c	2007-05-11 12:00:56.271589306 +0200
@@ -80,7 +80,7 @@ R128Setup
 }
 
 /* The following record must be called r128ModuleData */
-_X_EXPORT XF86ModuleData r128ModuleData =
+_X_EXPORT XF86ModuleData r128randr12ModuleData =
 {
     &R128VersionRec,
     R128Setup,
diff -u -r -p xf86-video-ati.randr12.orig/src/r128_version.h xf86-video-ati.randr12/src/r128_version.h
--- xf86-video-ati.randr12.orig/src/r128_version.h	2007-05-11 12:00:07.033296622 +0200
+++ xf86-video-ati.randr12/src/r128_version.h	2007-05-11 12:00:56.304584811 +0200
@@ -33,8 +33,8 @@
 #undef  R128_VERSION_STRINGIFY
 #undef  R128_VERSION_NAME
 
-#define R128_NAME          "R128"
-#define R128_DRIVER_NAME   "r128"
+#define R128_NAME          "R128RANDR12"
+#define R128_DRIVER_NAME   "r128randr12"
 
 #define R128_VERSION_MAJOR 4
 #define R128_VERSION_MINOR 1
diff -u -r -p xf86-video-ati.randr12.orig/src/radeon_misc.c xf86-video-ati.randr12/src/radeon_misc.c
--- xf86-video-ati.randr12.orig/src/radeon_misc.c	2007-05-11 12:00:06.049430646 +0200
+++ xf86-video-ati.randr12/src/radeon_misc.c	2007-05-11 12:00:56.314583449 +0200
@@ -79,7 +79,7 @@ RADEONSetup
 }
 
 /* The following record must be called radeonModuleData */
-_X_EXPORT XF86ModuleData radeonModuleData =
+_X_EXPORT XF86ModuleData radeonrandr12ModuleData =
 {
     &RADEONVersionRec,
     RADEONSetup,
diff -u -r -p xf86-video-ati.randr12.orig/src/radeon_version.h xf86-video-ati.randr12/src/radeon_version.h
--- xf86-video-ati.randr12.orig/src/radeon_version.h	2007-05-11 12:00:06.773332034 +0200
+++ xf86-video-ati.randr12/src/radeon_version.h	2007-05-11 12:00:56.346579091 +0200
@@ -34,8 +34,8 @@
 #undef  RADEON_VERSION_STRINGIFY
 #undef  RADEON_VERSION_NAME
 
-#define RADEON_NAME          "RADEON"
-#define RADEON_DRIVER_NAME   "radeon"
+#define RADEON_NAME          "RADEONRANDR12"
+#define RADEON_DRIVER_NAME   "radeon"
 #define R200_DRIVER_NAME     "r200"
 #define R300_DRIVER_NAME     "r300"
 
diff -u -r -p xf86-video-ati-6.8.0.orig//src/Makefile.am xf86-video-ati-6.8.0/src/Makefile.am
--- xf86-video-ati-6.8.0.orig//src/Makefile.am	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/Makefile.am	2008-02-19 12:50:49.000000000 +0100
@@ -80,16 +80,16 @@ endif
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
 INCLUDES = -I$(srcdir)/AtomBios/includes
 
-ati_drv_la_LTLIBRARIES = ati_drv.la
-ati_drv_la_LDFLAGS = -module -avoid-version
-ati_drv_ladir = @moduledir@/drivers
-ati_drv_la_SOURCES = \
+atirandr12_drv_la_LTLIBRARIES = atirandr12_drv.la
+atirandr12_drv_la_LDFLAGS = -module -avoid-version
+atirandr12_drv_ladir = @moduledir@/drivers
+atirandr12_drv_la_SOURCES = \
 	ati.c atimodule.c
 
-mach64_drv_la_LTLIBRARIES = mach64_drv.la
-mach64_drv_la_LDFLAGS = -module -avoid-version
-mach64_drv_ladir = @moduledir@/drivers
-mach64_drv_la_SOURCES = \
+mach64randr12_drv_la_LTLIBRARIES = mach64randr12_drv.la
+mach64randr12_drv_la_LDFLAGS = -module -avoid-version
+mach64randr12_drv_ladir = @moduledir@/drivers
+mach64randr12_drv_la_SOURCES = \
 	atibus.c atichip.c atiprobe.c atividmem.c \
 	atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \
 	atidac.c atidecoder.c atidsp.c atii2c.c \
@@ -99,17 +99,17 @@ mach64_drv_la_SOURCES = \
 	atiload.c atimisc.c atimach64probe.c $(ATIMISC_CPIO_SOURCES) \
 	$(ATIMISC_DGA_SOURCES) $(ATIMISC_DRI_SRCS) $(ATIMISC_EXA_SOURCES)
 
-r128_drv_la_LTLIBRARIES = r128_drv.la
-r128_drv_la_LDFLAGS = -module -avoid-version
-r128_drv_ladir = @moduledir@/drivers
-r128_drv_la_SOURCES = \
+r128randr12_drv_la_LTLIBRARIES = r128randr12_drv.la
+r128randr12_drv_la_LDFLAGS = -module -avoid-version
+r128randr12_drv_ladir = @moduledir@/drivers
+r128randr12_drv_la_SOURCES = \
 	r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \
 	r128_video.c r128_misc.c r128_probe.c $(R128_DRI_SRCS)
 
-radeon_drv_la_LTLIBRARIES = radeon_drv.la
-radeon_drv_la_LDFLAGS = -module -avoid-version
-radeon_drv_ladir = @moduledir@/drivers
-radeon_drv_la_SOURCES = \
+radeonrandr12_drv_la_LTLIBRARIES = radeonrandr12_drv.la
+radeonrandr12_drv_la_LDFLAGS = -module -avoid-version
+radeonrandr12_drv_ladir = @moduledir@/drivers
+radeonrandr12_drv_la_SOURCES = \
 	radeon_accel.c radeon_cursor.c radeon_dga.c \
 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
 	radeon_vip.c radeon_misc.c radeon_probe.c \
@@ -119,29 +119,29 @@ radeon_drv_la_SOURCES = \
 	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c
 
 if XMODES
-radeon_drv_la_SOURCES += \
+radeonrandr12_drv_la_SOURCES += \
 	$(XMODE_SRCS)
 endif
 
-theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la
-theatre_detect_drv_la_LDFLAGS = -module -avoid-version
-theatre_detect_drv_ladir = @moduledir@/multimedia
-theatre_detect_drv_la_SOURCES = \
+theatre_detectrandr12_drv_la_LTLIBRARIES = theatre_detectrandr12_drv.la
+theatre_detectrandr12_drv_la_LDFLAGS = -module -avoid-version
+theatre_detectrandr12_drv_ladir = @moduledir@/multimedia
+theatre_detectrandr12_drv_la_SOURCES = \
 	theatre_detect.c theatre_detect_module.c
 
-theatre_drv_la_LTLIBRARIES = theatre_drv.la
-theatre_drv_la_LDFLAGS = -module -avoid-version
-theatre_drv_ladir = @moduledir@/multimedia
+theatrerandr12_drv_la_LTLIBRARIES = theatrerandr12_drv.la
+theatrerandr12_drv_la_LDFLAGS = -module -avoid-version
+theatrerandr12_drv_ladir = @moduledir@/multimedia
 
-theatre_drv_la_SOURCES = \
+theatrerandr12_drv_la_SOURCES = \
 	theatre.c theatre_module.c
 
-theatre200_drv_la_LTLIBRARIES = theatre200_drv.la
-theatre200_drv_la_LDFLAGS = -module -avoid-version
-theatre200_drv_ladir = @moduledir@/multimedia
-theatre200_drv_la_CFLAGS = \
-	$(AM_CFLAGS) -DMICROC_DIR=\"$(theatre200_drv_ladir)\"
-theatre200_drv_la_SOURCES = \
+theatre200randr12_drv_la_LTLIBRARIES = theatre200randr12_drv.la
+theatre200randr12_drv_la_LDFLAGS = -module -avoid-version
+theatre200randr12_drv_ladir = @moduledir@/multimedia
+theatre200randr12_drv_la_CFLAGS = \
+	$(AM_CFLAGS) -DMICROC_DIR=\"$(theatre200randr12_drv_ladir)\"
+theatre200randr12_drv_la_SOURCES = \
 	theatre200.c theatre200_module.c
 
 EXTRA_DIST = \
diff -u -r -p xf86-video-ati-6.8.0.orig//src/ati.c xf86-video-ati-6.8.0/src/ati.c
--- xf86-video-ati-6.8.0.orig//src/ati.c	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/ati.c	2008-02-19 12:28:50.000000000 +0100
@@ -66,9 +66,9 @@
 #include "ativersion.h"
 
 /* names duplicated from version headers */
-#define MACH64_DRIVER_NAME  "mach64"
-#define R128_DRIVER_NAME    "r128"
-#define RADEON_DRIVER_NAME  "radeon"
+#define MACH64_DRIVER_NAME  "mach64randr12"
+#define R128_DRIVER_NAME    "r128randr12"
+#define RADEON_DRIVER_NAME  "radeonrandr12"
 
 enum
 {
diff -u -r -p xf86-video-ati-6.8.0.orig//src/atimach64version.h xf86-video-ati-6.8.0/src/atimach64version.h
--- xf86-video-ati-6.8.0.orig//src/atimach64version.h	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/atimach64version.h	2008-02-19 12:29:20.000000000 +0100
@@ -34,7 +34,7 @@
 #undef  MACH64_VERSION_NAME
 
 #define MACH64_NAME          "MACH64"
-#define MACH64_DRIVER_NAME   "mach64"
+#define MACH64_DRIVER_NAME   "mach64randr12"
 
 #define MACH64_VERSION_MAJOR 6
 #define MACH64_VERSION_MINOR 7
diff -u -r -p xf86-video-ati-6.8.0.orig//src/atimisc.c xf86-video-ati-6.8.0/src/atimisc.c
--- xf86-video-ati-6.8.0.orig//src/atimisc.c	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/atimisc.c	2008-02-19 12:36:25.000000000 +0100
@@ -70,7 +70,7 @@ ATISetup
 }
 
 /* The following record must be called mach64ModuleData */
-_X_EXPORT XF86ModuleData mach64ModuleData =
+_X_EXPORT XF86ModuleData mach64randr12ModuleData =
 {
     &ATIVersionRec,
     ATISetup,
diff -u -r -p xf86-video-ati-6.8.0.orig//src/radeon_version.h xf86-video-ati-6.8.0/src/radeon_version.h
--- xf86-video-ati-6.8.0.orig//src/radeon_version.h	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/radeon_version.h	2008-02-19 12:45:16.000000000 +0100
@@ -35,7 +35,7 @@
 #undef  RADEON_VERSION_NAME
 
 #define RADEON_NAME          "RADEONRANDR12"
-#define RADEON_DRIVER_NAME   "radeon"
+#define RADEON_DRIVER_NAME   "radeonrandr12"
 #define R200_DRIVER_NAME     "r200"
 #define R300_DRIVER_NAME     "r300"
 
diff -u -r -p xf86-video-ati-6.8.0.orig//src/radeon_video.c xf86-video-ati-6.8.0/src/radeon_video.c
--- xf86-video-ati-6.8.0.orig//src/radeon_video.c	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/radeon_video.c	2008-02-19 12:42:46.000000000 +0100
@@ -1500,7 +1500,7 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
 
     info->adaptor = adapt;
 
-	if(!xf86LoadSubModule(pScrn,"theatre_detect")) 
+	if(!xf86LoadSubModule(pScrn,"theatre_detectrandr12")) 
 	{
 		xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"Unable to load Rage Theatre detect module\n");
 		goto skip_theatre;
@@ -1517,7 +1517,7 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
 		{
 			case RT100_ATI_ID:
 			{
-				if(!xf86LoadSubModule(pScrn,"theatre")) 
+				if(!xf86LoadSubModule(pScrn,"theatrerandr12")) 
 				{
 					xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"Unable to load Rage Theatre module\n");
 					xfree(pPriv->theatre);
@@ -1527,7 +1527,7 @@ RADEONAllocAdaptor(ScrnInfoPtr pScrn)
 			}
 			case RT200_ATI_ID:
 			{
-				if(!xf86LoadSubModule(pScrn,"theatre200")) 
+				if(!xf86LoadSubModule(pScrn,"theatre200randr12")) 
 				{
 					xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"Unable to load Rage Theatre module\n");
 					xfree(pPriv->theatre);
diff -u -r -p xf86-video-ati-6.8.0.orig//src/theatre200_module.c xf86-video-ati-6.8.0/src/theatre200_module.c
--- xf86-video-ati-6.8.0.orig//src/theatre200_module.c	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/theatre200_module.c	2008-02-19 12:37:56.000000000 +0100
@@ -9,7 +9,7 @@ static MODULESETUPPROTO(theatre200Setup)
 
 static XF86ModuleVersionInfo theatre200VersRec =
 {
-        "theatre200",
+        "theatre200randr12",
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
@@ -21,7 +21,7 @@ static XF86ModuleVersionInfo theatre200V
         {0,0,0,0}
 };
  
-_X_EXPORT XF86ModuleData theatre200ModuleData = {
+_X_EXPORT XF86ModuleData theatre200randr12ModuleData = {
         &theatre200VersRec,
         theatre200Setup,
         NULL
diff -u -r -p xf86-video-ati-6.8.0.orig//src/theatre_detect_module.c xf86-video-ati-6.8.0/src/theatre_detect_module.c
--- xf86-video-ati-6.8.0.orig//src/theatre_detect_module.c	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/theatre_detect_module.c	2008-02-19 12:38:04.000000000 +0100
@@ -13,7 +13,7 @@ static MODULESETUPPROTO(theatre_detectSe
 
 static XF86ModuleVersionInfo theatre_detectVersRec =
 {
-        "theatre_detect",
+        "theatre_detectrandr12",
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
@@ -25,7 +25,7 @@ static XF86ModuleVersionInfo theatre_det
         {0,0,0,0}
 };
  
-_X_EXPORT XF86ModuleData theatre_detectModuleData = {
+_X_EXPORT XF86ModuleData theatre_detectrandr12ModuleData = {
         &theatre_detectVersRec,
         theatre_detectSetup,
         NULL
diff -u -r -p xf86-video-ati-6.8.0.orig//src/theatre_module.c xf86-video-ati-6.8.0/src/theatre_module.c
--- xf86-video-ati-6.8.0.orig//src/theatre_module.c	2008-02-19 12:26:35.000000000 +0100
+++ xf86-video-ati-6.8.0/src/theatre_module.c	2008-02-19 12:38:12.000000000 +0100
@@ -9,7 +9,7 @@ static MODULESETUPPROTO(theatreSetup);
 
 static XF86ModuleVersionInfo theatreVersRec =
 {
-        "theatre",
+        "theatrerandr12",
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
@@ -21,7 +21,7 @@ static XF86ModuleVersionInfo theatreVers
         {0,0,0,0}
 };
  
-_X_EXPORT XF86ModuleData theatreModuleData = {
+_X_EXPORT XF86ModuleData theatrerandr12ModuleData = {
         &theatreVersRec,
         theatreSetup,
         NULL
--- xf86-video-ati-6.8.0/src/radeon_dri.c.orig	2008-04-22 20:30:51.000000000 +0000
+++ xf86-video-ati-6.8.0/src/radeon_dri.c	2008-04-22 20:31:31.000000000 +0000
@@ -1299,7 +1299,7 @@
     }
 
     /* Low level DRM open */
-    fd = drmOpen(RADEON_DRIVER_NAME, busId);
+    fd = drmOpen("radeon", busId);
     xfree(busId);
     if (fd < 0) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1420,7 +1420,7 @@
     if (!(pDRIInfo = DRICreateInfoRec())) return FALSE;
 
     info->pDRIInfo                       = pDRIInfo;
-    pDRIInfo->drmDriverName              = RADEON_DRIVER_NAME;
+    pDRIInfo->drmDriverName              = "radeon";
 
     if ( (info->ChipFamily >= CHIP_FAMILY_R300) ) {
        pDRIInfo->clientDriverName        = R300_DRIVER_NAME;
@@ -1428,7 +1428,7 @@
     if ( info->ChipFamily >= CHIP_FAMILY_R200 )
        pDRIInfo->clientDriverName	 = R200_DRIVER_NAME;
     else 
-       pDRIInfo->clientDriverName	 = RADEON_DRIVER_NAME;
+       pDRIInfo->clientDriverName	 = "radeon";
 
     if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
 	pDRIInfo->busIdString = DRICreatePCIBusID(info->PciInfo);

Places

File xf86-video-ati.randr12.diff of Package xorg-x11-driver-video (Revision 945a63ce422e147d8a23fc6229a8a02a)

Places