[pkgsrc/trunk]: pkgsrc/devel/wayland wayland: Simplify patches.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/wayland wayland: Simplify patches.
From: nia <nia%pkgsrc.org@localhost>
Date: Mon, 06 Jan 2020 23:30:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1561cd25d91
branches:  trunk
changeset: 346963:d1561cd25d91
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jan 05 19:30:48 2020 +0000

description:
wayland: Simplify patches.

Bump PKGREVISION

diffstat:

 devel/wayland/Makefile                                |   17 +-
 devel/wayland/distinfo                                |   30 +--
 devel/wayland/patches/patch-Makefile.am               |    6 +-
 devel/wayland/patches/patch-configure.ac              |   32 +----
 devel/wayland/patches/patch-cursor_os-compatibility.c |    6 +-
 devel/wayland/patches/patch-cursor_wayland-cursor.c   |    5 +-
 devel/wayland/patches/patch-src_event-loop.c          |   20 +--
 devel/wayland/patches/patch-src_wayland-os.c          |   89 +------------
 devel/wayland/patches/patch-src_wayland-os.h          |   20 +--
 devel/wayland/patches/patch-src_wayland-server.c      |   52 +++-----
 devel/wayland/patches/patch-src_wayland-shm.c         |    4 +-
 devel/wayland/patches/patch-tests_client-test.c       |   23 ---
 devel/wayland/patches/patch-tests_connection-test.c   |   33 -----
 devel/wayland/patches/patch-tests_event-loop-test.c   |   44 ------
 devel/wayland/patches/patch-tests_os-wrappers-test.c  |  114 +----------------
 devel/wayland/patches/patch-tests_queue-test.c        |   25 ---
 devel/wayland/patches/patch-tests_sanity-test.c       |   27 ----
 devel/wayland/patches/patch-tests_test-helpers.c      |   56 --------
 devel/wayland/patches/patch-tests_test-runner.c       |  100 ++-------------
 19 files changed, 101 insertions(+), 602 deletions(-)

diffs (truncated from 1058 to 300 lines):

diff -r 84501da1172c -r d1561cd25d91 devel/wayland/Makefile
--- a/devel/wayland/Makefile    Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/Makefile    Sun Jan 05 19:30:48 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/09/09 20:26:58 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/05 19:30:48 nia Exp $
 
 DISTNAME=      wayland-1.17.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  https://wayland.freedesktop.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -11,10 +11,14 @@
 COMMENT=       Display server protocol - development libraries
 LICENSE=       mit
 
-USE_TOOLS+=            autoconf automake autoreconf gmake pkg-config
-USE_LANGUAGES+=                c c++
-GNU_CONFIGURE=         YES
-USE_LIBTOOL=           YES
+GNU_CONFIGURE= YES
+USE_LIBTOOL=   YES
+
+USE_TOOLS+=    autoconf automake autoreconf
+USE_TOOLS+=    gmake pkg-config
+
+USE_LANGUAGES= c c++
+
 CONFIGURE_ARGS+=       --disable-documentation
 
 PKGCONFIG_OVERRIDE+=   src/wayland-client.pc.in
@@ -27,6 +31,7 @@
        ${CP} ${FILESDIR}/event-loop-kqueue.c ${WRKSRC}/src
        cd ${WRKSRC} && autoreconf -fvi
 
+.include "platform.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
diff -r 84501da1172c -r d1561cd25d91 devel/wayland/distinfo
--- a/devel/wayland/distinfo    Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/distinfo    Sun Jan 05 19:30:48 2020 +0000
@@ -1,23 +1,17 @@
-$NetBSD: distinfo,v 1.6 2019/09/09 20:26:58 nia Exp $
+$NetBSD: distinfo,v 1.7 2020/01/05 19:30:48 nia Exp $
 
 SHA1 (wayland-1.17.0.tar.xz) = 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600
 RMD160 (wayland-1.17.0.tar.xz) = 635494fb0f5d9eb1e782f98e08c3e0e26ff44268
 SHA512 (wayland-1.17.0.tar.xz) = c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
 Size (wayland-1.17.0.tar.xz) = 437680 bytes
-SHA1 (patch-Makefile.am) = af2c47eb2e1a4924ea842aeea1d0f00832762ec0
-SHA1 (patch-configure.ac) = df15013a1639d673e5f0a86433a074f6201dbbc4
-SHA1 (patch-cursor_os-compatibility.c) = 9aac1c734199bc7e33e7735356bc8dbc80fba89d
-SHA1 (patch-cursor_wayland-cursor.c) = 81c6896b3a541e662db440d8557c6b3e70fcb580
-SHA1 (patch-src_event-loop.c) = 04d0eed4ba0708518201ec630dab97d52735fb0c
-SHA1 (patch-src_wayland-os.c) = 7297f8259aea9603a7ba20fe58f79e3fd0042990
-SHA1 (patch-src_wayland-os.h) = 1e01dfadb5ed5889d76e024d30537935f33631a3
-SHA1 (patch-src_wayland-server.c) = 335de8f5390eb337dfbde26f523162bd44c06baf
-SHA1 (patch-src_wayland-shm.c) = 694232eac180f1a6a31c96f9ac98cb0b5a016d20
-SHA1 (patch-tests_client-test.c) = 6ffe18dfd64176a92f6f795eb757c54a3cf0ad10
-SHA1 (patch-tests_connection-test.c) = af53116c99cbb8d6570bcec66bfd895c1ae01700
-SHA1 (patch-tests_event-loop-test.c) = 79909fdce7b73a7b19c58d3711329f6288fe7204
-SHA1 (patch-tests_os-wrappers-test.c) = 9d154702d0b0238cba554df18e5dbdc620bd9ab8
-SHA1 (patch-tests_queue-test.c) = 3ee8433faa50b033ab880d3c5b6a9846063d6bd6
-SHA1 (patch-tests_sanity-test.c) = 80e06834ccf344fda16a6a8f85e062f2b4a744ec
-SHA1 (patch-tests_test-helpers.c) = 1895c0bdadefdaeaa421e7051b71a297b3a5e2c3
-SHA1 (patch-tests_test-runner.c) = 35d911064c1b65537ef2276797b8041fd6b023f7
+SHA1 (patch-Makefile.am) = cfdf21bb32743590f88b6ab13ca00335f4e30475
+SHA1 (patch-configure.ac) = 57a86b0f77062d475e92123199ee61c0ac6d2443
+SHA1 (patch-cursor_os-compatibility.c) = 04bc63b40ba882dbc6babe8dca9d1619107fafb9
+SHA1 (patch-cursor_wayland-cursor.c) = 6dcb4bd2d241527e9ee62fb6ddad6447cc379ba8
+SHA1 (patch-src_event-loop.c) = 84128ea7ac073acc65d8ae2e6f4ea93f3c5fe9ec
+SHA1 (patch-src_wayland-os.c) = eb51bf1dc539926a14848097d04bb762cf1fe962
+SHA1 (patch-src_wayland-os.h) = d07a731f081c1600c3041cc1349120031d28337f
+SHA1 (patch-src_wayland-server.c) = 25c884c08a229f2e5fe56e4b864a68ffcce2eda5
+SHA1 (patch-src_wayland-shm.c) = 8a2e5ae22bc400cd2c5c9dec421d536229b2943f
+SHA1 (patch-tests_os-wrappers-test.c) = a17a2e3cbab039becc8c4cb2f1be379b3bffba0e
+SHA1 (patch-tests_test-runner.c) = e97cfc48340b0de1c2642cb7cc48d9acf0a533eb
diff -r 84501da1172c -r d1561cd25d91 devel/wayland/patches/patch-Makefile.am
--- a/devel/wayland/patches/patch-Makefile.am   Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/patches/patch-Makefile.am   Sun Jan 05 19:30:48 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.am,v 1.1 2019/08/18 16:05:12 nia Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2020/01/05 19:30:48 nia Exp $
 
 https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
 
@@ -9,8 +9,8 @@
        src/wayland-server.c                    \
        src/wayland-shm.c                       \
 -      src/event-loop.c
-+      src/event-loop.c                        \
-+      src/event-loop-kqueue.c 
++      src/event-loop.c                        \
++      src/event-loop-kqueue.c
  
  nodist_libwayland_server_la_SOURCES =         \
        protocol/wayland-server-protocol.h      \
diff -r 84501da1172c -r d1561cd25d91 devel/wayland/patches/patch-configure.ac
--- a/devel/wayland/patches/patch-configure.ac  Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/patches/patch-configure.ac  Sun Jan 05 19:30:48 2020 +0000
@@ -1,41 +1,28 @@
-$NetBSD: patch-configure.ac,v 1.1 2019/08/18 16:05:12 nia Exp $
-
-BSD support from FreeBSD
+$NetBSD: patch-configure.ac,v 1.2 2020/01/05 19:30:48 nia Exp $
 
 https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
 
 --- configure.ac.orig  2019-03-21 00:55:25.000000000 +0000
 +++ configure.ac
-@@ -65,6 +65,28 @@ AC_SUBST(GCC_CFLAGS)
+@@ -65,6 +65,17 @@ AC_SUBST(GCC_CFLAGS)
  AC_CHECK_HEADERS([sys/prctl.h])
  AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate prctl])
  
-+
 +AC_CHECK_HEADERS([sys/epoll.h sys/event.h])
 +if test "x$ac_cv_header_sys_epoll_h" != "xyes" && test "x$ac_cv_header_sys_event_h" != "xyes"; then
 +      AC_MSG_ERROR([Can't find sys/epoll.h or sys/event.h. Please ensure either epoll or kqueue is available.])
 +fi
 +
-+AC_CHECK_HEADERS([sys/signalfd.h sys/timerfd.h])
-+
-+# Credential support on FreeBSD
 +AC_CHECK_HEADERS([sys/ucred.h])
 +
 +# dlopen()
 +AC_CHECK_LIB([dl], [dlsym], [DL_LIBS=-ldl])
 +AC_SUBST([DL_LIBS])
 +
-+# Defines __FreeBSD__ if we're on FreeBSD
-+AC_CHECK_HEADERS([sys/param.h])
-+
-+# waitid() and signal.h are needed for the test suite.
-+AC_CHECK_FUNCS([waitid])
-+AC_CHECK_HEADERS([signal.h])
-+
  AC_ARG_ENABLE([libraries],
              [AC_HELP_STRING([--disable-libraries],
                              [Disable compilation of wayland libraries])],
-@@ -100,17 +122,23 @@ AC_SUBST([ICONDIR])
+@@ -100,12 +111,14 @@ AC_SUBST([ICONDIR])
  
  if test "x$enable_libraries" = "xyes"; then
        PKG_CHECK_MODULES(FFI, [libffi])
@@ -45,23 +32,14 @@
 -      AC_CHECK_DECL(TFD_CLOEXEC,[],
 -                    [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland libraries")],
 -                    [[#include <sys/timerfd.h>]])
-+dnl convert SFD_CLOEXEC and TFD_CLOEXEC to warning while figuring out how to do this.
 +      if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then
 +              AC_CHECK_DECL(SFD_CLOEXEC,[],
-+                            [AC_MSG_WARN("SFD_CLOEXEC is needed to compile wayland libraries")],
++                            [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland libraries")],
 +                            [[#include <sys/signalfd.h>]])
 +              AC_CHECK_DECL(TFD_CLOEXEC,[],
-+                            [AC_MSG_WARN("TFD_CLOEXEC is needed to compile wayland libraries")],
++                            [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland libraries")],
 +                            [[#include <sys/timerfd.h>]])
 +      fi
        AC_CHECK_DECL(CLOCK_MONOTONIC,[],
                      [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland libraries")],
                      [[#include <time.h>]])
- fi
- 
-+EPOLLSHIM_LIBS="-lepoll-shim"
-+AC_SUBST(EPOLLSHIM_LIBS)
-+
- PKG_CHECK_MODULES(EXPAT, [expat])
- 
- AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
diff -r 84501da1172c -r d1561cd25d91 devel/wayland/patches/patch-cursor_os-compatibility.c
--- a/devel/wayland/patches/patch-cursor_os-compatibility.c     Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/patches/patch-cursor_os-compatibility.c     Sun Jan 05 19:30:48 2020 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-cursor_os-compatibility.c,v 1.1 2019/08/19 12:50:23 nia Exp $
+$NetBSD: patch-cursor_os-compatibility.c,v 1.2 2020/01/05 19:30:48 nia Exp $
 
-fallocate is currently a no-op on NetBSD.
-Make sure ftruncate is used instead.
+NetBSD support: no filesystems currently support posix_fallocate,
+so it always fails
 
 --- cursor/os-compatibility.c.orig     2019-03-21 00:55:25.000000000 +0000
 +++ cursor/os-compatibility.c
diff -r 84501da1172c -r d1561cd25d91 devel/wayland/patches/patch-cursor_wayland-cursor.c
--- a/devel/wayland/patches/patch-cursor_wayland-cursor.c       Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/patches/patch-cursor_wayland-cursor.c       Sun Jan 05 19:30:48 2020 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-cursor_wayland-cursor.c,v 1.1 2019/09/09 20:08:29 nia Exp $
+$NetBSD: patch-cursor_wayland-cursor.c,v 1.2 2020/01/05 19:30:48 nia Exp $
 
-fallocate is currently a no-op on NetBSD.
+NetBSD support: no filesystems currently support posix_fallocate,
+so it always fails
 
 --- cursor/wayland-cursor.c.orig       2019-03-21 00:55:25.000000000 +0000
 +++ cursor/wayland-cursor.c
diff -r 84501da1172c -r d1561cd25d91 devel/wayland/patches/patch-src_event-loop.c
--- a/devel/wayland/patches/patch-src_event-loop.c      Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/patches/patch-src_event-loop.c      Sun Jan 05 19:30:48 2020 +0000
@@ -1,31 +1,19 @@
-$NetBSD: patch-src_event-loop.c,v 1.1 2019/08/18 16:05:12 nia Exp $
+$NetBSD: patch-src_event-loop.c,v 1.2 2020/01/05 19:30:48 nia Exp $
 
 https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
 
 --- src/event-loop.c.orig      2019-03-21 00:55:25.000000000 +0000
 +++ src/event-loop.c
-@@ -22,7 +22,8 @@
-  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+@@ -23,6 +23,8 @@
   * SOFTWARE.
   */
--
+ 
 +#include "config.h"
 +#ifdef HAVE_SYS_EPOLL_H
  #include <stddef.h>
  #include <stdio.h>
  #include <errno.h>
-@@ -35,9 +36,9 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/epoll.h>
-+#include <unistd.h>
- #include <sys/signalfd.h>
- #include <sys/timerfd.h>
--#include <unistd.h>
- #include "wayland-util.h"
- #include "wayland-private.h"
- #include "wayland-server-core.h"
-@@ -702,3 +703,4 @@ wl_event_loop_get_destroy_listener(struc
+@@ -702,3 +704,4 @@ wl_event_loop_get_destroy_listener(struc
  {
        return wl_signal_get(&loop->destroy_signal, notify);
  }
diff -r 84501da1172c -r d1561cd25d91 devel/wayland/patches/patch-src_wayland-os.c
--- a/devel/wayland/patches/patch-src_wayland-os.c      Sun Jan 05 19:24:40 2020 +0000
+++ b/devel/wayland/patches/patch-src_wayland-os.c      Sun Jan 05 19:30:48 2020 +0000
@@ -1,96 +1,29 @@
-$NetBSD: patch-src_wayland-os.c,v 1.2 2019/08/28 10:35:40 nia Exp $
-
-BSD support from FreeBSD
+$NetBSD: patch-src_wayland-os.c,v 1.3 2020/01/05 19:30:48 nia Exp $
 
 https://lists.freedesktop.org/archives/wayland-devel/2019-February/040024.html
 
 --- src/wayland-os.c.orig      2019-03-21 00:55:25.000000000 +0000
 +++ src/wayland-os.c
-@@ -25,14 +25,20 @@
- 
- #define _GNU_SOURCE
- 
-+#include "../config.h"
-+
- #include <sys/types.h>
- #include <sys/socket.h>
+@@ -30,9 +30,17 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <errno.h>
+-#include <sys/epoll.h>
+ 
+ #include "../config.h"
++
 +#ifdef HAVE_SYS_EPOLL_H
- #include <sys/epoll.h>
++#include <sys/epoll.h>
 +#endif
++
 +#ifdef HAVE_SYS_EVENT_H
 +#include <sys/event.h>
 +#endif
- 
--#include "../config.h"
++
  #include "wayland-os.h"
  
  static int
-@@ -62,26 +68,50 @@ wl_os_socket_cloexec(int domain, int typ
- {
-       int fd;
- 
-+#ifdef SOCK_CLOEXEC
-       fd = socket(domain, type | SOCK_CLOEXEC, protocol);
-       if (fd >= 0)
-               return fd;
-       if (errno != EINVAL)
-               return -1;
-+#endif
- 
-       fd = socket(domain, type, protocol);
-       return set_cloexec_or_close(fd);
- }
- 
- int
-+wl_os_socketpair_cloexec(int domain, int type, int protocol, int sv[2])
Prev by Date: [pkgsrc/trunk]: pkgsrc/www *** empty log message ***
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Removed www/wml
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www *** empty log message ***
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Removed www/wml
Indexes:
Home | Main Index | Thread Index | Old Index