File xf86-video-intel-2.9.1-legacy.patch of Package xorg-x11-driver-video-intel-legacy

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-intel-2.9.1-legacy.patch of Package xorg-x11-driver-video-intel-legacy

Index: xf86-video-intel-2.9.1/configure.ac
===================================================================
--- xf86-video-intel-2.9.1.orig/configure.ac
+++ xf86-video-intel-2.9.1/configure.ac
@@ -21,7 +21,7 @@
 # Process this file with autoconf to produce a configure script
 
 AC_PREREQ(2.57)
-AC_INIT([xf86-video-intel],
+AC_INIT([xf86-video-intellegacy],
         2.9.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
@@ -181,7 +181,7 @@ AC_SUBST([XORG_CFLAGS])
 AC_SUBST([WARN_CFLAGS])
 AC_SUBST([moduledir])
 
-DRIVER_NAME=intel
+DRIVER_NAME=intellegacy
 AC_SUBST([DRIVER_NAME])
 
 m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1.3 or later before running autoconf/autogen])])
Index: xf86-video-intel-2.9.1/man/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/man/Makefile.am
+++ xf86-video-intel-2.9.1/man/Makefile.am
@@ -27,7 +27,7 @@
 drivermandir = $(DRIVER_MAN_DIR)
 driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
 
-EXTRA_DIST = $(DRIVER_NAME).man
+EXTRA_DIST = intel.man
 
 CLEANFILES = $(driverman_DATA)
 
@@ -47,7 +47,5 @@ MAN_SUBSTS = \
 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
-SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
-.man.$(DRIVER_MAN_SUFFIX):
+$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX): intel.man
 	sed $(MAN_SUBSTS) < $< > $@
Index: xf86-video-intel-2.9.1/src/ch7017/ch7017_module.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/ch7017/ch7017_module.c
+++ xf86-video-intel-2.9.1/src/ch7017/ch7017_module.c
@@ -12,7 +12,7 @@ static MODULESETUPPROTO(ch7017Setup);
 
 static XF86ModuleVersionInfo ch7017VersRec = 
   {
-    "ch7017",
+    "ch7017legacy",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -24,7 +24,7 @@ static XF86ModuleVersionInfo ch7017VersR
     { 0,0,0,0 }
   };
 
-_X_EXPORT XF86ModuleData ch7017ModuleData = {
+_X_EXPORT XF86ModuleData ch7017legacyModuleData = {
   &ch7017VersRec,
   ch7017Setup,
   NULL
Index: xf86-video-intel-2.9.1/src/ch7017/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/src/ch7017/Makefile.am
+++ xf86-video-intel-2.9.1/src/ch7017/Makefile.am
@@ -6,11 +6,11 @@
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
-ch7017_la_LTLIBRARIES = ch7017.la
-ch7017_la_LDFLAGS = -module -avoid-version
-ch7017_ladir = @moduledir@/drivers
+ch7017legacy_la_LTLIBRARIES = ch7017legacy.la
+ch7017legacy_la_LDFLAGS = -module -avoid-version
+ch7017legacy_ladir = @moduledir@/drivers
 
-ch7017_la_SOURCES = \
+ch7017legacy_la_SOURCES = \
 	ch7017.c \
 	ch7017_module.c \
 	ch7017_reg.h
Index: xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx.c
+++ xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx.c
@@ -311,7 +311,7 @@ ch7xxx_restore(I2CDevPtr d)
     ch7xxx_write(dev_priv, CH7xxx_PM, dev_priv->save_PM);
 }
 
-_X_EXPORT I830I2CVidOutputRec CH7xxxVidOutput = {
+_X_EXPORT I830I2CVidOutputRec CH7xxxLegacyVidOutput = {
     .init = ch7xxx_init,
     .detect = ch7xxx_detect,
     .mode_valid = ch7xxx_mode_valid,
Index: xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx_module.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/ch7xxx/ch7xxx_module.c
+++ xf86-video-intel-2.9.1/src/ch7xxx/ch7xxx_module.c
@@ -11,7 +11,7 @@
 static MODULESETUPPROTO(ch7xxxSetup);
 
 static XF86ModuleVersionInfo ch7xxxVersRec =  {
-    "ch7xxx",
+    "ch7xxxlegacy",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -23,7 +23,7 @@ static XF86ModuleVersionInfo ch7xxxVersR
     { 0,0,0,0 }
 };
 
-_X_EXPORT XF86ModuleData ch7xxxModuleData = {
+_X_EXPORT XF86ModuleData ch7xxxlegacyModuleData = {
     &ch7xxxVersRec,
     ch7xxxSetup,
     NULL
Index: xf86-video-intel-2.9.1/src/ch7xxx/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/src/ch7xxx/Makefile.am
+++ xf86-video-intel-2.9.1/src/ch7xxx/Makefile.am
@@ -6,11 +6,11 @@
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
-ch7xxx_la_LTLIBRARIES = ch7xxx.la
-ch7xxx_la_LDFLAGS = -module -avoid-version
-ch7xxx_ladir = @moduledir@/drivers
+ch7xxxlegacy_la_LTLIBRARIES = ch7xxxlegacy.la
+ch7xxxlegacy_la_LDFLAGS = -module -avoid-version
+ch7xxxlegacy_ladir = @moduledir@/drivers
 
-ch7xxx_la_SOURCES = \
+ch7xxxlegacy_la_SOURCES = \
 	ch7xxx.c \
 	ch7xxx_module.c \
 	ch7xxx.h \
Index: xf86-video-intel-2.9.1/src/i810_driver.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/i810_driver.c
+++ xf86-video-intel-2.9.1/src/i810_driver.c
@@ -298,7 +298,7 @@ int I830EntityIndex = -1;
 static MODULESETUPPROTO(i810Setup);
 
 static XF86ModuleVersionInfo intelVersRec = {
-   "intel",
+   "intellegacy",
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
@@ -310,7 +310,7 @@ static XF86ModuleVersionInfo intelVersRe
    {0, 0, 0, 0}
 };
 
-_X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL };
+_X_EXPORT XF86ModuleData intellegacyModuleData = { &intelVersRec, i810Setup, NULL };
 
 static pointer
 i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
Index: xf86-video-intel-2.9.1/src/i810.h
===================================================================
--- xf86-video-intel-2.9.1.orig/src/i810.h
+++ xf86-video-intel-2.9.1/src/i810.h
@@ -70,8 +70,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define Xrealloc realloc
 
 #define I810_VERSION 4000
-#define I810_NAME "intel"
-#define I810_DRIVER_NAME "intel"
+#define I810_NAME "intellegacy"
+#define I810_DRIVER_NAME "intellegacy"
 
 #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR
 #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR
Index: xf86-video-intel-2.9.1/src/i830_dvo.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/i830_dvo.c
+++ xf86-video-intel-2.9.1/src/i830_dvo.c
@@ -43,35 +43,35 @@ static struct _I830DVODriver i830_dvo_dr
 {
     {
 	.type = I830_OUTPUT_DVO_TMDS,
-	.modulename = "sil164",
-	.fntablename = "SIL164VidOutput",
+	.modulename = "sil164legacy",
+	.fntablename = "SIL164LegacyVidOutput",
 	.dvo_reg = DVOC,
 	.address = (SIL164_ADDR_1<<1),
     },
     {
 	.type = I830_OUTPUT_DVO_TMDS,
-	.modulename = "ch7xxx",
-	.fntablename = "CH7xxxVidOutput",
+	.modulename = "ch7xxxlegacy",
+	.fntablename = "CH7xxxLegacyVidOutput",
 	.dvo_reg = DVOC,
 	.address = (CH7xxx_ADDR_1<<1),
     },
     {
 	.type = I830_OUTPUT_DVO_LVDS,
-	.modulename = "ivch",
+	.modulename = "ivchlegacy",
 	.fntablename = "ivch_methods",
 	.dvo_reg = DVOA,
 	.address = 0x04, /* Might also be 0x44, 0x84, 0xc4 */
     },
     {
 	.type = I830_OUTPUT_DVO_TMDS,
-	.modulename = "tfp410",
-	.fntablename = "TFP410VidOutput",
+	.modulename = "tfp410legacy",
+	.fntablename = "TFP410LegacyVidOutput",
 	.dvo_reg = DVOC,
 	.address = (TFP410_ADDR_1<<1),
     },
     {
 	.type = I830_OUTPUT_DVO_LVDS,
-	.modulename = "ch7017",
+	.modulename = "ch7017legacy",
 	.fntablename = "ch7017_methods",
 	.dvo_reg = DVOC,
 	.address = 0xea,
@@ -423,7 +423,7 @@ i830_dvo_init(ScrnInfoPtr pScrn)
 	ret_ptr = NULL;
 	drv->vid_rec = LoaderSymbol(drv->fntablename);
 
-	if (!strcmp(drv->modulename, "ivch") &&
+	if (!strcmp(drv->modulename, "ivchlegacy") &&
 	    pI830->quirk_flag & QUIRK_IVCH_NEED_DVOB) {
 	    drv->dvo_reg = DVOB;
 	}
Index: xf86-video-intel-2.9.1/src/ivch/ivch_module.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/ivch/ivch_module.c
+++ xf86-video-intel-2.9.1/src/ivch/ivch_module.c
@@ -39,7 +39,7 @@
 static MODULESETUPPROTO(ivch_setup);
 
 static XF86ModuleVersionInfo ivch_version = {
-    "ivch",
+    "ivchlegacy",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -51,7 +51,7 @@ static XF86ModuleVersionInfo ivch_versio
     { 0,0,0,0 }
 };
 
-_X_EXPORT XF86ModuleData ivchModuleData = {
+_X_EXPORT XF86ModuleData ivchlegacyModuleData = {
     &ivch_version,
     ivch_setup,
     NULL
Index: xf86-video-intel-2.9.1/src/ivch/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/src/ivch/Makefile.am
+++ xf86-video-intel-2.9.1/src/ivch/Makefile.am
@@ -6,11 +6,11 @@
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
-ivch_la_LTLIBRARIES = ivch.la
-ivch_la_LDFLAGS = -module -avoid-version
-ivch_ladir = @moduledir@/drivers
+ivchlegacy_la_LTLIBRARIES = ivchlegacy.la
+ivchlegacy_la_LDFLAGS = -module -avoid-version
+ivchlegacy_ladir = @moduledir@/drivers
 
-ivch_la_SOURCES = \
+ivchlegacy_la_SOURCES = \
 	ivch.c \
 	ivch_module.c \
 	ivch_reg.h
Index: xf86-video-intel-2.9.1/src/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/src/Makefile.am
+++ xf86-video-intel-2.9.1/src/Makefile.am
@@ -29,11 +29,11 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
 
-intel_drv_la_LTLIBRARIES = intel_drv.la
-intel_drv_la_LDFLAGS = -module -avoid-version
-intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
-intel_drv_la_LIBADD += @PCIACCESS_LIBS@
+intellegacy_drv_la_LTLIBRARIES = intellegacy_drv.la
+intellegacy_drv_la_LDFLAGS = -module -avoid-version
+intellegacy_drv_ladir = @moduledir@/drivers
+intellegacy_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
+intellegacy_drv_la_LIBADD += @PCIACCESS_LIBS@
 
 INTEL_DRI_SRCS = \
          i810_dri.c \
@@ -51,7 +51,7 @@ INTEL_XVMC_SRCS = \
          i965_hwmc.h
 
 
-intel_drv_la_SOURCES = \
+intellegacy_drv_la_SOURCES = \
          brw_defines.h \
          brw_structs.h \
          common.h \
@@ -116,13 +116,13 @@ EXTRA_DIST = 		\
 	$(INTEL_XVMC_SRCS)
 
 if DRI
-intel_drv_la_SOURCES += \
+intellegacy_drv_la_SOURCES += \
 	$(INTEL_DRI_SRCS)
-intel_drv_la_LIBADD += \
+intellegacy_drv_la_LIBADD += \
 	$(DRI_LIBS)
 endif
 
 if XVMC
-intel_drv_la_SOURCES += \
+intellegacy_drv_la_SOURCES += \
 	$(INTEL_XVMC_SRCS)
 endif
Index: xf86-video-intel-2.9.1/src/sil164/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/src/sil164/Makefile.am
+++ xf86-video-intel-2.9.1/src/sil164/Makefile.am
@@ -6,11 +6,11 @@
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
-sil164_la_LTLIBRARIES = sil164.la
-sil164_la_LDFLAGS = -module -avoid-version
-sil164_ladir = @moduledir@/drivers
+sil164legacy_la_LTLIBRARIES = sil164legacy.la
+sil164legacy_la_LDFLAGS = -module -avoid-version
+sil164legacy_ladir = @moduledir@/drivers
 
-sil164_la_SOURCES = \
+sil164legacy_la_SOURCES = \
 	sil164.c \
 	sil164_module.c \
 	sil164.h \
Index: xf86-video-intel-2.9.1/src/sil164/sil164.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/sil164/sil164.c
+++ xf86-video-intel-2.9.1/src/sil164/sil164.c
@@ -258,7 +258,7 @@ sil164_restore(I2CDevPtr d)
 }
 
 
-_X_EXPORT I830I2CVidOutputRec SIL164VidOutput = {
+_X_EXPORT I830I2CVidOutputRec SIL164LegacyVidOutput = {
     .init = sil164_init,
     .detect = sil164_detect,
     .mode_valid = sil164_mode_valid,
Index: xf86-video-intel-2.9.1/src/sil164/sil164_module.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/sil164/sil164_module.c
+++ xf86-video-intel-2.9.1/src/sil164/sil164_module.c
@@ -13,7 +13,7 @@
 static MODULESETUPPROTO(sil164Setup);
 
 static XF86ModuleVersionInfo sil164VersRec = {
-    "sil164",
+    "sil164legacy",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -25,7 +25,7 @@ static XF86ModuleVersionInfo sil164VersR
     { 0,0,0,0 }
 };
 
-_X_EXPORT XF86ModuleData sil164ModuleData = {
+_X_EXPORT XF86ModuleData sil164legacyModuleData = {
     &sil164VersRec,
     sil164Setup,
     NULL
Index: xf86-video-intel-2.9.1/src/tfp410/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/src/tfp410/Makefile.am
+++ xf86-video-intel-2.9.1/src/tfp410/Makefile.am
@@ -6,11 +6,11 @@
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
 	@PCIACCESS_CFLAGS@
 
-tfp410_la_LTLIBRARIES = tfp410.la
-tfp410_la_LDFLAGS = -module -avoid-version
-tfp410_ladir = @moduledir@/drivers
+tfp410legacy_la_LTLIBRARIES = tfp410legacy.la
+tfp410legacy_la_LDFLAGS = -module -avoid-version
+tfp410legacy_ladir = @moduledir@/drivers
 
-tfp410_la_SOURCES = \
+tfp410legacy_la_SOURCES = \
 	tfp410.c \
 	tfp410_module.c \
 	tfp410.h \
Index: xf86-video-intel-2.9.1/src/tfp410/tfp410.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/tfp410/tfp410.c
+++ xf86-video-intel-2.9.1/src/tfp410/tfp410.c
@@ -280,7 +280,7 @@ tfp410_restore(I2CDevPtr d)
     tfp410WriteByte(tfp, TFP410_CTL_1, tfp->SavedReg.ctl1);
 }
 
-_X_EXPORT I830I2CVidOutputRec TFP410VidOutput = {
+_X_EXPORT I830I2CVidOutputRec TFP410LegacyVidOutput = {
     .init = tfp410_init,
     .detect = tfp410_detect,
     .mode_valid = tfp410_mode_valid,
Index: xf86-video-intel-2.9.1/src/tfp410/tfp410_module.c
===================================================================
--- xf86-video-intel-2.9.1.orig/src/tfp410/tfp410_module.c
+++ xf86-video-intel-2.9.1/src/tfp410/tfp410_module.c
@@ -13,7 +13,7 @@
 static MODULESETUPPROTO(tfp410Setup);
 
 static XF86ModuleVersionInfo tfp410VersRec = {
-    "tfp410",
+    "tfp410legacy",
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -25,7 +25,7 @@ static XF86ModuleVersionInfo tfp410VersR
     { 0,0,0,0 }
 };
 
-_X_EXPORT XF86ModuleData tfp410ModuleData = {
+_X_EXPORT XF86ModuleData tfp410legacyModuleData = {
     &tfp410VersRec,
     tfp410Setup,
     NULL
Index: xf86-video-intel-2.9.1/src/xvmc/Makefile.am
===================================================================
--- xf86-video-intel-2.9.1.orig/src/xvmc/Makefile.am
+++ xf86-video-intel-2.9.1/src/xvmc/Makefile.am
@@ -1,18 +1,18 @@
 if XVMC
-lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
+lib_LTLIBRARIES=libI810XvMClegacy.la libIntelXvMClegacy.la
 endif
 
 SUBDIRS = shader
 
-libI810XvMC_la_SOURCES = I810XvMC.c \
+libI810XvMClegacy_la_SOURCES = I810XvMC.c \
 			 I810XvMC.h
 
-libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-	-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
-libI810XvMC_la_LDFLAGS = -version-number 1:0:0
-libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
+libI810XvMClegacy_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ \
+	@DRI_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
+libI810XvMClegacy_la_LDFLAGS = -version-number 1:0:0
+libI810XvMClegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
 
-libIntelXvMC_la_SOURCES = intel_xvmc.c \
+libIntelXvMClegacy_la_SOURCES = intel_xvmc.c \
         intel_xvmc.h                   \
         intel_xvmc_dump.c              \
         i915_structs.h                 \
@@ -28,7 +28,8 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
         dri2.c                         \
         dri2.h	
 
-libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
+libIntelXvMClegacy_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
-libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread -ldrm_intel
+libIntelXvMClegacy_la_LDFLAGS = -version-number 1:0:0
+libIntelXvMClegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread \
+	-ldrm_intel

Places

File xf86-video-intel-2.9.1-legacy.patch of Package xorg-x11-driver-video-intel-legacy

Places