Skip to content

Commit b847320

Browse files
authored
Merge pull request ocaml#27846 from jmid/conf-freeglut-windows
Update conf-freeglut for the mingw-w64 ports
2 parents e88dced + bca4d3a commit b847320

File tree

3 files changed

+52
-1
lines changed
  • packages
    • conf-freeglut/conf-freeglut.1
    • conf-mingw-w64-freeglut-i686/conf-mingw-w64-freeglut-i686.1
    • conf-mingw-w64-freeglut-x86_64/conf-mingw-w64-freeglut-x86_64.1

3 files changed

+52
-1
lines changed

packages/conf-freeglut/conf-freeglut.1/opam

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,24 @@ homepage: "https://freeglut.sourceforge.net/"
55
license: "X11"
66
bug-reports: "https://github.com/ocaml/opam-repository/issues"
77
build: [
8-
["pkg-config" "--exists" "glut"] {os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}
8+
["pkg-config" "--print-errors" "--exists" "freeglut"] {os = "win32" & os-distribution = "msys"}
9+
["pkg-config" "--print-errors" "--exists" "glut"] {os != "win32" & os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}
910
]
1011
depends: [
1112
"conf-pkg-config" {build & os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}
13+
("host-arch-x86_32" {os = "win32" & os-distribution != "cygwinports"} &
14+
"conf-mingw-w64-freeglut-i686" {os = "win32" & os-distribution != "cygwinports"} |
15+
"host-arch-x86_64" {os = "win32" & os-distribution != "cygwinports"} &
16+
"conf-mingw-w64-freeglut-x86_64" {os = "win32" & os-distribution != "cygwinports"})
1217
]
1318
depexts: [
1419
["freeglut3-dev"] {os-family = "debian" | os-family = "ubuntu"}
1520
["freeglut-dev"] {os-distribution = "alpine"}
1621
["freeglut-devel"] {os-distribution = "centos" | os-family = "fedora" | os-distribution = "ol"}
1722
["freeglut-devel"] {os-family = "suse" | os-family = "opensuse"}
1823
["freeglut"] {os-family = "arch"}
24+
["freeglut"] {os = "macos" & os-distribution = "homebrew"}
25+
["freeglut"] {os = "macos" & os-distribution = "macports"}
1926
["freeglut"] {os = "freebsd"}
2027
]
2128
synopsis: "Virtual package relying on a FreeGLUT system installation"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
opam-version: "2.0"
2+
synopsis: "FreeGLUT for i686 mingw-w64 (32-bit x86)"
3+
description: "Ensures the i686 version of FreeGLUT for the mingw-w64 project is available"
4+
maintainer: "David Allsopp <[email protected]>"
5+
authors: ["Pawel W. Olszta" "Andreas Umbach" "Steve Baker" "John F. Fay" "John Tsiombikas" "Diederick C. Niehorster"]
6+
license: "X11"
7+
homepage: "https://freeglut.sourceforge.net/"
8+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
9+
flags: conf
10+
available: os = "win32"
11+
build: [
12+
# Cygwin is missing a pkg-config .pc file https://cygwin.com/packages/x86_64/mingw64-i686-freeglut/mingw64-i686-freeglut-2.8.1-1
13+
["pkg-config" "--personality=i686-w64-mingw32" "freeglut"] {os = "win32" & os-distribution = "msys2"}
14+
]
15+
depends: [
16+
"conf-pkg-config" {build}
17+
"conf-mingw-w64-gcc-i686" {build}
18+
]
19+
depexts: [
20+
["mingw64-i686-freeglut"] {os = "win32" & os-distribution = "cygwin"}
21+
["mingw-w64-i686-freeglut"] {os = "win32" & os-distribution = "msys2"}
22+
]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
opam-version: "2.0"
2+
synopsis: "FreeGLUT for x86_64 mingw-w64 (64-bit x86_64)"
3+
description: "Ensures the x86_64 version of FreeGLUT for the mingw-w64 project is available"
4+
maintainer: "David Allsopp <[email protected]>"
5+
authors: ["Pawel W. Olszta" "Andreas Umbach" "Steve Baker" "John F. Fay" "John Tsiombikas" "Diederick C. Niehorster"]
6+
license: "X11"
7+
homepage: "https://freeglut.sourceforge.net/"
8+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
9+
flags: conf
10+
available: os = "win32"
11+
build: [
12+
# Cygwin is missing a pkg-config .pc file https://www.cygwin.com/packages/x86_64/mingw64-x86_64-freeglut/mingw64-x86_64-freeglut-2.8.1-1
13+
["pkg-config" "--personality=x86_64-w64-mingw32" "freeglut"] {os = "win32" & os-distribution = "msys2"}
14+
]
15+
depends: [
16+
"conf-pkg-config" {build}
17+
"conf-mingw-w64-gcc-x86_64" {build}
18+
]
19+
depexts: [
20+
["mingw64-x86_64-freeglut"] {os = "win32" & os-distribution = "cygwin"}
21+
["mingw-w64-x86_64-freeglut"] {os = "win32" & os-distribution = "msys2"}
22+
]

0 commit comments

Comments
 (0)