Merge branch 'master' into dev/jack/4167

1 files changed, 0 insertions, 35 deletions

diff --git a/ports/openxr-loader/0001-fix-embedded-python-path.patch b/ports/openxr-loader/0001-fix-embedded-python-path.patch
deleted file mode 100644
index 3fe7e61e8..000000000
--- a/ports/openxr-loader/0001-fix-embedded-python-path.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/specification/scripts/genxr.py b/specification/scripts/genxr.py

-index 906c044..b0a414f 100755

---- a/specification/scripts/genxr.py

-+++ b/specification/scripts/genxr.py

-@@ -17,6 +17,12 @@

- import argparse

- import re

- import sys

-+import os

-+

-+base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))

-+sys.path.append(os.path.join(base_dir, 'src', 'scripts'))

-+sys.path.append(os.path.join(base_dir, 'specification', 'scripts'))

-+

- import time

- import xml.etree.ElementTree as etree

- 

-diff --git a/src/scripts/src_genxr.py b/src/scripts/src_genxr.py

-index 960b6cd..6f49296 100755

---- a/src/scripts/src_genxr.py

-+++ b/src/scripts/src_genxr.py

-@@ -14,7 +14,12 @@

- # See the License for the specific language governing permissions and

- # limitations under the License.

- 

--import argparse, cProfile, pdb, string, sys, time

-+import argparse, cProfile, pdb, string, sys, time, os

-+

-+base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))

-+sys.path.append(os.path.join(base_dir, 'src', 'scripts'))

-+sys.path.append(os.path.join(base_dir, 'specification', 'scripts'))

-+

- from reg import *

- from generator import write

- from cgenerator import CGeneratorOptions, COutputGenerator