Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge libXvMC 1.0.11, libXxf86dga 1.1.5, libx...
details: https://anonhg.NetBSD.org/xsrc/rev/19e3aad13d44
branches: trunk
changeset: 10250:19e3aad13d44
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Mar 18 04:27:54 2019 +0000
description:
merge libXvMC 1.0.11, libXxf86dga 1.1.5, libxkbfile 1.1.0, and xtrans 1.4.0.
diffstat:
external/mit/libXvMC/dist/README | 24 ----
external/mit/libXvMC/dist/src/XvMC.c | 30 +++-
external/mit/libXxf86dga/dist/README | 25 ----
external/mit/libxkbfile/dist/README | 24 ----
external/mit/xtrans/dist/README | 37 -------
external/mit/xtrans/dist/Xtranssock.c | 176 +---------------------------------
6 files changed, 21 insertions(+), 295 deletions(-)
diffs (truncated from 488 to 300 lines):
diff -r 393e5e6be337 -r 19e3aad13d44 external/mit/libXvMC/dist/README
--- a/external/mit/libXvMC/dist/README Mon Mar 18 04:24:28 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/lib/libXvMC
-
- http://cgit.freedesktop.org/xorg/lib/libXvMC
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 393e5e6be337 -r 19e3aad13d44 external/mit/libXvMC/dist/src/XvMC.c
--- a/external/mit/libXvMC/dist/src/XvMC.c Mon Mar 18 04:24:28 2019 +0000
+++ b/external/mit/libXvMC/dist/src/XvMC.c Mon Mar 18 04:27:54 2019 +0000
@@ -117,7 +117,7 @@
if(surface_info) {
xvmcSurfaceInfo sinfo;
- int i;
+ CARD32 i;
*num = rep.num;
@@ -178,7 +178,7 @@
if(ret) {
xvImageFormatInfo Info;
- int i;
+ CARD32 i;
*count_return = rep.num;
@@ -491,6 +491,7 @@
CARD32 magic;
#ifdef HAVE_SHMAT
+ int shmKey;
volatile CARD32 *shMem;
struct timezone here;
struct timeval now;
@@ -510,7 +511,8 @@
magic = 0;
req->magic = 0;
#ifdef HAVE_SHMAT
- req->shmKey = shmget(IPC_PRIVATE, 1024, IPC_CREAT | 0600);
+ shmKey = shmget(IPC_PRIVATE, 1024, IPC_CREAT | 0600);
+ req->shmKey = (CARD32) shmKey;
/*
* We fill a shared memory page with a repetitive pattern. If the
@@ -521,10 +523,10 @@
* otherwise stupid-looking pattern algorithm.
*/
- if (req->shmKey >= 0) {
- shMem = (CARD32 *) shmat(req->shmKey, NULL, 0);
- shmctl( req->shmKey, IPC_RMID, NULL);
- if ( shMem ) {
+ if (shmKey >= 0) {
+ shMem = (CARD32 *) shmat(shmKey, NULL, 0);
+ shmctl(shmKey, IPC_RMID, NULL);
+ if (shMem != (void *) -1) {
register volatile CARD32 *shMemC = shMem;
register int i;
@@ -539,6 +541,7 @@
}
} else {
req->shmKey = -1;
+ shmKey = -1;
}
}
#else
@@ -548,14 +551,16 @@
UnlockDisplay (dpy);
SyncHandle ();
#ifdef HAVE_SHMAT
- if ( req->shmKey >= 0) {
+ if (shmKey >= 0) {
shmdt( (const void *) shMem );
}
#endif
return -1;
}
#ifdef HAVE_SHMAT
- shmdt( (const void *) shMem );
+ if (shmKey >= 0) {
+ shmdt( (const void *) shMem );
+ }
#endif
if (rep.length > 0) {
@@ -600,7 +605,12 @@
*major = rep.major;
*minor = rep.minor;
*patchLevel = rep.patchLevel;
- *isLocal = (req->shmKey > 0) ? rep.isLocal : 1;
+#ifdef HAVE_SHMAT
+ if (shmKey >= 0)
+ *isLocal = rep.isLocal;
+ else
+#endif
+ *isLocal = 1;
return (rep.length > 0) ? Success : BadImplementation;
}
diff -r 393e5e6be337 -r 19e3aad13d44 external/mit/libXxf86dga/dist/README
--- a/external/mit/libXxf86dga/dist/README Mon Mar 18 04:24:28 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-libXxf86dga - Client library for the XFree86-DGA extension.
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/lib/libXxf86dga
-
- http://cgit.freedesktop.org/xorg/lib/libXxf86dga
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 393e5e6be337 -r 19e3aad13d44 external/mit/libxkbfile/dist/README
--- a/external/mit/libxkbfile/dist/README Mon Mar 18 04:24:28 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/lib/libxkbfile
-
- http://cgit.freedesktop.org/xorg/lib/libxkbfile
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 393e5e6be337 -r 19e3aad13d44 external/mit/xtrans/dist/README
--- a/external/mit/xtrans/dist/README Mon Mar 18 04:24:28 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-xtrans is a library of code that is shared among various X packages to
-handle network protocol transport in a modular fashion, allowing a
-single place to add new transport types. It is used by the X server,
-libX11, libICE, the X font server, and related components.
-
-It is however, *NOT* a shared library, but code which each consumer
-includes and builds it's own copy of with various #ifdef flags to make
-each copy slightly different. To support this in the modular build
-system, this package simply installs the C source files into
-$(prefix)/include/X11/Xtrans and installs a pkg-config file and an
-autoconf m4 macro file with the flags needed to use it.
-
-Documentation of the xtrans API can be found in the included xtrans.xml
-file in DocBook XML format. If 'xmlto' is installed, you can generate text,
-html, postscript or pdf versions of the documentation by configuring
-the build with --enable-docs, which is the default.
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-under the component "Lib/xtrans".
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/lib/libxtrans
-
- http://cgit.freedesktop.org/xorg/lib/libxtrans
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 393e5e6be337 -r 19e3aad13d44 external/mit/xtrans/dist/Xtranssock.c
--- a/external/mit/xtrans/dist/Xtranssock.c Mon Mar 18 04:24:28 2019 +0000
+++ b/external/mit/xtrans/dist/Xtranssock.c Mon Mar 18 04:27:54 2019 +0000
@@ -112,14 +112,6 @@
#include <sys/filio.h>
#endif
-#if (defined(__i386__) && defined(SYSV)) && !defined(SCO325) && !defined(sun)
-#include <net/errno.h>
-#endif
-
-#if defined(__i386__) && defined(SYSV)
-#include <sys/stropts.h>
-#endif
-
#include <unistd.h>
#else /* !WIN32 */
@@ -223,14 +215,6 @@
#define UNIX_PATH "/tmp/.ICE-unix/"
#define UNIX_DIR "/tmp/.ICE-unix"
#endif /* ICE_t */
-#if defined(TEST_t)
-#define UNIX_PATH "/tmp/.Test-unix/test"
-#define UNIX_DIR "/tmp/.Test-unix"
-#endif
-#if defined(LBXPROXY_t)
-#define UNIX_PATH "/tmp/.X11-unix/X"
-#define UNIX_DIR "/tmp/.X11-unix"
-#endif
#endif /* UNIXCONN */
@@ -533,7 +517,7 @@
addr->sa_len = addrlen;
#endif
addr->sa_family = AF_UNIX;
-#ifdef HAS_STRLCPY
+#if defined(HAVE_STRLCPY) || defined(HAS_STRLCPY)
strlcpy(addr->sa_data, port, portlen);
#else
strncpy(addr->sa_data, port, portlen);
@@ -674,91 +658,6 @@
#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-
-static XtransConnInfo
-TRANS(SocketOpenCLTSClient) (Xtransport *thistrans, const char *protocol,
- const char *host, const char *port)
-
-{
- XtransConnInfo ciptr;
- int i = -1;
-
- prmsg (2,"SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port);
-
- SocketInitOnce();
-
- while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
- if ((ciptr = TRANS(SocketOpen) (
- i, Sockettrans2devtab[i].devcotsname)) != NULL)
- break;
- }
- if (i < 0) {
- if (i == -1)
- prmsg (1,"SocketOpenCLTSClient: Unable to open socket for %s\n",
- thistrans->TransName);
- else
- prmsg (1,"SocketOpenCLTSClient: Unable to determine socket type for %s\n",
- thistrans->TransName);
- return NULL;
- }
-
- /* Save the index for later use */
-
- ciptr->index = i;
-
Home |
Main Index |
Thread Index |
Old Index