From nobody Sun Dec 26 17:10:46 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A0CE11927A5B; Sun, 26 Dec 2021 17:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMS462t4wz3GD5; Sun, 26 Dec 2021 17:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4320C63D1; Sun, 26 Dec 2021 17:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BQHAkrw049659; Sun, 26 Dec 2021 17:10:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BQHAkBD049658; Sun, 26 Dec 2021 17:10:46 GMT (envelope-from git) Date: Sun, 26 Dec 2021 17:10:46 GMT Message-Id: <202112261710.1BQHAkBD049658@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: c5812b6f2c3d - main - devel/sdl20: replace 571ee96df4f6 with upstream fix List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5812b6f2c3d9f1dde4d3a7077cc60adca38bd3a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640538646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PrgjdrZs9IRjo0OG7oi2f/Hc0wLzpNfbp5sX3l3sumc=; b=FlvbOnperF0/paHOEAuosXbL5ymmUMg98RJAuJX/UAhn1SlfrZZqfZa7RnMIR7q7/rPe9I PNVmDFFALMFTKMDKx9xH4/SUU5ThlwNms7sQwgS2hTsrEkRQFycigDhk7IAtYqKGPmCTFL cdpORTkUazA09rXFXbgIWUGSIMoYVp5LZeeX6EqJy3WdgcZf3Y1kw3mZlUdCmgKt/od0p4 wE2i7ISjpFB7yqNTXbApj2Hwzu7dx4veN5sO63x5Pukru68UUSUu7ohkQmBxn1/8MdCWgs Th1wk/aDZKv1pkuiX3rh/5uicaT8V/kOJ21KccM0hus+wipG89e+ljNZynsO3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640538646; a=rsa-sha256; cv=none; b=nP0FdEZIDNpSUHG48+jVhmXAiCEq99jcYBB81ck+Bm6HNjkYho/HtMagXCXQugEGFDXShQ quWChelj9q1KlMHs6wDrlykWRaO1Tqtb53qjbl5Yio/aWcm2F6ZuHD+d+nzIYYy4JaRsZw EXJXLMTKOFa5QpbH+kO/6AYXNJ6LqXx1jeIGcA9JqEgPXkbfquMYLzjR8dHnM6xuUEwgDf E6V1tV4neddCqWetDNuHhJJtGfgEPrLXDGiPv+JgF6b37uggAFy2ceYOZBAo9t2rkWumLR NQq80W3iOuTW9HopK1DrIHTFr894kd0LYEWAGD/hE/sHOYjQ8ys/FQVljHTepg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5812b6f2c3d9f1dde4d3a7077cc60adca38bd3a commit c5812b6f2c3d9f1dde4d3a7077cc60adca38bd3a Author: Jan Beich AuthorDate: 2021-12-26 16:04:45 +0000 Commit: Jan Beich CommitDate: 2021-12-26 17:09:28 +0000 devel/sdl20: replace 571ee96df4f6 with upstream fix --- devel/sdl20/files/patch-wayland-1.20 | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/devel/sdl20/files/patch-wayland-1.20 b/devel/sdl20/files/patch-wayland-1.20 index bd219dccc701..724894a1b714 100644 --- a/devel/sdl20/files/patch-wayland-1.20 +++ b/devel/sdl20/files/patch-wayland-1.20 @@ -1,3 +1,5 @@ +https://github.com/libsdl-org/sdl/commit/e2ade2bfc46d + ld: error: undefined symbol: wl_proxy_marshal_flags >>> referenced by SDL_waylanddatamanager.c >>> build/.libs/SDL_waylanddatamanager.o:(Wayland_data_source_destroy) @@ -9,21 +11,25 @@ ld: error: undefined symbol: wl_proxy_marshal_flags --- src/video/wayland/SDL_waylanddyn.h.orig 2020-03-11 01:36:18 UTC +++ src/video/wayland/SDL_waylanddyn.h -@@ -75,6 +75,7 @@ void SDL_WAYLAND_UnloadSymbols(void); +@@ -75,6 +75,8 @@ void SDL_WAYLAND_UnloadSymbols(void); #define wl_proxy_create (*WAYLAND_wl_proxy_create) #define wl_proxy_destroy (*WAYLAND_wl_proxy_destroy) #define wl_proxy_marshal (*WAYLAND_wl_proxy_marshal) +#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags) ++#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags) #define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data) #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) #define wl_proxy_get_version (*WAYLAND_wl_proxy_get_version) --- src/video/wayland/SDL_waylandsym.h.orig 2020-03-11 01:36:18 UTC +++ src/video/wayland/SDL_waylandsym.h -@@ -35,6 +35,7 @@ +@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_co + SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) + SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) - SDL_WAYLAND_MODULE(WAYLAND_CLIENT) - SDL_WAYLAND_SYM(void, wl_proxy_marshal, (struct wl_proxy *, uint32_t, ...)) -+SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_flags, (struct wl_proxy *, uint32_t, const struct wl_interface *, uint32_t, uint32_t, ...)) - SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_create, (struct wl_proxy *, const struct wl_interface *)) - SDL_WAYLAND_SYM(void, wl_proxy_destroy, (struct wl_proxy *)) - SDL_WAYLAND_SYM(int, wl_proxy_add_listener, (struct wl_proxy *, void (**)(void), void *)) ++SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20) ++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) ++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) ++ + SDL_WAYLAND_INTERFACE(wl_seat_interface) + SDL_WAYLAND_INTERFACE(wl_surface_interface) + SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)