From 030af09061440614bfb70fd7cef5288b4afaebe1 Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 12 Jul 2007 19:48:40 +0000 Subject: update to 1.8.4 too many changes to list here (1.6.0 was in 2002), see the bundled ChangeLog file --- games/plib/Makefile | 5 ++- games/plib/PLIST | 20 +++++++++++- games/plib/distinfo | 14 ++++----- games/plib/patches/patch-aa | 35 --------------------- games/plib/patches/patch-ab | 75 --------------------------------------------- games/plib/patches/patch-ac | 13 -------- games/plib/patches/patch-ad | 17 ++++++++++ games/plib/patches/patch-ae | 12 ++++++++ games/plib/patches/patch-af | 22 +++++++++++++ 9 files changed, 79 insertions(+), 134 deletions(-) delete mode 100644 games/plib/patches/patch-aa delete mode 100644 games/plib/patches/patch-ab delete mode 100644 games/plib/patches/patch-ac create mode 100644 games/plib/patches/patch-ad create mode 100644 games/plib/patches/patch-ae create mode 100644 games/plib/patches/patch-af (limited to 'games/plib') diff --git a/games/plib/Makefile b/games/plib/Makefile index db0183aa4d5..bbdce8f0465 100644 --- a/games/plib/Makefile +++ b/games/plib/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2007/02/02 18:05:54 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2007/07/12 19:48:40 drochner Exp $ # -DISTNAME= plib-1.6.0 -PKGREVISION= 3 +DISTNAME= plib-1.8.4 CATEGORIES= games x11 MASTER_SITES= http://plib.sourceforge.net/dist/ diff --git a/games/plib/PLIST b/games/plib/PLIST index f8037200815..fd267113f4e 100644 --- a/games/plib/PLIST +++ b/games/plib/PLIST @@ -1,13 +1,24 @@ -@comment $NetBSD: PLIST,v 1.2 2003/09/22 12:27:28 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/07/12 19:48:40 drochner Exp $ include/plib/fnt.h include/plib/js.h +include/plib/net.h include/plib/netBuffer.h include/plib/netChannel.h include/plib/netChat.h include/plib/netMessage.h include/plib/netMonitor.h include/plib/netSocket.h +include/plib/pcx.h +include/plib/psl.h include/plib/pu.h +include/plib/puAux.h +include/plib/puAuxLocal.h +include/plib/puFLTK.h +include/plib/puGLUT.h +include/plib/puNative.h +include/plib/puPW.h +include/plib/puSDL.h +include/plib/pw.h include/plib/sg.h include/plib/sl.h include/plib/slPortability.h @@ -16,10 +27,14 @@ include/plib/ssg.h include/plib/ssgAux.h include/plib/ssgKeyFlier.h include/plib/ssgMSFSPalette.h +include/plib/ssgaBillboards.h include/plib/ssgaFire.h include/plib/ssgaLensFlare.h include/plib/ssgaParticleSystem.h +include/plib/ssgaScreenDump.h include/plib/ssgaShapes.h +include/plib/ssgaSky.h +include/plib/ssgaSphere.h include/plib/ssgaWaveSystem.h include/plib/ssgconf.h include/plib/ul.h @@ -27,7 +42,10 @@ include/plib/ulRTTI.h lib/libplibfnt.a lib/libplibjs.a lib/libplibnet.a +lib/libplibpsl.a lib/libplibpu.a +lib/libplibpuaux.a +lib/libplibpw.a lib/libplibsg.a lib/libplibsl.a lib/libplibsm.a diff --git a/games/plib/distinfo b/games/plib/distinfo index d93227beeaa..597e5ecc873 100644 --- a/games/plib/distinfo +++ b/games/plib/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2006/03/28 23:05:05 joerg Exp $ +$NetBSD: distinfo,v 1.8 2007/07/12 19:48:41 drochner Exp $ -SHA1 (plib-1.6.0.tar.gz) = f2c0c8ba909e7df12850fafba9bb57152cb96976 -RMD160 (plib-1.6.0.tar.gz) = 7f9873fb15277bdb8f73e010b6381d04401fb1bd -Size (plib-1.6.0.tar.gz) = 523897 bytes -SHA1 (patch-aa) = a887f535574f88ce3882868b000ca1d39b0a49c5 -SHA1 (patch-ab) = 308b6f2eabe9551012b9b4c272a124587191d170 -SHA1 (patch-ac) = 2cd987814a89d4a841f130ff1e138fe540cc7ff8 +SHA1 (plib-1.8.4.tar.gz) = 16d3faab36fdde85c5bf620046b56c65dfad6769 +RMD160 (plib-1.8.4.tar.gz) = a0b6f2fdd4035cb2a6b83616726563d779efb87f +Size (plib-1.8.4.tar.gz) = 793758 bytes +SHA1 (patch-ad) = 1ec59b079a662bfc9b5ea5fa03686292ac05659f +SHA1 (patch-ae) = ae69e86642c53ef32619d6411809f80ab973b208 +SHA1 (patch-af) = 2eac06fa7462711c018c2b5876b218ef56b46dbb diff --git a/games/plib/patches/patch-aa b/games/plib/patches/patch-aa deleted file mode 100644 index 28ee6c921c4..00000000000 --- a/games/plib/patches/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2006/03/28 23:05:05 joerg Exp $ - ---- src/sl/slPortability.h.orig Mon Sep 22 06:08:29 2003 -+++ src/sl/slPortability.h Mon Sep 22 06:09:02 2003 -@@ -35,7 +35,8 @@ - - /* the next lines are to define BSD */ - /* see http://www.freebsd.org/handbook/porting.html for why we do this */ --#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) \ -+ && !defined(USG) - #include - #endif - -@@ -70,15 +71,17 @@ - #include - #include - --#if (defined(__linux__) || defined(BSD)) && !defined(__NetBSD__) -+#if (defined(__linux__) || defined(BSD) || defined(__DragonFly__)) && !defined(__NetBSD__) - #define SL_USING_OSS_AUDIO 1 - #endif - - #ifdef SL_USING_OSS_AUDIO - # if defined(__linux__) - # include --# elif defined(__FreeBSD__) --# include -+# elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000) || defined(__DragonFly__) -+# include -+# elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) -+# include - # else - /* - Tom thinks this file may be under some diff --git a/games/plib/patches/patch-ab b/games/plib/patches/patch-ab deleted file mode 100644 index b644b2ebc33..00000000000 --- a/games/plib/patches/patch-ab +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2006/03/28 23:05:05 joerg Exp $ - ---- src/js/js.h.orig Mon Sep 22 06:05:53 2003 -+++ src/js/js.h Mon Sep 22 06:06:47 2003 -@@ -62,8 +62,12 @@ - # include - # include - --# if defined(__FreeBSD__) || defined(__NetBSD__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -+# if defined(__FreeBSD__) && __FreeBSD_version >= 500000 -+# include -+# else - # include -+# endif - # define JS_DATA_TYPE joystick - # define JS_RETURN (sizeof(struct JS_DATA_TYPE)) - # elif defined(__linux__) -@@ -111,7 +115,7 @@ - #elif defined (macintosh) - # define _JS_MAX_AXES 9 - #else --# if defined(__FreeBSD__) || defined(__NetBSD__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - # define _JS_MAX_AXES 2 - # else - # define _JS_MAX_AXES 9 -@@ -132,9 +136,9 @@ class jsJoystick - - - --/*#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - int id ; --#endif*/ -+#endif - #ifdef WIN32 - JOYINFOEX js ; - UINT js_id ; -@@ -312,7 +316,7 @@ class jsJoystick - } - - #else --# if defined(__FreeBSD__) || defined(__NetBSD__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - FILE *joyfile; - char joyfname[1024]; - int noargs, in_no_axes; -@@ -338,7 +342,7 @@ class jsJoystick - if ( error ) - return ; - --# if defined(__FreeBSD__) || defined(__NetBSD__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - - /* - FIXME: get joystick name for BSD -@@ -494,7 +498,7 @@ public: - - - #else --# if defined(__FreeBSD__) || defined(__NetBSD__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - //id = ident; - sprintf ( fname, "/dev/joy%d", ident ) ; - # elif defined(__linux__) -@@ -725,7 +729,7 @@ public: - } - - if ( buttons ) --# if defined(__FreeBSD__) || defined(__NetBSD__) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - *buttons = ( js.b1 ? 1 : 0 ) | ( js.b2 ? 2 : 0 ) ; - # else - *buttons = js.buttons ; diff --git a/games/plib/patches/patch-ac b/games/plib/patches/patch-ac deleted file mode 100644 index 2b1d9e04334..00000000000 --- a/games/plib/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2006/03/28 23:05:05 joerg Exp $ - ---- src/net/netSocket.cxx.orig Mon Sep 22 06:03:03 2003 -+++ src/net/netSocket.cxx Mon Sep 22 06:03:29 2003 -@@ -25,7 +25,7 @@ - - #if defined(__CYGWIN__) || !defined (WIN32) - --#if defined(__APPLE__) -+#if defined(__APPLE__) || defined (__FreeBSD__) || defined(__DragonFly__) - # include - #endif - diff --git a/games/plib/patches/patch-ad b/games/plib/patches/patch-ad new file mode 100644 index 00000000000..8c6eec5d62c --- /dev/null +++ b/games/plib/patches/patch-ad @@ -0,0 +1,17 @@ +$NetBSD: patch-ad,v 1.6 2007/07/12 19:48:42 drochner Exp $ + +--- src/js/jsBSD.cxx.orig 2007-03-22 23:35:44.000000000 +0100 ++++ src/js/jsBSD.cxx +@@ -52,11 +52,8 @@ + #endif + #ifdef HAVE_USB_JS + #if defined(__NetBSD__) +-#ifdef HAVE_USBHID_H ++#define HAVE_USBHID_H 1 + #include +-#else +-#include +-#endif + #elif defined(__FreeBSD__) + extern "C" { + # if __FreeBSD_version < 500000 diff --git a/games/plib/patches/patch-ae b/games/plib/patches/patch-ae new file mode 100644 index 00000000000..642b4a91424 --- /dev/null +++ b/games/plib/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.3 2007/07/12 19:48:42 drochner Exp $ + +--- src/sl/sl.h.orig 2007-03-22 23:38:18.000000000 +0100 ++++ src/sl/sl.h +@@ -26,6 +26,7 @@ + #define __SL_H__ 1 + + #include ++#include + #include "slPortability.h" + + #ifdef SL_USING_OSS_AUDIO diff --git a/games/plib/patches/patch-af b/games/plib/patches/patch-af new file mode 100644 index 00000000000..218a26170a7 --- /dev/null +++ b/games/plib/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.3 2007/07/12 19:48:43 drochner Exp $ + +--- src/ssgAux/ssgaSky.h.orig 2007-03-22 23:41:19.000000000 +0100 ++++ src/ssgAux/ssgaSky.h +@@ -104,7 +104,7 @@ public: + ssgaCelestialBodyList ( int init = 3 ) + : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { } + +- ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); } ++ ~ssgaCelestialBodyList () { removeAll(); } + + int getNum (void) { return total ; } + +@@ -192,7 +192,7 @@ public: + ssgaCloudLayerList ( int init = 3 ) + : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { } + +- ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); } ++ ~ssgaCloudLayerList () { removeAll(); } + + int getNum (void) { return total ; } + -- cgit v1.2.3