Skip to content

Commit 74cb15f

Browse files
Tobias-Fischerbaszalmstra
authored andcommitted
Remove OpenGL and GL support handling
Removed OpenGL and GL support handling from build and recipe requirements.
1 parent 70e6f9a commit 74cb15f

1 file changed

Lines changed: 0 additions & 93 deletions

File tree

vinca/main.py

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,6 @@ def generate_output(pkg_shortname, vinca_conf, distro, version, all_pkgs=None):
474474
)
475475

476476
for dep in build_deps:
477-
if dep in ["REQUIRE_OPENGL", "REQUIRE_GL"]:
478-
output["requirements"]["host"].append(dep)
479-
continue
480-
481477
resolved_dep = resolve_pkgname(dep, vinca_conf, distro)
482478
if not resolved_dep:
483479
unsatisfied_deps.add(dep)
@@ -492,10 +488,6 @@ def generate_output(pkg_shortname, vinca_conf, distro, version, all_pkgs=None):
492488
run_deps += gdeps
493489

494490
for dep in run_deps:
495-
if dep in ["REQUIRE_OPENGL", "REQUIRE_GL"]:
496-
output["requirements"]["host"].append(dep)
497-
continue
498-
499491
resolved_dep = resolve_pkgname(dep, vinca_conf, distro, is_rundep=True)
500492
if not resolved_dep:
501493
unsatisfied_deps.add(dep)
@@ -589,49 +581,6 @@ def sortkey(k):
589581
{"if": "build_platform == target_platform", "then": [pkg_move_to_build]}
590582
]
591583

592-
# fix up OPENGL support for Unix
593-
if (
594-
"REQUIRE_OPENGL" in output["requirements"]["run"]
595-
or "REQUIRE_OPENGL" in output["requirements"]["host"]
596-
):
597-
# add requirements for opengl
598-
while "REQUIRE_OPENGL" in output["requirements"]["run"]:
599-
output["requirements"]["run"].remove("REQUIRE_OPENGL")
600-
while "REQUIRE_OPENGL" in output["requirements"]["host"]:
601-
output["requirements"]["host"].remove("REQUIRE_OPENGL")
602-
603-
output["requirements"]["host"] += [
604-
{
605-
"if": "linux",
606-
"then": ["libgl-devel", "libopengl-devel"],
607-
}
608-
]
609-
610-
output["requirements"]["host"] += [
611-
{"if": "unix", "then": ["xorg-libx11", "xorg-libxext"]},
612-
]
613-
output["requirements"]["run"] += [
614-
{"if": "unix", "then": ["xorg-libx11", "xorg-libxext"]},
615-
]
616-
617-
# fix up GL support for Unix
618-
if (
619-
"REQUIRE_GL" in output["requirements"]["run"]
620-
or "REQUIRE_GL" in output["requirements"]["host"]
621-
):
622-
# add requirements for gl
623-
while "REQUIRE_GL" in output["requirements"]["run"]:
624-
output["requirements"]["run"].remove("REQUIRE_GL")
625-
while "REQUIRE_GL" in output["requirements"]["host"]:
626-
output["requirements"]["host"].remove("REQUIRE_GL")
627-
628-
output["requirements"]["host"] += [
629-
{
630-
"if": "linux",
631-
"then": ["libgl-devel"],
632-
}
633-
]
634-
635584
# remove duplicates
636585
for dep_type in ["build", "host", "run"]:
637586
tmp_nonduplicate = []
@@ -1144,48 +1093,6 @@ def parse_package(pkg, distro, vinca_conf, path):
11441093
"${{ '$RECIPE_DIR/build_catkin.sh' if unix or wasm32 else '%RECIPE_DIR%\\\\bld_catkin.bat' }}"
11451094
)
11461095

1147-
# fix up OPENGL support for Unix
1148-
if (
1149-
"REQUIRE_OPENGL" in recipe["requirements"]["run"]
1150-
or "REQUIRE_OPENGL" in recipe["requirements"]["host"]
1151-
):
1152-
# add requirements for opengl
1153-
while "REQUIRE_OPENGL" in recipe["requirements"]["run"]:
1154-
recipe["requirements"]["run"].remove("REQUIRE_OPENGL")
1155-
while "REQUIRE_OPENGL" in recipe["requirements"]["host"]:
1156-
recipe["requirements"]["host"].remove("REQUIRE_OPENGL")
1157-
1158-
recipe["requirements"]["host"] += [
1159-
{
1160-
"if": "linux",
1161-
"then": ["libgl-devel", "libopengl-devel"],
1162-
}
1163-
]
1164-
recipe["requirements"]["host"] += [
1165-
{"if": "unix", "then": ["xorg-libx11", "xorg-libxext"]},
1166-
]
1167-
recipe["requirements"]["run"] += [
1168-
{"if": "unix", "then": ["xorg-libx11", "xorg-libxext"]},
1169-
]
1170-
1171-
# fix up GL support for Unix
1172-
if (
1173-
"REQUIRE_GL" in recipe["requirements"]["run"]
1174-
or "REQUIRE_GL" in recipe["requirements"]["host"]
1175-
):
1176-
# add requirements for gl
1177-
while "REQUIRE_GL" in recipe["requirements"]["run"]:
1178-
recipe["requirements"]["run"].remove("REQUIRE_GL")
1179-
while "REQUIRE_GL" in recipe["requirements"]["host"]:
1180-
recipe["requirements"]["host"].remove("REQUIRE_GL")
1181-
1182-
recipe["requirements"]["host"] += [
1183-
{
1184-
"if": "linux",
1185-
"then": ["libgl-devel"],
1186-
}
1187-
]
1188-
11891096
return recipe
11901097

11911098

0 commit comments

Comments
 (0)