xserver-xorg-video-newport: Changes to 'upstream-unstable'
.gitignore | 70 +++++++++++++++++++++++++++++++++++++++++++++-----
COPYING | 31 ++++++++++++++++------
ChangeLog | 60 -------------------------------------------
Makefile.am | 17 +++++++-----
README | 41 +++++++++++++++--------------
README.sgml | 71 ---------------------------------------------------
configure.ac | 49 ++++++++++++++++-------------------
man/.gitignore | 2 -
man/Makefile.am | 59 +++++++++++++++---------------------------
src/.gitignore | 6 ----
src/newport_cursor.c | 2 -
src/newport_driver.c | 56 ++--------------------------------------
12 files changed, 168 insertions(+), 296 deletions(-)
New commits:
commit 0d20e0453fcbe348e517e65fa45126ea4b4477cc
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 12 13:29:07 2012 +0200
xf86-video-newport 0.2.4
diff --git a/configure.ac b/configure.ac
index 1fd8896..fff23b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-newport],
- [0.2.3],
+ [0.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-newport])
AC_CONFIG_SRCDIR([Makefile.am])
commit 3e01816ce8a8d42144cb6726435ee72cf698ce92
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Sep 26 22:54:13 2011 -0400
Remove if(E != NULL) checks around free(E)
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 5fb6f18..93f765c 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -187,8 +187,6 @@ NewportGetRec(ScrnInfoPtr pScrn)
static Bool
NewportFreeRec(ScrnInfoPtr pScrn)
{
- if (pScrn->driverPrivate == NULL)
- return TRUE;
free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
return TRUE;
@@ -654,8 +652,7 @@ NewportCloseScreen(int scrnIndex, ScreenPtr pScreen)
#endif
NewportRestore(pScrn, TRUE);
- if (pNewport->ShadowPtr)
- free(pNewport->ShadowPtr);
+ free(pNewport->ShadowPtr);
/* unmap the Newport's registers from memory */
NewportUnmapRegs(pScrn);
commit 95b2e6f88fca70216d0bffd813981316ec74b2de
Author: Paulo Zanoni <pzanoni@mandriva.com>
Date: Mon Dec 13 15:55:18 2010 -0200
Replace X{c,r,}alloc and Xfree for stdlib functions
Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/newport_cursor.c b/src/newport_cursor.c
index 3264de4..37b7492 100644
--- a/src/newport_cursor.c
+++ b/src/newport_cursor.c
@@ -125,7 +125,7 @@ static unsigned char* NewportRealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr
CARD32 *mem, *SrcS, *SrcM, *DstS;
unsigned int i;
- if (!(mem = xcalloc(1, size)))
+ if (!(mem = calloc(1, size)))
return NULL;
SrcS = (CARD32*)pCurs->bits->source;
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 6bd7c9f..5fb6f18 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -189,7 +189,7 @@ NewportFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return TRUE;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
return TRUE;
}
@@ -255,7 +255,7 @@ NewportProbe(DriverPtr drv, int flags)
}
}
}
- xfree(devSections);
+ free(devSections);
return foundScreen;
}
@@ -354,7 +354,7 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
/* Fill in pScrn->options) */
xf86CollectOptions(pScrn, NULL);
- if (!(pNewport->Options = xalloc(sizeof(NewportOptions))))
+ if (!(pNewport->Options = malloc(sizeof(NewportOptions))))
return FALSE;
memcpy(pNewport->Options, NewportOptions, sizeof(NewportOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pNewport->Options);
@@ -655,7 +655,7 @@ NewportCloseScreen(int scrnIndex, ScreenPtr pScreen)
NewportRestore(pScrn, TRUE);
if (pNewport->ShadowPtr)
- xfree(pNewport->ShadowPtr);
+ free(pNewport->ShadowPtr);
/* unmap the Newport's registers from memory */
NewportUnmapRegs(pScrn);
commit 21c5ff7a38fb0a678f90478659e5e486213fb6a0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index b5cb076..1fd8896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-newport],
[0.2.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-newport])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,29 +40,29 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
# Checks for libraries.
-
AC_SUBST([moduledir])
DRIVER_NAME=newport
commit 1e66f6b1960fbc1261da1118083c5283f06fc1c5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index b191898..b5cb076 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=newport
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit f669d93ea1a6e2de304ff0a73e5d8ace0c9094ba
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index b12cff7..b191898 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
commit be8da92fde7a6d5606ff052ae18ce7027fc14160
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 8ff2460..b12cff7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-newport],
[xf86-video-newport])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit cd3146c2e05b6e2005ff696e6b2daf448246d11d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 65c8ea2..8ff2460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-newport],
- 0.2.3,
+ [0.2.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-newport)
+ [xf86-video-newport])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit 7fa3f4afea77c3eb7768ee18b7ddf352024bdf4a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:57 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index e206fc2..65c8ea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
# Checks for libraries.
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=newport
commit fbbe579d900759cdf3cca486e5af9ed537c1fae2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 7a668d6..e206fc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
# Checks for libraries.
-# Checks for header files.
-AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
commit 6a5c1636c9b2e73e02af94e14cc7a7d41a442ce9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:31 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f2dffbf..7a668d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit 47fe48827a8cafad37a05c39e9b450738aa2ed61
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:19 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index fff45ab..f2dffbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-newport],
0.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit 4bbbfb202fd1d31340e9eaff929a3a14d9a4c884
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:29 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index 61833ec..fff45ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit c46b3ca0418dedfa7a8a526f014dc2e43c4f785d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 19:26:30 2010 -0400
README: keep the text version of README, discard the sgml version
The linuxdoc doc tool is deprecated.
README files are exclusively text files.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 99b6082..33384c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,12 +21,7 @@
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
-
-EXTRA_DIST = XF86Config.indy README.sgml
+EXTRA_DIST = XF86Config.indy
.PHONY: ChangeLog INSTALL
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index 750b3a1..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
-<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
-]>
-
-<article>
-<title>Information for newport Users
-<author>Guido Günther
-<date>24 February 2003
-<toc>
-
-<sect>Supported Hardware
-<p>
-This is an unaccelerated driver for the SGI newport cards (a.k.a. XL) as found
-in the SGI Indy and Indigo2. Both the 8bit and 24bit versions are tested and
-working.
-
-<sect>Features
-<p>
-<itemize>
- <item>Support for 8 and 24 bit pixel depths
- <item>Hardware cursor support to reduce flicker
-</itemize>
-
-<sect>Notes
-<p>
-<itemize>
- <item>X -configure does not generate a xorg.conf file.
- <item>There's only a 1280x1024 mode.
-</itemize>
-
-
-<sect>Configuration
-<p>
-The driver auto-detects all device information necessary to
-initialize the card on the Indy. The only lines you need in the "Device"
-section of your xorg.conf file are:
-<verb>
- Section "Device"
- Identifier "SGI newport"
- Driver "newport"
- EndSection
-</verb>
-Indigo2 users have to use the BusID option as documented below.
-
-However, if you have problems with auto-detection, you can specify:
-<itemize>
- <item>bitplanes - number of physical bitplanes (8 or 24)
- <item>HWCursor - enable or disable hardware cursor
- <item>BusID - set this to "1" on the Indigo2 XL
-</itemize>
-
-<sect>Authors
-<p>
-<itemize>
- <item>Guido Guenther <url url="mailto:agx@sigxcpu.org";>
-</itemize>
-
-
-<sect>Acknowledgements
-<p>
-<itemize>
- <item>Gleb O. Raiko <url url="mailto:raiko@niisi.msk.ru";> for getting the beast to build
- <item>Ralf Baechle <url url="mailto:ralf@oss.sgi.com";> for his patience...
- <item>Ulf Carlsson <url url="mailto:ulfc@calypso.engr.sgi.com";> for comments and elf loader code
- <item>Nina A. Podolskaya <url url="mailto:nap@niisi.msk.ru";> for elf loader code
- <item>all the guys who wrote the newport_con linux kernel code
-</itemize>
-
-</article>
diff --git a/configure.ac b/configure.ac
index 9a0484c..61833ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,8 +72,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=newport
AC_SUBST([DRIVER_NAME])
-XORG_CHECK_LINUXDOC
-
AC_OUTPUT([
Makefile
src/Makefile
commit dd7a59d040c7a6b6b721f241537c3426d9865c7f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 19:21:38 2010 -0400
README: fix linuxdoc content
defs.ent are located under X11 directory
ident tag is not a Linuxdoc tag
replace docbook email tag with linuxdoc email tag
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/README b/README
index 1295a9d..659b801 100644
--- a/README
+++ b/README
@@ -16,31 +16,31 @@
______________________________________________________________________
- [1m1. Supported Hardware[0m
+ 1. Supported Hardware
This is an unaccelerated driver for the SGI newport cards (a.k.a. XL)
as found in the SGI Indy and Indigo2. Both the 8bit and 24bit versions
are tested and working.
- [1m2. Features[0m
+ 2. Features
- +o Support for 8 and 24 bit pixel depths
+ o Support for 8 and 24 bit pixel depths
- +o Hardware cursor support to reduce flicker
+ o Hardware cursor support to reduce flicker
- [1m3. Notes[0m
+ 3. Notes
- +o X -configure does not generate a xorg.conf file.
+ o X -configure does not generate a xorg.conf file.
- +o There's only a 1280x1024 mode.
+ o There's only a 1280x1024 mode.
- [1m4. Configuration[0m
+ 4. Configuration
The driver auto-detects all device information necessary to initialize
the card on the Indy. The only lines you need in the "Device" section
@@ -56,34 +56,35 @@
However, if you have problems with auto-detection, you can specify:
- +o bitplanes - number of physical bitplanes (8 or 24)
+ o bitplanes - number of physical bitplanes (8 or 24)
- +o HWCursor - enable or disable hardware cursor
+ o HWCursor - enable or disable hardware cursor
- +o BusID - set this to "1" on the Indigo2 XL
+ o BusID - set this to "1" on the Indigo2 XL
- [1m5. Authors[0m
+ 5. Authors
- +o Guido Guenther <agx@sigxcpu.org>
+ o Guido Guenther <mailto:agx@sigxcpu.org>
- [1m6. Acknowledgements[0m
+ 6. Acknowledgements
- +o Gleb O. Raiko <raiko@niisi.msk.ru> for getting the beast to build
+ o Gleb O. Raiko <mailto:raiko@niisi.msk.ru> for getting the beast to
+ build
- +o Ralf Baechle <ralf@oss.sgi.com> for his patience...
+ o Ralf Baechle <mailto:ralf@oss.sgi.com> for his patience...
- +o Ulf Carlsson <ulfc@calypso.engr.sgi.com> for comments and elf
- loader code
+ o Ulf Carlsson <mailto:ulfc@calypso.engr.sgi.com> for comments and
+ elf loader code
- +o Nina A. Podolskaya <nap@niisi.msk.ru> for elf loader code
+ o Nina A. Podolskaya <mailto:nap@niisi.msk.ru> for elf loader code
- +o all the guys who wrote the newport_con linux kernel code
+ o all the guys who wrote the newport_con linux kernel code
diff --git a/README.sgml b/README.sgml
index 70a22bd..750b3a1 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,13 +1,11 @@
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
]>
<article>
<title>Information for newport Users
<author>Guido Günther
<date>24 February 2003
-<ident>
-</ident>
<toc>
<sect>Supported Hardware
@@ -54,17 +52,17 @@ However, if you have problems with auto-detection, you can specify:
<sect>Authors
<p>
<itemize>
- <item>Guido Guenther <email>agx@sigxcpu.org</email>
+ <item>Guido Guenther <url url="mailto:agx@sigxcpu.org";>
</itemize>
<sect>Acknowledgements
<p>
<itemize>
- <item>Gleb O. Raiko <email>raiko@niisi.msk.ru</email> for getting the beast to build
- <item>Ralf Baechle <email>ralf@oss.sgi.com</email> for his patience...
- <item>Ulf Carlsson <email>ulfc@calypso.engr.sgi.com</email> for comments and elf loader code
- <item>Nina A. Podolskaya <email>nap@niisi.msk.ru</email> for elf loader code
+ <item>Gleb O. Raiko <url url="mailto:raiko@niisi.msk.ru";> for getting the beast to build
+ <item>Ralf Baechle <url url="mailto:ralf@oss.sgi.com";> for his patience...
+ <item>Ulf Carlsson <url url="mailto:ulfc@calypso.engr.sgi.com";> for comments and elf loader code
+ <item>Nina A. Podolskaya <url url="mailto:nap@niisi.msk.ru";> for elf loader code
<item>all the guys who wrote the newport_con linux kernel code
</itemize>
commit feb48d8c797370d827a4be5472e209c13ffeb4f1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 20:49:44 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..8cbb3a6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,27 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+(c) 2000-2002 Guido Guenther <agx@sigxcpu.org>
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
+(c) 2004 Dominik Behr <dominikbehr@yahoo.com>
+this code is released under xfree 4.3.0 and xorg 6.8.0 license
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit 48f48e585bf542be48d7d34dc66d430d6843268f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 23 14:46:46 2010 +0100
newport: stop using obsolete loader functions
The loader symbol list functions have been removed from the server in
1.7.
Reported-and-tested-by: Bernhard R. Link <brlink@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 64b643a..6bd7c9f 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -102,36 +102,6 @@ static SymTabRec NewportChipsets[] = {
{-1, NULL }
};
-/* List of Symbols from other modules that this module references */
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAGetFallbackOps",
- "XAAInit",
- NULL
-};
-
-
-#ifdef XFree86LOADER
-
static MODULESETUPPROTO(newportSetup);
static XF86ModuleVersionInfo newportVersRec =
@@ -172,14 +142,6 @@ newportSetup(pointer module, pointer opts, int *errmaj, int *errmin)
xf86AddDriver(&NEWPORT, module, 0);
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- *
- */
- LoaderRefSymLists( fbSymbols, ramdacSymbols, shadowSymbols, xaaSymbols, NULL);
-
-
- /*
* The return value must be non-NULL on success even though
* there is no TearDownProc.
*/
@@ -190,8 +152,6 @@ newportSetup(pointer module, pointer opts, int *errmaj, int *errmin)
}
}
-#endif /* XFree86LOADER */
-
typedef enum {
OPTION_BITPLANES,
OPTION_BUS_ID,
@@ -486,7 +446,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists( fbSymbols, NULL);
/* Load ramdac modules */
if (pNewport->hwCursor) {
@@ -494,7 +453,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
/* Load ShadowFB module */
@@ -502,7 +460,6 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
NewportFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
return TRUE;
}
@@ -596,8 +553,6 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
if (!pNewport->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa"))
pNewport->NoAccel = TRUE;
- else
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
#if 0
if (pScrn->bitsPerPixel < 24)
commit 12f5f9a07259b986fdf9f76004da9512f7890382
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:54:02 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..8f2454b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
drivermandir = $(DRIVER_MAN_DIR)
commit c7912af51eb02292ae7efde7ce8165b22935bf57
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 21d3a0c..9a0484c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit fb0e0d04d1e229ebd1c60ce5359518fb14460f2e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index d62629c..99b6082 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
if BUILD_LINUXDOC
README: README.sgml
commit 79d2c1d3303d297bce9f21d46c5f3def2675b422
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 7c6369e..d62629c 100644
Reply to: