[Midnightbsd-cvs] mports [18941] trunk/x11-drivers/xf86-video-chips: fix build of xf86-video-chips

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu May 14 20:06:58 EDT 2015 

Revision: 18941
          http://svnweb.midnightbsd.org/mports/?rev=18941
Author:   laffer1
Date:     2015-05-14 20:06:58 -0400 (Thu, 14 May 2015)
Log Message:
-----------
fix build of xf86-video-chips

Modified Paths:
--------------
    trunk/x11-drivers/xf86-video-chips/Makefile
    trunk/x11-drivers/xf86-video-chips/pkg-plist

Added Paths:
-----------
    trunk/x11-drivers/xf86-video-chips/files/
    trunk/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c
    trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
    trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
    trunk/x11-drivers/xf86-video-chips/files/patch-util_iopl.h

Modified: trunk/x11-drivers/xf86-video-chips/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-chips/Makefile	2015-05-15 00:05:21 UTC (rev 18940)
+++ trunk/x11-drivers/xf86-video-chips/Makefile	2015-05-15 00:06:58 UTC (rev 18941)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-chips
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,6 +12,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	videoproto xextproto
-MAN4=		chips.4x
 
 .include <bsd.port.mk>

Added: trunk/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c	2015-05-15 00:06:58 UTC (rev 18941)
@@ -0,0 +1,28 @@
+--- src/ct_driver.c.orig	2012-07-16 03:35:59 UTC
++++ src/ct_driver.c
+@@ -96,9 +96,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi banking wrapper need this */
+ #ifdef HAVE_ISA
+ #include "mibank.h"
+@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    pBankInfo = NULL;
+ 	    return FALSE;
+ 	}
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Initialise cursor functions */
+@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    }
+ 	}
+ 	
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ #ifdef ENABLE_SILKEN_MOUSE
+ 	xf86SetSilkenMouse(pScreen);


Property changes on: trunk/x11-drivers/xf86-video-chips/files/patch-src_ct__driver.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
===================================================================
--- trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am	2015-05-15 00:06:58 UTC (rev 18941)
@@ -0,0 +1,13 @@
+--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
+@@ -3,7 +3,7 @@
+ noinst_PROGRAMS = dRegs mRegs modClock memClock
+ endif
+ 
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h


Property changes on: trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
===================================================================
--- trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in	2015-05-15 00:06:58 UTC (rev 18941)
@@ -0,0 +1,15 @@
+--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
+@@ -238,9 +238,9 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h
+ all: all-am
+ 


Property changes on: trunk/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
===================================================================
--- trunk/x11-drivers/xf86-video-chips/files/patch-util_iopl.h	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-chips/files/patch-util_iopl.h	2015-05-15 00:06:58 UTC (rev 18941)
@@ -0,0 +1,63 @@
+--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
+@@ -0,0 +1,60 @@
++#ifdef __NetBSD__
++#  include <sys/types.h>
++#  include <machine/pio.h>
++#  include <machine/sysarch.h>
++#else
++#  if defined(__linux__)
++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
++ * #    include <sys/io.h>
++ */
++int iopl(int level);
++#  endif
++#  if defined(SVR4) && defined(i386)
++#    include <sys/types.h>
++#    ifdef NCR
++       /* broken NCR <sys/sysi86.h> */
++#      define __STDC
++#      include <sys/sysi86.h>
++#      undef __STDC
++#    else
++#      include <sys/sysi86.h>
++#    endif
++#    ifdef SVR4
++#      if !defined(sun)
++#        include <sys/seg.h>
++#      endif
++#    endif
++#    include <sys/v86.h>
++#    if defined(sun)
++#      include <sys/psw.h>
++#    endif
++#  endif
++#  include "AsmMacros.h"
++#endif /* NetBSD */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __NetBSD__
++#  define SET_IOPL() i386_iopl(3)
++#  define RESET_IOPL() i386_iopl(0)
++#else
++#  if defined(SVR4) && defined(i386)
++#    ifndef SI86IOPL
++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
++#    else
++#      define SET_IOPL() sysi86(SI86IOPL,3)
++#      define RESET_IOPL() sysi86(SI86IOPL,0)
++#    endif
++#  else
++#    ifdef linux
++#      define SET_IOPL() iopl(3)
++#      define RESET_IOPL() iopl(0)
++#    else
++#      define SET_IOPL() (void)0
++#      define RESET_IOPL() (void)0
++#    endif
++#  endif
++#endif


Property changes on: trunk/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-chips/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-chips/pkg-plist	2015-05-15 00:05:21 UTC (rev 18940)
+++ trunk/x11-drivers/xf86-video-chips/pkg-plist	2015-05-15 00:06:58 UTC (rev 18941)
@@ -1,5 +1,2 @@
-lib/xorg/modules/drivers/chips_drv.la
 lib/xorg/modules/drivers/chips_drv.so
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
+man/man4/chips.4x.gz

More information about the Midnightbsd-cvs mailing list