Merge pull request #24101 from yallop/ctypes-0.21.0

avsm · web-flow · commit 9f1b40aa26c7 · 2023-07-21T14:28:56.000+01:00
Add ctypes 0.21.1, ctypes-foreign 0.21.1
diff --git a/packages/binaryen_dsl/binaryen_dsl.0.7/opam b/packages/binaryen_dsl/binaryen_dsl.0.7/opam
@@ -15,7 +15,7 @@ depends: [
   "ocaml"
   "core" {< "v0.15"}
   "dune" {>= "2.8"}
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "libbinaryen" {< "102"}
 ]
 build: [
diff --git a/packages/ctypes-foreign/ctypes-foreign.0.21.1/opam b/packages/ctypes-foreign/ctypes-foreign.0.21.1/opam
@@ -0,0 +1,49 @@
+opam-version: "2.0"
+synopsis: "Dynamic access to foreign C libraries using Ctypes"
+description: """
+
+This installs the `ctypes-foreign` interface which
+uses `libffi` to provide dynamic access to foreign libraries."""
+maintainer: ["Jeremy Yallop <yallop@gmail.com>"]
+authors: ["Jeremy Yallop"]
+license: "MIT"
+tags: ["org:mirage"]
+homepage: "https://github.com/yallop/ocaml-ctypes"
+doc: "https://ocamllabs.github.io/ocaml-ctypes/"
+bug-reports: "https://github.com/yallop/ocaml-ctypes/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "ocaml" {>= "4.03.0"}
+  "integers" {with-test & >= "0.2.2"}
+  "ctypes" {= version}
+  "dune-configurator"
+  "conf-pkg-config"
+  "lwt" {with-test & >= "2.4.7"}
+  "ounit2" {with-test}
+  "conf-ncurses" {with-test}
+  "stdlib-shims" {with-test}
+  "conf-fts" {with-test & os != "win32"}
+  "conf-libffi" {>= "2.0.0"}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/yallop/ocaml-ctypes.git"
+url {
+  src: "https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.21.1.tar.gz"
+  checksum: "md5=8b201d932741c5096854e5eb39139b90"
+}
diff --git a/packages/ctypes/ctypes.0.21.1/opam b/packages/ctypes/ctypes.0.21.1/opam
@@ -0,0 +1,58 @@
+opam-version: "2.0"
+synopsis: "Combinators for binding to C libraries without writing any C"
+description: """
+
+ctypes is a library for binding to C libraries using pure OCaml. The primary
+aim is to make writing C extensions as straightforward as possible.
+The core of ctypes is a set of combinators for describing the structure of C
+types -- numeric types, arrays, pointers, structs, unions and functions. You
+can use these combinators to describe the types of the functions that you want
+to call, then bind directly to those functions -- all without writing or
+generating any C!
+
+To install the optional `ctypes-foreign` interface (which uses `libffi` to
+provide dynamic access to foreign libraries), you will need to also install
+the `ctypes-foreign` package.
+
+    opam install ctypes-foreign
+
+This will make the `ctypes-foreign` ocamlfind subpackage available."""
+maintainer: ["Jeremy Yallop <yallop@gmail.com>"]
+authors: ["Jeremy Yallop"]
+license: "MIT"
+tags: ["org:mirage"]
+homepage: "https://github.com/yallop/ocaml-ctypes"
+doc: "https://yallop.github.io/ocaml-ctypes/"
+bug-reports: "https://github.com/yallop/ocaml-ctypes/issues"
+depends: [
+  "dune" {>= "2.9"}
+  "ocaml" {>= "4.03.0"}
+  "integers"
+  "dune-configurator"
+  "bigarray-compat"
+  "ounit2" {with-test}
+  "conf-fts" {with-test & os != "win32"}
+  "conf-pkg-config" {with-test}
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
+dev-repo: "git+https://github.com/yallop/ocaml-ctypes.git"
+url {
+  src: "https://github.com/yallop/ocaml-ctypes/archive/refs/tags/0.21.1.tar.gz"
+  checksum: "md5=8b201d932741c5096854e5eb39139b90"
+}
diff --git a/packages/eigen/eigen.0.1.0/opam b/packages/eigen/eigen.0.1.0/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "4.02"}
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "dune" {>= "1.1.0"}
 ]
 available: arch = "x86_32" | arch = "x86_64"
