cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bring in patches from libggi-stable, prompted by broken GGI_DISPLAY=dga target

Browse Source 
in the last release
This commit is contained in:
todd 2005-01-31 14:20:26 +00:00
parent 6d81e319cd
commit 6bb24f3d13
12 changed files with 618 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/ggi/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2005/01/17 12:45:28 alek Exp $
# $OpenBSD: Makefile,v 1.32 2005/01/31 14:20:26 todd Exp $
# Uses pthreads
COMMENT= "Generic Graphics Library"
DISTNAME= libggi-2.1.0
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= graphics
HOMEPAGE= http://www.ggi-project.org/

18
graphics/ggi/patches/patch-display_X_buffer_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-display_X_buffer_c,v 1.1 2005/01/31 14:20:26 todd Exp $
--- display/X/buffer.c.orig Sun Nov 14 14:52:00 2004
+++ display/X/buffer.c Sun Jan 30 15:40:35 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-display_X_buffer_c,v 1.1 2005/01/31 14:20:26 todd Exp $
+/* $Id: patch-display_X_buffer_c,v 1.1 2005/01/31 14:20:26 todd Exp $
******************************************************************************
LibGGI Display-X target: buffer and buffer syncronization handling.
@@ -211,7 +211,7 @@ int _ggi_x_create_ximage(ggi_visual *vis
_ggi_build_pixfmtstr(vis, target + i, sizeof(target) - i, 1);
i = strlen(target);
#ifdef HAVE_SNPRINTF
- snprintf(target + i, GGI_MAX_APILEN, ":-physz=%i,%i:pointer",
+ snprintf(target + i, GGI_MAX_APILEN - i, ":-physz=%i,%i:pointer",
LIBGGI_MODE(vis)->size.x, LIBGGI_MODE(vis)->size.y);
#else
sprintf(target + i, ":-physz=%i,%i:pointer",

18
graphics/ggi/patches/patch-display_X_helper_shm_shm_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-display_X_helper_shm_shm_c,v 1.1 2005/01/31 14:20:26 todd Exp $
--- display/X/helper/shm/shm.c.orig Sun Nov 14 14:21:41 2004
+++ display/X/helper/shm/shm.c Sun Jan 30 15:40:36 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-display_X_helper_shm_shm_c,v 1.1 2005/01/31 14:20:26 todd Exp $
+/* $Id: patch-display_X_helper_shm_shm_c,v 1.1 2005/01/31 14:20:26 todd Exp $
******************************************************************************
MIT-SHM extension support for display-x
@@ -287,7 +287,7 @@ static int _ggi_xshm_create_ximage(ggi_v
_ggi_build_pixfmtstr(vis, target + i, sizeof(target) - i, 1);
i = strlen(target);
#ifdef HAVE_SNPRINTF
- snprintf(target + i, GGI_MAX_APILEN, ":-layout=%iplb%i:-physz=%i,%i:pointer",
+ snprintf(target + i, GGI_MAX_APILEN - i, ":-layout=%iplb%i:-physz=%i,%i:pointer",
priv->ximage->bytes_per_line * LIBGGI_VIRTY(vis),
priv->ximage->bytes_per_line,
LIBGGI_MODE(vis)->size.x, LIBGGI_MODE(vis)->size.y);

189
graphics/ggi/patches/patch-display_xf86dga_XF86DGA_c Normal file
View File

@ -0,0 +1,189 @@
$OpenBSD: patch-display_xf86dga_XF86DGA_c,v 1.1 2005/01/31 14:20:26 todd Exp $
--- display/xf86dga/XF86DGA.c.orig Sat Sep 18 05:50:34 2004
+++ display/xf86dga/XF86DGA.c Sun Jan 30 15:40:46 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-display_xf86dga_XF86DGA_c,v 1.1 2005/01/31 14:20:26 todd Exp $
+/* $Id: patch-display_xf86dga_XF86DGA_c,v 1.1 2005/01/31 14:20:26 todd Exp $
Copyright (c) 1995 Jon Tombs
Copyright (c) 1995,1996 The XFree86 Project, Inc
@@ -51,7 +51,8 @@ static char *xf86dga_extension_name = XF
* *
*****************************************************************************/
-static int close_display();
+static XEXT_GENERATE_CLOSE_DISPLAY(close_display, xf86dga_info)
+
static /* const */ XExtensionHooks xf86dga_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -70,16 +71,40 @@ static XEXT_GENERATE_FIND_DISPLAY(find_d
xf86dga_extension_name,
&xf86dga_extension_hooks, 0, NULL)
-static XEXT_GENERATE_CLOSE_DISPLAY(close_display, xf86dga_info)
-
/*****************************************************************************
* *
* public XFree86-DGA Extension routines *
* *
*****************************************************************************/
- static Bool _ggi_XF86DGAQueryExtension(Display * dpy, int *event_basep,
- int *error_basep)
+/* prototypes to suppress compiler warnings */
+Bool _ggi_XF86DGAQueryExtension(Display * dpy, int *event_basep,
+ int *error_basep);
+Bool _ggi_XF86DGAQueryVersion(Display * dpy, int *majorVersion,
+ int *minorVersion);
+Bool _ggi_XF86DGAGetVideoLL(Display * dpy, int screen, int *offset,
+ int *width, int *bank_size, int *ram_size);
+Bool _ggi_XF86DGADirectVideoLL(Display * dpy, int screen, int enable);
+Bool _ggi_XF86DGASetViewPort(Display * dpy, int screen, int x, int y);
+Bool _ggi_XF86DGAInstallColormap(Display * dpy, int screen, Colormap cmap);
+Bool _ggi_XF86DGAQueryDirectVideo(Display * dpy, int screen, int *flags);
+Bool _ggi_XF86DGACopyArea(Display * dpy, int screen, Drawable d,
+ GC gc,
+ int src_x, int src_y,
+ unsigned int width, unsigned int height,
+ int dst_x, int dst_y);
+Bool _ggi_XF86DGAFillRectangle(Display * dpy, int screen,
+ Drawable d, GC gc,
+ int x, int y,
+ unsigned int width, unsigned int height);
+void _ggi_XF86DGAUnmap(void);
+int _ggi_XF86DGADirectVideo(Display * dis, int screen, int enable);
+int _ggi_XF86DGAGetVideo(Display * dis, int screen, char **addr,
+ int *width, int *bank, int *ram);
+
+
+Bool _ggi_XF86DGAQueryExtension(Display * dpy, int *event_basep,
+ int *error_basep)
{
XExtDisplayInfo *info = find_display(dpy);
@@ -93,8 +118,8 @@ static XEXT_GENERATE_CLOSE_DISPLAY(close
}
-static Bool _ggi_XF86DGAQueryVersion(Display * dpy, int *majorVersion,
- int *minorVersion)
+Bool _ggi_XF86DGAQueryVersion(Display * dpy, int *majorVersion,
+ int *minorVersion)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGAQueryVersionReply rep;
@@ -118,9 +143,8 @@ static Bool _ggi_XF86DGAQueryVersion(Dis
return True;
}
-static Bool _ggi_XF86DGAGetVideoLL(Display * dpy, int screen, int *offset,
- int *width, int *bank_size,
- int *ram_size)
+Bool _ggi_XF86DGAGetVideoLL(Display * dpy, int screen, int *offset,
+ int *width, int *bank_size, int *ram_size)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGAGetVideoLLReply rep;
@@ -150,8 +174,7 @@ static Bool _ggi_XF86DGAGetVideoLL(Displ
}
-static Bool _ggi_XF86DGADirectVideoLL(Display * dpy, int screen,
- int enable)
+Bool _ggi_XF86DGADirectVideoLL(Display * dpy, int screen, int enable)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGADirectVideoReq *req;
@@ -170,8 +193,7 @@ static Bool _ggi_XF86DGADirectVideoLL(Di
return True;
}
-static Bool _ggi_XF86DGASetViewPort(Display * dpy, int screen,
- int x, int y)
+Bool _ggi_XF86DGASetViewPort(Display * dpy, int screen, int x, int y)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGASetViewPortReq *req;
@@ -192,8 +214,7 @@ static Bool _ggi_XF86DGASetViewPort(Disp
}
-static Bool _ggi_XF86DGAInstallColormap(Display * dpy, int screen,
- Colormap cmap)
+Bool _ggi_XF86DGAInstallColormap(Display * dpy, int screen, Colormap cmap)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGAInstallColormapReq *req;
@@ -213,8 +234,7 @@ static Bool _ggi_XF86DGAInstallColormap(
}
-static Bool _ggi_XF86DGAQueryDirectVideo(Display * dpy, int screen,
- int *flags)
+Bool _ggi_XF86DGAQueryDirectVideo(Display * dpy, int screen, int *flags)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGAQueryDirectVideoReply rep;
@@ -239,11 +259,11 @@ static Bool _ggi_XF86DGAQueryDirectVideo
}
-static Bool _ggi_XF86DGACopyArea(Display * dpy, int screen, Drawable d,
- GC gc,
- int src_x, int src_y,
- unsigned int width, unsigned int height,
- int dst_x, int dst_y)
+Bool _ggi_XF86DGACopyArea(Display * dpy, int screen, Drawable d,
+ GC gc,
+ int src_x, int src_y,
+ unsigned int width, unsigned int height,
+ int dst_x, int dst_y)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGACopyAreaReq *req;
@@ -270,11 +290,10 @@ static Bool _ggi_XF86DGACopyArea(Display
}
-static Bool _ggi_XF86DGAFillRectangle(Display * dpy, int screen,
- Drawable d, GC gc,
- int x, int y,
- unsigned int width,
- unsigned int height)
+Bool _ggi_XF86DGAFillRectangle(Display * dpy, int screen,
+ Drawable d, GC gc,
+ int x, int y,
+ unsigned int width, unsigned int height)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86DGAFillRectangleReq *req;
@@ -346,7 +365,7 @@ static int memory_fd;
static char *_XFree86addr = NULL;
static int _XFree86size = 0;
-static int _ggi_XF86DGADirectVideo(Display * dis, int screen, int enable)
+int _ggi_XF86DGADirectVideo(Display * dis, int screen, int enable)
{
if (enable & XF86DGADirectGraphics) {
#if !defined(ISC) && !defined(HAS_SVR3_MMAP) && !defined(Lynx)
@@ -384,8 +403,8 @@ static int _ggi_XF86DGADirectVideo(Displ
}
-static int _ggi_XF86DGAGetVideo(Display * dis, int screen, char **addr,
- int *width, int *bank, int *ram)
+int _ggi_XF86DGAGetVideo(Display * dis, int screen, char **addr,
+ int *width, int *bank, int *ram)
{
int offset;
char *devname;
@@ -459,7 +478,7 @@ static int _ggi_XF86DGAGetVideo(Display
}
-static void _ggi_XF86DGAUnmap(void)
+void _ggi_XF86DGAUnmap(void)
{
munmap(_XFree86addr, _XFree86size);
close(memory_fd);

165
graphics/ggi/patches/patch-display_xf86dga_XF86VMode_c Normal file
View File

@ -0,0 +1,165 @@
$OpenBSD: patch-display_xf86dga_XF86VMode_c,v 1.3 2005/01/31 14:20:26 todd Exp $
--- display/xf86dga/XF86VMode.c.orig Sat Sep 18 05:50:34 2004
+++ display/xf86dga/XF86VMode.c Sun Jan 30 15:40:46 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-display_xf86dga_XF86VMode_c,v 1.3 2005/01/31 14:20:26 todd Exp $
+/* $Id: patch-display_xf86dga_XF86VMode_c,v 1.3 2005/01/31 14:20:26 todd Exp $
This is a modified version of the XF86VMode API functions for use
internally by the LibGGI xf86dga target. Mods by Marcus Sundberg and
@@ -79,7 +79,8 @@ static char *xf86vidmode_extension_name
* *
*****************************************************************************/
-static int close_display();
+static XEXT_GENERATE_CLOSE_DISPLAY(close_display, xf86vidmode_info)
+
static /* const */ XExtensionHooks xf86vidmode_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
@@ -98,17 +99,32 @@ static XEXT_GENERATE_FIND_DISPLAY(find_d
xf86vidmode_extension_name,
&xf86vidmode_extension_hooks, 0, NULL)
-static XEXT_GENERATE_CLOSE_DISPLAY(close_display, xf86vidmode_info)
-
-
/*****************************************************************************
* *
* public XFree86-VidMode Extension routines *
* *
*****************************************************************************/
- static Bool _ggi_XF86VidModeQueryExtension(Display * dpy,
- int *event_basep,
- int *error_basep)
+/* prototypes added to suppress compiler warnings */
+Bool _ggi_XF86VidModeQueryExtension(Display * dpy,
+ int *event_basep, int *error_basep);
+Bool _ggi_XF86VidModeSetClientVersion(Display * dpy);
+Bool _ggi_XF86VidModeQueryVersion(Display * dpy, int *majorVersion,
+ int *minorVersion);
+Bool _ggi_XF86VidModeSetGamma(Display * dpy,
+ int screen, XF86VidModeGamma * Gamma);
+Bool _ggi_XF86VidModeGetGamma(Display * dpy,
+ int screen, XF86VidModeGamma * Gamma);
+Bool _ggi_XF86VidModeGetAllModeLines(Display * dpy, int screen,
+ int *modecount,
+ XF86VidModeModeInfo *** modelinesPtr);
+Bool _ggi_XF86VidModeSwitchToMode(Display * dpy, int screen,
+ XF86VidModeModeInfo * modeline);
+Bool _ggi_XF86VidModeLockModeSwitch(Display * dpy, int screen, int lock);
+Bool _ggi_XF86VidModeSetViewPort(Display * dpy, int screen, int x, int y);
+
+
+Bool _ggi_XF86VidModeQueryExtension(Display * dpy,
+ int *event_basep, int *error_basep)
{
XExtDisplayInfo *info = find_display(dpy);
@@ -122,7 +138,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY(close
}
-static Bool _ggi_XF86VidModeSetClientVersion(Display * dpy)
+Bool _ggi_XF86VidModeSetClientVersion(Display * dpy)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeSetClientVersionReq *req;
@@ -141,8 +157,8 @@ static Bool _ggi_XF86VidModeSetClientVer
}
-static Bool _ggi_XF86VidModeQueryVersion(Display * dpy, int *majorVersion,
- int *minorVersion)
+Bool _ggi_XF86VidModeQueryVersion(Display * dpy, int *majorVersion,
+ int *minorVersion)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeQueryVersionReply rep;
@@ -168,8 +184,8 @@ static Bool _ggi_XF86VidModeQueryVersion
return True;
}
-static Bool _ggi_XF86VidModeSetGamma(Display * dpy,
- int screen, XF86VidModeGamma * Gamma)
+Bool _ggi_XF86VidModeSetGamma(Display * dpy,
+ int screen, XF86VidModeGamma * Gamma)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeSetGammaReq *req;
@@ -190,8 +206,8 @@ static Bool _ggi_XF86VidModeSetGamma(Dis
}
-static Bool _ggi_XF86VidModeGetGamma(Display * dpy,
- int screen, XF86VidModeGamma * Gamma)
+Bool _ggi_XF86VidModeGetGamma(Display * dpy,
+ int screen, XF86VidModeGamma * Gamma)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeGetGammaReply rep;
@@ -219,10 +235,9 @@ static Bool _ggi_XF86VidModeGetGamma(Dis
/* We don't need XF86VidModeGetModeLine */
-static Bool _ggi_XF86VidModeGetAllModeLines(Display * dpy, int screen,
- int *modecount,
- XF86VidModeModeInfo ***
- modelinesPtr)
+Bool _ggi_XF86VidModeGetAllModeLines(Display * dpy, int screen,
+ int *modecount,
+ XF86VidModeModeInfo *** modelinesPtr)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeGetAllModeLinesReply rep;
@@ -322,8 +337,7 @@ static Bool _ggi_XF86VidModeGetAllModeLi
Xfree(modelines[i]->
private);
} else {
- _XRead32(dpy,
- (char *)
+ _XRead32(dpy, (char *)
modelines[i]->
private,
oldxmdline.
@@ -364,8 +378,7 @@ static Bool _ggi_XF86VidModeGetAllModeLi
Xfree(modelines[i]->
private);
} else {
- _XRead(dpy,
- (char *)
+ _XRead(dpy, (char *)
modelines[i]->
private,
xmdline.privsize *
@@ -415,8 +428,8 @@ static Bool _ggi_XF86VidModeGetAllModeLi
* bother with those functions.
*/
-static Bool _ggi_XF86VidModeSwitchToMode(Display * dpy, int screen,
- XF86VidModeModeInfo * modeline)
+Bool _ggi_XF86VidModeSwitchToMode(Display * dpy, int screen,
+ XF86VidModeModeInfo * modeline)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeSwitchToModeReq *req;
@@ -498,8 +511,7 @@ static Bool _ggi_XF86VidModeSwitchToMode
}
-static Bool _ggi_XF86VidModeLockModeSwitch(Display * dpy, int screen,
- int lock)
+Bool _ggi_XF86VidModeLockModeSwitch(Display * dpy, int screen, int lock)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeLockModeSwitchReq *req;
@@ -518,8 +530,7 @@ static Bool _ggi_XF86VidModeLockModeSwit
}
-static Bool _ggi_XF86VidModeSetViewPort(Display * dpy, int screen,
- int x, int y)
+Bool _ggi_XF86VidModeSetViewPort(Display * dpy, int screen, int x, int y)
{
XExtDisplayInfo *info = find_display(dpy);
xXF86VidModeSetViewPortReq *req;

68
graphics/ggi/patches/patch-display_xf86dga_extutil_h Normal file
View File

@ -0,0 +1,68 @@
$OpenBSD: patch-display_xf86dga_extutil_h,v 1.1 2005/01/31 14:20:26 todd Exp $
--- display/xf86dga/extutil.h.orig Sat Sep 18 05:48:05 2004
+++ display/xf86dga/extutil.h Sun Jan 30 15:40:46 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-display_xf86dga_extutil_h,v 1.1 2005/01/31 14:20:26 todd Exp $ */
+/* $Id: patch-display_xf86dga_extutil_h,v 1.1 2005/01/31 14:20:26 todd Exp $ */
/*
* $XConsortium: extutil.h,v 1.15 94/10/07 15:36:33 kaleb Exp $
*
@@ -153,9 +153,8 @@ extern XExtDisplayInfo *XextAddDisplay(
/* extinfo */ ,
Display * /* dpy */ ,
char * /* ext_name */ ,
- XExtensionHooks * /* hooks */
- ,
- int /* nevents */ ,
+ XExtensionHooks * /* hooks */
+ , int /* nevents */ ,
XPointer /* data */
#endif
);
@@ -187,8 +186,10 @@ extern XExtDisplayInfo *XextFindDisplay(
* something that is called many, many times would be bad.
*/
#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \
-XExtDisplayInfo *proc (dpy) \
- register Display *dpy; \
+XExtDisplayInfo *proc \
+ ( \
+ register Display *dpy \
+ ) \
{ \
XExtDisplayInfo *dpyinfo; \
if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \
@@ -198,20 +199,24 @@ XExtDisplayInfo *proc (dpy) \
}
#define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \
-int proc (dpy, codes) \
- Display *dpy; \
- XExtCodes *codes; \
+int proc \
+ ( \
+ Display *dpy, \
+ XExtCodes *codes \
+ ) \
{ \
return XextRemoveDisplay (extinfo, dpy); \
}
#define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \
-char *proc (dpy, code, codes, buf, n) \
- Display *dpy; \
- int code; \
- XExtCodes *codes; \
- char *buf; \
- int n; \
+char *proc \
+ ( \
+ Display *dpy, \
+ int code, \
+ XExtCodes *codes, \
+ char *buf, \
+ int n \
+ ) \
{ \
code -= codes->first_error; \
if (code >= 0 && code < nerr) { \

74
graphics/ggi/patches/patch-display_xf86dga_visual_c Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-display_xf86dga_visual_c,v 1.1 2005/01/31 14:20:26 todd Exp $
--- display/xf86dga/visual.c.orig Sun Sep 12 16:01:40 2004
+++ display/xf86dga/visual.c Sun Jan 30 15:40:46 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-display_xf86dga_visual_c,v 1.1 2005/01/31 14:20:26 todd Exp $
+/* $Id: patch-display_xf86dga_visual_c,v 1.1 2005/01/31 14:20:26 todd Exp $
******************************************************************************
XF86DGA display target.
@@ -163,7 +163,7 @@ static int do_cleanup(ggi_visual * vis)
free(DGA_PRIV(vis));
free(LIBGGI_GC(vis));
- DGA_PRIV(vis) = NULL;
+ LIBGGI_PRIVATE(vis) = NULL;
ggUnregisterCleanup((ggcleanup_func *) do_cleanup, vis);
@@ -235,7 +235,8 @@ static int GGIopen(ggi_visual * vis, str
goto out_freegc;
err = _ggi_physz_parse_option(options[OPT_PHYSZ].result,
- &(priv->x.physzflags), &(priv->x.physz));
+ &(priv->x.physzflags),
+ &(priv->x.physz));
if (err != GGI_OK)
goto out_freegc;
@@ -276,7 +277,7 @@ static int GGIopen(ggi_visual * vis, str
GGIDPRINT_MISC("Virtwidth: %d, depth: %d, size: %d\n",
priv->width, priv->depth, priv->size);
- DGA_PRIV(vis) = priv;
+ LIBGGI_PRIVATE(vis) = (void *) priv;
/* Register cleanup handler */
ggRegisterCleanup((ggcleanup_func *) do_cleanup, vis);
@@ -325,8 +326,10 @@ static int GGIopen(ggi_visual * vis, str
_args.win = DefaultRootWindow(priv->x.display);
_args.ptralwaysrel = 1;
_args.wait = 0;
- _args.exposefunc = _args.exposearg
- = _args.resizefunc = _args.resizearg = NULL;
+ _args.exposefunc = NULL;
+ _args.exposearg = NULL;
+ _args.resizefunc = NULL;
+ _args.resizearg = NULL;
_args.gglock = priv->x.xliblock;
if ((inp = giiOpen("xwin", &_args, NULL)) == NULL) {
@@ -372,20 +375,19 @@ static int GGIclose(ggi_visual * vis, st
}
-EXPORTFUNC
-int GGIdl_xf86dga(int func, void **funcptr);
+EXPORTFUNC int GGIdl_xf86dga(int func, void **funcptr);
int GGIdl_xf86dga(int func, void **funcptr)
{
switch (func) {
case GGIFUNC_open:
- *funcptr = GGIopen;
+ *funcptr = (void *) GGIopen;
return 0;
case GGIFUNC_exit:
*funcptr = NULL;
return 0;
case GGIFUNC_close:
- *funcptr = GGIclose;
+ *funcptr = (void *) GGIclose;
return 0;
default:
*funcptr = NULL;

23
graphics/ggi/patches/patch-doc_man_display-sub_7 Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-doc_man_display-sub_7,v 1.1 2005/01/31 14:20:26 todd Exp $
--- doc/man/display-sub.7.orig Mon Nov 22 05:42:53 2004
+++ doc/man/display-sub.7 Sun Jan 30 15:40:46 2005
@@ -1,4 +1,4 @@
-.TH "display-sub" 7 "2004-10-14" "libggi-2.1.x" GGI
+.TH "display-sub" 7 "2005-01-16" "libggi-2.1.x" GGI
.SH NAME
\fBdisplay-sub\fR : Make a child visual that is a window to the parent
.SH SYNOPSIS
@@ -23,6 +23,13 @@ moving/resizing the window does \fInot\f
have to perform those yourself. All it does for you is providing a
virtual visual within an existing one, which is convenient to allow
for window system canvases to be about any GGI program.
+.RS
+\fBImportant:\fR
+It is possible to have (\fB0\fR, \fB0\fR) as upper, left corner. But
+beware, \fB0\fR means \fBGGI_AUTO\fR and therefore it may get overridden by
+\fBGGI_DEFMODE\fR environment variable. In this case, you may get
+unintended results.
+.RE
.SH OPTIONS
.TP
\fItarget-spec\fR

30
graphics/ggi/patches/patch-ggi_init_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-ggi_init_c,v 1.1 2005/01/31 14:20:26 todd Exp $
--- ggi/init.c.orig Wed Oct 27 07:26:22 2004
+++ ggi/init.c Sun Jan 30 15:40:46 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-ggi_init_c,v 1.1 2005/01/31 14:20:26 todd Exp $
+/* $Id: patch-ggi_init_c,v 1.1 2005/01/31 14:20:26 todd Exp $
******************************************************************************
LibGGI initialization.
@@ -320,9 +320,9 @@ ggi_visual *ggiOpen(const char *driver,.
return NULL;
}
- va_start(drivers,driver);
+ va_start(drivers, driver);
- argptr=va_arg(drivers,void *);
+ argptr = va_arg(drivers, void *);
va_end(drivers);
GGIDPRINT_CORE("Loading driver %s\n",driver);
@@ -348,8 +348,6 @@ ggi_visual *ggiOpen(const char *driver,.
} while (0);
-
- va_end(drivers);
if (success) {
ggLock(_ggiVisuals.mutex);

9
graphics/ggi/patches/patch-include_ggi_display_Makefile_am Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-include_ggi_display_Makefile_am,v 1.1 2005/01/31 14:20:26 todd Exp $
--- include/ggi/display/Makefile.am.orig Thu Jan 29 07:49:34 2004
+++ include/ggi/display/Makefile.am Sun Jan 30 15:40:46 2005
@@ -6,4 +6,4 @@ ggiinclude_HEADERS = auto.h \
libkgi.h kgi.h fbdev.h glide.h lcd823.h svgalib.h \
ipc.h memory.h tele.h file.h \
aa.h monotext.h vcsa.h \
- directx.h quartz.h vgl.h
+ directx.h vgl.h

8
graphics/ggi/patches/patch-ltmain_sh
View File

@ -1,6 +1,6 @@
--- ltmain.sh.orig 2003-01-28 09:35:01.000000000 -0600
+++ ltmain.sh 2004-01-20 06:38:27.000000000 -0600
@@ -1781,11 +1781,6 @@ compiler."
--- ltmain.sh.orig Fri Oct 29 14:53:22 2004
+++ ltmain.sh Sun Jan 30 15:23:51 2005
@@ -1799,11 +1799,6 @@ compiler."
continue
fi
@ -12,7 +12,7 @@
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4583,40 +4578,6 @@ relink_command=\"$relink_command\""
@@ -4613,40 +4608,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0

18
graphics/ggi/patches/patch-programs_regress_mode_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-programs_regress_mode_c,v 1.1 2005/01/31 14:20:26 todd Exp $
--- programs/regress/mode.c.orig Sun Oct 10 04:18:46 2004
+++ programs/regress/mode.c Sun Jan 30 15:40:46 2005
@@ -1,4 +1,4 @@
-/* $Id: patch-programs_regress_mode_c,v 1.1 2005/01/31 14:20:26 todd Exp $
+/* $Id: patch-programs_regress_mode_c,v 1.1 2005/01/31 14:20:26 todd Exp $
******************************************************************************
This is a regression-test for mode handling.
@@ -140,7 +140,7 @@ static void testcase3(const char *desc)
err = ggiInit();
printassert(err == GGI_OK, "ggiInit failed with %i\n", err);
- vis = ggiOpen("memory", NULL);
+ vis = ggiOpen(NULL);
printassert(vis != NULL, "ggiOpen() failed\n");
err = ggiCheckSimpleMode(vis, GGI_AUTO, GGI_AUTO, 2, GT_AUTO, &mode);