summaryrefslogtreecommitdiffstats
path: root/gfx/angle
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
commitfbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch)
tree4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /gfx/angle
parentReleasing progress-linux version 124.0.1-1~progress7.99u1. (diff)
downloadfirefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz
firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx/angle')
-rw-r--r--gfx/angle/moz.build5
-rw-r--r--gfx/angle/targets/angle_gpu_info_util/moz.build4
-rw-r--r--gfx/angle/targets/angle_image_util/moz.build4
-rw-r--r--gfx/angle/targets/libEGL/moz.build5
-rw-r--r--gfx/angle/targets/libGLESv2/moz.build2
-rw-r--r--gfx/angle/targets/preprocessor/moz.build4
-rw-r--r--gfx/angle/targets/translator/moz.build1
-rwxr-xr-xgfx/angle/update-angle.py14
8 files changed, 16 insertions, 23 deletions
diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
index ea4be831bd..ee870a088e 100644
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -4,7 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DIRS += ["targets/translator"]
+DIRS += [
+ "targets/angle_common",
+ "targets/translator",
+]
# Only build libEGL/libGLESv2 on Windows
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
diff --git a/gfx/angle/targets/angle_gpu_info_util/moz.build b/gfx/angle/targets/angle_gpu_info_util/moz.build
index f2fe1dd3d4..7278d2bfcd 100644
--- a/gfx/angle/targets/angle_gpu_info_util/moz.build
+++ b/gfx/angle/targets/angle_gpu_info_util/moz.build
@@ -170,10 +170,6 @@ USE_LIBS += [
"angle_common",
]
-DIRS += [
- "../angle_common",
-]
-
OS_LIBS += [
"dxgi",
"setupapi",
diff --git a/gfx/angle/targets/angle_image_util/moz.build b/gfx/angle/targets/angle_image_util/moz.build
index 8a17982e17..38871adc6e 100644
--- a/gfx/angle/targets/angle_image_util/moz.build
+++ b/gfx/angle/targets/angle_image_util/moz.build
@@ -150,10 +150,6 @@ USE_LIBS += [
"angle_common",
]
-DIRS += [
- "../angle_common",
-]
-
# LDFLAGS += [
# "--color-diagnostics",
# "/call-graph-profile-sort:no",
diff --git a/gfx/angle/targets/libEGL/moz.build b/gfx/angle/targets/libEGL/moz.build
index 9327db4c23..eb8c049493 100644
--- a/gfx/angle/targets/libEGL/moz.build
+++ b/gfx/angle/targets/libEGL/moz.build
@@ -157,11 +157,6 @@ USE_LIBS += [
"libGLESv2",
]
-DIRS += [
- "../angle_common",
- "../libGLESv2",
-]
-
OS_LIBS += [
"advapi32",
"comdlg32",
diff --git a/gfx/angle/targets/libGLESv2/moz.build b/gfx/angle/targets/libGLESv2/moz.build
index dfcf0df719..18d296d084 100644
--- a/gfx/angle/targets/libGLESv2/moz.build
+++ b/gfx/angle/targets/libGLESv2/moz.build
@@ -366,11 +366,9 @@ USE_LIBS += [
]
DIRS += [
- "../angle_common",
"../angle_gpu_info_util",
"../angle_image_util",
"../compression_utils_portable",
- "../translator",
]
OS_LIBS += [
diff --git a/gfx/angle/targets/preprocessor/moz.build b/gfx/angle/targets/preprocessor/moz.build
index 3fbce2e0c4..c790132062 100644
--- a/gfx/angle/targets/preprocessor/moz.build
+++ b/gfx/angle/targets/preprocessor/moz.build
@@ -156,10 +156,6 @@ USE_LIBS += [
"angle_common",
]
-DIRS += [
- "../angle_common",
-]
-
# LDFLAGS += [
# "--color-diagnostics",
# "/call-graph-profile-sort:no",
diff --git a/gfx/angle/targets/translator/moz.build b/gfx/angle/targets/translator/moz.build
index 38dbb74f79..4b59b82403 100644
--- a/gfx/angle/targets/translator/moz.build
+++ b/gfx/angle/targets/translator/moz.build
@@ -298,7 +298,6 @@ USE_LIBS += [
]
DIRS += [
- "../angle_common",
"../preprocessor",
]
diff --git a/gfx/angle/update-angle.py b/gfx/angle/update-angle.py
index 348a1cf745..99d65f84f6 100755
--- a/gfx/angle/update-angle.py
+++ b/gfx/angle/update-angle.py
@@ -5,7 +5,7 @@
assert __name__ == "__main__"
-"""
+r"""
To update ANGLE in Gecko, use Windows with git-bash, and setup depot_tools, python2, and
python3. Because depot_tools expects `python` to be `python2` (shame!), python2 must come
before python3 in your path.
@@ -502,8 +502,18 @@ def export_target(target_full_name) -> Set[str]:
dep_dirs = set(dep_libs)
dep_dirs.discard("zlib")
+ # Those directories are added by gfx/angle/moz.build.
+ already_added_dirs = [
+ "angle_common",
+ "translator",
+ "libEGL",
+ "libGLESv2",
+ ]
+
append_arr(lines, "USE_LIBS", dep_libs)
- append_arr(lines, "DIRS", ["../" + x for x in dep_dirs])
+ append_arr(
+ lines, "DIRS", ["../" + x for x in dep_dirs if x not in already_added_dirs]
+ )
append_arr(lines, "OS_LIBS", os_libs)
append_arr_commented(lines, "LDFLAGS", ldflags)