pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
doomlegacy-devel: Update to SVN revision 1549
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Tue Sep 29 18:06:34 2020 +0200
Changeset: 679a7d446085688b047c8ba381bd860fbea1d468
Modified Files:
doomlegacy-devel/Makefile
doomlegacy-devel/TODO
doomlegacy-devel/distinfo
Removed Files:
doomlegacy-devel/patches/patch-src_i__tcp.c
doomlegacy-devel/patches/patch-src_mserv.c
doomlegacy-devel/patches/patch-src_t__prepro.h
Log Message:
doomlegacy-devel: Update to SVN revision 1549
r1548: SunOS patches merged
=> Remove SunOS related pkgsrc patches
r1549: Support for masked textures if width is not a power of 2
=> Several graphical elements in Lost Civilization are now displayed
correctly
Updated TODO file.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=679a7d446085688b047c8ba381bd860fbea1d468
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
doomlegacy-devel/Makefile | 2 +-
doomlegacy-devel/TODO | 26 ++++++++++--
doomlegacy-devel/distinfo | 3 --
doomlegacy-devel/patches/patch-src_i__tcp.c | 57 --------------------------
doomlegacy-devel/patches/patch-src_mserv.c | 55 -------------------------
doomlegacy-devel/patches/patch-src_t__prepro.h | 17 --------
6 files changed, 24 insertions(+), 136 deletions(-)
diffs:
diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index 84704fd63e..cff49e7ae5 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -2,7 +2,7 @@
VERS= 1.48.4
#PKGNAME= doomlegacy-${VERS}
-SVNVERS= 1547
+SVNVERS= 1549
DISTNAME= doomlegacy-devel-0r${SVNVERS}
CATEGORIES= games
diff --git a/doomlegacy-devel/TODO b/doomlegacy-devel/TODO
index 18bb996055..09caeabf75 100644
--- a/doomlegacy-devel/TODO
+++ b/doomlegacy-devel/TODO
@@ -43,7 +43,7 @@ Part 10: Some textures show pink/black/pink stripes
Just a cosmetic problem.
[X] Created upstream bug report #663
- Reason was missing support for DeepSea tall patches (see Part 12)
+ Reason was missing support for DeePsea tall patches (see Part 12)
Fixed in SVN revision 1547
=> Works as expected
@@ -61,6 +61,10 @@ Part 11: Resurrect SunOS codepath
[X] Use fcntl() instead of ioctl() to enable non-blocking mode of socket
Should be usable for all POSIX conformant operating systems
[X] Created upstream bug report #666
+ Patches merged in SVN revision 1548
+[X] Remove pkgsrc patches for SunOS support
+
+Part�11�finished.
Part 12: Support for DeePsea tall patches in textures and sprites
@@ -72,10 +76,10 @@ http://jnechaevsky.users.sourceforge.net/files/512x512.wad
[X] Tested to work for sprites with software renderer
[X] Make it work for textures with hardware renderer
[X] Propose reduced patchset upstream
- => Support for DeepSea tall patches was added in SVN revision 1547
+ => Support for DeePsea tall patches was added in SVN revision 1547
[X] Test upstream patches
=> Works now with software and hardware renderer
-[X] Remove pkgsrc patches for DeepSea tall patches
+[X] Remove pkgsrc patches for DeePsea tall patches
The hardware renderer still has some problems (HOM with specific viewing
angles). This looks unrelated to the texture format.
@@ -83,4 +87,20 @@ angles). This looks unrelated to the texture format.
Part�12�finished.
+Part 13: Problem with masked textures if width not a power of 2
+===============================================================
+[X] Discussed while testing fix for bug #663 with Lost Civilization
+ => Problem with a large tree in Map 1
+ => A similar problem exist with the rotating saw blade in Map 4
+ Fixed in SVN revision 1549
+ => Works as expected
+
+Part�13�finished.
+
+
+Part 14: Import final release
+=============================
+[ ] Import version 1.48.6 to pkgsrc
+
+
EOF
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index 4ee7c77bc3..52f06e56e9 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -8,9 +8,6 @@ SHA1 (patch-src_Makefile) = 34c323bdd96787cb6afe0be5dc99b129ab8f1552
SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
SHA1 (patch-src_doomdata.h) = 8c3186dafbf11a8a75262a06755dd9807cb58612
SHA1 (patch-src_dstrings.c) = 16e50ac649f76d415b820a0e5093d15af3180e6d
-SHA1 (patch-src_i__tcp.c) = 3b58113fa9d6e49b5e45ea615f1fab6e893b2eb4
-SHA1 (patch-src_mserv.c) = ac024a322b39a37083c821ccb14fb4e520a89343
SHA1 (patch-src_p__local.h) = e429f2ce5d60dd538bc5e796847b53ae72604b33
SHA1 (patch-src_p__setup.c) = dcdd64c1ae97dc7f9cdccc834b6f34d301e124f5
SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543
-SHA1 (patch-src_t__prepro.h) = 935f43fcebdfe22cbafc8c9a1978cbf91a4c46a1
diff --git a/doomlegacy-devel/patches/patch-src_i__tcp.c b/doomlegacy-devel/patches/patch-src_i__tcp.c
deleted file mode 100644
index 5995a2c232..0000000000
--- a/doomlegacy-devel/patches/patch-src_i__tcp.c
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-src_i__tcp.c,v 1.3 2020/06/18 10:14:54 micha Exp $
-
-Use native inet_aton() on Solaris.
-Use portable fcntl() instead of ioctl() for non-blocking mode by default.
-https://sourceforge.net/p/doomlegacy/bugs/666/
-
---- src/i_tcp.c.orig 2020-05-10 22:05:16.000000000 +0000
-+++ src/i_tcp.c
-@@ -123,7 +123,7 @@
-
- #ifdef __OS2__
- // sys/types.h is also included unconditionally by doomincl.h
--# include <sys/types.h>
-+# include <sys/types.h> // [MB] 2020-06-18: Maybe required for old Unix too
- # include <sys/time.h>
- #endif // __OS2__
-
-@@ -146,6 +146,7 @@
- // non-windows includes
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <fcntl.h> // [MB] 2020-06-18: For fcntl()
- #include <unistd.h>
- #include <netdb.h>
- #include <sys/ioctl.h>
-@@ -355,7 +356,9 @@ byte generic_hashaddr( mysockaddr_t *a
- // htons: host to net byte order
- // ntohs: net to host byte order
-
--#if defined( WIN32) || defined( __OS2__) || defined( SOLARIS)
-+// [MB] 2020-06-18: Use native inet_aton() on Solaris
-+// Solaris has inet_aton() in libresolv since version 2.6 from 1997
-+#if defined( WIN32) || defined( __OS2__) // || defined( SOLARIS)
- // [WDJ] Also defined in mserv.c, but too small, will be inlined anyway.
- static inline
- int inet_aton(const char *hostname,
-@@ -1006,7 +1009,20 @@ retry_bind:
- CONS_Printf("Network port: %d\n", my_sock_port);
-
- // make it non blocking
-+#ifndef LINUX
- ioctl (s, FIONBIO, &trueval);
-+#else
-+ // [MB] 2020-06-18: Use portable POSIX way to enable non-blocking mode
-+ // https://pubs.opengroup.org/onlinepubs/9699919799/functions/fcntl.html
-+ {
-+ int res = fcntl(s, F_SETFL, O_NONBLOCK);
-+ if(-1 == res)
-+ {
-+ I_SoftError("UDP_Socket: Switching to non-blocking mode failed: %s\n", strerror(errno));
-+ goto close_socket;
-+ }
-+ }
-+#endif
-
- // make it broadcastable
- #ifdef LINUX
diff --git a/doomlegacy-devel/patches/patch-src_mserv.c b/doomlegacy-devel/patches/patch-src_mserv.c
deleted file mode 100644
index 9004fd98f8..0000000000
--- a/doomlegacy-devel/patches/patch-src_mserv.c
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD$
-
-Use native inet_aton() on Solaris.
-Use portable fcntl() instead of ioctl() for non-blocking mode by default.
-https://sourceforge.net/p/doomlegacy/bugs/666/
-
---- src/mserv.c.orig 2020-06-16 09:17:35.000000000 +0000
-+++ src/mserv.c
-@@ -122,12 +122,13 @@
- #else
- # include <unistd.h>
- # ifdef __OS2__
--# include <sys/types.h>
-+# include <sys/types.h> // [MB] 2020-06-16: Maybe required for old Unix too
- # endif
- # include <sys/socket.h> // socket(),...
- # include <sys/time.h> // timeval,... (TIMEOUT)
- # include <netinet/in.h> // sockaddr_in
- # include <arpa/inet.h> // inet_addr(),...
-+# include <fcntl.h> // [MB] 2020-06-16: For fcntl()
- # include <netdb.h> // gethostbyname(),...
- # include <sys/ioctl.h>
- # include <errno.h>
-@@ -210,7 +211,9 @@ struct Copy_CVarMS_t
- #define close closesocket
- #endif
-
--#if defined( WIN32) || defined( __OS2__) || defined( SOLARIS)
-+// [MB] 2020-06-16: Use native inet_aton() on Solaris
-+// Solaris has inet_aton() in libresolv since version 2.6 from 1997
-+#if defined( WIN32) || defined( __OS2__) // || defined( SOLARIS)
- // it seems windows doesn't define that... maybe some other OS? OS/2
- static inline
- int inet_aton(const char *hostname,
-@@ -643,9 +646,19 @@ static int MS_Connect(char *ip_addr, cha
- // winsock.h: int ioctlsocket(SOCKET,long,u_long *);
- u_long test = 1; // [smite] I have no idea what this type is supposed to be
- ioctlsocket(ms_socket_fd, FIONBIO, &test);
--#else
-+#elif defined(__OS2__)
- res = 1; // non-blocking true
- ioctl(ms_socket_fd, FIONBIO, &res);
-+#else
-+ // [MB] 2020-06-16: Use portable POSIX way to enable non-blocking mode
-+ // https://pubs.opengroup.org/onlinepubs/9699919799/functions/fcntl.html
-+ res = fcntl(ms_socket_fd, F_SETFL, O_NONBLOCK);
-+ if(-1 == res)
-+ {
-+ con_state = MSCS_FAILED;
-+ MS_Close_socket();
-+ return MS_CONNECT_ERROR;
-+ }
- #endif
- res = connect(ms_socket_fd, (struct sockaddr *) &ms_addr, sizeof(ms_addr));
- if (res < 0)
diff --git a/doomlegacy-devel/patches/patch-src_t__prepro.h b/doomlegacy-devel/patches/patch-src_t__prepro.h
deleted file mode 100644
index 9562526934..0000000000
--- a/doomlegacy-devel/patches/patch-src_t__prepro.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_t__prepro.h,v 1.1 2020/06/10 15:35:02 micha Exp $
-
-The type label_t is not available on all OS, e.g. on SmartOS.
-labelforname() is an unused function and the only place where label_t is used.
-https://sourceforge.net/p/doomlegacy/bugs/666/
-
---- src/t_prepro.h.orig 2018-07-16 09:17:06.000000000 +0000
-+++ src/t_prepro.h
-@@ -97,6 +97,8 @@ typedef enum // section types
-
- /****** goto labels ***********/
-
-+#if 0
- label_t * labelforname(char *labelname);
-+#endif
-
- #endif
Home |
Main Index |
Thread Index |
Old Index