Hello community, here is the log from the commit of package libXvMC for openSUSE:Factory checked in at 2019-03-26 22:29:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXvMC (Old) and /work/SRC/openSUSE:Factory/.libXvMC.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXvMC" Tue Mar 26 22:29:30 2019 rev:11 rq:687590 version:1.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/libXvMC/libXvMC.changes 2016-11-05 21:21:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libXvMC.new.25356/libXvMC.changes 2019-03-26 22:29:32.317747541 +0100 @@ -1,0 +2,13 @@ +Fri Mar 22 11:21:33 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.11 + * autogen: add default patch prefix + * autogen.sh: use quoted string variables + * autogen.sh: use exec instead of waiting for configure to finish + * Update configure.ac bug URL for gitlab migration + * Need to check for -1, not 0, to determine if shmat() failed + * Fix sign comparison warnings for loop indexes + * Fix handling of shmKey in XvMCGetDRInfo + * Update README for gitlab migration + +------------------------------------------------------------------- Old: ---- libXvMC-1.0.10.tar.bz2 New: ---- libXvMC-1.0.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXvMC.spec ++++++ --- /var/tmp/diff_new_pack.tcIqzn/_old 2019-03-26 22:29:33.761747193 +0100 +++ /var/tmp/diff_new_pack.tcIqzn/_new 2019-03-26 22:29:33.761747193 +0100 @@ -1,7 +1,7 @@ # # spec file for package libXvMC # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libXvMC %define lname libXvMC1 -Version: 1.0.10 +Version: 1.0.11 Release: 0 Summary: X-Video Motion Compensation library License: MIT ++++++ libXvMC-1.0.10.tar.bz2 -> libXvMC-1.0.11.tar.bz2 ++++++ ++++ 26645 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/ChangeLog new/libXvMC-1.0.11/ChangeLog --- old/libXvMC-1.0.10/ChangeLog 2016-10-04 22:25:40.000000000 +0200 +++ new/libXvMC-1.0.11/ChangeLog 2019-03-16 23:15:34.000000000 +0100 @@ -1,3 +1,103 @@ +commit 63a79d1d087f5121b07510692bf6dd8207d0c0d7 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 16 15:11:28 2019 -0700 + + libXvMC 1.0.11 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8c0a1b5d9d5dea58c516a6aefa6dd15192919b48 +Author: Alan Coopersmith <[email protected]> +Date: Fri Dec 7 19:56:27 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 45de1c449740caf45984aac59ab35741defcadbb +Author: Alan Coopersmith <[email protected]> +Date: Mon Nov 19 22:55:06 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a964f14b7b61bb8055d5144c96ecbba5dfae4a3e +Author: Alan Coopersmith <[email protected]> +Date: Sat Sep 22 15:56:27 2018 -0700 + + Fix sign comparison warnings for loop indexes + + XvMC.c: In function ‘XvMCListSurfaceTypes’: + XvMC.c:124:19: warning: comparison between signed and unsigned integer + expressions [-Wsign-compare] + for(i = 0; i < rep.num; i++) { + ^ + XvMC.c: In function ‘XvMCListSubpictureTypes’: + XvMC.c:185:26: warning: comparison between signed and unsigned integer + expressions [-Wsign-compare] + for(i = 0; i < rep.num; i++) { + ^ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 28ad81420723175bfb163e20406af6d4d56bf4d4 +Author: Alan Coopersmith <[email protected]> +Date: Sat Sep 22 15:51:49 2018 -0700 + + Need to check for -1, not 0, to determine if shmat() failed + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 68d0e5a122c6c76c19cc58ce9cea1424c7a5db11 +Author: Neha Gupta <[email protected]> +Date: Fri Jun 5 08:20:48 2015 +0000 + + Fix handling of shmKey in XvMCGetDRInfo + + If we store the result of shmget in a CARD32 (unsigned int), then + checking if it returned -1 for an error by using >= 0 doesn't work. + + Also, once the request is flushed from the buffer (as XReply does), + there's no guarantee the values in it are still valid, so it's better + to rely on our local variable instead. + + Fixes: https://gitlab.freedesktop.org/xorg/lib/libxvmc/issues/1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 48ca78665a3f251f94b190b61fcc2027b07a76c9 +Author: Mihail Konev <[email protected]> +Date: Thu Jan 26 13:52:49 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <[email protected]> + +commit 290edda14c96e34873cd5601d3c515ce74ca01a5 +Author: Emil Velikov <[email protected]> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 9b8c4f2f82cd45c7c394efa992663fb75452e39f +Author: Peter Hutterer <[email protected]> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Emil Velikov <[email protected]> + commit 44a462835cbe263451a463af17f0fbedc1c957b2 Author: Matthieu Herrb <[email protected]> Date: Tue Oct 4 22:09:12 2016 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/INSTALL new/libXvMC-1.0.11/INSTALL --- old/libXvMC-1.0.10/INSTALL 2016-10-04 22:25:40.000000000 +0200 +++ new/libXvMC-1.0.11/INSTALL 2019-03-16 23:15:34.000000000 +0100 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/Makefile.am new/libXvMC-1.0.11/Makefile.am --- old/libXvMC-1.0.10/Makefile.am 2016-08-17 14:58:43.000000000 +0200 +++ new/libXvMC-1.0.11/Makefile.am 2019-03-16 23:15:18.000000000 +0100 @@ -42,3 +42,5 @@ lint: (cd src && $(MAKE) $(MFLAGS) lint) endif LINT + +EXTRA_DIST = README.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/README new/libXvMC-1.0.11/README --- old/libXvMC-1.0.10/README 2016-08-17 14:58:43.000000000 +0200 +++ new/libXvMC-1.0.11/README 1970-01-01 01:00:00.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/README.md new/libXvMC-1.0.11/README.md --- old/libXvMC-1.0.10/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/libXvMC-1.0.11/README.md 2019-03-16 23:15:18.000000000 +0100 @@ -0,0 +1,18 @@ +libXvMC - X-Video Motion Compensation API +----------------------------------------- + +All questions regarding this software should be directed at the +Xorg mailing list: + + https://lists.x.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + https://gitlab.freedesktop.org/xorg/lib/libXvMC + +Please submit bug reports and requests to merge patches there. + +For patch submission instructions, see: + + https://www.x.org/wiki/Development/Documentation/SubmittingPatches + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/compile new/libXvMC-1.0.11/compile --- old/libXvMC-1.0.10/compile 2016-10-04 00:58:19.000000000 +0200 +++ new/libXvMC-1.0.11/compile 2019-03-16 23:15:26.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/config.h.in new/libXvMC-1.0.11/config.h.in --- old/libXvMC-1.0.10/config.h.in 2016-10-04 21:42:58.000000000 +0200 +++ new/libXvMC-1.0.11/config.h.in 2019-03-16 23:15:25.000000000 +0100 @@ -33,8 +33,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/configure.ac new/libXvMC-1.0.11/configure.ac --- old/libXvMC-1.0.10/configure.ac 2016-10-04 21:30:13.000000000 +0200 +++ new/libXvMC-1.0.11/configure.ac 2019-03-16 23:15:18.000000000 +0100 @@ -21,8 +21,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXvMC], [1.0.10], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXvMC]) +AC_INIT([libXvMC], [1.0.11], + [https://gitlab.freedesktop.org/xorg/lib/libXvMC/issues], [libXvMC]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/missing new/libXvMC-1.0.11/missing --- old/libXvMC-1.0.10/missing 2016-10-04 00:58:19.000000000 +0200 +++ new/libXvMC-1.0.11/missing 2019-03-16 23:15:26.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXvMC-1.0.10/src/XvMC.c new/libXvMC-1.0.11/src/XvMC.c --- old/libXvMC-1.0.10/src/XvMC.c 2016-09-23 09:56:49.000000000 +0200 +++ new/libXvMC-1.0.11/src/XvMC.c 2019-03-16 23:15:18.000000000 +0100 @@ -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; }
