Module Name: xsrc
Committed By: mrg
Date: Mon Mar 18 04:27:54 UTC 2019
Modified Files:
xsrc/external/mit/libXvMC/dist/src: XvMC.c
xsrc/external/mit/xtrans/dist: Xtranssock.c
Removed Files:
xsrc/external/mit/libXvMC/dist: README
xsrc/external/mit/libXxf86dga/dist: README
xsrc/external/mit/libxkbfile/dist: README
xsrc/external/mit/xtrans/dist: README
Log Message:
merge libXvMC 1.0.11, libXxf86dga 1.1.5, libxkbfile 1.1.0, and xtrans 1.4.0.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXvMC/dist/README
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXvMC/dist/src/XvMC.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXxf86dga/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libxkbfile/dist/README
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xtrans/dist/README
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xtrans/dist/Xtranssock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXvMC/dist/src/XvMC.c
diff -u xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.6 xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.7
--- xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.6 Tue Oct 4 22:01:49 2016
+++ xsrc/external/mit/libXvMC/dist/src/XvMC.c Mon Mar 18 04:27:54 2019
@@ -117,7 +117,7 @@ XvMCSurfaceInfo * XvMCListSurfaceTypes(D
if(surface_info) {
xvmcSurfaceInfo sinfo;
- int i;
+ CARD32 i;
*num = rep.num;
@@ -178,7 +178,7 @@ XvImageFormatValues * XvMCListSubpicture
if(ret) {
xvImageFormatInfo Info;
- int i;
+ CARD32 i;
*count_return = rep.num;
@@ -491,6 +491,7 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
CARD32 magic;
#ifdef HAVE_SHMAT
+ int shmKey;
volatile CARD32 *shMem;
struct timezone here;
struct timeval now;
@@ -510,7 +511,8 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
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 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
* 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 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
}
} else {
req->shmKey = -1;
+ shmKey = -1;
}
}
#else
@@ -548,14 +551,16 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
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 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
*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;
}
Index: xsrc/external/mit/xtrans/dist/Xtranssock.c
diff -u xsrc/external/mit/xtrans/dist/Xtranssock.c:1.2 xsrc/external/mit/xtrans/dist/Xtranssock.c:1.3
--- xsrc/external/mit/xtrans/dist/Xtranssock.c:1.2 Mon Feb 20 14:55:47 2017
+++ xsrc/external/mit/xtrans/dist/Xtranssock.c Mon Mar 18 04:27:54 2019
@@ -112,14 +112,6 @@ from the copyright holders.
#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 @@ static int TRANS(SocketINETClose) (Xtran
#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 @@ TRANS(SocketReopen) (int i _X_UNUSED, in
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 @@ TRANS(SocketOpenCOTSServer) (Xtransport
#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;
-
- return ciptr;
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, const char *protocol,
- const char *host, const char *port)
-
-{
- XtransConnInfo ciptr;
- int i = -1;
-
- prmsg (2,"SocketOpenCLTSServer(%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,"SocketOpenCLTSServer: Unable to open socket for %s\n",
- thistrans->TransName);
- else
- prmsg (1,"SocketOpenCLTSServer: Unable to determine socket type for %s\n",
- thistrans->TransName);
- return NULL;
- }
-
-#ifdef IPV6_V6ONLY
- if (Sockettrans2devtab[i].family == AF_INET6)
- {
- int one = 1;
- setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int));
- }
-#endif
- /* Save the index for later use */
-
- ciptr->index = i;
-
- return ciptr;
-}
-
-#endif /* TRANS_SERVER */
-
-
#ifdef TRANS_REOPEN
static XtransConnInfo
@@ -795,40 +694,6 @@ TRANS(SocketReopenCOTSServer) (Xtranspor
return ciptr;
}
-static XtransConnInfo
-TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, const char *port)
-
-{
- XtransConnInfo ciptr;
- int i = -1;
-
- prmsg (2,
- "SocketReopenCLTSServer(%d, %s)\n", fd, port);
-
- SocketInitOnce();
-
- while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
- if ((ciptr = TRANS(SocketReopen) (
- i, Sockettrans2devtab[i].devcotsname, fd, port)) != NULL)
- break;
- }
- if (i < 0) {
- if (i == -1)
- prmsg (1,"SocketReopenCLTSServer: Unable to open socket for %s\n",
- thistrans->TransName);
- else
- prmsg (1,"SocketReopenCLTSServer: Unable to determine socket type for %s\n",
- thistrans->TransName);
- return NULL;
- }
-
- /* Save the index for later use */
-
- ciptr->index = i;
-
- return ciptr;
-}
-
#endif /* TRANS_REOPEN */
@@ -2113,11 +1978,7 @@ TRANS(SocketBytesReadable) (XtransConnIn
return ret;
}
#else
-#if defined(__i386__) && defined(SYSV) && !defined(SCO325)
- return ioctl (ciptr->fd, I_NREAD, (char *) pend);
-#else
return ioctl (ciptr->fd, FIONREAD, (char *) pend);
-#endif /* __i386__ && SYSV || _SEQUENT_ && _SOCKET_VERSION == 1 */
#endif /* WIN32 */
}
@@ -2514,15 +2375,8 @@ Xtransport TRANS(SocketTCPFuncs) = {
tcp_nolisten,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
- TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
- TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
- TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
@@ -2558,15 +2412,8 @@ Xtransport TRANS(SocketINETFuncs) = {
NULL,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
- TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
- TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
- TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
@@ -2603,15 +2450,8 @@ Xtransport TRANS(SocketINET6Funcs) =
NULL,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
- TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
- TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
- TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
@@ -2655,15 +2495,8 @@ Xtransport TRANS(SocketLocalFuncs) = {
NULL,
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
- TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
- TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
- TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
@@ -2713,15 +2546,8 @@ Xtransport TRANS(SocketUNIXFuncs) = {
#endif
TRANS(SocketOpenCOTSServer),
#endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
- TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
- TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
#ifdef TRANS_REOPEN
TRANS(SocketReopenCOTSServer),
- TRANS(SocketReopenCLTSServer),
#endif
TRANS(SocketSetOption),
#ifdef TRANS_SERVER