diff --git a/packages/eigen/eigen.0.1.1/opam b/packages/eigen/eigen.0.1.1/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "4.02"}
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "dune" {>= "1.1.0"}
 ]
 available: arch = "x86_32" | arch = "x86_64"
diff --git a/packages/eigen/eigen.0.1.2/opam b/packages/eigen/eigen.0.1.2/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "4.02"}
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "dune" {>= "1.1.0"}
 ]
 available: arch = "x86_32" | arch = "x86_64"
diff --git a/packages/eigen/eigen.0.1.3/opam b/packages/eigen/eigen.0.1.3/opam
@@ -12,7 +12,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "4.02"}
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "dune" {>= "1.1.0"}
 ]
 available: arch = "x86_32" | arch = "x86_64"
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.3.2/opam b/packages/hacl-star-raw/hacl-star-raw.0.3.2/opam
@@ -13,7 +13,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"
 depends: [
   "ocaml" {>= "4.05.0"}
   "ocamlfind" {build}
-  "ctypes"
+  "ctypes" {< "0.21.0"}
   "ctypes-foreign"
   "conf-which" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.4.0/opam b/packages/hacl-star-raw/hacl-star-raw.0.4.0/opam
@@ -14,7 +14,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"
 depends: [
   "ocaml" { >= "4.08.0" }
   "ocamlfind" {build}
-  "ctypes" { >= "0.18.0" }
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "ctypes-foreign"
   "conf-which" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.4.1/opam b/packages/hacl-star-raw/hacl-star-raw.0.4.1/opam
@@ -14,7 +14,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"
 depends: [
   "ocaml" { >= "4.08.0" }
   "ocamlfind" {build}
-  "ctypes" { >= "0.18.0" }
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "ctypes-foreign"
   "conf-which" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.4.2/opam b/packages/hacl-star-raw/hacl-star-raw.0.4.2/opam
@@ -14,7 +14,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"
 depends: [
   "ocaml" { >= "4.08.0" }
   "ocamlfind" {build}
-  "ctypes" { >= "0.18.0" }
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "ctypes-foreign"
   "conf-which" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.4.3/opam b/packages/hacl-star-raw/hacl-star-raw.0.4.3/opam
@@ -14,7 +14,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"
 depends: [
   "ocaml" { >= "4.08.0" }
   "ocamlfind" {build}
-  "ctypes" { >= "0.18.0" }
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "ctypes-foreign"
   "conf-which" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.4.4/opam b/packages/hacl-star-raw/hacl-star-raw.0.4.4/opam
@@ -14,7 +14,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"
 depends: [
   "ocaml" { >= "4.08.0" }
   "ocamlfind" {build}
-  "ctypes" { >= "0.18.0" }
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
 ]
 conflicts: ["ocaml-option-bytecode-only"]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.4.5/opam b/packages/hacl-star-raw/hacl-star-raw.0.4.5/opam
@@ -14,7 +14,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"
 depends: [
   "ocaml" { >= "4.08.0" }
   "ocamlfind" {build}
-  "ctypes" { >= "0.18.0" }
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
 ]
 conflicts: ["ocaml-option-bytecode-only"]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.5.0/opam b/packages/hacl-star-raw/hacl-star-raw.0.5.0/opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
   "ocamlfind" {build}
-  "ctypes" {>= "0.18.0"}
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
   "conf-cmake" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.6.0/opam b/packages/hacl-star-raw/hacl-star-raw.0.6.0/opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
   "ocamlfind" {build}
-  "ctypes" {>= "0.18.0"}
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
   "conf-cmake" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.6.1/opam b/packages/hacl-star-raw/hacl-star-raw.0.6.1/opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
   "ocamlfind" {build}
-  "ctypes" {>= "0.18.0"}
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
   "conf-cmake" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.6.2/opam b/packages/hacl-star-raw/hacl-star-raw.0.6.2/opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
   "ocamlfind" {build}
-  "ctypes" {>= "0.18.0"}
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
   "conf-cmake" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.7.0/opam b/packages/hacl-star-raw/hacl-star-raw.0.7.0/opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
   "ocamlfind" {build}
-  "ctypes" {>= "0.18.0"}
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
   "conf-cmake" {build}
 ]
diff --git a/packages/hacl-star-raw/hacl-star-raw.0.7.1/opam b/packages/hacl-star-raw/hacl-star-raw.0.7.1/opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "1.2"}
   "ocamlfind" {build}
-  "ctypes" {>= "0.18.0"}
+  "ctypes" {>= "0.18.0" & < "0.21.0"}
   "conf-which" {build}
   "conf-cmake" {build}
 ]
diff --git a/packages/libudev/libudev.0.2.1/opam b/packages/libudev/libudev.0.2.1/opam
@@ -11,7 +11,7 @@ depends: [
   "ocamlbuild" {build}
   "topkg" {build & >= "0.9.0"}
   "conf-libudev"
-  "ctypes" {>= "0.4.1"}
+  "ctypes" {>= "0.4.1" & < "0.21.0"}
   "ctypes-foreign"
   "stdint"
 ]
diff --git a/packages/lz4/lz4.1.1.1/opam b/packages/lz4/lz4.1.1.1/opam
@@ -31,7 +31,7 @@ depends: [
   "base-bigarray"
   "ocamlfind" {build}
   "ocamlbuild" {build & != "0.9.0"}
-  "ctypes" {>= "0.4.1"}
+  "ctypes" {>= "0.4.1" & < "0.21.0"}
   "ounit" {with-test}
   "conf-liblz4"
 ]
diff --git a/packages/lz4/lz4.1.2.0/opam b/packages/lz4/lz4.1.2.0/opam
@@ -17,7 +17,7 @@ depends: [
   "ocaml" {>= "4.02"}
   "conf-liblz4"
   "dune" { >= "2.0" }
-  "ctypes" {>= "0.4.1"}
+  "ctypes" {>= "0.4.1" & < "0.21.0"}
   "ounit2" {with-test}
   "odoc" {with-doc}
 ]
diff --git a/packages/mariadb/mariadb.1.1.5/opam b/packages/mariadb/mariadb.1.1.5/opam
@@ -17,7 +17,7 @@ depends: [
   "ocaml" {>= "4.07.0" & < "5.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "ctypes" {>= "0.7.0"}
+  "ctypes" {>= "0.7.0" & < "0.21.0"}
   "conf-mariadb"
   "conf-gcc"
 ]
diff --git a/packages/mariadb/mariadb.1.1.6/opam b/packages/mariadb/mariadb.1.1.6/opam
@@ -17,7 +17,7 @@ depends: [
   "ocaml" {>= "4.07.0" & < "5.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
-  "ctypes" {>= "0.7.0"}
+  "ctypes" {>= "0.7.0" & < "0.21.0"}
   "conf-mariadb"
   "conf-gcc"
 ]
diff --git a/packages/memcpy/memcpy.0.2.1/opam b/packages/memcpy/memcpy.0.2.1/opam
@@ -12,7 +12,7 @@ install: [[make "install"]]
 remove: [["ocamlfind" "remove" "memcpy"]]
 depends: [
   "ocaml" {>= "4.01.0"}
-  "ctypes" {>= "0.12.0"}
+  "ctypes" {>= "0.12.0" & < "0.21.0"}
   "ounit" {with-test}
   "ocamlfind" {build}
   "ocamlbuild" {build}
diff --git a/packages/netlink/netlink.0.2.1/opam b/packages/netlink/netlink.0.2.1/opam
@@ -16,7 +16,7 @@ remove: [
 depends: [
   "ocaml" {< "5.0.0"}
   "ocamlfind"
-  "ctypes"
+  "ctypes" {< "0.21.0"}
   "ctypes-foreign"
   "ocamlbuild" {build}
 ]
diff --git a/packages/pci/pci.1.0.1/opam b/packages/pci/pci.1.0.1/opam
@@ -17,7 +17,7 @@ remove: [
 ]
 depends: [
   "ocaml" {>= "4.01.0" & < "5.0.0"}
-  "ctypes" {>= "0.4"}
+  "ctypes" {>= "0.4" & < "0.21.0"}
   "ocamlfind" {build}
 #  "ounit" {with-test}
   "ocamlbuild" {build}
diff --git a/packages/tgls/tgls.0.8.4/opam b/packages/tgls/tgls.0.8.4/opam
@@ -13,7 +13,7 @@ depends: [
   "ocamlbuild" {build}
   "topkg" {build}
   "base-bytes"
-  "ctypes" {>= "0.4.0"}
+  "ctypes" {>= "0.4.0" & < "0.21.0"}
   "ctypes-foreign"
   "tsdl" {with-test}
   "result" {with-test}
diff --git a/packages/tgls/tgls.0.8.5/opam b/packages/tgls/tgls.0.8.5/opam
@@ -13,7 +13,7 @@ depends: [
   "ocamlbuild" {build}
   "topkg" {build}
   "base-bytes"
-  "ctypes" {>= "0.4.0"}
+  "ctypes" {>= "0.4.0" & < "0.21.0"}
   "ctypes-foreign"
   "tsdl" {with-test}
   "result" {with-test}
diff --git a/packages/tgls/tgls.0.8.6/opam b/packages/tgls/tgls.0.8.6/opam
@@ -23,7 +23,7 @@ depends: [
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "topkg" {build & >= "1.0.3"}
-  "ctypes" {>= "0.4.0"}
+  "ctypes" {>= "0.4.0" & < "0.21.0"}
   "ctypes-foreign"
   "xmlm" {dev}
 ]
diff --git a/packages/tsdl/tsdl.0.9.7/opam b/packages/tsdl/tsdl.0.9.7/opam
@@ -14,7 +14,7 @@ depends: [
   "ocamlbuild" {build}
   "topkg" {build}
   "conf-sdl2"
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "ctypes-foreign" ]
 build: [[
   "ocaml" "pkg/pkg.ml" "build"
diff --git a/packages/tsdl/tsdl.0.9.8/opam b/packages/tsdl/tsdl.0.9.8/opam
@@ -14,7 +14,7 @@ depends: [
   "ocamlbuild" {build}
   "topkg" {build & >= "1.0.1"}
   "conf-sdl2"
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "ctypes-foreign" ]
 build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]]
 
diff --git a/packages/tsdl/tsdl.0.9.9/opam b/packages/tsdl/tsdl.0.9.9/opam
@@ -34,7 +34,7 @@ depends: [
   "ocamlbuild" {build}
   "topkg" {build & >= "1.0.3"}
   "conf-sdl2"
-  "ctypes" {>= "0.14.0"}
+  "ctypes" {>= "0.14.0" & < "0.21.0"}
   "ctypes-foreign"
 ]
 build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"]
diff --git a/packages/unix-errno/unix-errno.0.6.0/opam b/packages/unix-errno/unix-errno.0.6.0/opam
diff --git a/packages/unix-errno/unix-errno.0.6.1/opam b/packages/unix-errno/unix-errno.0.6.1/opam
diff --git a/packages/zstd/zstd.0.3/opam b/packages/zstd/zstd.0.3/opam

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ depends: [`
`15`	`15`	`"ocaml"`
`16`	`16`	`"core" {< "v0.15"}`
`17`	`17`	`"dune" {>= "2.8"}`
`18`		`- "ctypes" {>= "0.14.0"}`
	`18`	`+ "ctypes" {>= "0.14.0" & < "0.21.0"}`
`19`	`19`	`"libbinaryen" {< "102"}`
`20`	`20`	`]`
`21`	`21`	`build: [`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ build: [`
`12`	`12`	`]`
`13`	`13`	`depends: [`
`14`	`14`	`"ocaml" {>= "4.02"}`
`15`		`- "ctypes" {>= "0.14.0"}`
	`15`	`+ "ctypes" {>= "0.14.0" & < "0.21.0"}`
`16`	`16`	`"dune" {>= "1.1.0"}`
`17`	`17`	`]`
`18`	`18`	`available: arch = "x86_32" \| arch = "x86_64"`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"`
`13`	`13`	`depends: [`
`14`	`14`	`"ocaml" {>= "4.05.0"}`
`15`	`15`	`"ocamlfind" {build}`
`16`		`- "ctypes"`
	`16`	`+ "ctypes" {< "0.21.0"}`
`17`	`17`	`"ctypes-foreign"`
`18`	`18`	`"conf-which" {build}`
`19`	`19`	`]`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ bug-reports: "https://github.com/hacl-star/hacl-star/issues"`
`14`	`14`	`depends: [`
`15`	`15`	`"ocaml" { >= "4.08.0" }`
`16`	`16`	`"ocamlfind" {build}`
`17`		`- "ctypes" { >= "0.18.0" }`
	`17`	`+ "ctypes" {>= "0.18.0" & < "0.21.0"}`
`18`	`18`	`"ctypes-foreign"`
`19`	`19`	`"conf-which" {build}`
`20`	`20`	`]`