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 5f8260936149a025f249375c75674975)

Currently displaying revision 5f8260936149a025f249375c75674975 , Show latest

diff -u -r xf86-video-ati.randr12.orig/configure.ac xf86-video-ati.randr12/configure.ac
--- xf86-video-ati.randr12.orig/configure.ac	2007-03-12 12:28:03.453712000 +0100
+++ xf86-video-ati.randr12/configure.ac	2007-03-12 16:53:37.155528000 +0100
@@ -208,7 +208,7 @@
 AC_SUBST([DRI_CFLAGS])
 AC_SUBST([moduledir])
 
-DRIVER_NAME=ati
+DRIVER_NAME=atirandr12
 AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
diff -u -r xf86-video-ati.randr12.orig/man/Makefile.am xf86-video-ati.randr12/man/Makefile.am
--- xf86-video-ati.randr12.orig/man/Makefile.am	2007-03-12 12:28:01.711455000 +0100
+++ xf86-video-ati.randr12/man/Makefile.am	2007-03-12 17:02:51.399029000 +0100
@@ -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 xf86-video-ati.randr12.orig/src/Makefile.am xf86-video-ati.randr12/src/Makefile.am
--- xf86-video-ati.randr12.orig/src/Makefile.am	2007-03-12 12:28:02.816350000 +0100
+++ xf86-video-ati.randr12/src/Makefile.am	2007-03-12 16:51:38.421383000 +0100
@@ -48,18 +48,18 @@
 
 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 atibus.c atichip.c atiident.c atioption.c \
 	atiprobe.c atividmem.c atimodule.c $(ATI_CPIO_SOURCES) \
 	radeon_probe.c r128_probe.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 = \
 	atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \
 	atidac.c atidecoder.c atidsp.c atifillin.c atii2c.c \
 	atilock.c atimach64.c atimach64accel.c atimach64cursor.c \
