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 9923bb0c53704be533e40b0de4062c92)

Currently displaying revision 9923bb0c53704be533e40b0de4062c92 , 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
--- xf86-video-ati.randr12.orig/src/Makefile.am	2007-05-11 12:00:06.613353827 +0200
+++ xf86-video-ati.randr12/src/Makefile.am	2007-05-11 12:17:34.244240407 +0200
@@ -47,16 +47,16 @@ endif
 
 AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
 
-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
 
-atimisc_drv_la_LTLIBRARIES = atimisc_drv.la
-atimisc_drv_la_LDFLAGS = -module -avoid-version
-atimisc_drv_ladir = @moduledir@/drivers
-atimisc_drv_la_SOURCES = \
+atimiscrandr12_drv_la_LTLIBRARIES = atimiscrandr12_drv.la
+atimiscrandr12_drv_la_LDFLAGS = -module -avoid-version
+atimiscrandr12_drv_ladir = @moduledir@/drivers
+atimiscrandr12_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 \
@@ -66,41 +66,41 @@ atimisc_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 radeon_display.c \
 	radeon_crtc.c radeon_output.c radeon_modes.c \
 	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES)
 
-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.randr12.orig/src/ati.c xf86-video-ati.randr12/src/ati.c
--- xf86-video-ati.randr12.orig/src/ati.c	2007-05-11 12:00:05.982439771 +0200
+++ xf86-video-ati.randr12/src/ati.c	2007-05-11 12:24:31.649229355 +0200
@@ -128,12 +128,12 @@ ATIProbe
     /* Call Radeon driver probe */
     if (DoRadeon)
     {
-        pointer radeon = xf86LoadDrvSubModule(pDriver, "radeon");
+        pointer radeon = xf86LoadDrvSubModule(pDriver, "radeonrandr12");
 
         if (!radeon)
         {
             xf86Msg(X_ERROR,
-                ATI_NAME ":  Failed to load \"radeon\" module.\n");
+                ATI_NAME ":  Failed to load \"radeonrandr12\" module.\n");
             return FALSE;
         }
 
@@ -150,12 +150,12 @@ ATIProbe
     /* Call Rage 128 driver probe */
     if (DoRage128)
     {
-        pointer r128 = xf86LoadDrvSubModule(pDriver, "r128");
+        pointer r128 = xf86LoadDrvSubModule(pDriver, "r128randr12");
 
         if (!r128)
         {
             xf86Msg(X_ERROR,
-                ATI_NAME ":  Failed to load \"r128\" module.\n");
+                ATI_NAME ":  Failed to load \"r128randr12\" module.\n");
             return FALSE;
         }
 
@@ -172,12 +172,12 @@ ATIProbe
     /* Call Mach64 driver probe */
     if (DoMach64)
     {
-        pointer atimisc = xf86LoadDrvSubModule(pDriver, "atimisc");
+        pointer atimisc = xf86LoadDrvSubModule(pDriver, "atimiscrandr12");
 
         if (!atimisc)
         {
             xf86Msg(X_ERROR,
-                ATI_NAME ":  Failed to load \"atimisc\" module.\n");
+                ATI_NAME ":  Failed to load \"atimiscrandr12\" module.\n");
             return FALSE;
         }
 
diff -u -r -p xf86-video-ati.randr12.orig/src/atimisc.c xf86-video-ati.randr12/src/atimisc.c
--- xf86-video-ati.randr12.orig/src/atimisc.c	2007-05-11 12:00:06.641350013 +0200
+++ xf86-video-ati.randr12/src/atimisc.c	2007-05-11 12:00:56.209597750 +0200
@@ -37,7 +37,7 @@
 
 static XF86ModuleVersionInfo ATIVersionRec =
 {
-    "atimisc",
+    "atimiscrandr12",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -76,7 +76,7 @@ ATISetup
             /* ati & atimisc module versions must match */
             do
             {
-                XF86ModuleData *pModuleData = LoaderSymbol("atiModuleData");
+                XF86ModuleData *pModuleData = LoaderSymbol("atirandr12ModuleData");
 
                 if (pModuleData)
                 {
@@ -143,7 +143,7 @@ ATISetup
 }
 
 /* The following record must be called atimiscModuleData */
-_X_EXPORT XF86ModuleData atimiscModuleData =
+_X_EXPORT XF86ModuleData atimiscrandr12ModuleData =
 {
     &ATIVersionRec,
     ATISetup,
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   "radeonrandr12"
 #define R200_DRIVER_NAME     "r200"
 #define R300_DRIVER_NAME     "r300"

Places

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

Places