Update glslang revision and remove cherry-pick

Cherry-picking build fix is no longer needed with the latest revision.

diff --git a/external/fetch_sources.py b/external/fetch_sources.py
index f6ef240..698fb4e 100644 (file)
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -134,11 +134,10 @@ class SourcePackage (Source):
                        self.postExtract(dstPath)
 
 class GitRepo (Source):
-       def __init__(self, url, revision, baseDir, extractDir = "src", postFetch=None):
+       def __init__(self, url, revision, baseDir, extractDir = "src"):
                Source.__init__(self, baseDir, extractDir)
                self.url                = url
                self.revision   = revision
-               self.postFetch  = postFetch
 
        def update (self):
                fullDstPath = os.path.join(EXTERNAL_DIR, self.baseDir, self.extractDir)
@@ -150,9 +149,6 @@ class GitRepo (Source):
                try:
                        execute(["git", "fetch", self.url, "+refs/heads/*:refs/remotes/origin/*"])
                        execute(["git", "checkout", self.revision])
-
-                       if self.postFetch != None:
-                               self.postFetch(fullDstPath)
                finally:
                        popWorkingDir()
 
@@ -160,10 +156,6 @@ def postExtractLibpng (path):
        shutil.copy(os.path.join(path, "scripts", "pnglibconf.h.prebuilt"),
                                os.path.join(path, "pnglibconf.h"))
 
-def postFetchGlslang (path):
-       execute(["git", "fetch", "git@github.com:phaulos/glslang.git", "+refs/heads/*:refs/remotes/origin/*"])
-       execute(["git", "cherry-pick", "5f6892e23c9eed8c308bc16e145abccaacacb6b7"])
-
 PACKAGES = [
        SourcePackage(
                "http://zlib.net/zlib-1.2.8.tar.gz",
@@ -182,9 +174,8 @@ PACKAGES = [
                "spirv-tools"),
        GitRepo(
                "git@gitlab.khronos.org:GLSL/glslang.git",
-               "75be019cfac8f29e93f0bebe90b85bc4d5a761c2",
-               "glslang",
-               postFetch = postFetchGlslang),
+               "9e1d1465801ace8edd95c951a3d4a9ada75306ed",
+               "glslang"),
 ]
 
 def parseArgs ():