Blender-Python-Module-Docker/build-282a.diff at master · dralois/Blender-Python-Module-Docker · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
diff -Naur ../build_environment_orig/cmake/versions.cmake ./cmake/versions.cmake
--- ../build_environment_orig/cmake/versions.cmake	2020-06-04 17:20:03.071776600 +0000
+++ ./cmake/versions.cmake	2020-06-04 17:22:16.238739100 +0000
@@ -25,7 +25,7 @@
 set(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190)

 set(PNG_VERSION 1.6.35)
-set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
+set(PNG_URI https://sourceforge.net/projects/libpng/files/libpng16/1.6.35/libpng-1.6.35.tar.xz/download?use_mirror=cfhcable)
 set(PNG_HASH 678b7e696a62a193ed3503b04bf449d6)

 set(JPEG_VERSION 1.5.3)
@@ -44,7 +44,7 @@
 set(BLOSC_HASH 6e4a49c8c06f05aa543f3312cfce3d55)

 set(PTHREADS_VERSION 3.0.0)
-set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
+set(PTHREADS_URI https://sourceforge.net/projects/pthreads4w/files/pthreads4w-code-v3.0.0.zip/download?use_mirror=cfhcable)
 set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)

 set(OPENEXR_VERSION 2.4.0)
@@ -67,15 +67,15 @@
 endif()

 set(FREETYPE_VERSION 2.9.1)
-set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
+set(FREETYPE_URI https://sourceforge.net/projects/freetype/files/freetype2/2.9.1/freetype-2.9.1.tar.gz/download?use_mirror=cfhcable)
 set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056)

 set(GLEW_VERSION 1.13.0)
-set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
+set(GLEW_URI https://sourceforge.net/projects/glew/files/glew/1.13.0/glew-1.13.0.tgz/download?use_mirror=cfhcable)
 set(GLEW_HASH 7cbada3166d2aadfc4169c4283701066)

 set(FREEGLUT_VERSION 3.0.0)
-set(FREEGLUT_URI http://pilotfiber.dl.sourceforge.net/project/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
+set(FREEGLUT_URI https://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/freeglut-3.0.0.tar.gz/download?use_mirror=cfhcable)
 set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754)

 set(HDF5_VERSION 1.8.17)
@@ -136,7 +136,7 @@
 set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79)

 set(OSL_VERSION 1.9.9)
-set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
+set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.9.9.tar.gz)
 set(OSL_HASH 44ad511e424965a10fce051a053b0605)

 set(PYTHON_VERSION 3.7.4)
@@ -146,8 +146,8 @@
 set(PYTHON_HASH d33e4aae66097051c2eca45ee3604803)

 set(TBB_VERSION 2019_U9)
-set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
-set(TBB_HASH 584edbec127c508f2cd5b6e79ad200fc)
+set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/2019_U9.tar.gz)
+set(TBB_HASH 26263622e9187212ec240dcf01b66207)

 set(OPENVDB_VERSION 7.0.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
@@ -165,7 +165,7 @@
 set(NUMPY_HASH aed49b31bcb44ec73b8155be78566135)

 set(LAME_VERSION 3.100)
-set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
+set(LAME_URI https://sourceforge.net/projects/lame/files/lame/3.100/lame-3.100.tar.gz/download?use_mirror=cfhcable)
 set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)

 set(OGG_VERSION 1.3.3)
@@ -207,7 +207,7 @@
 set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)

 set(FAAD_VERSION 2-2.8.8)
-set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.gz)
+set(FAAD_URI https://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/faad2-2.8.8.tar.gz/download?use_mirror=cfhcable)
 set(FAAD_HASH 28f6116efdbe9378269f8a6221767d1f)

 set(FFMPEG_VERSION 4.0.2)
@@ -243,7 +243,7 @@
 set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)

 set(SPNAV_VERSION 0.2.3)
-set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
+set(SPNAV_URI https://sourceforge.net/projects/spacenav/files/spacenav%20library%20%28SDK%29/libspnav%200.2.3/libspnav-0.2.3.tar.gz/download?use_mirror=cfhcable)
 set(SPNAV_HASH 44d840540d53326d4a119c0f1aa7bf0a)

 set(JEMALLOC_VERSION 5.0.1)
@@ -256,7 +256,7 @@

 set(TINYXML_VERSION 2_6_2)
 set(TINYXML_VERSION_DOTS 2.6.2)
-set(TINYXML_URI https://nchc.dl.sourceforge.net/project/tinyxml/tinyxml/${TINYXML_VERSION_DOTS}/tinyxml_${TINYXML_VERSION}.tar.gz)
+set(TINYXML_URI https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz/download?use_mirror=cfhcable)
 set(TINYXML_HASH c1b864c96804a10526540c664ade67f0)

 set(YAMLCPP_VERSION 0.6.3)
@@ -264,7 +264,7 @@
 set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)

 set(LCMS_VERSION 2.9)
-set(LCMS_URI https://nchc.dl.sourceforge.net/project/lcms/lcms/${LCMS_VERSION}/lcms2-${LCMS_VERSION}.tar.gz)
+set(LCMS_URI https://sourceforge.net/projects/lcms/files/lcms/2.9/lcms2-2.9.tar.gz/download?use_mirror=cfhcable)
 set(LCMS_HASH 8de1b7724f578d2995c8fdfa35c3ad0e)

 set(PUGIXML_VERSION 1.9)
@@ -272,7 +272,7 @@
 set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714)

 set(FLEXBISON_VERSION 2.5.5)
-set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
+set(FLEXBISON_URI https://sourceforge.net/projects/winflexbison/files/old_versions/win_flex_bison-2.5.5.zip/download?use_mirror=cfhcable)
 set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)

 # Libraries to keep Python modules static on Linux.
@@ -308,7 +308,7 @@
 set(USD_HASH 79ff176167b3fe85f4953abd6cc5e0cc)

 set(OIDN_VERSION 1.0.0)
-set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip)
+set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v1.0.0/oidn-1.0.0.src.zip)
 set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60)

 set(LIBGLU_VERSION 9.0.1)
diff -Naur ../build_environment_orig/patches/osl.diff ./patches/osl.diff
--- ../build_environment_orig/patches/osl.diff	2020-06-04 17:20:03.332754200 +0000
+++ ./patches/osl.diff	2020-06-04 17:22:16.480737900 +0000
@@ -72,3 +72,15 @@

  size_t
  LLVM_Util::total_jit_memory_held ()
+--- OpenShadingLanguage-Release-1.9.9/CMakeLists.txt	2018-05-01 22:39:02.000000000 +0000
++++ blender-git/build_linux/deps/build/osl/src/external_osl/CMakeLists.txt	2020-05-28 21:09:54.800000000 +0000
+@@ -161,9 +161,7 @@
+ add_subdirectory (src/osl.imageio)
+ endif ()
+
+ add_subdirectory (src/shaders)
+-add_subdirectory (src/shaders/MaterialX)
+-
+ if (INSTALL_DOCS)
+ add_subdirectory (src/doc)
+ endif ()