update ptex and opensubdiv (#1593)

* update ptex and opensubdiv

* fix osd

* update some x libraries

* try fix opensubdiv

* update some x libs

packages/l/libx11/xmake.lua

@@ -7,6 +7,7 @@ package("libx11")
     add_versions("1.6.9", "b8c0930a9b25de15f3d773288cacd5e2f0a4158e194935615c52aeceafd1107b")
     add_versions("1.7.0", "c48ec61785ec68fc6a9a6aca0a9578393414fe2562e3cc9cca30234345c7b6ac")
     add_versions("1.7.3", "029acf61e7e760a3150716b145a58ce5052ee953e8cccc8441d4f550c420debb")
+    add_versions("1.8.1", "d52f0a7c02a45449f37b0831d99ff936d92eb4ce8b4c97dc17a63cea79ce5a76")
 
     if is_plat("linux") then
         add_syslinks("dl")

packages/l/libxau/xmake.lua

@@ -3,8 +3,8 @@ package("libxau")
     set_homepage("https://www.x.org/")
     set_description("X.Org: A Sample Authorization Protocol for X")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXau-$(version).tar.bz2")
-    add_versions("1.0.9", "ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec")
+    set_urls("https://www.x.org/archive/individual/lib/libXau-$(version).tar.gz")
+    add_versions("1.0.10", "51a54da42475d4572a0b59979ec107c27dacf6c687c2b7b04e5cf989a7c7e60c")
 
     if is_plat("linux") then
         add_extsources("apt::libxau-dev", "pacman::libxau")

packages/l/libxcursor/xmake.lua

@@ -3,8 +3,8 @@ package("libxcursor")
     set_homepage("https://www.x.org/")
     set_description("X.Org: X Window System Cursor management library")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXcursor-$(version).tar.bz2")
-    add_versions("1.2.0", "3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782")
+    set_urls("https://www.x.org/archive/individual/lib/libXcursor-$(version).tar.gz")
+    add_versions("1.2.1", "77f96b9ad0a3c422cfa826afabaf1e02b9bfbfc8908c5fa1a45094faad074b98")
 
     if is_plat("linux") then
         add_extsources("apt::libxcursor-dev")

packages/l/libxext/xmake.lua

@@ -3,8 +3,8 @@ package("libxext")
     set_homepage("https://www.x.org/")
     set_description("X.Org: Library for common extensions to the X11 protocol")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXext-$(version).tar.bz2")
-    add_versions("1.3.4", "59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b")
+    set_urls("https://www.x.org/archive/individual/lib/libXext-$(version).tar.gz")
+    add_versions("1.3.5", "1a3dcda154f803be0285b46c9338515804b874b5ccc7a2b769ab7fd76f1035bd")
 
     if is_plat("linux") then
         add_extsources("apt::libxext-dev")

packages/l/libxfixes/xmake.lua

@@ -3,8 +3,8 @@ package("libxfixes")
     set_homepage("https://www.x.org/")
     set_description("X.Org: Header files for the XFIXES extension")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXfixes-$(version).tar.bz2")
-    add_versions("5.0.3", "de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6")
+    set_urls("https://www.x.org/archive/individual/lib/libXfixes-$(version).tar.gz")
+    add_versions("6.0.0", "82045da5625350838390c9440598b90d69c882c324ca92f73af9f0e992cb57c7")
 
     if is_plat("linux") then
         add_extsources("apt::libxfixes-dev", "pacman::libxfixes")

packages/l/libxinerama/xmake.lua

@@ -3,8 +3,8 @@ package("libxinerama")
     set_homepage("https://www.x.org/")
     set_description("X.Org: API for Xinerama extension to X11 Protocol")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXinerama-$(version).tar.bz2")
-    add_versions("1.1.4", "0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720")
+    set_urls("https://www.x.org/archive/individual/lib/libXinerama-$(version).tar.gz")
+    add_versions("1.1.5", "2efa855cb42dc620eff3b77700d8655695e09aaa318f791f201fa60afa72b95c")
 
     if is_plat("linux") then
         add_extsources("apt::libxinerama-dev")

packages/l/libxrender/xmake.lua

@@ -3,8 +3,8 @@ package("libxrender")
     set_homepage("https://www.x.org/")
     set_description("X.Org: Library for the Render Extension to the X11 protocol")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXrender-$(version).tar.bz2")
-    add_versions("0.9.10", "c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949")
+    set_urls("https://www.x.org/archive/individual/lib/libXrender-$(version).tar.gz")
+    add_versions("0.9.11", "6aec3ca02e4273a8cbabf811ff22106f641438eb194a12c0ae93c7e08474b667")
 
     if is_plat("linux") then
         add_extsources("apt::libxrender-dev")

packages/l/libxxf86vm/xmake.lua

@@ -3,8 +3,8 @@ package("libxxf86vm")
     set_homepage("https://www.x.org/")
     set_description("X.Org: XFree86-VidMode X extension")
 
-    set_urls("https://www.x.org/archive/individual/lib/libXxf86vm-$(version).tar.bz2")
-    add_versions("1.1.4", "afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57")
+    set_urls("https://www.x.org/archive/individual/lib/libXxf86vm-$(version).tar.gz")
+    add_versions("1.1.5", "f3f1c29fef8accb0adbd854900c03c6c42f1804f2bc1e4f3ad7b2e1f3b878128")
 
     if is_plat("linux") then
         add_extsources("apt::libxxf86vm-dev")

packages/o/opensubdiv/xmake.lua

@@ -6,6 +6,7 @@ package("opensubdiv")
 
     add_urls("https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v$(version).tar.gz", {version = function (version) return version:gsub("%.", "_") end})
     add_versions("3.4.4", "20d49f80a2b778ad4d01f091ad88d8c2f91cf6c7363940c6213241ce6f1048fb")
+    add_versions("3.5.0", "8f5044f453b94162755131f77c08069004f25306fd6dc2192b6d49889efb8095")
 
     if is_plat("windows") then
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
@@ -14,6 +15,7 @@ package("opensubdiv")
     add_configs("glfw",   {description = "Enable components depending on GLFW.", default = true, type = "boolean"})
     add_configs("ptex",   {description = "Enable components depending on Ptex.", default = true, type = "boolean"})
     add_configs("tbb",    {description = "Enable components depending on TBB.", default = false, type = "boolean"})
+    add_configs("openmp", {description = "Enable OpenMP backend.", default = false, type = "boolean"})
     add_configs("opencl", {description = "Enable OpenCL backend.", default = false, type = "boolean"})
     add_configs("cuda",   {description = "Enable CUDA backend.", default = false, type = "boolean"})
 
@@ -27,7 +29,7 @@ package("opensubdiv")
                 package:add("deps", dep)
             end
         end
-        for _, dep in ipairs({"opencl", "cuda"}) do
+        for _, dep in ipairs({"openmp", "opencl", "cuda"}) do
             if package:config(dep) then
                 package:add("deps", dep, {system = true})
             end
@@ -36,11 +38,15 @@ package("opensubdiv")
 
     on_install("windows", "macosx", "linux", function (package)
         local configs = {"-DNO_EXAMPLES=ON", "-DNO_TUTORIALS=ON", "-DNO_REGRESSION=ON", "-DNO_DOC=ON", "-DNO_CLEW=ON", "-DNO_TESTS=ON", "-DNO_GLTESTS=ON"}
+        if package:config("glfw") then
+            io.replace("cmake/FindGLFW.cmake", "NOT X11_xf86vmode_FOUND", "FALSE", {plain = true})
+        end
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         for _, dep in ipairs({"glfw", "ptex", "tbb", "opencl", "cuda"}) do
-            table.insert(configs, "-DNO_" .. dep:upper() .. "=" .. (package:config(dep) and "ON" or "OFF"))
+            table.insert(configs, "-DNO_" .. dep:upper() .. "=" .. (package:config(dep) and "OFF" or "ON"))
         end
+        table.insert(configs, "-DNO_OMP=" .. (package:config("openmp") and "OFF" or "ON"))
         if package:is_plat("windows") then
             local vs_sdkver = import("core.tool.toolchain").load("msvc"):config("vs_sdkver")
             if vs_sdkver then

packages/p/ptex/xmake.lua

@@ -8,6 +8,7 @@ package("ptex")
              "https://github.com/wdas/ptex.git")
     add_versions("v2.3.2", "30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b")
     add_versions("v2.4.1", "664253b84121251fee2961977fe7cf336b71cd846dc235cd0f4e54a0c566084e")
+    add_versions("v2.4.2", "c8235fb30c921cfb10848f4ea04d5b662ba46886c5e32ad5137c5086f3979ee1")
 
     add_deps("zlib")
     if is_plat("linux") then

packages/u/util-macros/xmake.lua

@@ -5,6 +5,7 @@ package("util-macros")
 
     set_urls("https://www.x.org/archive/individual/util/util-macros-$(version).tar.bz2")
     add_versions("1.19.2", "d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712")
+    add_versions("1.19.3", "0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971")
 
     add_deps("pkg-config")
 

packages/x/xorgproto/xmake.lua

@@ -4,10 +4,9 @@ package("xorgproto")
     set_homepage("https://www.x.org/")
     set_description("X.Org: Protocol Headers")
 
-    set_urls("https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$(version).tar.bz2")
-    add_versions("2019.2", "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e")
-    add_versions("2021.3", "4c732b14fc7c7db64306374d9e8386d6172edbb93f587614df1938b9d9b9d737")
-    add_versions("2021.5", "aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015")
+    set_urls("https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$(version).tar.gz")
+    add_versions("2021.5", "be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff")
+    add_versions("2022.2", "da351a403d07a7006d7bdc8dcfc14ddc1b588b38fb81adab9989a8eef605757b")
 
     if is_plat("linux") then
         add_extsources("apt::x11proto-dev", "pkgconfig::xproto")