Wed May 4 02:54:46 2016 UTC ()
fix copy/paste mis in previous


(tnn)
diff -r1.5 -r1.6 pkgsrc/x11/libxshmfence/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/libxshmfence/files/xshmfence_semaphore.c
cvs diff -r1.5 -r1.6 pkgsrc/x11/libxshmfence/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libxshmfence/Makefile 2016/05/04 02:43:31 1.5
+++ pkgsrc/x11/libxshmfence/Makefile 2016/05/04 02:54:46 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2016/05/04 02:43:31 tnn Exp $ 1# $NetBSD: Makefile,v 1.6 2016/05/04 02:54:46 tnn Exp $
2 2
3DISTNAME= libxshmfence-1.2 3DISTNAME= libxshmfence-1.2
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= http://xorg.freedesktop.org/archive/individual/lib/ 6MASTER_SITES= http://xorg.freedesktop.org/archive/individual/lib/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Shared memory 'SyncFence' synchronization primitive 11COMMENT= Shared memory 'SyncFence' synchronization primitive
12LICENSE= mit 12LICENSE= mit
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config autoconf automake autoreconf 16USE_TOOLS+= pkg-config autoconf automake autoreconf
17 17
cvs diff -r1.4 -r1.5 pkgsrc/x11/libxshmfence/files/xshmfence_semaphore.c (expand / switch to unified diff)

--- pkgsrc/x11/libxshmfence/files/xshmfence_semaphore.c 2016/05/04 02:48:27 1.4
+++ pkgsrc/x11/libxshmfence/files/xshmfence_semaphore.c 2016/05/04 02:54:46 1.5
@@ -154,27 +154,27 @@ xshmfence_init(int fd) @@ -154,27 +154,27 @@ xshmfence_init(int fd)
154 sem_t *lock; 154 sem_t *lock;
155 sem_t *cond; 155 sem_t *cond;
156 struct xshmfence f; 156 struct xshmfence f;
157 157
158 __sync_fetch_and_and(&f.refcnt, 0); 158 __sync_fetch_and_and(&f.refcnt, 0);
159 __sync_fetch_and_and(&f.triggered, 0); 159 __sync_fetch_and_and(&f.triggered, 0);
160 __sync_fetch_and_and(&f.waiting, 0); 160 __sync_fetch_and_and(&f.waiting, 0);
161  161
162 lock = mksemtemp(f.lockname, "/xshmfl-%i"); 162 lock = mksemtemp(f.lockname, "/xshmfl-%i");
163 if (lock == SEM_FAILED) { 163 if (lock == SEM_FAILED) {
164 err(EXIT_FAILURE, "xshmfence_init: sem_open"); 164 err(EXIT_FAILURE, "xshmfence_init: sem_open");
165 } 165 }
166 166
167 cond = mksemtemp(f.condname, "/xshmfl-%i"); 167 cond = mksemtemp(f.condname, "/xshmfc-%i");
168 if (cond == SEM_FAILED) { 168 if (cond == SEM_FAILED) {
169 err(EXIT_FAILURE, "xshmfence_init: sem_open"); 169 err(EXIT_FAILURE, "xshmfence_init: sem_open");
170 } 170 }
171  171
172 sem_close(lock); 172 sem_close(lock);
173 sem_close(cond); 173 sem_close(cond);
174  174
175 pwrite(fd, &f, sizeof(f), 0); 175 pwrite(fd, &f, sizeof(f), 0);
176} 176}
177 177
178/** 178/**
179 * xshmfence_open_semaphore: 179 * xshmfence_open_semaphore:
180 * @f: An X fence 180 * @f: An X fence