From af5fff43b194905c2a9bd267aa487c68976f8eb8 Mon Sep 17 00:00:00 2001 From: Yen-Ming Lee Date: Mon, 5 May 2003 20:04:26 +0000 Subject: update graphics/libggi from 2.0b3 to 2.0.3 transfer maintainership PR: 51797 Submitted by: Matthew West --- graphics/libggi/Makefile | 120 +++++++++++++++++++++++------------------ graphics/libggi/distinfo | 2 +- graphics/libggi/files/patch-aa | 109 +++++++++++++++++++++++++++++++++++++ graphics/libggi/files/patch-ab | 34 ++++++++++++ graphics/libggi/files/patch-ac | 14 +++++ graphics/libggi/pkg-plist | 27 ++++------ 6 files changed, 236 insertions(+), 70 deletions(-) create mode 100644 graphics/libggi/files/patch-aa create mode 100644 graphics/libggi/files/patch-ab create mode 100644 graphics/libggi/files/patch-ac (limited to 'graphics/libggi') diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index ca3dae3fa4ac..0ebc72341e8b 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -6,11 +6,12 @@ # PORTNAME= libggi -PORTVERSION= 2.0b3 +PORTVERSION= 2.0.3 CATEGORIES= graphics devel -MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_3/ +MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/v2.0/ +DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= mwest@uct.ac.za +MAINTAINER= giffunip@yahoo.com COMMENT= A flexible drawing library LIB_DEPENDS= gii.0:${PORTSDIR}/devel/libgii @@ -18,57 +19,73 @@ LIB_DEPENDS= gii.0:${PORTSDIR}/devel/libgii USE_BZIP2= yes USE_XLIB= yes INSTALLS_SHLIB= yes + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gii=${PREFIX} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAN3= ggiCopyBox.3ggi ggiCrossBlit.3ggi ggiDBGetBuffer.3ggi \ - ggiDrawBox.3ggi ggiDrawHLine.3ggi ggiDrawLine.3ggi \ - ggiDrawPixel.3ggi ggiDrawVLine.3ggi ggiEventPoll.3ggi \ - ggiFillscreen.3ggi ggiFlush.3ggi ggiGetPixelFormat.3ggi \ - ggiGetc.3ggi ggiInit.3ggi ggiMapColor.3ggi ggiOpen.3ggi \ - ggiPanic.3ggi ggiParseMode.3ggi \ - ggiPutc.3ggi ggiResourceAcquire.3ggi \ - ggiSetColorfulPalette.3ggi ggiSetDisplayFrame.3ggi \ - ggiSetFlags.3ggi ggiSetGCClipping.3ggi \ - ggiSetGCForeground.3ggi ggiSetGamma.3ggi \ - ggiSetGraphMode.3ggi ggiSetMode.3ggi ggiSetOrigin.3ggi \ - ggiSetPalette.3ggi -MAN6= cube3d.6 -MAN7= libggi.7ggi -MLINKS= ggiDBGetBuffer.3ggi ggiDBGetNumBuffers.3ggi \ - ggiDrawBox.3ggi ggiGetBox.3ggi - ggiPutBox.3ggi \ - ggiDrawHLine.3ggi ggiGetHLine.3ggi - ggiPutHLine.3ggi \ - ggiDrawPixel.3ggi ggiGetPixel.3ggi - ggiPutPixel.3ggi \ - ggiDrawVLine.3ggi ggiGetVLine.3ggi - ggiPutVLine.3ggi \ - ggiEventPoll.3ggi ggiAddEventMask.3ggi - ggiEventRead.3ggi \ - - ggiEventSend.3ggi - ggiEventsQueued.3ggi \ - - ggiGetEventMask.3ggi - ggiJoinInputs.3ggi \ - - ggiRemoveEventMask.3ggi - ggiSetEventMask.3ggi \ - ggiFlush.3ggi ggiFlushRegion.3ggi ggiGetc.3ggi ggiKbhit.3ggi \ - ggiInit.3ggi ggiExit.3ggi \ - ggiMapColor.3ggi ggiPackColors.3ggi - ggiUnmapPixel.3ggi \ - - ggiUnpackPixels.3ggi \ - ggiOpen.3ggi ggiClose.3ggi \ - ggiParseMode.3ggi ggiFPrintMode.3ggi - ggiPrintMode.3ggi \ - - ggiSPrintMode.3ggi ggiPutc.3ggi ggiPuts.3ggi \ - ggiResourceAcquire.3ggi ggiResourceMustAcquire.3ggi \ - - ggiResourceRelease.3ggi \ - ggiSetDisplayFrame.3ggi ggiGetDisplayFrame.3ggi \ - - ggiGetReadFrame.3ggi - ggiGetWriteFrame.3ggi \ - - ggiSetReadFrame.3ggi - ggiSetWriteFrame.3ggi \ - ggiSetFlags.3ggi ggiAddFlags.3ggi - ggiGetFlags.3ggi \ - - ggiRemoveFlags.3ggi \ - ggiSetGCClipping.3ggi ggiGetGCClipping.3ggi \ - ggiSetGCForeground.3ggi ggiGetGCBackground.3ggi \ - - ggiGetGCForeground.3ggi - ggiSetGCBackground.3ggi \ - ggiSetGamma.3ggi ggiGetGamma.3ggi - ggiGetGammaMap.3ggi \ - - ggiSetGammaMap.3ggi \ - ggiSetGraphMode.3ggi ggiCheckGraphMode.3ggi \ - - ggiCheckSimpleMode.3ggi - ggiCheckTextMode.3ggi \ - - ggiSetSimpleMode.3ggi - ggiSetTextMode.3ggi \ - ggiSetMode.3ggi ggiCheckMode.3ggi - ggiGetMode.3ggi \ - ggiSetOrigin.3ggi ggiGetOrigin.3ggi \ - ggiSetPalette.3ggi ggiGetPalette.3ggi +MAN1= cube3d.1 ggiteleserver.1 monitest.1 +MAN3= ggiCopyBox.3 ggiCrossBlit.3 ggiDBGetBuffer.3 \ + ggiDrawBox.3 ggiDrawHLine.3 ggiDrawLine.3 \ + ggiDrawPixel.3 ggiDrawVLine.3 ggiEventPoll.3 \ + ggiFillscreen.3 ggiFlush.3 ggiGetPixelFormat.3 \ + ggiGetc.3 ggiInit.3 ggiMapColor.3 ggiOpen.3 \ + ggiPanic.3 ggiParseMode.3 \ + ggiPutc.3 ggiResourceAcquire.3 \ + ggiSetColorfulPalette.3 ggiSetDisplayFrame.3 \ + ggiSetFlags.3 ggiSetGCClipping.3 \ + ggiSetGCForeground.3 ggiSetGamma.3 \ + ggiSetGraphMode.3 ggiSetMode.3 ggiSetOrigin.3 \ + ggiSetPalette.3 \ + ggiDetachInput.3 ggiEventSelect.3 \ + ggiGammaMax.3 ggiGetCharSize.3 ggiGetInput.3 \ + ggi_color.3 ggi_coord.3 ggi_directbuffer.3 \ + ggi_graphtype.3 ggi_mode.3 ggi_pixel.3 \ + ggi_pixelformat.3 ggi_pixellinearbuffer.3 \ + ggi_pixelplanarbuffer.3 ggi_samplelinearbuffer.3 \ + ggi_sampleplanarbuffer.3 +MAN7= libggi.7 \ + display-aa.7 display-dga.7 display-directx.7 \ + display-directxnt.7 display-fbdev.7 display-file.7 \ + display-glide.7 display-memory.7 display-monotext.7 \ + display-multi.7 display-palemu.7 display-sub.7 \ + display-svgalib.7 display-tele.7 display-tile.7 \ + display-trueemu.7 display-vcsa.7 display-vgl.7 \ + display-x.7 +MLINKS= ggiDBGetBuffer.3 ggiDBGetNumBuffers.3 \ + ggiDrawBox.3 ggiGetBox.3 - ggiPutBox.3 \ + ggiDrawHLine.3 ggiGetHLine.3 - ggiPutHLine.3 \ + ggiDrawPixel.3 ggiGetPixel.3 - ggiPutPixel.3 \ + ggiDrawVLine.3 ggiGetVLine.3 - ggiPutVLine.3 \ + ggiEventPoll.3 ggiAddEventMask.3 - ggiEventRead.3 \ + - ggiEventSend.3 - ggiEventsQueued.3 \ + - ggiGetEventMask.3 - ggiJoinInputs.3 \ + - ggiRemoveEventMask.3 - ggiSetEventMask.3 \ + ggiFlush.3 ggiFlushRegion.3 ggiGetc.3 ggiKbhit.3 \ + ggiInit.3 ggiExit.3 \ + ggiMapColor.3 ggiPackColors.3 - ggiUnmapPixel.3 \ + - ggiUnpackPixels.3 \ + ggiOpen.3 ggiClose.3 \ + ggiParseMode.3 ggiFPrintMode.3 - ggiPrintMode.3 \ + - ggiSPrintMode.3 ggiPutc.3 ggiPuts.3 \ + ggiResourceAcquire.3 ggiResourceMustAcquire.3 \ + - ggiResourceRelease.3 \ + ggiSetDisplayFrame.3 ggiGetDisplayFrame.3 \ + - ggiGetReadFrame.3 - ggiGetWriteFrame.3 \ + - ggiSetReadFrame.3 - ggiSetWriteFrame.3 \ + ggiSetFlags.3 ggiAddFlags.3 - ggiGetFlags.3 \ + - ggiRemoveFlags.3 \ + ggiSetGCClipping.3 ggiGetGCClipping.3 \ + ggiSetGCForeground.3 ggiGetGCBackground.3 \ + - ggiGetGCForeground.3 - ggiSetGCBackground.3 \ + ggiSetGamma.3ggi ggiGetGamma.3 - ggiGetGammaMap.3 \ + - ggiSetGammaMap.3 \ + ggiSetGraphMode.3 ggiCheckGraphMode.3 \ + - ggiCheckSimpleMode.3 - ggiCheckTextMode.3 \ + - ggiSetSimpleMode.3 - ggiSetTextMode.3 \ + ggiSetMode.3 ggiCheckMode.3 - ggiGetMode.3 \ + ggiSetOrigin.3 ggiGetOrigin.3 \ + ggiSetPalette.3 ggiGetPalette.3 .include @@ -88,6 +105,5 @@ PLIST_SUB+= WITH_SVGALIB="@comment " post-install: @${CP} ${WRKSRC}/libggi.conf ${PREFIX}/etc/ggi/libggi.conf.dist - @${CP} ${WRKSRC}/extensions/misc/libggimisc.conf ${PREFIX}/etc/ggi/libggimisc.conf.dist .include diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo index f803a3cf8f15..d4b11c18782c 100644 --- a/graphics/libggi/distinfo +++ b/graphics/libggi/distinfo @@ -1 +1 @@ -MD5 (libggi-2.0b3.tar.bz2) = f13740d79f63b46acf820c0d5a26d7d2 +MD5 (libggi-2.0.3.src.tar.bz2) = 89a723c041a123110cad167d37f1a192 diff --git a/graphics/libggi/files/patch-aa b/graphics/libggi/files/patch-aa new file mode 100644 index 000000000000..040e1cf6a2af --- /dev/null +++ b/graphics/libggi/files/patch-aa @@ -0,0 +1,109 @@ +*** display/kgi/kgi.c.orig Thu Dec 5 16:59:59 2002 +--- display/kgi/kgi.c Mon Apr 14 17:06:19 2003 +*************** +*** 15,20 **** +--- 15,30 ---- + kgic_mapper_identify_request_t request; + kgic_mapper_identify_result_t result; + } cb; ++ #ifdef __FreeBSD__ ++ union { ++ kgic_mapper_attach_request_t request; ++ kgic_mapper_attach_result_t result; ++ } at; ++ union { ++ kgic_mapper_get_unit_request_t request; ++ kgic_mapper_get_unit_result_t result; ++ } get_unit; ++ #endif + + if (NULL == ctx) { + +*************** +*** 35,40 **** +--- 45,81 ---- + return -KGI_INVAL; + } + ++ #ifdef __FreeBSD__ ++ memset(&get_unit, 0, sizeof(get_unit)); ++ ++ /* Pass an invalid device id to force auto attachement */ ++ get_unit.request.unit = -1; ++ if (ioctl(ctx->mapper.fd, KGIC_MAPPER_GET_UNIT, &get_unit)) { ++ perror("failed to get free unit"); ++ return errno; ++ } ++ ++ /* Close /dev/graphic then open the true one */ ++ close(ctx->mapper.fd); ++ ++ sprintf(fname, "/dev/graphic%i", get_unit.result.unit); ++ ctx->mapper.fd = open(fname, O_RDWR | O_NONBLOCK); ++ if (ctx->mapper.fd < 0) { ++ perror("failed to open /dev/graphicX"); ++ return errno; ++ } ++ ++ memset(&at, 0, sizeof(at)); ++ ++ /* Pass an invalid device id to force auto attachement */ ++ at.request.device_id = -1; ++ if (ioctl(ctx->mapper.fd, KGIC_MAPPER_ATTACH, &at)) { ++ ++ perror("failed to attach to device"); ++ return errno; ++ } ++ #endif ++ + memset(&cb, 0, sizeof(cb)); + strncpy(cb.request.client, client, + sizeof(cb.request.client)); +*************** +*** 245,252 **** + switch (cb.result.type & KGI_RT_MASK) { + + case KGI_RT_MMIO: +! printf("MMIO: window %i, size %i, align %.8x, " +! "access %.8x\n", + cb.result.info.mmio.window, + cb.result.info.mmio.size, + cb.result.info.mmio.align, +--- 286,293 ---- + switch (cb.result.type & KGI_RT_MASK) { + + case KGI_RT_MMIO: +! printf("MMIO: window %li, size %li, align %.8lx, " +! "access %.8lx\n", + cb.result.info.mmio.window, + cb.result.info.mmio.size, + cb.result.info.mmio.align, +*************** +*** 254,266 **** + break; + + case KGI_RT_ACCEL: +! printf("ACCEL: recommended are %i buffers of size %i\n", + cb.result.info.accel.buffers, + cb.result.info.accel.buffer_size); + break; + + case KGI_RT_SHMEM: +! printf("SHMEM: (maximum) aperture size %i\n", + cb.result.info.shmem.aperture_size); + break; + +--- 295,307 ---- + break; + + case KGI_RT_ACCEL: +! printf("ACCEL: recommended are %li buffers of size %li\n", + cb.result.info.accel.buffers, + cb.result.info.accel.buffer_size); + break; + + case KGI_RT_SHMEM: +! printf("SHMEM: (maximum) aperture size %li\n", + cb.result.info.shmem.aperture_size); + break; + diff --git a/graphics/libggi/files/patch-ab b/graphics/libggi/files/patch-ab new file mode 100644 index 000000000000..342deb7ad4a3 --- /dev/null +++ b/graphics/libggi/files/patch-ab @@ -0,0 +1,34 @@ +*** display/kgi/mode.c.orig Mon Nov 4 16:32:41 2002 +--- display/kgi/mode.c Mon Apr 14 13:13:40 2003 +*************** +*** 114,119 **** +--- 114,125 ---- + int name_size; + char *space; + ++ #ifdef __FreeBSD__ ++ /* XXX no accel support in kernel */ ++ GGIDPRINT("Warning!! Accel not supported by FreeBSD kernel\n"); ++ return -1; ++ #endif ++ + accel = kgiGetResource(&KGI_CTX(vis), 0, KGI_RT_ACCEL); + if (! accel) { + +*************** +*** 180,186 **** + return -1; + } + +! GGIDPRINT("Found fb as resource %d", fb->resource); + + kgiSetupMmapFB(&KGI_CTX(vis), fb->resource); + +--- 186,192 ---- + return -1; + } + +! GGIDPRINT("Found fb as resource %d\n", fb->resource); + + kgiSetupMmapFB(&KGI_CTX(vis), fb->resource); + diff --git a/graphics/libggi/files/patch-ac b/graphics/libggi/files/patch-ac new file mode 100644 index 000000000000..a5bc69375e61 --- /dev/null +++ b/graphics/libggi/files/patch-ac @@ -0,0 +1,14 @@ +*** include/ggi/display/kgi.h.orig Mon Apr 14 13:24:33 2003 +--- include/ggi/display/kgi.h Mon Apr 14 13:25:00 2003 +*************** +*** 29,37 **** + #define _GGI_DISPLAY_KGI_H + + #include +- #include + #include +- #include + + #include + +--- 29,35 ---- diff --git a/graphics/libggi/pkg-plist b/graphics/libggi/pkg-plist index bfd07ce5e4d0..e74b3743af5e 100644 --- a/graphics/libggi/pkg-plist +++ b/graphics/libggi/pkg-plist @@ -4,16 +4,15 @@ bin/monitest @unexec if cmp -s %D/etc/ggi/libggi.conf %D/etc/ggi/libggi.conf.dist; then rm -f %D/etc/ggi/libggi.conf; fi etc/ggi/libggi.conf.dist @exec [ -f %B/libggi.conf ] || cp %B/%f %B/libggi.conf -@unexec if cmp -s %D/etc/ggi/libggimisc.conf %D/etc/ggi/libggimisc.conf.dist; then rm -f %D/etc/ggi/libggimisc.conf; fi -etc/ggi/libggimisc.conf.dist -@exec [ -f %B/libggimisc.conf ] || cp %B/%f %B/libggimisc.conf -include/ggi/default/genkgi.h include/ggi/display/aa.h include/ggi/display/directx.h include/ggi/display/fbdev.h include/ggi/display/file.h include/ggi/display/glide.h +include/ggi/display/ipc.h +include/ggi/display/kgi.h include/ggi/display/lcd823.h +include/ggi/display/libkgi.h include/ggi/display/linvtsw.h include/ggi/display/mansync.h include/ggi/display/memory.h @@ -30,6 +29,7 @@ include/ggi/display/vcsa.h include/ggi/display/vgl.h include/ggi/display/x.h include/ggi/display/xcommon.h +include/ggi/display/xevi.h include/ggi/display/xf86dga.h include/ggi/display/xlib.h include/ggi/ggi-unix.h @@ -41,10 +41,9 @@ include/ggi/internal/ggi-dl.h include/ggi/internal/ggidlinit.h include/ggi/internal/ggilibinit.h include/ggi/internal/internal.h -include/ggi/internal/misc_int.h include/ggi/internal/plat.h include/ggi/internal/structs.h -include/ggi/misc.h +include/ggi/ll.h include/ggi/types.h lib/ggi/default/color.la lib/ggi/default/color.so @@ -80,12 +79,12 @@ lib/ggi/default/text_32.la lib/ggi/default/text_32.so lib/ggi/display/X.la lib/ggi/display/X.so -lib/ggi/display/X_misc.la -lib/ggi/display/X_misc.so -lib/ggi/display/Xlib.la -lib/ggi/display/Xlib.so %%WITH_AALIB%%lib/ggi/display/aa.la %%WITH_AALIB%%lib/ggi/display/aa.so +lib/ggi/display/file.la +lib/ggi/display/file.so +lib/ggi/display/ipc.la +lib/ggi/display/ipc.so lib/ggi/display/mansync.la lib/ggi/display/mansync.so lib/ggi/display/memory.la @@ -100,8 +99,6 @@ lib/ggi/display/sub.la lib/ggi/display/sub.so %%WITH_SVGALIB%%lib/ggi/display/svgalib.la %%WITH_SVGALIB%%lib/ggi/display/svgalib.so -%%WITH_SVGALIB%%lib/ggi/display/svgalib_misc.la -%%WITH_SVGALIB%%lib/ggi/display/svgalib_misc.so lib/ggi/display/tele.la lib/ggi/display/tele.so lib/ggi/display/terminfo.la @@ -117,10 +114,6 @@ lib/ggi/display/vgl.so lib/libggi.la lib/libggi.so lib/libggi.so.2 -lib/libggimisc.la -lib/libggimisc.so -lib/libggimisc.so.2 -@dirrm include/ggi/default @dirrm include/ggi/display -@dirrm lib/ggi/default @dirrm lib/ggi/display +@dirrm lib/ggi/default -- cgit v1.2.3