9187a6460f
Submitted by: clutton <clutton@zoho.com> Reviewed by: cpm, rene Obtained from: https://github.com/paranormal/ MFH: 2016Q4 Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html Differential Revision: https://reviews.freebsd.org/D8517
37 lines
965 B
Text
37 lines
965 B
Text
--- third_party/angle/BUILD.gn.orig 2016-10-06 04:04:51.000000000 +0300
|
|
+++ third_party/angle/BUILD.gn 2016-10-31 01:36:29.431524000 +0200
|
|
@@ -15,6 +15,12 @@
|
|
}
|
|
}
|
|
|
|
+if (use_x11) {
|
|
+ pkg_config("x11") {
|
|
+ packages = [ "x11", "xi", "xext" ]
|
|
+ }
|
|
+}
|
|
+
|
|
angle_git_is_present = exec_script("src/commit_id.py",
|
|
[
|
|
"check",
|
|
@@ -350,11 +356,7 @@
|
|
if (use_x11) {
|
|
sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
|
|
deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
|
|
- libs += [
|
|
- "X11",
|
|
- "Xi",
|
|
- "Xext",
|
|
- ]
|
|
+ configs += [ ":x11" ]
|
|
}
|
|
if (is_mac) {
|
|
sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
|
|
@@ -492,7 +494,7 @@
|
|
|
|
config("angle_util_config") {
|
|
include_dirs = [ "util" ]
|
|
- if (is_linux && use_x11) {
|
|
+ if ((is_linux || is_bsd) && use_x11) {
|
|
libs = [ "X11" ]
|
|
}
|
|
}
|