update to 2.0.4; prompted & supplied by Eric Faurot
This commit is contained in:
todd
parent
bcfcc2ddaf
commit
ec36e7d9f9
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2002/12/28 19:34:51 todd Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2004/01/20 13:50:53 todd Exp $
|
||||
# Uses pthreads
|
||||
|
||||
COMMENT= "Generic Graphics Library"
|
||||
DISTNAME= libggi-2.0.2
|
||||
DISTNAME= libggi-2.0.4
|
||||
CATEGORIES= graphics
|
||||
|
||||
HOMEPAGE= http://www.ggi-project.org/
|
||||
@ -13,12 +13,14 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/v2.0/
|
||||
MASTER_SITES= ftp://ftp.ggi-project.org/pub/packages/ggi/ggi/v2.0/
|
||||
EXTRACT_SUFX= .src.tar.bz2
|
||||
|
||||
LIB_DEPENDS= gii.0.8::graphics/gii
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
|
||||
CFLAGS+= -pthread
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (libggi-2.0.2.src.tar.bz2) = 07ada325a17b5bbe66ef79a1a7f8fc10
|
||||
RMD160 (libggi-2.0.2.src.tar.bz2) = 6f011f0b76831c2aa13be9b3a74791dfd2f0e9f9
|
||||
SHA1 (libggi-2.0.2.src.tar.bz2) = b54d1957e16de91c7d771cc7a9843ae3f7015961
|
||||
MD5 (libggi-2.0.4.src.tar.bz2) = b1a68aba26e12cd164ea032ad3ad5556
|
||||
RMD160 (libggi-2.0.4.src.tar.bz2) = b370de9fbb27cfab5b8532ea70c215481cc12e03
|
||||
SHA1 (libggi-2.0.4.src.tar.bz2) = 2d15fe15f13f9f0926e88a4eb2df87a103e99da9
|
||||
|
||||
@ -1,274 +0,0 @@
|
||||
$OpenBSD: patch-default_linear_16_crossblit_c,v 1.1 2004/01/05 00:26:57 espie Exp $
|
||||
--- default/linear_16/crossblit.c.orig 2004-01-05 01:16:36.000000000 +0100
|
||||
+++ default/linear_16/crossblit.c 2004-01-05 01:18:58.000000000 +0100
|
||||
@@ -1278,68 +1278,68 @@ static inline void cb16to16_mmx(ggi_visu
|
||||
while (stopcol > dstp + 11) {
|
||||
void *dummy;
|
||||
__asm__ __volatile__(
|
||||
- "movq (%1), %%mm0\n\t
|
||||
- pxor %%mm5, %%mm5\n\t
|
||||
- movq 8(%1), %%mm1\n\t
|
||||
- pxor %%mm6, %%mm6\n\t
|
||||
- movq 16(%1), %%mm2\n\t
|
||||
- pxor %%mm7, %%mm7\n\t
|
||||
- add $24, %1\n\t
|
||||
-
|
||||
- .Lleft%=:
|
||||
- cmp $0, 8(%2)\n\t
|
||||
- je .Lmiddle%=\n\t
|
||||
-
|
||||
- movq %%mm0, %%mm3\n\t
|
||||
- movq %%mm1, %%mm4\n\t
|
||||
- psllw (%2), %%mm3\n\t
|
||||
- psllw (%2), %%mm4\n\t
|
||||
- pand 8(%2), %%mm3\n\t
|
||||
- pand 8(%2), %%mm4\n\t
|
||||
- por %%mm3, %%mm5\n\t
|
||||
- movq %%mm2, %%mm3\n\t
|
||||
- por %%mm4, %%mm6\n\t
|
||||
- psllw (%2), %%mm3\n\t
|
||||
- pand 8(%2), %%mm3\n\t
|
||||
- cmp $0, (%2)\n\t
|
||||
- por %%mm3, %%mm7\n\t
|
||||
- je .Lright%=\n\t
|
||||
- add $16, %2\n\t
|
||||
- jmp .Lleft%=\n\t
|
||||
-
|
||||
- .Lmiddle%=:\n\t
|
||||
- cmp $0, (%2)\n\t
|
||||
- je .Lright%=\n\t
|
||||
-
|
||||
- .Ldone%=:\n\t
|
||||
- movq %%mm5, (%0)\n\t
|
||||
- movq %%mm6, 8(%0)\n\t
|
||||
- movq %%mm7, 16(%0)\n\t
|
||||
- add $24, %0\n\t
|
||||
- jmp .Lout%=\n\t
|
||||
-
|
||||
- .Lright%=:\n\t
|
||||
- add $16, %2\n\t
|
||||
- cmp $0, 8(%2)\n\t
|
||||
- je .Ldone%=\n\t
|
||||
-
|
||||
- movq %%mm0, %%mm3\n\t
|
||||
- movq %%mm1, %%mm4\n\t
|
||||
- psrlw (%2), %%mm3\n\t
|
||||
- psrlw (%2), %%mm4\n\t
|
||||
- pand 8(%2), %%mm3\n\t
|
||||
- pand 8(%2), %%mm4\n\t
|
||||
- por %%mm3, %%mm5\n\t
|
||||
- movq %%mm2, %%mm3\n\t
|
||||
- por %%mm4, %%mm6\n\t
|
||||
- psrlw (%2), %%mm3\n\t
|
||||
- pand 8(%2), %%mm3\n\t
|
||||
- por %%mm3, %%mm7\n\t
|
||||
+ "movq (%1), %%mm0\n\t"
|
||||
+ "pxor %%mm5, %%mm5\n\t"
|
||||
+ "movq 8(%1), %%mm1\n\t"
|
||||
+ "pxor %%mm6, %%mm6\n\t"
|
||||
+ "movq 16(%1), %%mm2\n\t"
|
||||
+ "pxor %%mm7, %%mm7\n\t"
|
||||
+ "add $24, %1\n\t"
|
||||
+
|
||||
+ ".Lleft%=:"
|
||||
+ "cmp $0, 8(%2)\n\t"
|
||||
+ "je .Lmiddle%=\n\t"
|
||||
+
|
||||
+ "movq %%mm0, %%mm3\n\t"
|
||||
+ "movq %%mm1, %%mm4\n\t"
|
||||
+ "psllw (%2), %%mm3\n\t"
|
||||
+ "psllw (%2), %%mm4\n\t"
|
||||
+ "pand 8(%2), %%mm3\n\t"
|
||||
+ "pand 8(%2), %%mm4\n\t"
|
||||
+ "por %%mm3, %%mm5\n\t"
|
||||
+ "movq %%mm2, %%mm3\n\t"
|
||||
+ "por %%mm4, %%mm6\n\t"
|
||||
+ "psllw (%2), %%mm3\n\t"
|
||||
+ "pand 8(%2), %%mm3\n\t"
|
||||
+ "cmp $0, (%2)\n\t"
|
||||
+ "por %%mm3, %%mm7\n\t"
|
||||
+ "je .Lright%=\n\t"
|
||||
+ "add $16, %2\n\t"
|
||||
+ "jmp .Lleft%=\n\t"
|
||||
+
|
||||
+ ".Lmiddle%=:\n\t"
|
||||
+ "cmp $0, (%2)\n\t"
|
||||
+ "je .Lright%=\n\t"
|
||||
+
|
||||
+ ".Ldone%=:\n\t"
|
||||
+ "movq %%mm5, (%0)\n\t"
|
||||
+ "movq %%mm6, 8(%0)\n\t"
|
||||
+ "movq %%mm7, 16(%0)\n\t"
|
||||
+ "add $24, %0\n\t"
|
||||
+ "jmp .Lout%=\n\t"
|
||||
+
|
||||
+ ".Lright%=:\n\t"
|
||||
+ "add $16, %2\n\t"
|
||||
+ "cmp $0, 8(%2)\n\t"
|
||||
+ "je .Ldone%=\n\t"
|
||||
+
|
||||
+ "movq %%mm0, %%mm3\n\t"
|
||||
+ "movq %%mm1, %%mm4\n\t"
|
||||
+ "psrlw (%2), %%mm3\n\t"
|
||||
+ "psrlw (%2), %%mm4\n\t"
|
||||
+ "pand 8(%2), %%mm3\n\t"
|
||||
+ "pand 8(%2), %%mm4\n\t"
|
||||
+ "por %%mm3, %%mm5\n\t"
|
||||
+ "movq %%mm2, %%mm3\n\t"
|
||||
+ "por %%mm4, %%mm6\n\t"
|
||||
+ "psrlw (%2), %%mm3\n\t"
|
||||
+ "pand 8(%2), %%mm3\n\t"
|
||||
+ "por %%mm3, %%mm7\n\t"
|
||||
|
||||
- jmp .Lright%=\n\t
|
||||
+ "jmp .Lright%=\n\t"
|
||||
|
||||
- .Lout%=:\n\t
|
||||
- emms\n\t"
|
||||
+ ".Lout%=:\n\t"
|
||||
+ "emms\n\t"
|
||||
: "=qom" (dstp), "=qom" (srcp), "=q" (dummy)
|
||||
: "qom" (dstp), "qom" (srcp), "q" (tab)
|
||||
: "cc", "memory");
|
||||
@@ -1438,74 +1438,74 @@ static inline void cb32to16_mmx(ggi_visu
|
||||
void *dummy;
|
||||
__asm__ __volatile__(
|
||||
|
||||
- "movq (%1), %%mm0\n\t
|
||||
- movq 8(%1), %%mm1\n\t
|
||||
- movq 16(%1), %%mm2\n\t
|
||||
- movq 24(%1), %%mm3\n\t
|
||||
- add $32, %1\n\t
|
||||
- pxor %%mm7, %%mm7\n\t
|
||||
- pxor %%mm6, %%mm6\n\t
|
||||
-
|
||||
- .Lleft%=:
|
||||
- cmp $0, 8(%2)\n\t
|
||||
- je .Lmiddle%=\n\t
|
||||
-
|
||||
- movq %%mm1, %%mm4\n\t
|
||||
- movq %%mm0, %%mm5\n\t
|
||||
- pslld (%2), %%mm4\n\t
|
||||
- pslld (%2), %%mm5\n\t
|
||||
- psrad $16, %%mm4\n\t
|
||||
- psrad $16, %%mm5\n\t
|
||||
- packssdw %%mm4, %%mm5\n\t
|
||||
- movq %%mm3, %%mm4\n\t
|
||||
- pand 8(%2), %%mm5\n\t
|
||||
- por %%mm5, %%mm6\n\t
|
||||
- movq %%mm2, %%mm5\n\t
|
||||
- pslld (%2), %%mm4\n\t
|
||||
- pslld (%2), %%mm5\n\t
|
||||
- psrad $16, %%mm4\n\t
|
||||
- psrad $16, %%mm5\n\t
|
||||
- packssdw %%mm4, %%mm5\n\t
|
||||
- pand 8(%2), %%mm5\n\t
|
||||
- cmp $0, (%2)\n\t
|
||||
- por %%mm5, %%mm7\n\t
|
||||
- je .Lright%=\n\t
|
||||
- add $16, %2\n\t
|
||||
- jmp .Lleft%=\n\t
|
||||
-
|
||||
- .Lmiddle%=:\n\t
|
||||
- cmp $0, (%2)\n\t
|
||||
- je .Lright%=\n\t
|
||||
-
|
||||
- .Ldone%=:\n\t
|
||||
- movq %%mm6, (%0)\n\t
|
||||
- movq %%mm7, 8(%0)\n\t
|
||||
- add $16, %0\n\t
|
||||
- jmp .Lout%=\n\t
|
||||
-
|
||||
- .Lright%=:\n\t
|
||||
- add $16, %2\n\t
|
||||
- cmp $0, 8(%2)\n\t
|
||||
- je .Ldone%=\n\t
|
||||
-
|
||||
- movq %%mm1, %%mm4\n\t
|
||||
- movq %%mm0, %%mm5\n\t
|
||||
- psrld (%2), %%mm4\n\t
|
||||
- psrld (%2), %%mm5\n\t
|
||||
- packssdw %%mm4, %%mm5\n\t
|
||||
- movq %%mm3, %%mm4\n\t
|
||||
- pand 8(%2), %%mm5\n\t
|
||||
- por %%mm5, %%mm6\n\t
|
||||
- movq %%mm2, %%mm5\n\t
|
||||
- psrld (%2), %%mm4\n\t
|
||||
- psrld (%2), %%mm5\n\t
|
||||
- packssdw %%mm4, %%mm5\n\t
|
||||
- pand 8(%2), %%mm5\n\t
|
||||
- por %%mm5, %%mm7\n\t
|
||||
- jmp .Lright%=\n\t
|
||||
+ "movq (%1), %%mm0\n\t"
|
||||
+ "movq 8(%1), %%mm1\n\t"
|
||||
+ "movq 16(%1), %%mm2\n\t"
|
||||
+ "movq 24(%1), %%mm3\n\t"
|
||||
+ "add $32, %1\n\t"
|
||||
+ "pxor %%mm7, %%mm7\n\t"
|
||||
+ "pxor %%mm6, %%mm6\n\t"
|
||||
+
|
||||
+ ".Lleft%=:"
|
||||
+ "cmp $0, 8(%2)\n\t"
|
||||
+ "je .Lmiddle%=\n\t"
|
||||
+
|
||||
+ "movq %%mm1, %%mm4\n\t"
|
||||
+ "movq %%mm0, %%mm5\n\t"
|
||||
+ "pslld (%2), %%mm4\n\t"
|
||||
+ "pslld (%2), %%mm5\n\t"
|
||||
+ "psrad $16, %%mm4\n\t"
|
||||
+ "psrad $16, %%mm5\n\t"
|
||||
+ "packssdw %%mm4, %%mm5\n\t"
|
||||
+ "movq %%mm3, %%mm4\n\t"
|
||||
+ "pand 8(%2), %%mm5\n\t"
|
||||
+ "por %%mm5, %%mm6\n\t"
|
||||
+ "movq %%mm2, %%mm5\n\t"
|
||||
+ "pslld (%2), %%mm4\n\t"
|
||||
+ "pslld (%2), %%mm5\n\t"
|
||||
+ "psrad $16, %%mm4\n\t"
|
||||
+ "psrad $16, %%mm5\n\t"
|
||||
+ "packssdw %%mm4, %%mm5\n\t"
|
||||
+ "pand 8(%2), %%mm5\n\t"
|
||||
+ "cmp $0, (%2)\n\t"
|
||||
+ "por %%mm5, %%mm7\n\t"
|
||||
+ "je .Lright%=\n\t"
|
||||
+ "add $16, %2\n\t"
|
||||
+ "jmp .Lleft%=\n\t"
|
||||
+
|
||||
+ ".Lmiddle%=:\n\t"
|
||||
+ "cmp $0, (%2)\n\t"
|
||||
+ "je .Lright%=\n\t"
|
||||
+
|
||||
+ ".Ldone%=:\n\t"
|
||||
+ "movq %%mm6, (%0)\n\t"
|
||||
+ "movq %%mm7, 8(%0)\n\t"
|
||||
+ "add $16, %0\n\t"
|
||||
+ "jmp .Lout%=\n\t"
|
||||
+
|
||||
+ ".Lright%=:\n\t"
|
||||
+ "add $16, %2\n\t"
|
||||
+ "cmp $0, 8(%2)\n\t"
|
||||
+ "je .Ldone%=\n\t"
|
||||
+
|
||||
+ "movq %%mm1, %%mm4\n\t"
|
||||
+ "movq %%mm0, %%mm5\n\t"
|
||||
+ "psrld (%2), %%mm4\n\t"
|
||||
+ "psrld (%2), %%mm5\n\t"
|
||||
+ "packssdw %%mm4, %%mm5\n\t"
|
||||
+ "movq %%mm3, %%mm4\n\t"
|
||||
+ "pand 8(%2), %%mm5\n\t"
|
||||
+ "por %%mm5, %%mm6\n\t"
|
||||
+ "movq %%mm2, %%mm5\n\t"
|
||||
+ "psrld (%2), %%mm4\n\t"
|
||||
+ "psrld (%2), %%mm5\n\t"
|
||||
+ "packssdw %%mm4, %%mm5\n\t"
|
||||
+ "pand 8(%2), %%mm5\n\t"
|
||||
+ "por %%mm5, %%mm7\n\t"
|
||||
+ "jmp .Lright%=\n\t"
|
||||
|
||||
- .Lout%=:\n\t
|
||||
- emms\n\t"
|
||||
+ ".Lout%=:\n\t"
|
||||
+ "emms\n\t"
|
||||
: "=qom" (dstp), "=qom" (srcp), "=q" (dummy)
|
||||
: "qom" (dstp), "qom" (srcp), "q" (tab)
|
||||
: "cc", "memory");
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-display_xf86dga_XF86VMode_c,v 1.1 2002/12/28 19:34:51 todd Exp $
|
||||
--- display/xf86dga/XF86VMode.c.orig Sat Dec 28 02:04:05 2002
|
||||
+++ display/xf86dga/XF86VMode.c Sat Dec 28 02:11:46 2002
|
||||
@@ -37,8 +37,10 @@ from Kaleb S. KEITHLEY.
|
||||
/* THIS IS NOT AN X CONSORTIUM STANDARD */
|
||||
|
||||
#define _POSIX_C_SOURCE 199309L
|
||||
+#if !defined(__OpenBSD__)
|
||||
#define _POSIX_SOURCE
|
||||
#define _XOPEN_SOURCE 500L
|
||||
+#endif
|
||||
#define _BSD_SOURCE
|
||||
#define _SVID_SOURCE
|
||||
#define FUNCPROTO 15
|
||||
@ -1,35 +1,6 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.3 2002/12/28 19:34:51 todd Exp $
|
||||
--- ltmain.sh.orig Sun Dec 8 15:36:07 2002
|
||||
+++ ltmain.sh Sat Dec 28 01:57:11 2002
|
||||
@@ -1082,6 +1082,17 @@ compiler."
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -pthread)
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1522,6 +1533,9 @@ compiler."
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
+ -pthread)
|
||||
+ continue
|
||||
+ ;;
|
||||
%DEPLIBS%)
|
||||
alldeplibs=yes
|
||||
continue
|
||||
@@ -1767,11 +1781,6 @@ compiler."
|
||||
--- 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."
|
||||
continue
|
||||
fi
|
||||
|
||||
@ -41,7 +12,7 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2002/12/28 19:34:51 todd Exp $
|
||||
if test -n "$old_archive_from_expsyms_cmds"; then
|
||||
# figure out the soname
|
||||
set dummy $library_names
|
||||
@@ -4569,40 +4578,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -4583,40 +4578,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-programs_demos_cube3d_c,v 1.1 2003/01/18 09:21:09 pvalchev Exp $
|
||||
--- programs/demos/cube3d.c.orig Sat Jan 18 02:00:00 2003
|
||||
+++ programs/demos/cube3d.c Sat Jan 18 02:00:31 2003
|
||||
$OpenBSD: patch-programs_demos_cube3d_c,v 1.2 2004/01/20 13:50:53 todd Exp $
|
||||
--- programs/demos/cube3d.c.orig 2004-01-20 06:38:43.000000000 -0600
|
||||
+++ programs/demos/cube3d.c 2004-01-20 06:37:46.000000000 -0600
|
||||
@@ -501,7 +501,7 @@ int spawn_bg(char *what)
|
||||
if (pid == -1)
|
||||
return -1;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-programs_demos_wrap_c,v 1.1 2003/01/18 09:21:09 pvalchev Exp $
|
||||
--- programs/demos/wrap.c.orig Sat Jan 18 02:00:17 2003
|
||||
+++ programs/demos/wrap.c Sat Jan 18 02:00:38 2003
|
||||
$OpenBSD: patch-programs_demos_wrap_c,v 1.2 2004/01/20 13:50:53 todd Exp $
|
||||
--- programs/demos/wrap.c.orig 2004-01-20 06:38:48.000000000 -0600
|
||||
+++ programs/demos/wrap.c 2004-01-20 06:37:35.000000000 -0600
|
||||
@@ -131,7 +131,7 @@ void init_client(client_t *client, ggi_m
|
||||
perror("fork");
|
||||
exit(-1);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/12/28 19:34:51 todd Exp $
|
||||
lib/libggi.so.2.2
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/01/20 13:50:53 todd Exp $
|
||||
lib/libggi.so.2.4
|
||||
DYNLIBDIR(%D/lib)
|
||||
lib/ggi/default/color.so
|
||||
lib/ggi/default/ilbm.so
|
||||
@ -33,6 +33,5 @@ lib/ggi/display/trueemu.so
|
||||
lib/ggi/helper/helper_x_dbe.so
|
||||
lib/ggi/helper/helper_x_evi.so
|
||||
lib/ggi/helper/helper_x_shm.so
|
||||
man/man3/ggiResourceAcquire.3
|
||||
man/man3/ggiResourceMustAcquire.3
|
||||
man/man3/ggiResourceRelease.3
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2003/11/23 14:03:54 sturm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.11 2004/01/20 13:50:53 todd Exp $
|
||||
bin/cube3d
|
||||
bin/ggiteleserver
|
||||
bin/monitest
|
||||
@ -184,6 +184,9 @@ man/man3/ggiPutc.3
|
||||
man/man3/ggiPuts.3
|
||||
man/man3/ggiRemoveEventMask.3
|
||||
man/man3/ggiRemoveFlags.3
|
||||
man/man3/ggiResourceAcquire.3
|
||||
man/man3/ggiResourceMustAcquire.3
|
||||
man/man3/ggiResourceRelease.3
|
||||
man/man3/ggiSPrintMode.3
|
||||
man/man3/ggiSetColorfulPalette.3
|
||||
man/man3/ggiSetDisplayFrame.3
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user