Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit xorg-x11-driver-video
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 13 Mar 2007 01:04:05 +0100
  • Message-id: <20070313000405.B4354678188@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xorg-x11-driver-video
checked in at Tue Mar 13 01:04:05 CET 2007.

--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-10 16:18:29.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-03-12 17:36:58.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 12 17:34:35 CET 2007 - sndirsch@xxxxxxx
+
+- added optional drivers with experimental RANDR 1.2 support
+ ("radeonrandr12", "nvrandr12")
+
+-------------------------------------------------------------------

New:
----
xf86-video-ati.randr12-20070311.tar.bz2
xf86-video-ati.randr12.diff
xf86-video-mga.randr12-20070311.tar.bz2
xf86-video-mga.randr12.diff
xf86-video-nv.randr12-20070311.tar.bz2
xf86-video-nv.randr12.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.A31431/_old 2007-03-13 01:03:26.000000000 +0100
+++ /var/tmp/diff_new_pack.A31431/_new 2007-03-13 01:03:26.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 61
+Release: 62
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -67,6 +67,9 @@
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-1.9.91.tar.bz2
+Source46: xf86-video-ati.randr12-20070311.tar.bz2
+Source47: xf86-video-nv.randr12-20070311.tar.bz2
+Source48: xf86-video-mga.randr12-20070311.tar.bz2
Patch: xf86-video-intel.diff
Patch1: radeon-xrandr-dotclock.diff
Patch2: radeon_dell.diff
@@ -82,6 +85,9 @@
Patch18: radeon-vbios-ppc.diff
Patch26: rn50_pixel_clock_limit.patch
Patch27: xf86-video-ati-mergedfb-dpi.diff
+Patch28: xf86-video-ati.randr12.diff
+Patch29: xf86-video-nv.randr12.diff
+Patch30: xf86-video-mga.randr12.diff

%description
This package contains X.Org video drivers.
@@ -91,6 +97,14 @@
%prep
%setup -T -c %{name}
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
+ln -snf ati.man xf86-video-ati.randr12/man/atirandr12.man
+ln -snf r128.man xf86-video-ati.randr12/man/r128randr12.man
+ln -snf radeon.man xf86-video-ati.randr12/man/radeonrandr12.man
+ln -snf nv.man xf86-video-nv.randr12/man/nvrandr12.man
+ln -snf mga.man xf86-video-mga.randr12/man/mgarandr12.man
+%patch28
+%patch29
+%patch30
pushd xf86-video-intel-*
%patch -p0
popd
@@ -130,13 +144,16 @@

%build
for dir in xf86-video-nv-* \
+ *.randr12 \
$(ls | grep -v -e xf86-video-impact \
-e xf86-video-nv \
+ -e randr12 \
); do
pushd $dir
case $dir in
xf86-video-mga-* | \
xf86-video-intel-* | \
+ *.randr12 | \
xf86-video-nsc-*) autoreconf -fi ;;
*) ;;
esac
@@ -148,8 +165,10 @@