@@ -68,41 +68,41 @@
 	atiload.c atimisc.c $(ATIMISC_DRI_SRCS) $(ATIMISC_DGA_SOURCES) \
 	$(ATIMISC_CPIO_SOURCES) $(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_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_display.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 xf86-video-ati.randr12.orig/src/atimisc.c xf86-video-ati.randr12/src/atimisc.c
--- xf86-video-ati.randr12.orig/src/atimisc.c	2007-03-12 12:28:02.905263000 +0100
+++ xf86-video-ati.randr12/src/atimisc.c	2007-03-12 17:23:33.217967000 +0100
@@ -37,7 +37,7 @@
 
 static XF86ModuleVersionInfo ATIVersionRec =
 {
-    "atimisc",
+    "atimiscrandr12",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -76,7 +76,7 @@
             /* ati & atimisc module versions must match */
             do
             {
-                XF86ModuleData *pModuleData = LoaderSymbol("atiModuleData");
+                XF86ModuleData *pModuleData = LoaderSymbol("atirandr12ModuleData");
 
                 if (pModuleData)
                 {
@@ -143,7 +143,7 @@
 }
 
 /* The following record must be called atimiscModuleData */
-_X_EXPORT XF86ModuleData atimiscModuleData =
+_X_EXPORT XF86ModuleData atimiscrandr12ModuleData =
 {
     &ATIVersionRec,
     ATISetup,
diff -u -r xf86-video-ati.randr12.orig/src/atimodule.c xf86-video-ati.randr12/src/atimodule.c
--- xf86-video-ati.randr12.orig/src/atimodule.c	2007-03-12 12:28:03.051202000 +0100
+++ xf86-video-ati.randr12/src/atimodule.c	2007-03-12 17:24:01.326836000 +0100
@@ -123,7 +123,7 @@
 }
 
 /* The following record must be called atiModuleData */
-_X_EXPORT XF86ModuleData atiModuleData =
+_X_EXPORT XF86ModuleData atirandr12ModuleData =
 {
     &ATIVersionRec,
     ATISetup,
diff -u -r xf86-video-ati.randr12.orig/src/atiprobe.c xf86-video-ati.randr12/src/atiprobe.c
--- xf86-video-ati.randr12.orig/src/atiprobe.c	2007-03-12 12:28:02.791375000 +0100
+++ xf86-video-ati.randr12/src/atiprobe.c	2007-03-12 17:27:16.608359000 +0100
@@ -650,10 +650,10 @@
 
 #ifdef XFree86LOADER
 
-            if (!xf86LoadSubModule(pScrn, "atimisc"))
+            if (!xf86LoadSubModule(pScrn, "atimiscrandr12"))
             {
                 xf86Msg(X_ERROR,
-                    ATI_NAME ":  Failed to load \"atimisc\" module.\n");
+                    ATI_NAME ":  Failed to load \"atimiscrandr12\" module.\n");
                 xf86DeleteScreen(pScrn->scrnIndex, 0);
                 continue;
             }
diff -u -r xf86-video-ati.randr12.orig/src/ativersion.h xf86-video-ati.randr12/src/ativersion.h
--- xf86-video-ati.randr12.orig/src/ativersion.h	2007-03-12 12:28:03.117050000 +0100
+++ xf86-video-ati.randr12/src/ativersion.h	2007-03-12 17:24:19.310828000 +0100
@@ -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 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-03-12 12:28:02.151013000 +0100
+++ xf86-video-ati.randr12/src/r128_misc.c	2007-03-12 17:24:50.808300000 +0100
@@ -80,7 +80,7 @@
 }
 
 /* The following record must be called r128ModuleData */
-_X_EXPORT XF86ModuleData r128ModuleData =
+_X_EXPORT XF86ModuleData r128randr12ModuleData =
 {
     &R128VersionRec,
     R128Setup,
diff -u -r xf86-video-ati.randr12.orig/src/r128_probe.c xf86-video-ati.randr12/src/r128_probe.c
--- xf86-video-ati.randr12.orig/src/r128_probe.c	2007-03-12 12:28:03.121046000 +0100
+++ xf86-video-ati.randr12/src/r128_probe.c	2007-03-12 17:27:51.421506000 +0100
@@ -197,9 +197,9 @@
 
 #ifdef XFree86LOADER
 
-	    if (!xf86LoadSubModule(pScrn, "r128")) {
+	    if (!xf86LoadSubModule(pScrn, "r128randr12")) {
 		xf86Msg(X_ERROR,
-		    R128_NAME ":  Failed to load \"r128\" module.\n");
+		    R128_NAME ":  Failed to load \"r128randr12\" module.\n");
 		xf86DeleteScreen(pScrn->scrnIndex, 0);
 		continue;
 	    }
diff -u -r 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-03-12 12:28:03.247918000 +0100
+++ xf86-video-ati.randr12/src/r128_version.h	2007-03-12 17:25:07.549547000 +0100
@@ -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 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-03-12 12:28:01.938232000 +0100
+++ xf86-video-ati.randr12/src/radeon_misc.c	2007-03-12 17:25:45.667389000 +0100
@@ -79,7 +79,7 @@
 }
 
 /* The following record must be called radeonModuleData */
-_X_EXPORT XF86ModuleData radeonModuleData =
+_X_EXPORT XF86ModuleData radeonrandr12ModuleData =
 {
     &RADEONVersionRec,
     RADEONSetup,
diff -u -r xf86-video-ati.randr12.orig/src/radeon_probe.c xf86-video-ati.randr12/src/radeon_probe.c
--- xf86-video-ati.randr12.orig/src/radeon_probe.c	2007-03-12 12:28:03.066103000 +0100
+++ xf86-video-ati.randr12/src/radeon_probe.c	2007-03-12 17:26:39.224774000 +0100
@@ -286,9 +286,9 @@
 					     RADEONPciChipsets, 0, 0, 0,
 					     0, 0))) {
 #ifdef XFree86LOADER
-		if (!xf86LoadSubModule(pScrn, "radeon")) {
+		if (!xf86LoadSubModule(pScrn, "radeonrandr12")) {
 		    xf86Msg(X_ERROR, RADEON_NAME
-			    ":  Failed to load \"radeon\" module.\n");
+			    ":  Failed to load \"radeonrandr12\" module.\n");
 		    xf86DeleteScreen(pScrn->scrnIndex, 0);
 		    continue;
 		}
diff -u -r 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-03-12 12:28:02.986180000 +0100
+++ xf86-video-ati.randr12/src/radeon_version.h	2007-03-12 17:26:03.121916000 +0100
@@ -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 5f8260936149a025f249375c75674975)

Places