Skip to content

Commit

Permalink
Merge pull request ocaml#25506 from Leonidas-from-XIV/conf-lablgl
Browse files Browse the repository at this point in the history
Create `conf-*` packages for OpenGL related system libraries
  • Loading branch information
mseri authored Mar 15, 2024
2 parents 232366c + 45c03ce commit ac9a846
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 35 deletions.
22 changes: 22 additions & 0 deletions packages/conf-freeglut/conf-freeglut.1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
opam-version: "2.0"
maintainer: "Marek Kubica <marek@xivilization.net>"
authors: ["Pawel W. Olszta" "Andreas Umbach" "Steve Baker" "John F. Fay" "John Tsiombikas" "Diederick C. Niehorster"]
homepage: "https://freeglut.sourceforge.net/"
license: "X11"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
build: [
["pkg-config" "--exists" "glut"] {os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}
]
depends: [
"conf-pkg-config" {build & os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}
]
depexts: [
["freeglut3-dev"] {os-family = "debian" | os-family = "ubuntu"}
["freeglut-dev"] {os-distribution = "alpine"}
["freeglut-devel"] {os-distribution = "centos" | os-distribution = "fedora" | os-distribution = "ol"}
["freeglut-devel"] {os-family = "suse" | os-family = "opensuse"}
["freeglut"] {os-family = "arch"}
["freeglut"] {os = "freebsd"}
]
synopsis: "Virtual package relying on a FreeGLUT system installation"
flags: conf
21 changes: 21 additions & 0 deletions packages/conf-libgl/conf-libgl.1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
opam-version: "2.0"
maintainer: "Marek Kubica <marek@xivilization.net>"
authors: ["ARB"]
homepage: "https://www.khronos.org/opengl"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
build: [
["pkg-config" "--exists" "gl"] {os-distribution != "debian"}
]
depends: [
"conf-pkg-config" {build & os-distribution != "debian"}
]
depexts: [
["mesa-common-dev"] {os-family = "debian" | os-family = "ubuntu"}
["mesa-libGL-devel"] {os-distribution = "fedora" | os-distribution = "ol"}
["Mesa-libGL-devel"] {os-family = "suse" | os-family = "opensuse"}
["mesa-dev"] {os-distribution = "alpine"}
["libgl"] {os-family = "arch"}
["libglvnd"] {os = "freebsd"}
]
synopsis: "Virtual package relying on a OpenGL system installation"
flags: conf
22 changes: 22 additions & 0 deletions packages/conf-libglu/conf-libglu.1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
opam-version: "2.0"
maintainer: "Marek Kubica <marek@xivilization.net>"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
authors: ["Brian Paul"]
homepage: "https://mesa3d.org/"
license: "SGI-B-2.0"
build: [
["pkg-config" "--exists" "glu"] {os-distribution != "ubuntu"}
]
depends: [
"conf-pkg-config" {build & os-distribution != "ubuntu"}
]
depexts: [
["libglu1-mesa-dev"] {os-family = "debian" | os-family = "ubuntu"}
["mesa-libGLU-devel"] {os-distribution = "fedora" | os-distribution = "ol"}
["glu-devel"] {os-family = "suse" | os-family = "opensuse"}
["glu"] {os-family = "arch"}
["glu-dev"] {os-distribution = "alpine"}
["libGLU"] {os = "freebsd"}
]
synopsis: "Virtual package relying on a libGLU system installation"
flags: conf
12 changes: 8 additions & 4 deletions packages/lablgl/lablgl.1.04.20120306/opam
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
opam-version: "2.0"
maintainer: "https://github.com/ocaml/opam-repository/issues"
authors: ["Jacques Garrigue et al., Nagoya University"]
homepage: "https://github.com/garrigue/lablgl"
bug-reports: "https://github.com/garrigue/lablgl/issues"
dev-repo: "git+https://github.com/garrigue/lablgl.git"
license: "BSD-3-Clause"
build: [
["cp" "Makefile.config.ex" "Makefile.config"]
["cp" "Makefile.config.osx" "Makefile.config"] {os = "macos"}
Expand All @@ -10,10 +15,9 @@ build: [
depends: [
"ocaml" {< "5.0"}
"camlp4"
]
depexts: [
["freeglut3-dev" "libglu1-mesa-dev" "mesa-common-dev"]
{os-family = "debian"}
"conf-libgl"
"conf-libglu"
"conf-freeglut"
]
install: [
[
Expand Down
13 changes: 6 additions & 7 deletions packages/lablgl/lablgl.1.05/opam
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
opam-version: "2.0"
maintainer: "garrigue@math.nagoya-u.ac.jp"
authors: ["Jacques Garrigue et al., Nagoya University"]
homepage: "http://labltk.forge.ocamlcore.org/"
bug-reports: "https://forge.ocamlcore.org/tracker/?group_id=291"
dev-repo: "git+https://forge.ocamlcore.org/anonscm/git/lablgl/lablgl.git"
homepage: "https://github.com/garrigue/lablgl"
bug-reports: "https://github.com/garrigue/lablgl/issues"
dev-repo: "git+https://github.com/garrigue/lablgl.git"
license: "BSD-3-Clause"
build: [
["cp" "Makefile.config.ex" "Makefile.config"]
Expand All @@ -23,10 +23,9 @@ remove: [
depends: [
"ocaml" {< "5.0"}
"camlp4"
]
depexts: [
["freeglut3-dev" "libglu1-mesa-dev" "mesa-common-dev"]
{os-family = "debian"}
"conf-libgl"
"conf-libglu"
"conf-freeglut"
]
synopsis: "Interface to OpenGL"
description: """
Expand Down
14 changes: 3 additions & 11 deletions packages/lablgl/lablgl.1.06/opam
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,9 @@ remove: [
depends: [
"ocaml" {>= "4.03" & < "5.0"}
"camlp5"
]
depexts: [
["freeglut3-dev" "libglu1-mesa-dev" "mesa-common-dev"]
{os-family = "debian"}
["freeglut-dev"] {os-distribution = "alpine"}
["freeglut-devel"] {os-distribution = "centos"}
["freeglut-devel"] {os-distribution = "fedora"}
["freeglut-devel"] {os-distribution = "oraclelinux"}
["freeglut-devel"] {os-family = "suse" | os-family = "opensuse"}
["freeglut" "libgl"] {os-family = "arch"}
["freeglut"] {os = "freebsd"}
"conf-libgl"
"conf-libglu"
"conf-freeglut"
]
synopsis: "Interface to OpenGL"
description: """
Expand Down
14 changes: 3 additions & 11 deletions packages/lablgl/lablgl.1.07/opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,9 @@ depends: [
"ocamlfind" {>= "1.2.1"}
"camlp-streams" {build}
"camlp5"
]
depexts: [
["freeglut3-dev" "libglu1-mesa-dev" "mesa-common-dev"]
{os-family = "debian"}
["freeglut-dev"] {os-distribution = "alpine"}
["freeglut-devel"] {os-distribution = "centos"}
["freeglut-devel"] {os-distribution = "fedora"}
["freeglut-devel"] {os-distribution = "oraclelinux"}
["freeglut-devel"] {os-family = "suse" | os-family = "opensuse"}
["freeglut" "libgl"] {os-family = "arch"}
["freeglut"] {os = "freebsd"}
"conf-libgl"
"conf-libglu"
"conf-freeglut"
]
synopsis: "Interface to OpenGL"
description: """
Expand Down
4 changes: 3 additions & 1 deletion packages/raylib/raylib.0.1.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ depends: [
"ctypes"
"ppx_cstubs"
"conf-cmake"
"conf-libgl"
"conf-libglu"
]
build: [
["dune" "subst"] {dev}
Expand All @@ -27,7 +29,7 @@ build: [
]
dev-repo: "git+https://github.com/tjammer/raylib-ocaml.git"
depexts: [
["libasound2-dev" "mesa-common-dev" "libx11-dev" "libxrandr-dev" "libxi-dev" "xorg-dev" "libgl1-mesa-dev" "libglu1-mesa-dev"] {os-family = "debian"}
["libasound2-dev" "libx11-dev" "libxrandr-dev" "libxi-dev" "xorg-dev" "libgl1-mesa-dev"] {os-family = "debian"}
["alsa-lib-devel" "mesa-libGL-devel" "libX11-devel" "libXrandr-devel" "libXi-devel" "libXcursor-devel" "libXinerama-devel"] {os-distribution = "fedora"}
]
available: [os = "linux" ]
Expand Down
4 changes: 3 additions & 1 deletion packages/raylib/raylib.0.2.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ depends: [
"dune-configurator"
"ctypes"
"ppx_cstubs"
"conf-libgl"
"conf-libglu"
]
build: [
["dune" "subst"] {dev}
Expand All @@ -27,7 +29,7 @@ build: [
]
dev-repo: "git+https://github.com/tjammer/raylib-ocaml.git"
depexts: [
["libasound2-dev" "mesa-common-dev" "libx11-dev" "libxrandr-dev" "libxi-dev" "xorg-dev" "libgl1-mesa-dev" "libglu1-mesa-dev"] {os-family = "debian"}
["libasound2-dev" "libx11-dev" "libxrandr-dev" "libxi-dev" "xorg-dev" "libgl1-mesa-dev"] {os-family = "debian"}
["alsa-lib-devel" "mesa-libGL-devel" "libX11-devel" "libXrandr-devel" "libXi-devel" "libXcursor-devel" "libXinerama-devel"] {os-distribution = "fedora"}
["alsa-lib-devel" "mesa-libGL-devel" "libX11-devel" "libXrandr-devel" "libXi-devel" "libXcursor-devel" "libXinerama-devel"] {os-distribution = "centos"}
["alsa-lib-dev" "mesa-dev" "libx11-dev" "libxrandr-dev" "libxi-dev" "libxcursor-dev" "libxinerama-dev"] {os-distribution = "alpine"}
Expand Down

0 comments on commit ac9a846

Please sign in to comment.