%install
for dir in xf86-video-nv-* \
+ *.randr12 \
$(ls | grep -v -e xf86-video-impact \
-e xf86-video-nv \
+ -e randr12
); do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done
@@ -235,6 +254,9 @@
%{_mandir}/man4/*

%changelog
+* Mon Mar 12 2007 - sndirsch@xxxxxxx
+- added optional drivers with experimental RANDR 1.2 support
+ ("radeonrandr12", "nvrandr12")
* Sat Mar 10 2007 - sndirsch@xxxxxxx
- xf86-video-nv-DAC.diff:
* Use DAC load detection to decide which OR to use instead of

++++++ xf86-video-ati.randr12.diff ++++++
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"

++++++ xf86-video-mga.randr12.diff ++++++
diff -u -r xf86-video-mga.randr12.orig/configure.ac xf86-video-mga.randr12/configure.ac
--- xf86-video-mga.randr12.orig/configure.ac 2007-03-12 12:28:08.289874000 +0100
+++ xf86-video-mga.randr12/configure.ac 2007-03-12 16:06:50.062431000 +0100
@@ -147,7 +147,7 @@
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])

-DRIVER_NAME=mga
+DRIVER_NAME=mgarandr12
AC_SUBST([DRIVER_NAME])

XORG_MANPAGE_SECTIONS
diff -u -r xf86-video-mga.randr12.orig/src/Makefile.am xf86-video-mga.randr12/src/Makefile.am
--- xf86-video-mga.randr12.orig/src/Makefile.am 2007-03-12 12:28:08.157002000 +0100
+++ xf86-video-mga.randr12/src/Makefile.am 2007-03-12 16:08:11.138271000 +0100
@@ -24,12 +24,12 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
-mga_drv_la_LTLIBRARIES = mga_drv.la
-mga_drv_la_LDFLAGS = -module -avoid-version
-mga_drv_ladir = @moduledir@/drivers
-mga_drv_la_LIBADD = $(noinst_LTLIBRARIES)
+mgarandr12_drv_la_LTLIBRARIES = mgarandr12_drv.la
+mgarandr12_drv_la_LDFLAGS = -module -avoid-version
+mgarandr12_drv_ladir = @moduledir@/drivers
+mgarandr12_drv_la_LIBADD = $(noinst_LTLIBRARIES)

-mga_drv_la_SOURCES = \
+mgarandr12_drv_la_SOURCES = \
mga_arc.c \
mga_bios.c \
mga_common.h \
@@ -54,18 +54,18 @@
mga_video.c

if DRI
-mga_drv_la_SOURCES += \
+mgarandr12_drv_la_SOURCES += \
mga_dri.c \
mga_dri.h \
mga_dripriv.h
endif

if USE_EXA
-mga_drv_la_SOURCES += \
+mgarandr12_drv_la_SOURCES += \
mga_exa.c
endif

if USE_XAA
-mga_drv_la_SOURCES += \
+mgarandr12_drv_la_SOURCES += \
mga_storm.c
endif
diff -u -r xf86-video-mga.randr12.orig/src/mga.h xf86-video-mga.randr12/src/mga.h
--- xf86-video-mga.randr12.orig/src/mga.h 2007-03-12 12:28:08.011159000 +0100
+++ xf86-video-mga.randr12/src/mga.h 2007-03-12 17:11:22.884036000 +0100
@@ -145,10 +145,10 @@
#define PORT_OFFSET (0x1F00 - 0x300)

#define MGA_VERSION 4000
-#define MGA_NAME "MGA"
+#define MGA_NAME "MGARANDR12"
#define MGA_C_NAME MGA
-#define MGA_MODULE_DATA mgaModuleData
-#define MGA_DRIVER_NAME "mga"
+#define MGA_MODULE_DATA mgarandr12ModuleData
+#define MGA_DRIVER_NAME "mgarandr12"

typedef struct {
unsigned char ExtVga[6];
++++++ xf86-video-nv.randr12.diff ++++++
diff -u -r xf86-video-nv.randr12.orig/configure.ac xf86-video-nv.randr12/configure.ac
--- xf86-video-nv.randr12.orig/configure.ac 2007-03-12 12:28:13.622543000 +0100
+++ xf86-video-nv.randr12/configure.ac 2007-03-12 15:34:10.580947000 +0100
@@ -82,7 +82,7 @@
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])

-DRIVER_NAME=nv
+DRIVER_NAME=nvrandr12
AC_SUBST([DRIVER_NAME])

XORG_MANPAGE_SECTIONS
diff -u -r xf86-video-nv.randr12.orig/man/Makefile.am xf86-video-nv.randr12/man/Makefile.am
--- xf86-video-nv.randr12.orig/man/Makefile.am 2007-03-12 12:28:13.302859000 +0100
+++ xf86-video-nv.randr12/man/Makefile.am 2007-03-12 15:31:33.575110000 +0100
@@ -42,9 +42,9 @@
XORGMANNAME = X Version 11

if SUPPORT_G80
-MAN_SUPPORT_G80 := 1
+MAN_SUPPORT_G80 = 1
else
-MAN_SUPPORT_G80 := 0
+MAN_SUPPORT_G80 = 0
endif

MAN_SUBSTS = \
diff -u -r xf86-video-nv.randr12.orig/src/Makefile.am xf86-video-nv.randr12/src/Makefile.am
--- xf86-video-nv.randr12.orig/src/Makefile.am 2007-03-12 12:28:13.426737000 +0100
+++ xf86-video-nv.randr12/src/Makefile.am 2007-03-12 15:58:41.268795000 +0100
@@ -24,11 +24,11 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@
-nv_drv_la_LTLIBRARIES = nv_drv.la
-nv_drv_la_LDFLAGS = -module -avoid-version
-nv_drv_ladir = @moduledir@/drivers
+nvrandr12_drv_la_LTLIBRARIES = nvrandr12_drv.la
+nvrandr12_drv_la_LDFLAGS = -module -avoid-version
+nvrandr12_drv_ladir = @moduledir@/drivers

-nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
+nvrandr12_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)

nv_sources = \
nv_const.h \
diff -u -r xf86-video-nv.randr12.orig/src/nv_const.h xf86-video-nv.randr12/src/nv_const.h
--- xf86-video-nv.randr12.orig/src/nv_const.h 2007-03-12 12:28:13.575585000 +0100
+++ xf86-video-nv.randr12/src/nv_const.h 2007-03-12 16:04:25.252388000 +0100
@@ -4,8 +4,8 @@
#define __NV_CONST_H__

#define NV_VERSION 4000
-#define NV_NAME "NV"
-#define NV_DRIVER_NAME "nv"
+#define NV_NAME "NVRANDR12"
+#define NV_DRIVER_NAME "nvrandr12"

#endif /* __NV_CONST_H__ */

diff -u -r xf86-video-nv.randr12.orig/src/nv_driver.c xf86-video-nv.randr12/src/nv_driver.c
--- xf86-video-nv.randr12.orig/src/nv_driver.c 2007-03-12 12:28:13.337825000 +0100
+++ xf86-video-nv.randr12/src/nv_driver.c 2007-03-12 17:17:00.894688000 +0100
@@ -455,7 +455,7 @@

static XF86ModuleVersionInfo nvVersRec =
{
- "nv",
+ "nvrandr12",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
@@ -467,7 +467,7 @@
{0,0,0,0}
};

-_X_EXPORT XF86ModuleData nvModuleData = { &nvVersRec, nvSetup, NULL };
+_X_EXPORT XF86ModuleData nvrandr12ModuleData = { &nvVersRec, nvSetup, NULL };
#endif



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >