pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove xf86-video-vga, desupported since xorg-server-1.5.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5c1414a81f09
branches: trunk
changeset: 624762:5c1414a81f09
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Sep 30 17:00:15 2013 +0000
description:
Remove xf86-video-vga, desupported since xorg-server-1.5.
diffstat:
doc/CHANGES-2013 | 3 +-
x11/Makefile | 3 +-
x11/xf86-video-vga/DESCR | 1 -
x11/xf86-video-vga/Makefile | 34 ---
x11/xf86-video-vga/PLIST | 3 -
x11/xf86-video-vga/distinfo | 7 -
x11/xf86-video-vga/patches/patch-aa | 49 ----
x11/xf86-video-vga/patches/patch-ab | 372 ------------------------------------
8 files changed, 3 insertions(+), 469 deletions(-)
diffs (truncated from 521 to 300 lines):
diff -r bdb45249b303 -r 5c1414a81f09 doc/CHANGES-2013
--- a/doc/CHANGES-2013 Mon Sep 30 16:59:10 2013 +0000
+++ b/doc/CHANGES-2013 Mon Sep 30 17:00:15 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2013,v 1.3607 2013/09/30 16:59:10 wiz Exp $
+$NetBSD: CHANGES-2013,v 1.3608 2013/09/30 17:00:15 wiz Exp $
Changes to the packages collection and infrastructure in 2013:
@@ -5073,3 +5073,4 @@
Removed x11/xf86-video-cyrix [wiz 2013-09-30]
Removed x11/xf86-video-imstt [wiz 2013-09-30]
Removed x11/xf86-video-nsc [wiz 2013-09-30]
+ Removed x11/xf86-video-vga [wiz 2013-09-30]
diff -r bdb45249b303 -r 5c1414a81f09 x11/Makefile
--- a/x11/Makefile Mon Sep 30 16:59:10 2013 +0000
+++ b/x11/Makefile Mon Sep 30 17:00:15 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.712 2013/09/30 16:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.713 2013/09/30 17:00:16 wiz Exp $
#
COMMENT= Packages to support the X window system
@@ -540,7 +540,6 @@
SUBDIR+= xf86-video-trident
SUBDIR+= xf86-video-tseng
SUBDIR+= xf86-video-vesa
-SUBDIR+= xf86-video-vga
SUBDIR+= xf86-video-vmware
SUBDIR+= xf86-video-wsfb
SUBDIR+= xf86bigfontproto
diff -r bdb45249b303 -r 5c1414a81f09 x11/xf86-video-vga/DESCR
--- a/x11/xf86-video-vga/DESCR Mon Sep 30 16:59:10 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-This is the generic VGA video driver for the modular Xorg server.
diff -r bdb45249b303 -r 5c1414a81f09 x11/xf86-video-vga/Makefile
--- a/x11/xf86-video-vga/Makefile Mon Sep 30 16:59:10 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2012/10/29 05:07:07 asau Exp $
-#
-
-DISTNAME= xf86-video-vga-4.1.0
-PKGREVISION= 4
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= joerg%NetBSD.org@localhost
-HOMEPAGE= http://xorg.freedesktop.org/
-COMMENT= Modular Xorg generic VGA video driver
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= autoconf autoheader automake autoreconf pkg-config
-
-BUILD_DEPENDS+= xorg-util-macros>=1.2.0:../../devel/xorg-util-macros
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
-.endif
-
-pre-configure:
- cd ${WRKSRC} && autoreconf -vif
-
-.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXext?= build
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r bdb45249b303 -r 5c1414a81f09 x11/xf86-video-vga/PLIST
--- a/x11/xf86-video-vga/PLIST Mon Sep 30 16:59:10 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/21 00:20:45 joerg Exp $
-lib/xorg/modules/drivers/vga_drv.la
-man/man4/vga.4
diff -r bdb45249b303 -r 5c1414a81f09 x11/xf86-video-vga/distinfo
--- a/x11/xf86-video-vga/distinfo Mon Sep 30 16:59:10 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2013/01/22 09:34:19 wiz Exp $
-
-SHA1 (xf86-video-vga-4.1.0.tar.bz2) = a3b5562e5714d956647389cc8c089fac85d7177e
-RMD160 (xf86-video-vga-4.1.0.tar.bz2) = ff87eab31181abb5aba2bc29dbb7a883392ef95b
-Size (xf86-video-vga-4.1.0.tar.bz2) = 233642 bytes
-SHA1 (patch-aa) = 90b4b24cbccbbe6aa0789694828d105e8dab6347
-SHA1 (patch-ab) = 04c37e11b5f8234c1588196c483c3a1682831211
diff -r bdb45249b303 -r 5c1414a81f09 x11/xf86-video-vga/patches/patch-aa
--- a/x11/xf86-video-vga/patches/patch-aa Mon Sep 30 16:59:10 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2013/01/22 09:34:19 wiz Exp $
-
-First chunk: automake-1.13 compat
-Rest:
-http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=97e2d125
-http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=a0d4a475
-
---- configure.ac.orig 2006-04-07 21:48:23.000000000 +0000
-+++ configure.ac
-@@ -27,7 +27,7 @@ AC_INIT([xf86-video-vga],
- xf86-video-vga)
-
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADER([config.h])
- AC_CONFIG_AUX_DIR(.)
-
- AM_INIT_AUTOMAKE([dist-bzip2])
-@@ -57,6 +57,30 @@ PKG_CHECK_MODULES(XORG, [xorg-server >=
- sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
- # Checks for libraries.
-+SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-+ [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
-+ [#include "xorg-server.h"])
-+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
-+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
-+CPPFLAGS="$SAVE_CPPFLAGS"
-+
-+SAVE_CFLAGS="$CFLAGS"
-+CFLAGS="$XORG_CFLAGS"
-+AC_CHECK_DECL(xf86ConfigIsaEntity,
-+ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
-+ [],
-+ [#include "xf86.h"])
-+CFLAGS="$SAVE_CFLAGS"
-+
-+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
-+fi
-+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-+
-+# Checks for libraries.
-
- # Checks for header files.
- AC_HEADER_STDC
diff -r bdb45249b303 -r 5c1414a81f09 x11/xf86-video-vga/patches/patch-ab
--- a/x11/xf86-video-vga/patches/patch-ab Mon Sep 30 16:59:10 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,372 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/06/09 08:18:39 hasso Exp $
-
-http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=97e2d125
-http://cgit.freedesktop.org/xorg/driver/xf86-video-vga/commit/?id=a0d4a475
-
---- src/generic.c.orig 2006-04-08 00:48:01 +0300
-+++ src/generic.c 2009-06-09 10:27:54 +0300
-@@ -50,8 +50,13 @@
-
- #include "fb.h"
-
-+#if HAVE_XF4BPP
- #include "xf4bpp.h"
-+#endif
-+
-+#if HAVE_XF1BPP
- #include "xf1bpp.h"
-+#endif
-
- #include "shadowfb.h"
-
-@@ -62,6 +67,10 @@
- #include "xf86Resources.h"
- #include "xf86int10.h"
-
-+#ifdef XSERVER_LIBPCIACCESS
-+#include <pciaccess.h>
-+#endif
-+
- /* Some systems #define VGA for their own purposes */
- #undef VGA
-
-@@ -79,10 +88,31 @@
- #define CLOCK_TOLERANCE 2000 /* Clock matching tolerance (2MHz) */
- #endif
-
-+/*
-+ * This structure is used to wrap the screen's CloseScreen vector.
-+ */
-+typedef struct _GenericRec
-+{
-+ Bool ShadowFB;
-+ Bool KGAUniversal;
-+ CARD8 * ShadowPtr;
-+ CARD32 ShadowPitch;
-+ CloseScreenProcPtr CloseScreen;
-+ OptionInfoPtr Options;
-+#ifdef XSERVER_LIBPCIACCESS
-+ struct pci_device *pciInfo;
-+#endif
-+} GenericRec, *GenericPtr;
-+
-+
- /* Forward definitions */
- static const OptionInfoRec *GenericAvailableOptions(int chipid, int busid);
- static void GenericIdentify(int);
- static Bool GenericProbe(DriverPtr, int);
-+#ifdef XSERVER_LIBPCIACCESS
-+static Bool GenericPciProbe(DriverPtr drv, int entity_num,
-+ struct pci_device *dev, intptr_t match_data);
-+#endif
- static Bool GenericPreInit(ScrnInfoPtr, int);
- static Bool GenericScreenInit(int, ScreenPtr, int, char **);
- static Bool GenericSwitchMode(int, DisplayModePtr, int);
-@@ -90,13 +120,33 @@ static void GenericAdjus
- static Bool GenericEnterVT(int, int);
- static void GenericLeaveVT(int, int);
- static void GenericFreeScreen(int, int);
-+#ifdef HAVE_ISA
- static int VGAFindIsaDevice(GDevPtr dev);
-+#endif
- #ifdef SPECIAL_FB_BYTE_ACCESS
- static Bool GenericMapMem(ScrnInfoPtr scrp);
- #endif
-
- static ModeStatus GenericValidMode(int, DisplayModePtr, Bool, int);
-
-+static GenericPtr GenericGetRec(ScrnInfoPtr pScreenInfo);
-+
-+enum GenericTypes
-+{
-+ CHIP_VGA_GENERIC
-+};
-+
-+#ifdef XSERVER_LIBPCIACCESS
-+static const struct pci_id_match generic_device_match[] = {
-+ {
-+ PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
-+ 0x00030000, 0x00ffffff, CHIP_VGA_GENERIC
-+ },
-+
-+ { 0, 0, 0 },
-+};
-+#endif
-+
- /* The root of all evil... */
- _X_EXPORT DriverRec VGA =
- {
-@@ -106,7 +156,13 @@ _X_EXPORT DriverRec VGA =
- GenericProbe,
- GenericAvailableOptions,
- NULL,
-- 0
-+ 0,
-+ NULL,
-+
-+#ifdef XSERVER_LIBPCIACCESS
-+ generic_device_match,
-+ GenericPciProbe
-+#endif
- };
-
- typedef enum
-@@ -146,8 +202,12 @@ static const char *vgahwSymbols[] =
- #ifdef XFree86LOADER
- static const char *miscfbSymbols[] =
- {
-+#if HAVE_XF1BPP
- "xf1bppScreenInit",
-+#endif
-+#if HAVE_XF4BPP
- "xf4bppScreenInit",
-+#endif
- NULL
- };
- #endif
-@@ -210,7 +270,13 @@ GenericSetup(pointer Module, pointer Opt
- if (!Initialised)
- {
- Initialised = TRUE;
-- xf86AddDriver(&VGA, Module, 0);
-+ xf86AddDriver(&VGA, Module,
-+#ifdef XSERVER_LIBPCIACCESS
-+ HaveDriverFuncs
-+#else
-+ 0
-+#endif
-+ );
- LoaderRefSymLists(vgahwSymbols, miscfbSymbols, fbSymbols,
- shadowfbSymbols, int10Symbols, NULL);
- return (pointer)TRUE;
-@@ -224,11 +290,6 @@ GenericSetup(pointer Module, pointer Opt
- #endif
-
-
--enum GenericTypes
--{
-- CHIP_VGA_GENERIC
--};
--
- /* Supported chipsets */
Home |
Main Index |
Thread Index |
Old Index