pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xf86-video-nsc Update to 2.8.3. Make it compile wi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cc4a3531682b
branches: trunk
changeset: 394395:cc4a3531682b
user: hasso <hasso%pkgsrc.org@localhost>
date: Tue Jun 09 17:10:15 2009 +0000
description:
Update to 2.8.3. Make it compile with new xserver - stoling assyntax.h from
old xserver and the libpciaccess patch from upstream repository.
Changes since 2.8.2:
Brice Goglin (1):
Define NSC_VERSION_* using PACKAGE_VERSION*
Eric Anholt (2):
Bug #9588: Fix build after XFree86Server unifdef by removing HAL junk.
Bump driver version to 2.8.3 to release untested build fixes.
James Cloos (2):
Rename .cvsignore to .gitignore
Add *~ to .gitignore to skip patch/emacs droppings
diffstat:
x11/xf86-video-nsc/Makefile | 13 +-
x11/xf86-video-nsc/distinfo | 13 +-
x11/xf86-video-nsc/files/assyntax.h | 749 ++++++++++++++++++++++++++++++++++++
x11/xf86-video-nsc/patches/patch-aa | 18 +
x11/xf86-video-nsc/patches/patch-ab | 15 +
x11/xf86-video-nsc/patches/patch-ac | 26 +
x11/xf86-video-nsc/patches/patch-ad | 14 +
x11/xf86-video-nsc/patches/patch-ae | 129 ++++++
8 files changed, 969 insertions(+), 8 deletions(-)
diffs (truncated from 1022 to 300 lines):
diff -r def4d0282889 -r cc4a3531682b x11/xf86-video-nsc/Makefile
--- a/x11/xf86-video-nsc/Makefile Tue Jun 09 15:15:07 2009 +0000
+++ b/x11/xf86-video-nsc/Makefile Tue Jun 09 17:10:15 2009 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/06/07 11:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/09 17:10:15 hasso Exp $
#
-DISTNAME= xf86-video-nsc-2.8.2
-PKGREVISION= 2
+DISTNAME= xf86-video-nsc-2.8.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -15,7 +14,13 @@
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= autoconf autoheader automake autoreconf pkg-config
+
+post-extract:
+ cp ${FILESDIR}/assyntax.h ${WRKSRC}/src/
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -vif
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
diff -r def4d0282889 -r cc4a3531682b x11/xf86-video-nsc/distinfo
--- a/x11/xf86-video-nsc/distinfo Tue Jun 09 15:15:07 2009 +0000
+++ b/x11/xf86-video-nsc/distinfo Tue Jun 09 17:10:15 2009 +0000
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/22 15:43:52 joerg Exp $
+$NetBSD: distinfo,v 1.2 2009/06/09 17:10:15 hasso Exp $
-SHA1 (xf86-video-nsc-2.8.2.tar.bz2) = 58ea8edbdf18dc8dd194f9d08761f829bfd09a01
-RMD160 (xf86-video-nsc-2.8.2.tar.bz2) = 0eeddcbc62fe0c525b7e02cb67caf0561a05facf
-Size (xf86-video-nsc-2.8.2.tar.bz2) = 479445 bytes
+SHA1 (xf86-video-nsc-2.8.3.tar.bz2) = 23d706458d68c9d380c3a22e146e9c58e656244f
+RMD160 (xf86-video-nsc-2.8.3.tar.bz2) = 3db7e868fb6b3974b466425a3896f9e1f8336fea
+Size (xf86-video-nsc-2.8.3.tar.bz2) = 465597 bytes
+SHA1 (patch-aa) = 908a0ba5af6b76ca1dbb275404ab26efdc4e7255
+SHA1 (patch-ab) = cb6052bcab07e31730d9e223f86915954a0cd921
+SHA1 (patch-ac) = 4a2b9999c9a34a369e973bc4e5313b413a46d5d5
+SHA1 (patch-ad) = 150f7963781f5ede279207f2e62b63d84916d7eb
+SHA1 (patch-ae) = 6e581450fa2fca794957486f48944d0b845ba418
diff -r def4d0282889 -r cc4a3531682b x11/xf86-video-nsc/files/assyntax.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-nsc/files/assyntax.h Tue Jun 09 17:10:15 2009 +0000
@@ -0,0 +1,749 @@
+#ifndef __ASSYNTAX_H__
+#define __ASSYNTAX_H__
+
+/*
+ * Copyright 1992 Vrije Universiteit, The Netherlands
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the Vrije Universiteit not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. The Vrije Universiteit makes no
+ * representations about the suitability of this software for any purpose.
+ * It is provided "as is" without express or implied warranty.
+ *
+ * The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+/*
+ * Copyright (c) 1993-1999 by The XFree86 Project, Inc.
+ *
+ * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 holder(s)
+ * and author(s) 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 holder(s) and author(s).
+ */
+
+ /*
+ * assyntax.h
+ *
+ * Select the syntax appropriate to the 386 assembler being used
+ * To add support for more assemblers add more columns to the CHOICE
+ * macro. Note that register names must also have uppercase names
+ * to avoid macro recursion. e.g., #define ah %ah recurses!
+ *
+ * NB 1. Some of the macros for certain assemblers imply that the code is to
+ * run in protected mode!! Caveat emptor.
+ *
+ * NB 2. 486 specific instructions are not included. This is to discourage
+ * their accidental use in code that is intended to run on 386 and 486
+ * systems.
+ *
+ * Supported assemblers:
+ *
+ * (a) AT&T SysVr4 as(1): default
+ * (b) GNU Assembler gas: define USE_GAS or GNU_ASSEMBLER
+ * (c) Amsterdam Compiler kit: define ACK_ASSEMBLER
+ *
+ * The following naming conventions have been used to identify the various
+ * data types:
+ * _SR = segment register version
+ * Integer:
+ * _Q = quadword = 64 bits
+ * _L = long = 32 bits
+ * _W = short = 16 bits
+ * _B = byte = 8 bits
+ * Floating-point:
+ * _X = m80real = 80 bits
+ * _D = double = 64 bits
+ * _S = single = 32 bits
+ *
+ * Author: Gregory J. Sharp, Sept 1992
+ * Vrije Universiteit, Amsterdam, The Netherlands
+ */
+
+#if defined(USE_GAS) && !defined(GNU_ASSEMBLER)
+#define GNU_ASSEMBLER
+#endif
+
+#if (defined(__STDC__) && !defined(UNIXCPP)) || (defined (sun) && defined (i386) && defined (SVR4) && defined (__STDC__) && !defined (__GNUC__))
+#define CONCAT(x, y) x ## y
+#else
+#define CONCAT(x, y) x/**/y
+#endif
+
+#ifdef ACK_ASSEMBLER
+
+/* Assume we write code for 32-bit protected mode! */
+
+/* Redefine register names for GAS & AT&T assemblers */
+#define AL al
+#define AH ah
+#define AX ax
+#define EAX ax
+#define BL bl
+#define BH bh
+#define BX bx
+#define EBX bx
+#define CL cl
+#define CH ch
+#define CX cx
+#define ECX cx
+#define DL dl
+#define DH dh
+#define DX dx
+#define EDX dx
+#define BP bp
+#define EBP bp
+#define SI si
+#define ESI si
+#define DI di
+#define EDI di
+#define SP sp
+#define ESP sp
+#define CS cs
+#define SS ss
+#define DS ds
+#define ES es
+#define FS fs
+#define GS gs
+/* Control Registers */
+#define CR0 cr0
+#define CR1 cr1
+#define CR2 cr2
+#define CR3 cr3
+/* Debug Registers */
+#define DR0 dr0
+#define DR1 dr1
+#define DR2 dr2
+#define DR3 dr3
+#define DR4 dr4
+#define DR5 dr5
+#define DR6 dr6
+#define DR7 dr7
+/* Floating-point Stack */
+#define ST st
+
+#define AS_BEGIN .sect .text; .sect .rom; .sect .data; .sect .bss; .sect .text
+
+
+#define _WTOG o16 /* word toggle for _W instructions */
+#define _LTOG /* long toggle for _L instructions */
+#define ADDR_TOGGLE a16
+#define OPSZ_TOGGLE o16
+#define USE16 .use16
+#define USE32 .use32
+
+#define CHOICE(a,b,c) c
+
+#else /* AT&T or GAS */
+
+/* Redefine register names for GAS & AT&T assemblers */
+#define AL %al
+#define AH %ah
+#define AX %ax
+#define EAX %eax
+#define BL %bl
+#define BH %bh
+#define BX %bx
+#define EBX %ebx
+#define CL %cl
+#define CH %ch
+#define CX %cx
+#define ECX %ecx
+#define DL %dl
+#define DH %dh
+#define DX %dx
+#define EDX %edx
+#define BP %bp
+#define EBP %ebp
+#define SI %si
+#define ESI %esi
+#define DI %di
+#define EDI %edi
+#define SP %sp
+#define ESP %esp
+#define CS %cs
+#define SS %ss
+#define DS %ds
+#define ES %es
+#define FS %fs
+#define GS %gs
+/* Control Registers */
+#define CR0 %cr0
+#define CR1 %cr1
+#define CR2 %cr2
+#define CR3 %cr3
+/* Debug Registers */
+#define DR0 %db0
+#define DR1 %db1
+#define DR2 %db2
+#define DR3 %db3
+#define DR4 %db4
+#define DR5 %db5
+#define DR6 %db6
+#define DR7 %db7
+/* Floating-point Stack */
+#define ST %st
+
+#define AS_BEGIN
+#define USE16
+#define USE32
+
+#ifdef GNU_ASSEMBLER
+
+#define ADDR_TOGGLE aword
+#define OPSZ_TOGGLE word
+
+#define CHOICE(a,b,c) b
+
+#else
+/*
+ * AT&T ASSEMBLER SYNTAX
+ * *********************
+ */
+#define CHOICE(a,b,c) a
+
+#define ADDR_TOGGLE addr16
+#define OPSZ_TOGGLE data16
+
+#endif /* GNU_ASSEMBLER */
+#endif /* ACK_ASSEMBLER */
+
+
+#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__)
+#define GLNAME(a) a
+#else
+#define GLNAME(a) CONCAT(_,a)
+#endif
+
+
+ /****************************************/
+ /* */
+ /* Select the various choices */
+ /* */
Home |
Main Index |
Thread Index |
Old Index