From nobody Mon Mar 28 09:32:46 2022 X-Original-To: dev-commits-ports-all@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 DA9151A47993; Mon, 28 Mar 2022 09:32: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 4KRnYB5ns7z3GcL; Mon, 28 Mar 2022 09:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648459966; 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=4P2aiJ+JDPvsIGb3Aaxr174nFoe6aqHsYYrke+Ur9do=; b=LQobrVKGCvbCdr9VlRO1SNneLiIEoL2T2Qm/gLNUkDrpnFtaVxypR6NckAXyNAdvSZU142 FctbCwzn6I1GHXZkkB1k4K8Flf8Jj4rWzJyqgz3fmA+qpKyjZE8WVNakGySowxBmolkUDS 4BwiNdCKz4t9bWviGjbJul+quqifgRjVaeCZKj1rSAG+fNxkmfVlGXwKa3tB1b7HIY9hiR dy8obdQ3uFVRg3uye59+I4oXjWbDE2rac9VNTDJXst+uWJI7SjyZLY+AOsQcQk1BihJMGy I/jnSZNyByJjOxoAIAiMWoGdSSiwfGm3kdg23Tfii744wJual4nidofqGjLfpw== 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 A6A0527165; Mon, 28 Mar 2022 09:32: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 22S9WkJT014071; Mon, 28 Mar 2022 09:32:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S9WkAl014070; Mon, 28 Mar 2022 09:32:46 GMT (envelope-from git) Date: Mon, 28 Mar 2022 09:32:46 GMT Message-Id: <202203280932.22S9WkAl014070@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3ed4568443a3 - main - devel/ocaml-sdl: unbreak the bytecode build and against OCaml 4.06+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ed4568443a36ecfca7ddddcad9b76e656f0bc58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648459966; 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=4P2aiJ+JDPvsIGb3Aaxr174nFoe6aqHsYYrke+Ur9do=; b=qfF5N/HiG6u7xxTMQdhS5wuTDbnlH0cf36ZsFnVBoBYDssTgDYsVmkpL7mEi2lv2MySzFw bqMg4qUiT6Ka0uPqF4bWcD4itFjDaSOkzK6CfD7sYZsVnvsfE76mbnQheVrgZiuu4IPYVD vwEISpsXMd58X6sAbKCvce/bsVLwmXb4FVsWben6Zgs+LQzTmsuLPiRkq/n3LyIEpYZYYi S+SPqCbMpec3EcaejWXV7gbxuJjdknUrtXk6dBfl74qyRalQbob1ytoMk1rOKXQadx9tHx QPxR25uMLeFDdt7Qdxw6LIfUPljA10OPT6NHUHmvgqOrgtHOSiwIeRdQknqmWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648459966; a=rsa-sha256; cv=none; b=gGnW7iB7ZihxxM/6IlWFoWhjjgq8rJS9iPxzMrtAbjZA+WAr5AwrIXF56j2AXG9wFZ//Lj cdyzWX2nOnHE2heSLYJNsvXhWkF/NQ1B5KVumtin44EU/VnitUz0f4aTiB54ez2hW7jX2T lygTW/84BlDj5R5QF9VmoV4aq50Rll8SxiHt+QLNJBpJ7phf7WJ+POdcUoq6jvKrcU08EE iwd93Wq01Cf6k/hFX+qWzs9AP9EyLS29TUa6baMXAwfn4DI1s0OMEvIumCf3CO4GF16QfH uzGsm2156pRgSo/lKWudMSbv2E5E3F0fYIXyidAJi8uo7t8FgO4GxrOl/+JI/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ed4568443a36ecfca7ddddcad9b76e656f0bc58 commit 3ed4568443a36ecfca7ddddcad9b76e656f0bc58 Author: Alexey Dokuchaev AuthorDate: 2022-03-28 09:32:12 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-03-28 09:32:12 +0000 devel/ocaml-sdl: unbreak the bytecode build and against OCaml 4.06+ Obtained from: Debian --- devel/ocaml-sdl/files/patch-src_Makefile | 20 ++++++++++++++++++++ devel/ocaml-sdl/files/patch-src_sdlmouse.ml | 17 +++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/devel/ocaml-sdl/files/patch-src_Makefile b/devel/ocaml-sdl/files/patch-src_Makefile new file mode 100644 index 000000000000..f6c2d2063533 --- /dev/null +++ b/devel/ocaml-sdl/files/patch-src_Makefile @@ -0,0 +1,20 @@ +--- src/Makefile.orig 2010-04-19 20:11:04 UTC ++++ src/Makefile +@@ -17,7 +17,7 @@ gfx_MODULES = sdlgfx + + TARGETS = sdl.cma $(patsubst %,sdl%.cma,$(PARTS)) + TARGETS += libsdlstub.$(A) $(patsubst %,libsdl%stub.$(A),$(PARTS)) +-ifdef OCAMLOPT ++ifneq ($(OCAMLOPT),no) + TARGETS += sdl.cmxa $(patsubst %,sdl%.cmxa,$(PARTS)) + endif + +@@ -87,7 +87,7 @@ ifdef OCAMLFIND + install-findlib : + $(OCAMLFIND) install sdl ../META \ + *.cma lib*.$(A) *.cmi *.mli \ +- $(if $(OCAMLOPT),*.cmxa sdl*.$(A) *.cmx) \ ++ $(if $(filter-out no,$(OCAMLOPT)),*.cmxa sdl*.$(A) *.cmx) \ + $(if $(OCAMLMKLIB),dll*.so) + ifeq ($(PLATFORM),Apple) + $(RANLIB) $$($(OCAMLFIND) printconf destdir)/sdl/*.$(A) diff --git a/devel/ocaml-sdl/files/patch-src_sdlmouse.ml b/devel/ocaml-sdl/files/patch-src_sdlmouse.ml new file mode 100644 index 000000000000..1690b0937f93 --- /dev/null +++ b/devel/ocaml-sdl/files/patch-src_sdlmouse.ml @@ -0,0 +1,17 @@ +--- src/sdlmouse.ml.orig 2011-04-10 15:33:52 UTC ++++ src/sdlmouse.ml +@@ -49,12 +49,12 @@ external cursor_data : cursor -> cursor_data + = "ml_SDL_Cursor_data" + + let string_of_bits x = +- let s = String.make 8 ' ' in ++ let s = Bytes.make 8 ' ' in + for i=0 to 7 do + if x land (1 lsl i) <> 0 + then s.[7-i] <- '@' + done ; +- s ++ Bytes.to_string s + + let pprint_cursor c = + let { data = data ; mask = mask } = cursor_data c in