order lines correctly

Still does not work correctly with the pebbles demo file, because
the math nodes don't work yet.

.clang-format

@@ -161,7 +161,6 @@ PenaltyBreakString: 1000000
 # "^\s+[A-Z][A-Z0-9_]+\s*\([^\n]*\)\n\s*\{"
 ForEachMacros:
   - BEGIN_ANIMFILTER_SUBCHANNELS
-  - BKE_pbvh_vertex_iter_begin
   - BLI_FOREACH_SPARSE_RANGE
   - BLI_SMALLSTACK_ITER_BEGIN
   - BMO_ITER

CMakeLists.txt

@@ -300,33 +300,15 @@ option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.or
 # Sound output
 option(WITH_SDL           "Enable SDL for sound and joystick support" ON)
 option(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
-if(APPLE)
-  option(WITH_COREAUDIO    "Enable CoreAudio for audio support on macOS" ON)
-else()
-  set(WITH_COREAUDIO OFF)
-endif()
 if(NOT WIN32)
   option(WITH_JACK          "Enable JACK Support (http://www.jackaudio.org)" ON)
   if(UNIX AND NOT APPLE)
     option(WITH_JACK_DYNLOAD  "Enable runtime dynamic JACK libraries loading" OFF)
   endif()
-else()
-  set(WITH_JACK OFF)
 endif()
 if(UNIX AND NOT APPLE)
   option(WITH_SDL_DYNLOAD  "Enable runtime dynamic SDL libraries loading" OFF)
 endif()
-if(UNIX AND NOT APPLE)
-  option(WITH_PULSEAUDIO   "Enable PulseAudio for audio support on Linux" ON)
-  option(WITH_PULSEAUDIO_DYNLOAD  "Enable runtime dynamic PulseAudio libraries loading" OFF)
-else()
-  set(WITH_PULSEAUDIO OFF)
-endif()
-if(WIN32)
-  option(WITH_WASAPI      "Enable Windows Audio Sessions API for audio support on Windows" ON)
-else()
-  set(WITH_WASAPI OFF)
-endif()
 
 # Compression
 option(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
@@ -689,11 +671,16 @@ if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE)
   )
 endif()
 
-set_and_warn_dependency(WITH_AUDASPACE WITH_OPENAL OFF)
+if(NOT WITH_AUDASPACE)
-set_and_warn_dependency(WITH_AUDASPACE WITH_COREAUDIO OFF)
+  if(WITH_OPENAL)
-set_and_warn_dependency(WITH_AUDASPACE WITH_JACK OFF)
+    message(WARNING "WITH_OPENAL requires WITH_AUDASPACE which is disabled")
-set_and_warn_dependency(WITH_AUDASPACE WITH_PULSEAUDIO OFF)
+    set(WITH_OPENAL OFF)
-set_and_warn_dependency(WITH_AUDASPACE WITH_WASAPI OFF)
+  endif()
+  if(WITH_JACK)
+    message(WARNING "WITH_JACK requires WITH_AUDASPACE which is disabled")
+    set(WITH_JACK OFF)
+  endif()
+endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
   message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
@@ -1951,15 +1938,11 @@ if(FIRST_RUN)
   info_cfg_option(WITH_CODEC_AVI)
   info_cfg_option(WITH_CODEC_FFMPEG)
   info_cfg_option(WITH_CODEC_SNDFILE)
-  info_cfg_option(WITH_COREAUDIO)
   info_cfg_option(WITH_JACK)
   info_cfg_option(WITH_JACK_DYNLOAD)
   info_cfg_option(WITH_OPENAL)
   info_cfg_option(WITH_SDL)
   info_cfg_option(WITH_SDL_DYNLOAD)
-  info_cfg_option(WITH_PULSEAUDIO)
-  info_cfg_option(WITH_PULSEAUDIO_DYNLOAD)
-  info_cfg_option(WITH_WASAPI)
 
   info_cfg_text("Compression:")
   info_cfg_option(WITH_LZMA)

GNUmakefile

@@ -506,7 +506,7 @@ check_descriptions: .FORCE
 #
 
 source_archive: .FORCE
-	python3 ./build_files/utils/make_source_archive.py
+	./build_files/utils/make_source_archive.sh
 
 INKSCAPE_BIN?="inkscape"
 icons: .FORCE

build_files/build_environment/CMakeLists.txt

@@ -47,7 +47,6 @@ include(ExternalProject)
 include(cmake/check_software.cmake)
 include(cmake/options.cmake)
 include(cmake/versions.cmake)
-include(cmake/download.cmake)
 
 if(ENABLE_MINGW64)
   include(cmake/setup_mingw64.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -44,9 +44,9 @@ set(ALEMBIC_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_alembic
-  URL file://${PACKAGE_DIR}/${ALEMBIC_FILE}
+  URL ${ALEMBIC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ALEMBIC_HASH_TYPE}=${ALEMBIC_HASH}
+  URL_HASH MD5=${ALEMBIC_MD5}
   PREFIX ${BUILD_DIR}/alembic
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/alembic

build_files/build_environment/cmake/blosc.cmake

@@ -36,9 +36,9 @@ set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
 )
 
 ExternalProject_Add(external_blosc
-  URL file://${PACKAGE_DIR}/${BLOSC_FILE}
+  URL ${BLOSC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${BLOSC_HASH_TYPE}=${BLOSC_HASH}
+  URL_HASH MD5=${BLOSC_HASH}
   PREFIX ${BUILD_DIR}/blosc
   PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}

build_files/build_environment/cmake/boost.cmake

@@ -86,9 +86,9 @@ set(BOOST_OPTIONS
 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
 
 ExternalProject_Add(external_boost
-  URL file://${PACKAGE_DIR}/${BOOST_FILE}
+  URL ${BOOST_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${BOOST_HASH_TYPE}=${BOOST_HASH}
+  URL_HASH MD5=${BOOST_HASH}
   PREFIX ${BUILD_DIR}/boost
   UPDATE_COMMAND  ""
   PATCH_COMMAND ${BOOST_PATCH_COMMAND}

build_files/build_environment/cmake/bzip2.cmake

@@ -30,9 +30,9 @@ else()
 endif()
 
 ExternalProject_Add(external_bzip2
-  URL file://${PACKAGE_DIR}/${BZIP2_FILE}
+  URL ${BZIP2_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${BZIP2_HASH_TYPE}=${BZIP2_HASH}
+  URL_HASH SHA256=${BZIP2_HASH}
   PREFIX ${BUILD_DIR}/bzip2
   CONFIGURE_COMMAND echo .
   BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}

build_files/build_environment/cmake/check_software.cmake

@@ -72,12 +72,9 @@ if(UNIX)
       "On Debian and Ubuntu:\n"
       "  apt install autoconf automake libtool yasm tcl ninja-build meson python3-mako\n"
       "\n"
-      "On macOS Intel (with homebrew):\n"
+      "On macOS (with homebrew):\n"
       "  brew install autoconf automake bison libtool pkg-config yasm\n"
       "\n"
-      "On macOS ARM (with homebrew):\n"
-      "  brew install autoconf automake bison flex libtool pkg-config yasm\n"
-      "\n"
       "Other platforms:\n"
       "  Install equivalent packages.\n")
     message(FATAL_ERROR "Install missing software before continuing")

build_files/build_environment/cmake/clew.cmake

@@ -19,9 +19,9 @@
 set(CLEW_EXTRA_ARGS)
 
 ExternalProject_Add(external_clew
-  URL file://${PACKAGE_DIR}/${CLEW_FILE}
+  URL ${CLEW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${CLEW_HASH_TYPE}=${CLEW_HASH}
+  URL_HASH MD5=${CLEW_HASH}
   PREFIX ${BUILD_DIR}/clew
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/clew

build_files/build_environment/cmake/cuew.cmake

@@ -19,9 +19,9 @@
 set(CUEW_EXTRA_ARGS)
 
 ExternalProject_Add(external_cuew
-  URL file://${PACKAGE_DIR}/${CUEW_FILE}
+  URL ${CUEW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${CUEW_HASH_TYPE}=${CUEW_HASH}
+  URL_HASH MD5=${CUEW_HASH}
   PREFIX ${BUILD_DIR}/cuew
   PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}

build_files/build_environment/cmake/download.cmake

@@ -1,93 +0,0 @@
-function(download_source dep)
-  set(TARGET_FILE ${${dep}_FILE})
-  set(TARGET_HASH_TYPE ${${dep}_HASH_TYPE})
-  set(TARGET_HASH ${${dep}_HASH})
-  if(PACKAGE_USE_UPSTREAM_SOURCES)
-    set(TARGET_URI  ${${dep}_URI})
-  else()
-    set(TARGET_URI  https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/${TARGET_FILE})
-  endif()
-  set(TARGET_FILE ${PACKAGE_DIR}/${TARGET_FILE})
-  message("Checking source : ${dep} (${TARGET_FILE})")
-  if(NOT EXISTS ${TARGET_FILE})
-    message("Checking source : ${dep} - source not found downloading from ${TARGET_URI}")
-    file(DOWNLOAD ${TARGET_URI} ${TARGET_FILE}
-         TIMEOUT 60  # seconds
-         EXPECTED_HASH ${TARGET_HASH_TYPE}=${TARGET_HASH}
-         TLS_VERIFY ON
-         SHOW_PROGRESS
-        )
-  endif()
-endfunction(download_source)
-
-download_source(ZLIB)
-download_source(OPENAL)
-download_source(PNG)
-download_source(JPEG)
-download_source(BOOST)
-download_source(BLOSC)
-download_source(PTHREADS)
-download_source(OPENEXR)
-download_source(FREETYPE)
-download_source(GLEW)
-download_source(FREEGLUT)
-download_source(ALEMBIC)
-download_source(GLFW)
-download_source(CLEW)
-download_source(GLFW)
-download_source(CUEW)
-download_source(OPENSUBDIV)
-download_source(SDL)
-download_source(OPENCOLLADA)
-download_source(OPENCOLORIO)
-download_source(LLVM)
-download_source(OPENMP)
-download_source(OPENIMAGEIO)
-download_source(TIFF)
-download_source(OSL)
-download_source(PYTHON)
-download_source(TBB)
-download_source(OPENVDB)
-download_source(NANOVDB)
-download_source(NUMPY)
-download_source(LAME)
-download_source(OGG)
-download_source(VORBIS)
-download_source(THEORA)
-download_source(FLAC)
-download_source(VPX)
-download_source(OPUS)
-download_source(X264)
-download_source(XVIDCORE)
-download_source(OPENJPEG)
-download_source(FFMPEG)
-download_source(FFTW)
-download_source(ICONV)
-download_source(SNDFILE)
-if(WITH_WEBP)
-  download_source(WEBP)
-endif()
-download_source(SPNAV)
-download_source(JEMALLOC)
-download_source(XML2)
-download_source(TINYXML)
-download_source(YAMLCPP)
-download_source(EXPAT)
-download_source(PUGIXML)
-download_source(FLEXBISON)
-download_source(BZIP2)
-download_source(FFI)
-download_source(LZMA)
-download_source(SSL)
-download_source(SQLITE)
-download_source(EMBREE)
-download_source(USD)
-download_source(OIDN)
-download_source(LIBGLU)
-download_source(MESA)
-download_source(NASM)
-download_source(XR_OPENXR_SDK)
-download_source(ISPC)
-download_source(GMP)
-download_source(POTRACE)
-download_source(HARU)

build_files/build_environment/cmake/embree.cmake

@@ -58,9 +58,9 @@ if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
   )
 else()
   ExternalProject_Add(external_embree
-    URL file://${PACKAGE_DIR}/${EMBREE_FILE}
+    URL ${EMBREE_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
+    URL_HASH MD5=${EMBREE_HASH}
     PREFIX ${BUILD_DIR}/embree
     PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}

build_files/build_environment/cmake/expat.cmake

@@ -25,9 +25,9 @@ set(EXPAT_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_expat
-  URL file://${PACKAGE_DIR}/${EXPAT_FILE}
+  URL ${EXPAT_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${EXPAT_HASH_TYPE}=${EXPAT_HASH}
+  URL_HASH MD5=${EXPAT_HASH}
   PREFIX ${BUILD_DIR}/expat
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/expat ${DEFAULT_CMAKE_FLAGS} ${EXPAT_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/expat

build_files/build_environment/cmake/ffi.cmake

@@ -17,8 +17,8 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_ffi
-  URL file://${PACKAGE_DIR}/${FFI_FILE}
+  URL ${FFI_URI}
-  URL_HASH ${FFI_HASH_TYPE}=${FFI_HASH}
+  URL_HASH SHA256=${FFI_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/ffi
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi

build_files/build_environment/cmake/ffmpeg.cmake

@@ -60,9 +60,9 @@ elseif(UNIX)
 endif()
 
 ExternalProject_Add(external_ffmpeg
-  URL file://${PACKAGE_DIR}/${FFMPEG_FILE}
+  URL ${FFMPEG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FFMPEG_HASH_TYPE}=${FFMPEG_HASH}
+  URL_HASH MD5=${FFMPEG_HASH}
   # OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
   # want for maximum runtime performance, but due to static nature of that library we
   # need to force ffmpeg to link against pthread, otherwise test program used by autoconf

build_files/build_environment/cmake/fftw.cmake

@@ -28,9 +28,9 @@ else()
 endif()
 
 ExternalProject_Add(external_fftw3
-  URL file://${PACKAGE_DIR}/${FFTW_FILE}
+  URL ${FFTW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FFTW_HASH_TYPE}=${FFTW_HASH}
+  URL_HASH MD5=${FFTW_HASH}
   PREFIX ${BUILD_DIR}/fftw3
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} ${FFTW_EXTRA_ARGS} --prefix=${mingw_LIBDIR}/fftw3
   PATCH_COMMAND ${FFTW3_PATCH_COMMAND}

build_files/build_environment/cmake/flac.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_flac
-  URL file://${PACKAGE_DIR}/${FLAC_FILE}
+  URL ${FLAC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FLAC_HASH_TYPE}=${FLAC_HASH}
+  URL_HASH SHA256=${FLAC_HASH}
   PREFIX ${BUILD_DIR}/flac
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/flexbison.cmake

@@ -19,9 +19,9 @@
 set(FLEXBISON_EXTRA_ARGS)
 
 ExternalProject_Add(external_flexbison
-  URL file://${PACKAGE_DIR}/${FLEXBISON_FILE}
+  URL ${FLEXBISON_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FLEXBISON_HASH_TYPE}=${FLEXBISON_HASH}
+  URL_HASH MD5=${FLEXBISON_HASH}
   PREFIX ${BUILD_DIR}/flexbison
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
   CONFIGURE_COMMAND echo .

build_files/build_environment/cmake/freeglut.cmake

@@ -24,9 +24,9 @@ if(WIN32)
     )
 
     ExternalProject_Add(external_freeglut
-      URL file://${PACKAGE_DIR}/${FREEGLUT_FILE}
+      URL ${FREEGLUT_URI}
       DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      URL_HASH ${FREEGLUT_HASH_TYPE}=${FREEGLUT_HASH}
+      URL_HASH MD5=${FREEGLUT_HASH}
       PREFIX ${BUILD_DIR}/freeglut
       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freeglut ${DEFAULT_C_FLAGS} ${DEFAULT_CXX_FLAGS} ${FREEGLUT_EXTRA_ARGS}
       INSTALL_DIR ${LIBDIR}/freeglut

build_files/build_environment/cmake/freetype.cmake

@@ -28,9 +28,9 @@ set(FREETYPE_EXTRA_ARGS
   -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE)
 
 ExternalProject_Add(external_freetype
-  URL file://${PACKAGE_DIR}/${FREETYPE_FILE}
+  URL ${FREETYPE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${FREETYPE_HASH_TYPE}=${FREETYPE_HASH}
+  URL_HASH MD5=${FREETYPE_HASH}
   PREFIX ${BUILD_DIR}/freetype
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/freetype

build_files/build_environment/cmake/glew.cmake

@@ -22,9 +22,9 @@ set(GLEW_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_glew
-  URL file://${PACKAGE_DIR}/${GLEW_FILE}
+  URL ${GLEW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${GLEW_HASH_TYPE}=${GLEW_HASH}
+  URL_HASH MD5=${GLEW_HASH}
   PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt ${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
   PREFIX ${BUILD_DIR}/glew
   CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}

build_files/build_environment/cmake/glfw.cmake

@@ -19,9 +19,9 @@
 set(GLFW_EXTRA_ARGS)
 
 ExternalProject_Add(external_glfw
-  URL file://${PACKAGE_DIR}/${GLFW_FILE}
+  URL ${GLFW_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${GLFW_HASH_TYPE}=${GLFW_HASH}
+  URL_HASH MD5=${GLFW_HASH}
   PREFIX ${BUILD_DIR}/glfw
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/glfw

build_files/build_environment/cmake/gmp.cmake

@@ -46,9 +46,9 @@ elseif(UNIX)
 endif()
 
 ExternalProject_Add(external_gmp
-  URL file://${PACKAGE_DIR}/${GMP_FILE}
+  URL ${GMP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
+  URL_HASH MD5=${GMP_HASH}
   PREFIX ${BUILD_DIR}/gmp
   CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/gmp ${GMP_OPTIONS} ${GMP_EXTRA_ARGS}
   BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && make -j${MAKE_THREADS}
@@ -84,9 +84,9 @@ if(WIN32)
   # given the C++ ABI between MSVC and mingw is not compatible, we need to build the bindings
   # with MSVC, while GMP can only be build with mingw.
   ExternalProject_Add(external_gmpxx
-    URL file://${PACKAGE_DIR}/${GMP_FILE}
+    URL ${GMP_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
+    URL_HASH MD5=${GMP_HASH}
     PREFIX ${BUILD_DIR}/gmpxx
     PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_gmpxx.txt ${BUILD_DIR}/gmpxx/src/external_gmpxx/CMakeLists.txt &&
                           ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/config_gmpxx.h ${BUILD_DIR}/gmpxx/src/external_gmpxx/config.h

build_files/build_environment/cmake/haru.cmake

@@ -24,9 +24,9 @@ set(HARU_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_haru
-  URL file://${PACKAGE_DIR}/${HARU_FILE}
+  URL ${HARU_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${HARU_HASH_TYPE}=${HARU_HASH}
+  URL_HASH MD5=${HARU_HASH}
   PREFIX ${BUILD_DIR}/haru
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/haru/src/external_haru < ${PATCH_DIR}/haru.diff
   CMAKE_ARGS

build_files/build_environment/cmake/iconv.cmake

@@ -19,9 +19,9 @@
 set(ICONV_EXTRA_ARGS)
 
 ExternalProject_Add(external_iconv
-  URL file://${PACKAGE_DIR}/${ICONV_FILE}
+  URL ${ICONV_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ICONV_HASH_TYPE}=${ICONV_HASH}
+  URL_HASH MD5=${ICONV_HASH}
   PREFIX ${BUILD_DIR}/iconv
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/ispc.cmake

@@ -63,9 +63,9 @@ set(ISPC_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_ispc
-  URL file://${PACKAGE_DIR}/${ISPC_FILE}
+  URL ${ISPC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ISPC_HASH_TYPE}=${ISPC_HASH}
+  URL_HASH MD5=${ISPC_HASH}
   PREFIX ${BUILD_DIR}/ispc
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ispc/src/external_ispc < ${PATCH_DIR}/ispc.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ISPC_EXTRA_ARGS} ${BUILD_DIR}/ispc/src/external_ispc

build_files/build_environment/cmake/jemalloc.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_jemalloc
-  URL file://${PACKAGE_DIR}/${JEMALLOC_FILE}
+  URL ${JEMALLOC_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${JEMALLOC_HASH_TYPE}=${JEMALLOC_HASH}
+  URL_HASH MD5=${JEMALLOC_HASH}
   PREFIX ${BUILD_DIR}/jemalloc
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/jpeg.cmake

@@ -21,9 +21,9 @@ if(WIN32)
   set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d -DWITH_CRT_DLL=On)
 
   ExternalProject_Add(external_jpeg
-    URL file://${PACKAGE_DIR}/${JPEG_FILE}
+    URL ${JPEG_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
+    URL_HASH MD5=${JPEG_HASH}
     PREFIX ${BUILD_DIR}/jpg
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/jpg
@@ -50,9 +50,9 @@ else(WIN32)
     -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib)
 
   ExternalProject_Add(external_jpeg
-    URL file://${PACKAGE_DIR}/${JPEG_FILE}
+    URL ${JPEG_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
+    URL_HASH MD5=${JPEG_HASH}
     PREFIX ${BUILD_DIR}/jpg
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/jpg

build_files/build_environment/cmake/lame.cmake

@@ -24,9 +24,9 @@ if(MSVC)
 endif()
 
 ExternalProject_Add(external_lame
-  URL file://${PACKAGE_DIR}/${LAME_FILE}
+  URL ${LAME_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LAME_HASH_TYPE}=${LAME_HASH}
+  URL_HASH MD5=${LAME_HASH}
   PREFIX ${BUILD_DIR}/lame
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
     --enable-export=full

build_files/build_environment/cmake/libglu.cmake

@@ -27,9 +27,9 @@ set(LIBGLU_EXTRA_FLAGS
 )
 
 ExternalProject_Add(external_libglu
-  URL file://${PACKAGE_DIR}/${LIBGLU_FILE}
+  URL ${LIBGLU_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LIBGLU_HASH_TYPE}=${LIBGLU_HASH}
+  URL_HASH MD5=${LIBGLU_HASH}
   PREFIX ${BUILD_DIR}/libglu
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/libglu/src/external_libglu/ &&

build_files/build_environment/cmake/llvm.cmake

@@ -52,9 +52,9 @@ endif()
 
 # short project name due to long filename issues on windows
 ExternalProject_Add(ll
-  URL file://${PACKAGE_DIR}/${LLVM_FILE}
+  URL ${LLVM_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LLVM_HASH_TYPE}=${LLVM_HASH}
+  URL_HASH MD5=${LLVM_HASH}
   CMAKE_GENERATOR ${LLVM_GENERATOR}
   LIST_SEPARATOR ^^
   PREFIX ${BUILD_DIR}/ll

build_files/build_environment/cmake/lzma.cmake

@@ -19,9 +19,9 @@
 set(LZMA_PATCH_CMD echo .)
 
 ExternalProject_Add(external_lzma
-  URL file://${PACKAGE_DIR}/${LZMA_FILE}
+  URL ${LZMA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${LZMA_HASH_TYPE}=${LZMA_HASH}
+  URL_HASH SHA256=${LZMA_HASH}
   PREFIX ${BUILD_DIR}/lzma
   PATCH_COMMAND ${LZMA_PATCH_CMD}
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma

build_files/build_environment/cmake/mesa.cmake

@@ -53,9 +53,9 @@ set(MESA_EXTRA_FLAGS
 )
 
 ExternalProject_Add(external_mesa
-  URL file://${PACKAGE_DIR}/${MESA_FILE}
+  URL ${MESA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${MESA_HASH_TYPE}=${MESA_HASH}
+  URL_HASH MD5=${MESA_HASH}
   PREFIX ${BUILD_DIR}/mesa
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/mesa/src/external_mesa/ &&

build_files/build_environment/cmake/nanovdb.cmake

@@ -37,9 +37,9 @@ set(NANOVDB_EXTRA_ARGS
 )
 
 ExternalProject_Add(nanovdb
-  URL file://${PACKAGE_DIR}/${NANOVDB_FILE}
+  URL ${NANOVDB_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NANOVDB_HASH_TYPE}=${NANOVDB_HASH}
+  URL_HASH MD5=${NANOVDB_HASH}
   PREFIX ${BUILD_DIR}/nanovdb
   SOURCE_SUBDIR nanovdb
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanovdb ${DEFAULT_CMAKE_FLAGS} ${NANOVDB_EXTRA_ARGS}

build_files/build_environment/cmake/nasm.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_nasm
-  URL file://${PACKAGE_DIR}/${NASM_FILE}
+  URL ${NASM_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NASM_HASH_TYPE}=${NASM_HASH}
+  URL_HASH SHA256=${NASM_HASH}
   PREFIX ${BUILD_DIR}/nasm
   PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/nasm/src/external_nasm < ${PATCH_DIR}/nasm.diff
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && ./autogen.sh && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/nasm

build_files/build_environment/cmake/numpy.cmake

@@ -32,9 +32,9 @@ endif()
 set(NUMPY_POSTFIX)
 
 ExternalProject_Add(external_numpy
-  URL file://${PACKAGE_DIR}/${NUMPY_FILE}
+  URL ${NUMPY_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${NUMPY_HASH_TYPE}=${NUMPY_HASH}
+  URL_HASH MD5=${NUMPY_HASH}
   PREFIX ${BUILD_DIR}/numpy
   PATCH_COMMAND ${NUMPY_PATCH}
   CONFIGURE_COMMAND ""

build_files/build_environment/cmake/ogg.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_ogg
-  URL file://${PACKAGE_DIR}/${OGG_FILE}
+  URL ${OGG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OGG_HASH_TYPE}=${OGG_HASH}
+  URL_HASH SHA256=${OGG_HASH}
   PREFIX ${BUILD_DIR}/ogg
   PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ogg/src/external_ogg < ${PATCH_DIR}/ogg.diff
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static

build_files/build_environment/cmake/openal.cmake

@@ -46,9 +46,9 @@ if(BUILD_MODE STREQUAL Release)
   endif()
 
   ExternalProject_Add(external_openal
-    URL file://${PACKAGE_DIR}/${OPENAL_FILE}
+    URL ${OPENAL_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${OPENAL_HASH_TYPE}=${OPENAL_HASH}
+    URL_HASH MD5=${OPENAL_HASH}
     PREFIX ${BUILD_DIR}/openal
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
     INSTALL_DIR ${LIBDIR}/openal

build_files/build_environment/cmake/opencollada.cmake

@@ -23,9 +23,9 @@ if(UNIX)
 endif()
 
 ExternalProject_Add(external_opencollada
-  URL file://${PACKAGE_DIR}/${OPENCOLLADA_FILE}
+  URL ${OPENCOLLADA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENCOLLADA_HASH_TYPE}=${OPENCOLLADA_HASH}
+  URL_HASH MD5=${OPENCOLLADA_HASH}
   PREFIX ${BUILD_DIR}/opencollada
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}

build_files/build_environment/cmake/opencolorio.cmake

@@ -55,9 +55,9 @@ else()
 endif()
 
 ExternalProject_Add(external_opencolorio
-  URL file://${PACKAGE_DIR}/${OPENCOLORIO_FILE}
+  URL ${OPENCOLORIO_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENCOLORIO_HASH_TYPE}=${OPENCOLORIO_HASH}
+  URL_HASH MD5=${OPENCOLORIO_HASH}
   PREFIX ${BUILD_DIR}/opencolorio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}

build_files/build_environment/cmake/openexr.cmake

@@ -42,9 +42,9 @@ set(OPENEXR_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_openexr
-  URL file://${PACKAGE_DIR}/${OPENEXR_FILE}
+  URL ${OPENEXR_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENEXR_HASH_TYPE}=${OPENEXR_HASH}
+  URL_HASH MD5=${OPENEXR_HASH}
   PREFIX ${BUILD_DIR}/openexr
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openexr

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -41,9 +41,9 @@ else()
 endif()
 
 ExternalProject_Add(external_openimagedenoise
-  URL file://${PACKAGE_DIR}/${OIDN_FILE}
+  URL ${OIDN_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
+  URL_HASH MD5=${OIDN_HASH}
   PREFIX ${BUILD_DIR}/openimagedenoise
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/oidn.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}

build_files/build_environment/cmake/openimageio.cmake

@@ -120,9 +120,9 @@ set(OPENIMAGEIO_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_openimageio
-  URL file://${PACKAGE_DIR}/${OPENIMAGEIO_FILE}
+  URL ${OPENIMAGEIO_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENIMAGEIO_HASH_TYPE}=${OPENIMAGEIO_HASH}
+  URL_HASH MD5=${OPENIMAGEIO_HASH}
   PREFIX ${BUILD_DIR}/openimageio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}

build_files/build_environment/cmake/openjpeg.cmake

@@ -28,9 +28,9 @@ else()
 endif()
 
 ExternalProject_Add(external_openjpeg
-  URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
+  URL ${OPENJPEG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
+  URL_HASH SHA256=${OPENJPEG_HASH}
   PREFIX ${BUILD_DIR}/openjpeg
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
@@ -42,9 +42,9 @@ ExternalProject_Add(external_openjpeg
 if(MSVC)
   set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
   ExternalProject_Add(external_openjpeg_msvc
-    URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
+    URL ${OPENJPEG_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
+    URL_HASH SHA256=${OPENJPEG_HASH}
     PREFIX ${BUILD_DIR}/openjpeg_msvc
     CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
     INSTALL_DIR ${LIBDIR}/openjpeg_msvc

build_files/build_environment/cmake/openmp.cmake

@@ -18,9 +18,9 @@
 
 
 ExternalProject_Add(external_openmp
-  URL file://${PACKAGE_DIR}/${OPENMP_FILE}
+  URL ${OPENMP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
+  URL_HASH MD5=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}

build_files/build_environment/cmake/opensubdiv.cmake

@@ -65,9 +65,9 @@ else()
 endif()
 
 ExternalProject_Add(external_opensubdiv
-  URL file://${PACKAGE_DIR}/${OPENSUBDIV_FILE}
+  URL ${OPENSUBDIV_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENSUBDIV_HASH_TYPE}=${OPENSUBDIV_HASH}
+  URL_HASH MD5=${OPENSUBDIV_HASH}
   PREFIX ${BUILD_DIR}/opensubdiv
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/opensubdiv

build_files/build_environment/cmake/openvdb.cmake

@@ -77,9 +77,9 @@ else()
 endif()
 
 ExternalProject_Add(openvdb
-  URL file://${PACKAGE_DIR}/${OPENVDB_FILE}
+  URL ${OPENVDB_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPENVDB_HASH_TYPE}=${OPENVDB_HASH}
+  URL_HASH MD5=${OPENVDB_HASH}
   PREFIX ${BUILD_DIR}/openvdb
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}

build_files/build_environment/cmake/options.cmake

@@ -35,25 +35,13 @@ else(BUILD_MODE STREQUAL "Debug")
   set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
 endif()
 
-set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files")
+option(DOWNLOAD_DIR "Path for downloaded files" ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
-# look in blenders source folder for packages directory, if that exists
-# it will our package folder, otherwise it will be in the build folder
-if(EXISTS "${CMAKE_SOURCE_DIR}/../../packages")
-  set(PACKAGE_DIR_DEFAULT "${CMAKE_SOURCE_DIR}/../../packages")
-else()
-  set(PACKAGE_DIR_DEFAULT "${CMAKE_CURRENT_BINARY_DIR}/packages")
-endif()
-set(PACKAGE_DIR ${PACKAGE_DIR_DEFAULT} CACHE STRING "Path for downloaded source files")
-option(PACKAGE_USE_UPSTREAM_SOURCES "Use soures upstream to download the package sources, when OFF the blender mirror will be used" ON)
-
 file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
-file(TO_CMAKE_PATH ${PACKAGE_DIR} PACKAGE_DIR)
 set(PATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/patches)
 set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/build)
 
 message("LIBDIR = ${LIBDIR}")
 message("DOWNLOAD_DIR = ${DOWNLOAD_DIR}")
-message("PACKAGE_DIR = ${PACKAGE_DIR}")
 message("PATCH_DIR = ${PATCH_DIR}")
 message("BUILD_DIR = ${BUILD_DIR}")
 

build_files/build_environment/cmake/opus.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_opus
-  URL file://${PACKAGE_DIR}/${OPUS_FILE}
+  URL ${OPUS_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${OPUS_HASH_TYPE}=${OPUS_HASH}
+  URL_HASH SHA256=${OPUS_HASH}
   PREFIX ${BUILD_DIR}/opus
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/opus
     --disable-shared

build_files/build_environment/cmake/osl.cmake

@@ -77,10 +77,10 @@ if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
 endif()
 
 ExternalProject_Add(external_osl
-  URL file://${PACKAGE_DIR}/${OSL_FILE}
+  URL ${OSL_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   LIST_SEPARATOR ^^
-  URL_HASH ${OSL_HASH_TYPE}=${OSL_HASH}
+  URL_HASH MD5=${OSL_HASH}
   PREFIX ${BUILD_DIR}/osl
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}

build_files/build_environment/cmake/png.cmake

@@ -27,9 +27,9 @@ if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
 endif()
 
 ExternalProject_Add(external_png
-  URL file://${PACKAGE_DIR}/${PNG_FILE}
+  URL ${PNG_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PNG_HASH_TYPE}=${PNG_HASH}
+  URL_HASH SHA256=${PNG_HASH}
   PREFIX ${BUILD_DIR}/png
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/png

build_files/build_environment/cmake/potrace.cmake

@@ -21,9 +21,9 @@ set(POTRACE_EXTRA_ARGS
 
 if((WIN32 AND BUILD_MODE STREQUAL Release) OR UNIX)
   ExternalProject_Add(external_potrace
-    URL file://${PACKAGE_DIR}/${POTRACE_FILE}
+    URL ${POTRACE_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${POTRACE_HASH_TYPE}=${POTRACE_HASH}
+    URL_HASH MD5=${POTRACE_HASH}
     PREFIX ${BUILD_DIR}/potrace
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_potrace.txt ${BUILD_DIR}/potrace/src/external_potrace/CMakeLists.txt
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/potrace ${DEFAULT_CMAKE_FLAGS} ${POTRACE_EXTRA_ARGS}

build_files/build_environment/cmake/pthreads.cmake

@@ -27,9 +27,9 @@ if(WIN32)
     set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS})
 
     ExternalProject_Add(external_pthreads
-      URL file://${PACKAGE_DIR}/${PTHREADS_FILE}
+      URL ${PTHREADS_URI}
       DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      URL_HASH ${PTHREADS_HASH_TYPE}=${PTHREADS_HASH}
+      URL_HASH MD5=${PTHREADS_HASH}
       PREFIX ${BUILD_DIR}/pthreads
       CONFIGURE_COMMAND echo .
       PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff

build_files/build_environment/cmake/pugixml.cmake

@@ -20,9 +20,9 @@ set(PUGIXML_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_pugixml
-  URL file://${PACKAGE_DIR}/${PUGIXML_FILE}
+  URL ${PUGIXML_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${PUGIXML_HASH_TYPE}=${PUGIXML_HASH}
+  URL_HASH MD5=${PUGIXML_HASH}
   PREFIX ${BUILD_DIR}/pugixml
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/pugixml

build_files/build_environment/cmake/python.cmake

@@ -37,9 +37,9 @@ if(WIN32)
   cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
 
   ExternalProject_Add(external_python
-    URL file://${PACKAGE_DIR}/${PYTHON_FILE}
+    URL ${PYTHON_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
+    URL_HASH MD5=${PYTHON_HASH}
     PREFIX ${BUILD_DIR}/python
     CONFIGURE_COMMAND ""
     BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p x64 -c ${BUILD_MODE}
@@ -90,9 +90,9 @@ else()
     export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
 
   ExternalProject_Add(external_python
-    URL file://${PACKAGE_DIR}/${PYTHON_FILE}
+    URL ${PYTHON_URI}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
+    URL_HASH MD5=${PYTHON_HASH}
     PREFIX ${BUILD_DIR}/python
     PATCH_COMMAND ${PYTHON_PATCH}
     CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}

build_files/build_environment/cmake/sdl.cmake

@@ -30,9 +30,9 @@ else()
 endif()
 
 ExternalProject_Add(external_sdl
-  URL file://${PACKAGE_DIR}/${SDL_FILE}
+  URL ${SDL_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SDL_HASH_TYPE}=${SDL_HASH}
+  URL_HASH MD5=${SDL_HASH}
   PREFIX ${BUILD_DIR}/sdl
   PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}

build_files/build_environment/cmake/sndfile.cmake

@@ -34,9 +34,9 @@ else()
 endif()
 
 ExternalProject_Add(external_sndfile
-  URL file://${PACKAGE_DIR}/${SNDFILE_FILE}
+  URL ${SNDFILE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SNDFILE_HASH_TYPE}=${SNDFILE_HASH}
+  URL_HASH MD5=${SNDFILE_HASH}
   PREFIX ${BUILD_DIR}/sndfile
   PATCH_COMMAND ${SNDFILE_PATCH_CMD}
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile

build_files/build_environment/cmake/spnav.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_spnav
-  URL file://${PACKAGE_DIR}/${SPNAV_FILE}
+  URL ${SPNAV_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SPNAV_HASH_TYPE}=${SPNAV_HASH}
+  URL_HASH MD5=${SPNAV_HASH}
   PREFIX ${BUILD_DIR}/spnav
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}

build_files/build_environment/cmake/sqlite.cmake

@@ -60,9 +60,9 @@ if(UNIX)
 endif()
 
 ExternalProject_Add(external_sqlite
-  URL file://${PACKAGE_DIR}/${SQLITE_FILE}
+  URL ${SQLITE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SQLITE_HASH_TYPE}=${SQLITE_HASH}
+  URL_HASH SHA1=${SQLITE_HASH}
   PREFIX ${BUILD_DIR}/sqlite
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/sqlite/src/external_sqlite < ${PATCH_DIR}/sqlite.diff
   CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}

build_files/build_environment/cmake/ssl.cmake

@@ -31,9 +31,9 @@ else()
 endif()
 
 ExternalProject_Add(external_ssl
-  URL file://${PACKAGE_DIR}/${SSL_FILE}
+  URL ${SSL_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
+  URL_HASH SHA256=${SSL_HASH}
   PREFIX ${BUILD_DIR}/ssl
   PATCH_COMMAND ${SSL_PATCH_CMD}
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl

build_files/build_environment/cmake/tbb.cmake

@@ -37,9 +37,9 @@ endif()
 
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb
-  URL file://${PACKAGE_DIR}/${TBB_FILE}
+  URL ${TBB_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${TBB_HASH_TYPE}=${TBB_HASH}
+  URL_HASH MD5=${TBB_HASH}
   PREFIX ${BUILD_DIR}/tbb
   PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
   ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver &&

build_files/build_environment/cmake/theora.cmake

@@ -23,9 +23,9 @@ else()
 endif()
 
 ExternalProject_Add(external_theora
-  URL file://${PACKAGE_DIR}/${THEORA_FILE}
+  URL ${THEORA_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${THEORA_HASH_TYPE}=${THEORA_HASH}
+  URL_HASH SHA256=${THEORA_HASH}
   PREFIX ${BUILD_DIR}/theora
   PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/theora/src/external_theora < ${PATCH_DIR}/theora.diff
   CONFIGURE_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora

build_files/build_environment/cmake/tiff.cmake

@@ -34,9 +34,9 @@ set(TIFF_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_tiff
-  URL file://${PACKAGE_DIR}/${TIFF_FILE}
+  URL ${TIFF_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${TIFF_HASH_TYPE}=${TIFF_HASH}
+  URL_HASH MD5=${TIFF_HASH}
   PREFIX ${BUILD_DIR}/tiff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/tiff

build_files/build_environment/cmake/usd.cmake

@@ -53,9 +53,9 @@ set(USD_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_usd
-  URL file://${PACKAGE_DIR}/${USD_FILE}
+  URL ${USD_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${USD_HASH_TYPE}=${USD_HASH}
+  URL_HASH MD5=${USD_HASH}
   PREFIX ${BUILD_DIR}/usd
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}

build_files/build_environment/cmake/versions.cmake

@@ -19,54 +19,37 @@
 set(ZLIB_VERSION 1.2.11)
 set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
 set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
-set(ZLIB_HASH_TYPE MD5)
-set(ZLIB_FILE zlib-${ZLIB_VERSION}.tar.gz)
 
 set(OPENAL_VERSION 1.20.1)
 set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
 set(OPENAL_HASH 556695068ce8375b89986083d810fd35)
-set(OPENAL_HASH_TYPE MD5)
-set(OPENAL_FILE openal-soft-${OPENAL_VERSION}.tar.bz2)
 
 set(PNG_VERSION 1.6.37)
 set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
 set(PNG_HASH 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca)
-set(PNG_HASH_TYPE SHA256)
-set(PNG_FILE libpng-${PNG_VERSION}.tar.xz)
 
 set(JPEG_VERSION 2.0.4)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
 set(JPEG_HASH 44c43e4a9fb352f47090804529317c88)
-set(JPEG_HASH_TYPE MD5)
-set(JPEG_FILE libjpeg-turbo-${JPEG_VERSION}.tar.gz)
 
 set(BOOST_VERSION 1.73.0)
 set(BOOST_VERSION_NODOTS 1_73_0)
 set(BOOST_VERSION_NODOTS_SHORT 1_73)
 set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
 set(BOOST_HASH 4036cd27ef7548b8d29c30ea10956196)
-set(BOOST_HASH_TYPE MD5)
-set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
 
 # Using old version as recommended by OpenVDB build documentation.
 set(BLOSC_VERSION 1.5.0)
 set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
 set(BLOSC_HASH 6e4a49c8c06f05aa543f3312cfce3d55)
-set(BLOSC_HASH_TYPE MD5)
-set(BLOSC_FILE blosc-${BLOSC_VERSION}.tar.gz)
 
 set(PTHREADS_VERSION 3.0.0)
-set(PTHREADS_URI http://prdownloads.sourceforge.net/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
+set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
 set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
-set(PTHREADS_HASH_TYPE MD5)
-set(PTHREADS_FILE pthreads4w-code-${PTHREADS_VERSION}.zip)
 
 set(OPENEXR_VERSION 2.5.5)
 set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
 set(OPENEXR_HASH 85e8a979092c9055d10ed103062d31a0)
-set(OPENEXR_HASH_TYPE MD5)
-set(OPENEXR_FILE openexr-${OPENEXR_VERSION}.tar.gz)
-
 if(WIN32)
   # Openexr started appending _d on its own so now
   # we need to tell the build the postfix is _s while
@@ -86,141 +69,97 @@ endif()
 set(FREETYPE_VERSION 2.10.2)
 set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
 set(FREETYPE_HASH b1cb620e4c875cd4d1bfa04945400945)
-set(FREETYPE_HASH_TYPE MD5)
-set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
 
 set(GLEW_VERSION 1.13.0)
 set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
 set(GLEW_HASH 7cbada3166d2aadfc4169c4283701066)
-set(GLEW_HASH_TYPE MD5)
-set(GLEW_FILE glew-${GLEW_VERSION}.tgz)
 
 set(FREEGLUT_VERSION 3.0.0)
-set(FREEGLUT_URI http://prdownloads.sourceforge.net/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
+set(FREEGLUT_URI http://pilotfiber.dl.sourceforge.net/project/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz)
 set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754)
-set(FREEGLUT_HASH_TYPE MD5)
-set(FREEGLUT_FILE freeglut-${FREEGLUT_VERSION}.tar.gz)
 
 set(ALEMBIC_VERSION 1.7.16)
 set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
-set(ALEMBIC_HASH effcc86e42fe6605588e3de57bde6677)
+set(ALEMBIC_MD5 effcc86e42fe6605588e3de57bde6677)
-set(ALEMBIC_HASH_TYPE MD5)
-set(ALEMBIC_FILE alembic-${ALEMBIC_VERSION}.tar.gz)
 
 # hash is for 3.1.2
 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
 set(GLFW_URI https://github.com/glfw/glfw/archive/${GLFW_GIT_UID}.zip)
 set(GLFW_HASH 20cacb1613da7eeb092f3ac4f6b2b3d0)
-set(GLFW_HASH_TYPE MD5)
-set(GLFW_FILE glfw-${GLFW_GIT_UID}.zip)
 
 # latest uid in git as of 2016-04-01
 set(CLEW_GIT_UID 277db43f6cafe8b27c6f1055f69dc67da4aeb299)
 set(CLEW_URI https://github.com/OpenCLWrangler/clew/archive/${CLEW_GIT_UID}.zip)
 set(CLEW_HASH 2c699d10ed78362e71f56fae2a4c5f98)
-set(CLEW_HASH_TYPE MD5)
-set(CLEW_FILE clew-${CLEW_GIT_UID}.zip)
 
 # latest uid in git as of 2016-04-01
 set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
 set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
 set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)
-set(CUEW_HASH_TYPE MD5)
-set(CUEW_FILE cuew-${CUEW_GIT_UID}.zip)
 
 set(OPENSUBDIV_VERSION v3_4_3)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
 set(OPENSUBDIV_HASH 7bbfa275d021fb829e521df749160edb)
-set(OPENSUBDIV_HASH_TYPE MD5)
-set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
 
 set(SDL_VERSION 2.0.12)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
 set(SDL_HASH 783b6f2df8ff02b19bb5ce492b99c8ff)
-set(SDL_HASH_TYPE MD5)
-set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz)
 
 set(OPENCOLLADA_VERSION v1.6.68)
 set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
 set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
-set(OPENCOLLADA_HASH_TYPE MD5)
-set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
 
 set(OPENCOLORIO_VERSION 2.0.0)
 set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
 set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
-set(OPENCOLORIO_HASH_TYPE MD5)
-set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
 if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
   # Newer version required by ISPC with arm support.
   set(LLVM_VERSION 11.0.1)
   set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
   set(LLVM_HASH e700af40ab83463e4e9ab0ba3708312e)
-  set(LLVM_HASH_TYPE MD5)
-  set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
 
   set(OPENMP_VERSION 9.0.1)
   set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
   set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
-  set(OPENMP_HASH_TYPE MD5)
-  set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 else()
   set(LLVM_VERSION 9.0.1)
   set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.tar.xz)
   set(LLVM_HASH b4268e733dfe352960140dc07ef2efcb)
-  set(LLVM_HASH_TYPE MD5)
-  set(LLVM_FILE llvm-project-${LLVM_VERSION}.tar.xz)
 
   set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
   set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
-  set(OPENMP_HASH_TYPE MD5)
-  set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
 endif()
 
 set(OPENIMAGEIO_VERSION 2.1.15.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
 set(OPENIMAGEIO_HASH f03aa5e3ac4795af04771ee4146e9832)
-set(OPENIMAGEIO_HASH_TYPE MD5)
-set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
 set(TIFF_VERSION 4.1.0)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
 set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
-set(TIFF_HASH_TYPE MD5)
-set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
 set(OSL_VERSION 1.11.10.0)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
 set(OSL_HASH dfdc23597aeef083832cbada62211756)
-set(OSL_HASH_TYPE MD5)
-set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
 set(PYTHON_VERSION 3.9.2)
 set(PYTHON_SHORT_VERSION 3.9)
 set(PYTHON_SHORT_VERSION_NO_DOTS 39)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
 set(PYTHON_HASH f0dc9000312abeb16de4eccce9a870ab)
-set(PYTHON_HASH_TYPE MD5)
-set(PYTHON_FILE Python-${PYTHON_VERSION}.tar.xz)
 
 set(TBB_VERSION 2020_U2)
 set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
 set(TBB_HASH 1b711ae956524855088df3bbf5ec65dc)
-set(TBB_HASH_TYPE MD5)
-set(TBB_FILE oneTBB-${TBB_VERSION}.tar.gz)
 
 set(OPENVDB_VERSION 8.0.1)
 set(OPENVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
 set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
-set(OPENVDB_HASH_TYPE MD5)
-set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
 set(NANOVDB_GIT_UID e62f7a0bf1e27397223c61ddeaaf57edf111b77f)
 set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
 set(NANOVDB_HASH 90919510bc6ccd630fedc56f748cb199)
-set(NANOVDB_HASH_TYPE MD5)
-set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
 
 set(IDNA_VERSION 2.10)
 set(CHARDET_VERSION 4.0.0)
@@ -233,148 +172,107 @@ set(NUMPY_VERSION 1.19.5)
 set(NUMPY_SHORT_VERSION 1.19)
 set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip)
 set(NUMPY_HASH f6a1b48717c552bbc18f1adc3cc1fe0e)
-set(NUMPY_HASH_TYPE MD5)
-set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip)
 
 set(LAME_VERSION 3.100)
 set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
 set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
-set(LAME_HASH_TYPE MD5)
-set(LAME_FILE lame-${LAME_VERSION}.tar.gz)
 
 set(OGG_VERSION 1.3.4)
 set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
 set(OGG_HASH fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e)
-set(OGG_HASH_TYPE SHA256)
-set(OGG_FILE libogg-${OGG_VERSION}.tar.gz)
 
 set(VORBIS_VERSION 1.3.6)
 set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
 set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
-set(VORBIS_HASH_TYPE SHA256)
-set(VORBIS_FILE libvorbis-${VORBIS_VERSION}.tar.gz)
 
 set(THEORA_VERSION 1.1.1)
 set(THEORA_URI http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2)
 set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc)
-set(THEORA_HASH_TYPE SHA256)
-set(THEORA_FILE libtheora-${THEORA_VERSION}.tar.bz2)
 
 set(FLAC_VERSION 1.3.3)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
 set(FLAC_HASH 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748)
-set(FLAC_HASH_TYPE SHA256)
-set(FLAC_FILE flac-${FLAC_VERSION}.tar.xz)
 
 set(VPX_VERSION 1.8.2)
 set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
 set(VPX_HASH 8735d9fcd1a781ae6917f28f239a8aa358ce4864ba113ea18af4bb2dc8b474ac)
-set(VPX_HASH_TYPE SHA256)
-set(VPX_FILE libvpx-v${VPX_VERSION}.tar.gz)
 
 set(OPUS_VERSION 1.3.1)
 set(OPUS_URI https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz)
 set(OPUS_HASH 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d)
-set(OPUS_HASH_TYPE SHA256)
-set(OPUS_FILE opus-${OPUS_VERSION}.tar.gz)
 
-set(X264_VERSION 33f9e1474613f59392be5ab6a7e7abf60fa63622)
+set(X264_URI https://code.videolan.org/videolan/x264/-/archive/33f9e1474613f59392be5ab6a7e7abf60fa63622/x264-33f9e1474613f59392be5ab6a7e7abf60fa63622.tar.gz)
-set(X264_URI https://code.videolan.org/videolan/x264/-/archive/${X264_VERSION}/x264-${X264_VERSION}.tar.gz)
 set(X264_HASH 5456450ee1ae02cd2328be3157367a232a0ab73315e8c8f80dab80469524f525)
-set(X264_HASH_TYPE SHA256)
-set(X264_FILE x264-${X264_VERSION}.tar.gz)
 
 set(XVIDCORE_VERSION 1.3.7)
 set(XVIDCORE_URI https://downloads.xvid.com/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
 set(XVIDCORE_HASH abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d)
-set(XVIDCORE_HASH_TYPE SHA256)
-set(XVIDCORE_FILE xvidcore-${XVIDCORE_VERSION}.tar.gz)
 
 set(OPENJPEG_VERSION 2.3.1)
 set(OPENJPEG_SHORT_VERSION 2.3)
 set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz)
 set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9)
-set(OPENJPEG_HASH_TYPE SHA256)
-set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz)
 
 set(FFMPEG_VERSION 4.2.3)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
 set(FFMPEG_HASH 695fad11f3baf27784e24cb0e977b65a)
-set(FFMPEG_HASH_TYPE MD5)
-set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2)
 
 set(FFTW_VERSION 3.3.8)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
 set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
-set(FFTW_HASH_TYPE MD5)
-set(FFTW_FILE fftw-${FFTW_VERSION}.tar.gz)
 
 set(ICONV_VERSION 1.16)
 set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz)
 set(ICONV_HASH 7d2a800b952942bb2880efb00cfd524c)
-set(ICONV_HASH_TYPE MD5)
-set(ICONV_FILE libiconv-${ICONV_VERSION}.tar.gz)
 
 set(SNDFILE_VERSION 1.0.28)
 set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
 set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
-set(SNDFILE_HASH_TYPE MD5)
+
-set(SNDFILE_FILE libsndfile-${SNDFILE_VERSION}.tar.gz)
+# set(HIDAPI_VERSION 0.8.0-rc1)
+# set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
+# set(HIDAPI_HASH 069f9dd746edc37b6b6d0e3656f47199)
+
+set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5)
+set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip)
+set(HIDAPI_HASH b6e22f6b514f8bcf594989f20ffc46fb)
 
 set(WEBP_VERSION 0.6.1)
 set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz)
 set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
-set(WEBP_HASH_TYPE MD5)
-set(WEBP_FILE libwebp-${WEBP_VERSION}.tar.gz)
 
 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_HASH 44d840540d53326d4a119c0f1aa7bf0a)
-set(SPNAV_HASH_TYPE MD5)
-set(SPNAV_FILE libspnav-${SPNAV_VERSION}.tar.gz)
 
 set(JEMALLOC_VERSION 5.2.1)
 set(JEMALLOC_URI https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2)
 set(JEMALLOC_HASH 3d41fbf006e6ebffd489bdb304d009ae)
-set(JEMALLOC_HASH_TYPE MD5)
-set(JEMALLOC_FILE jemalloc-${JEMALLOC_VERSION}.tar.bz2)
 
 set(XML2_VERSION 2.9.10)
 set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz)
 set(XML2_HASH 10942a1dc23137a8aa07f0639cbfece5)
-set(XML2_HASH_TYPE MD5)
-set(XML2_FILE libxml2-${XML2_VERSION}.tar.gz)
 
 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_HASH c1b864c96804a10526540c664ade67f0)
-set(TINYXML_HASH_TYPE MD5)
-set(TINYXML_FILE tinyxml_${TINYXML_VERSION}.tar.gz)
 
 set(YAMLCPP_VERSION 0.6.3)
 set(YAMLCPP_URI https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-${YAMLCPP_VERSION})
 set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
-set(YAMLCPP_HASH_TYPE MD5)
-set(YAMLCPP_FILE yaml-cpp-${YAMLCPP_VERSION}.tar.gz)
 
 set(EXPAT_VERSION 2_2_10)
 set(EXPAT_URI https://github.com/libexpat/libexpat/archive/R_${EXPAT_VERSION}.tar.gz)
 set(EXPAT_HASH 7ca5f09959fcb9a57618368deb627b9f)
-set(EXPAT_HASH_TYPE MD5)
-set(EXPAT_FILE libexpat-${EXPAT_VERSION}.tar.gz)
 
 set(PUGIXML_VERSION 1.10)
 set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar.gz)
 set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
-set(PUGIXML_HASH_TYPE MD5)
-set(PUGIXML_FILE pugixml-${PUGIXML_VERSION}.tar.gz)
 
 set(FLEXBISON_VERSION 2.5.5)
-set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-${FLEXBISON_VERSION}.zip)
+set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-2.5.5.zip)
 set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
-set(FLEXBISON_HASH_TYPE MD5)
-set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
 
 # Libraries to keep Python modules static on Linux.
 
@@ -383,107 +281,73 @@ set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
 set(BZIP2_VERSION 1.0.8)
 set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERSION}.orig.tar.gz)
 set(BZIP2_HASH ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269)
-set(BZIP2_HASH_TYPE SHA256)
-set(BZIP2_FILE bzip2_${BZIP2_VERSION}.orig.tar.gz)
 
 set(FFI_VERSION 3.3)
 set(FFI_URI https://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
 set(FFI_HASH 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056)
-set(FFI_HASH_TYPE SHA256)
-set(FFI_FILE libffi-${FFI_VERSION}.tar.gz)
 
 set(LZMA_VERSION 5.2.5)
 set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2)
 set(LZMA_HASH 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df)
-set(LZMA_HASH_TYPE SHA256)
-set(LZMA_FILE xz-${LZMA_VERSION}.tar.bz2)
 
 set(SSL_VERSION 1.1.1g)
 set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
 set(SSL_HASH ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46)
-set(SSL_HASH_TYPE SHA256)
-set(SSL_FILE openssl-${SSL_VERSION}.tar.gz)
 
 set(SQLITE_VERSION 3.31.1)
 set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
 set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
-set(SQLITE_HASH_TYPE SHA1)
-set(SQLITE_FILE sqlite-src-3240000.zip)
 
 set(EMBREE_VERSION 3.10.0)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
 set(EMBREE_HASH 4bbe29e7eaa46417efc75fc5f1e8eb87)
-set(EMBREE_HASH_TYPE MD5)
-set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
 set(EMBREE_ARM_GIT https://github.com/brechtvl/embree.git)
 
 set(USD_VERSION 21.02)
 set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
 set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
-set(USD_HASH_TYPE MD5)
-set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
 set(OIDN_VERSION 1.3.0)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
 set(OIDN_HASH 301a5a0958d375a942014df0679b9270)
-set(OIDN_HASH_TYPE MD5)
-set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 
 set(LIBGLU_VERSION 9.0.1)
 set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.xz)
 set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
-set(LIBGLU_HASH_TYPE MD5)
-set(LIBGLU_FILE glu-${LIBGLU_VERSION}.tar.xz)
 
 set(MESA_VERSION 20.3.4)
 set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
 set(MESA_HASH 556338446aef8ae947a789b3e0b5e056)
-set(MESA_HASH_TYPE MD5)
-set(MESA_FILE mesa-${MESA_VERSION}.tar.xz)
 
 set(NASM_VERSION 2.15.02)
 set(NASM_URI https://github.com/netwide-assembler/nasm/archive/nasm-${NASM_VERSION}.tar.gz)
 set(NASM_HASH aded8b796c996a486a56e0515c83e414116decc3b184d88043480b32eb0a8589)
-set(NASM_HASH_TYPE SHA256)
-set(NASM_FILE nasm-${NASM_VERSION}.tar.gz)
 
 set(XR_OPENXR_SDK_VERSION 1.0.14)
 set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
 set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75)
-set(XR_OPENXR_SDK_HASH_TYPE MD5)
-set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)
 
 if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
   # Unreleased version with macOS arm support.
   set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
   set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d)
-  set(ISPC_HASH_TYPE MD5)
-  set(ISPC_FILE f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
 else()
   set(ISPC_VERSION v1.14.1)
   set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
   set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a)
-  set(ISPC_HASH_TYPE MD5)
-  set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
 endif()
 
 set(GMP_VERSION 6.2.0)
 set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)
 set(GMP_HASH a325e3f09e6d91e62101e59f9bda3ec1)
-set(GMP_HASH_TYPE MD5)
-set(GMP_FILE gmp-${GMP_VERSION}.tar.xz)
 
 set(POTRACE_VERSION 1.16)
 set(POTRACE_URI http://potrace.sourceforge.net/download/${POTRACE_VERSION}/potrace-${POTRACE_VERSION}.tar.gz)
 set(POTRACE_HASH 5f0bd87ddd9a620b0c4e65652ef93d69)
-set(POTRACE_HASH_TYPE MD5)
-set(POTRACE_FILE potrace-${POTRACE_VERSION}.tar.gz)
 
 set(HARU_VERSION 2_3_0)
 set(HARU_URI https://github.com/libharu/libharu/archive/RELEASE_${HARU_VERSION}.tar.gz)
 set(HARU_HASH 4f916aa49c3069b3a10850013c507460)
-set(HARU_HASH_TYPE MD5)
-set(HARU_FILE libharu-${HARU_VERSION}.tar.gz)
 
 set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
 set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)

build_files/build_environment/cmake/vorbis.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_vorbis
-  URL file://${PACKAGE_DIR}/${VORBIS_FILE}
+  URL ${VORBIS_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${VORBIS_HASH_TYPE}=${VORBIS_HASH}
+  URL_HASH SHA256=${VORBIS_HASH}
   PREFIX ${BUILD_DIR}/vorbis
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
     --disable-shared

build_files/build_environment/cmake/vpx.cmake

@@ -35,9 +35,9 @@ else()
 endif()
 
 ExternalProject_Add(external_vpx
-  URL file://${PACKAGE_DIR}/${VPX_FILE}
+  URL ${VPX_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${VPX_HASH_TYPE}=${VPX_HASH}
+  URL_HASH SHA256=${VPX_HASH}
   PREFIX ${BUILD_DIR}/vpx
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/vpx/src/external_vpx/ &&

build_files/build_environment/cmake/webp.cmake

@@ -32,9 +32,9 @@ else()
 endif()
 
 ExternalProject_Add(external_webp
-  URL file://${PACKAGE_DIR}/${WEBP_FILE}
+  URL ${WEBP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${WEBP_HASH_TYPE}=${WEBP_HASH}
+  URL_HASH MD5=${WEBP_HASH}
   PREFIX ${BUILD_DIR}/webp
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/webp

build_files/build_environment/cmake/x264.cmake

@@ -41,9 +41,9 @@ if(UNIX AND NOT APPLE)
 endif()
 
 ExternalProject_Add(external_x264
-  URL file://${PACKAGE_DIR}/${X264_FILE}
+  URL ${X264_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${X264_HASH_TYPE}=${X264_HASH}
+  URL_HASH SHA256=${X264_HASH}
   PREFIX ${BUILD_DIR}/x264
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${X264_CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ &&
     ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264

build_files/build_environment/cmake/xml2.cmake

@@ -17,9 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_xml2
-  URL file://${PACKAGE_DIR}/${XML2_FILE}
+  URL ${XML2_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
+  URL_HASH MD5=${XML2_HASH}
   PREFIX ${BUILD_DIR}/xml2
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
     --prefix=${LIBDIR}/xml2

build_files/build_environment/cmake/xr_openxr.cmake

@@ -35,9 +35,9 @@ if(UNIX AND NOT APPLE)
 endif()
 
 ExternalProject_Add(external_xr_openxr_sdk
-  URL file://${PACKAGE_DIR}/${XR_OPENXR_SDK_FILE}
+  URL ${XR_OPENXR_SDK_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${XR_OPENXR_SDK_HASH_TYPE}=${XR_OPENXR_SDK_HASH}
+  URL_HASH MD5=${XR_OPENXR_SDK_HASH}
   PREFIX ${BUILD_DIR}/xr_openxr_sdk
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xr_openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${XR_OPENXR_SDK_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/xr_openxr_sdk

build_files/build_environment/cmake/xvidcore.cmake

@@ -21,9 +21,9 @@ if(WIN32)
 endif()
 
 ExternalProject_Add(external_xvidcore
-  URL file://${PACKAGE_DIR}/${XVIDCORE_FILE}
+  URL ${XVIDCORE_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${XVIDCORE_HASH_TYPE}=${XVIDCORE_HASH}
+  URL_HASH SHA256=${XVIDCORE_HASH}
   PREFIX ${BUILD_DIR}/xvidcore
   CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/xvidcore ${XVIDCORE_EXTRA_ARGS}
   BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make -j${MAKE_THREADS}

build_files/build_environment/cmake/yamlcpp.cmake

@@ -30,9 +30,9 @@ if(WIN32)
 endif()
 
 ExternalProject_Add(external_yamlcpp
-  URL file://${PACKAGE_DIR}/${YAMLCPP_FILE}
+  URL ${YAMLCPP_URI}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${YAMLCPP_HASH_TYPE}=${YAMLCPP_HASH}
+  URL_HASH MD5=${YAMLCPP_HASH}
   PREFIX ${BUILD_DIR}/yamlcpp
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/yamlcpp

build_files/build_environment/cmake/zlib.cmake

@@ -17,8 +17,9 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_zlib
-  URL file://${PACKAGE_DIR}/${ZLIB_FILE}
+  URL ${ZLIB_URI}
-  URL_HASH ${ZLIB_HASH_TYPE}=${ZLIB_HASH}
+  URL_HASH MD5=${ZLIB_HASH}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/zlib
   CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
   INSTALL_DIR ${LIBDIR}/zlib

build_files/build_environment/cmake/zlib_mingw.cmake

@@ -17,8 +17,8 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_zlib_mingw
-  URL file://${PACKAGE_DIR}/${ZLIB_FILE}
+  URL ${ZLIB_URI}
-  URL_HASH ${ZLIB_HASH_TYPE}=${ZLIB_HASH}
+  URL_HASH MD5=${ZLIB_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/zlib_mingw
   CONFIGURE_COMMAND echo .

build_files/build_environment/install_deps.sh

@@ -51,7 +51,7 @@ ARGS=$( \
 getopt \
 -o s:i:t:h \
 --long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
-with-all,with-opencollada,with-jack,with-pulseaudio,with-embree,with-oidn,with-nanovdb,\
+with-all,with-opencollada,with-jack,with-embree,with-oidn,with-nanovdb,\
 ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,ver-xr-openxr:,\
 force-all,force-python,force-boost,force-tbb,\
 force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
@@ -157,9 +157,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --with-jack
         Install the jack libraries.
 
-    --with-pulseaudio
-        Install the pulseaudio libraries.
-
     --ver-ocio=<ver>
         Force version of OCIO library.
 
@@ -724,9 +721,6 @@ while true; do
     --with-jack)
       WITH_JACK=true; shift; continue;
     ;;
-    --with-pulseaudio)
-      WITH_PULSEAUDIO=true; shift; continue;
-    ;;
     --ver-ocio)
       OCIO_VERSION="$2"
       OCIO_VERSION_MIN=$OCIO_VERSION
@@ -991,7 +985,6 @@ fi
 if [ "$WITH_ALL" = true ]; then
   WITH_JACK=true
   WITH_NANOVDB=true
-  WITH_PULSEAUDIO=true
 fi
 
 if [ "$WITH_NANOVDB" = true ]; then
@@ -3884,10 +3877,6 @@ install_DEB() {
     fi
   fi
 
-  if [ "$WITH_PULSEAUDIO" = true ]; then
-    _packages="$_packages libpulse-dev"
-  fi
-
   PRINT ""
   install_packages_DEB $_packages
 
@@ -4510,10 +4499,6 @@ install_RPM() {
       _packages="$_packages jack-audio-connection-kit-devel"
     fi
 
-    if [ "$WITH_PULSEAUDIO" = true ]; then
-      _packages="$_packages pulseaudio-libs-devel"
-    fi
-
     PRINT ""
     install_packages_RPM $_packages
 
@@ -4557,10 +4542,6 @@ install_RPM() {
       X264_USE=true
     fi
 
-    if [ "$WITH_PULSEAUDIO" = true ]; then
-      _packages="$_packages libpulse-devel"
-    fi
-
     if [ "$WITH_ALL" = true ]; then
       PRINT ""
       XVID_DEV="libxvidcore-devel"
@@ -5092,10 +5073,6 @@ install_ARCH() {
     _packages="$_packages jack2"
   fi
 
-  if [ "$WITH_PULSEAUDIO" = true ]; then
-    _packages="$_packages libpulse"
-  fi
-
   PRINT ""
   install_packages_ARCH $_packages
 
@@ -5911,14 +5888,6 @@ print_info() {
     _buildargs="$_buildargs $_1 $_2"
   fi
 
-  if [ "$WITH_PULSEAUDIO" = true ]; then
-    _1="-D WITH_PULSEAUDIO=ON"
-    _2="-D WITH_PULSEAUDIO_DYNLOAD=ON"
-    PRINT "  $_1"
-    PRINT "  $_2"
-    _buildargs="$_buildargs $_1 $_2"
-  fi
-
   if [ "$ALEMBIC_SKIP" = false ]; then
     _1="-D WITH_ALEMBIC=ON"
     PRINT "  $_1"

build_files/build_environment/windows/build_deps.cmd

@@ -117,7 +117,7 @@ set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads
 mkdir %STAGING%\%BuildDir%%ARCH%R
 cd %Staging%\%BuildDir%%ARCH%R
 echo %DATE% %TIME% : Start > %StatusFile%
-cmake -G "%CMAKE_BUILDER%" -Thost=x64  %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
+cmake -G "%CMAKE_BUILDER%" -Thost=x64  %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
 echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
 	msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
@@ -130,7 +130,7 @@ if "%NODEBUG%" == "1" goto exit
 cd %BUILD_DIR%
 mkdir %STAGING%\%BuildDir%%ARCH%D
 cd %Staging%\%BuildDir%%ARCH%D
-cmake -G "%CMAKE_BUILDER%" -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
+cmake -G "%CMAKE_BUILDER%" -Thost=x64 %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/  %CMAKE_DEBUG_OPTIONS%
 echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
 if "%dobuild%" == "1" (
 	msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal 

build_files/buildbot/config/blender_linux.cmake

@@ -16,7 +16,6 @@ set(WITH_DOC_MANPAGE         OFF CACHE BOOL "" FORCE)
 # Options which are specific to Linux release builds only
 
 set(WITH_JACK_DYNLOAD        ON  CACHE BOOL "" FORCE)
-set(WITH_PULSEAUDIO_DYNLOAD  ON  CACHE BOOL "" FORCE)
 set(WITH_SDL_DYNLOAD         ON  CACHE BOOL "" FORCE)
 
 # ######## Release environment specific settings ########

build_files/cmake/Modules/FindPulse.cmake

@@ -1,60 +0,0 @@
-# - Find PulseAudio library
-# Find the native PulseAudio includes and library
-# This module defines
-#  LIBPULSE_INCLUDE_DIRS, where to find pulse/pulseaudio.h, Set when
-#                         LIBPULSE_INCLUDE_DIR is found.
-#  LIBPULSE_LIBRARIES, libraries to link against to use PulseAudio.
-#  LIBPULSE_ROOT_DIR, The base directory to search for PulseAudio.
-#                     This can also be an environment variable.
-#  PULSE_FOUND, If false, do not try to use PulseAudio.
-#
-# also defined, but not for general use are
-#  LIBPULSE_LIBRARY, where to find the PulseAudio library.
-
-#=============================================================================
-# Copyright 2021 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD 3-Clause License,
-# see accompanying file BSD-3-Clause-license.txt for details.
-#=============================================================================
-
-# If LIBPULSE_ROOT_DIR was defined in the environment, use it.
-IF(NOT LIBPULSE_ROOT_DIR AND NOT $ENV{LIBPULSE_ROOT_DIR} STREQUAL "")
-  SET(LIBPULSE_ROOT_DIR $ENV{LIBPULSE_ROOT_DIR})
-ENDIF()
-
-SET(_pulse_SEARCH_DIRS
-  ${LIBPULSE_ROOT_DIR}
-)
-
-FIND_PATH(LIBPULSE_INCLUDE_DIR pulse/pulseaudio.h
-  HINTS
-    ${_pulse_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(LIBPULSE_LIBRARY
-  NAMES
-    pulse
-  HINTS
-    ${_pulse_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set PULSE_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Pulse DEFAULT_MSG
-  LIBPULSE_LIBRARY LIBPULSE_INCLUDE_DIR)
-
-IF(PULSE_FOUND)
-  SET(LIBPULSE_LIBRARIES ${LIBPULSE_LIBRARY})
-  SET(LIBPULSE_INCLUDE_DIRS ${LIBPULSE_INCLUDE_DIR})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  LIBPULSE_INCLUDE_DIR
-  LIBPULSE_LIBRARY
-)

build_files/cmake/config/blender_full.cmake

@@ -59,19 +59,12 @@ set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 
 
 # platform dependent options
-if(APPLE)
-  set(WITH_COREAUDIO           ON  CACHE BOOL "" FORCE)
-endif()
 if(NOT WIN32)
   set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 endif()
-if(WIN32)
-  set(WITH_WASAPI              ON  CACHE BOOL "" FORCE)
-endif()
 if(UNIX AND NOT APPLE)
   set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
   set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
-  set(WITH_PULSEAUDIO          ON  CACHE BOOL "" FORCE)
   set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
   set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
 endif()

build_files/cmake/config/blender_headless.cmake

@@ -10,12 +10,9 @@ set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE)
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesn't hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
 set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
-set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 

build_files/cmake/config/blender_lite.cmake

@@ -16,7 +16,6 @@ set(WITH_CODEC_AVI           OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
-set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES_EMBREE       OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
@@ -45,7 +44,6 @@ set(WITH_MOD_FLUID           OFF CACHE BOOL "" FORCE)
 set(WITH_MOD_OCEANSIM        OFF CACHE BOOL "" FORCE)
 set(WITH_MOD_REMESH          OFF CACHE BOOL "" FORCE)
 set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
-set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENIMAGEDENOISE    OFF CACHE BOOL "" FORCE)
@@ -56,7 +54,6 @@ set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)
 set(WITH_POTRACE             OFF CACHE BOOL "" FORCE)
 set(WITH_PUGIXML             OFF CACHE BOOL "" FORCE)
-set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
 set(WITH_NANOVDB             OFF CACHE BOOL "" FORCE)
 set(WITH_QUADRIFLOW          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

@@ -63,19 +63,12 @@ set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm
 set(WITH_CYCLES_DEVICE_OPTIX   ON CACHE BOOL "" FORCE)
 
 # platform dependent options
-if(APPLE)
-  set(WITH_COREAUDIO           ON  CACHE BOOL "" FORCE)
-endif()
 if(NOT WIN32)
   set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 endif()
-if(WIN32)
-  set(WITH_WASAPI              ON  CACHE BOOL "" FORCE)
-endif()
 if(UNIX AND NOT APPLE)
   set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
   set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
-  set(WITH_PULSEAUDIO          ON  CACHE BOOL "" FORCE)
   set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
   set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
 endif()

build_files/cmake/config/bpy_module.cmake

@@ -15,12 +15,9 @@ set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesn't hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_COREAUDIO           OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_PULSEAUDIO          OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
 set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
-set(WITH_WASAPI              OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 

build_files/cmake/macros.cmake

@@ -569,9 +569,6 @@ function(SETUP_LIBDIRS)
     if(WITH_JACK AND NOT WITH_JACK_DYNLOAD)
       link_directories(${JACK_LIBPATH})
     endif()
-    if(WITH_PULSEAUDIO AND NOT WITH_PULSEAUDIO_DYNLOAD)
-      link_directories(${LIBPULSE_LIBPATH})
-    endif()
     if(WITH_CODEC_SNDFILE)
       link_directories(${LIBSNDFILE_LIBPATH})
     endif()

build_files/cmake/platform/platform_apple_xcode.cmake

@@ -66,7 +66,7 @@ endif()
 if(XCODE_VERSION)
   # Construct SDKs path ourselves, because xcode-select path could be ambiguous.
   # Both /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed.
-  set(XCODE_SDK_DIR ${XCODE_DEVELOPER_DIR}/Platforms/MacOSX.platform/Developer/SDKs)
+  set(XCODE_SDK_DIR ${XCODE_DEVELOPER_DIR}/Platforms/MacOSX.platform//Developer/SDKs)
 
   # Detect SDK version to use
   if(NOT DEFINED OSX_SYSTEM)

build_files/cmake/platform/platform_unix.cmake

@@ -552,14 +552,6 @@ if(WITH_JACK)
   endif()
 endif()
 
-# Pulse is intended to use the system library.
-if(WITH_PULSEAUDIO)
-  find_package_wrapper(Pulse)
-  if(NOT PULSE_FOUND)
-    set(WITH_PULSEAUDIO OFF)
-  endif()
-endif()
-
 # Audio IO
 if(WITH_SYSTEM_AUDASPACE)
   find_package_wrapper(Audaspace)

build_files/utils/make_source_archive.py

@@ -1,198 +0,0 @@
-#!/usr/bin/env python3
-
-import dataclasses
-import os
-import re
-import subprocess
-from pathlib import Path
-from typing import Iterable, TextIO
-
-# This script can run from any location,
-# output is created in the $CWD
-#
-# NOTE: while the Python part of this script is portable,
-# it relies on external commands typically found on GNU/Linux.
-# Support for other platforms could be added by moving GNU `tar` & `md5sum` use to Python.
-
-SKIP_NAMES = {
-    ".gitignore",
-    ".gitmodules",
-    ".arcconfig",
-}
-
-
-def main() -> None:
-    output_dir = Path(".").absolute()
-    blender_srcdir = Path(__file__).absolute().parent.parent.parent
-    print(f"Source dir: {blender_srcdir}")
-
-    version = parse_blender_version(blender_srcdir)
-    manifest = output_dir / f"blender-{version}-manifest.txt"
-    tarball = output_dir / f"blender-{version}.tar.xz"
-
-    os.chdir(blender_srcdir)
-    create_manifest(version, manifest)
-    create_tarball(version, tarball, manifest)
-    create_checksum_file(tarball)
-    cleanup(manifest)
-    print("Done!")
-
-
-@dataclasses.dataclass
-class BlenderVersion:
-    version: int  # 293 for 2.93.1
-    patch: int  # 1 for 2.93.1
-    cycle: str  # 'alpha', 'beta', 'release', maybe others.
-
-    @property
-    def is_release(self) -> bool:
-        return self.cycle == "release"
-
-    def __str__(self) -> str:
-        """Convert to version string.
-
-        >>> str(BlenderVersion(293, 1, "alpha"))
-        '2.93.1-alpha'
-        >>> str(BlenderVersion(327, 0, "release"))
-        '3.27.0'
-        """
-        version_major = self.version // 100
-        version_minor = self.version % 100
-        as_string = f"{version_major}.{version_minor}.{self.patch}"
-        if self.is_release:
-            return as_string
-        return f"{as_string}-{self.cycle}"
-
-
-def parse_blender_version(blender_srcdir: Path) -> BlenderVersion:
-    version_path = blender_srcdir / "source/blender/blenkernel/BKE_blender_version.h"
-
-    version_info = {}
-    line_re = re.compile(r"^#define (BLENDER_VERSION[A-Z_]*)\s+([0-9a-z]+)$")
-
-    with version_path.open(encoding="utf-8") as version_file:
-        for line in version_file:
-            match = line_re.match(line.strip())
-            if not match:
-                continue
-            version_info[match.group(1)] = match.group(2)
-
-    return BlenderVersion(
-        int(version_info["BLENDER_VERSION"]),
-        int(version_info["BLENDER_VERSION_PATCH"]),
-        version_info["BLENDER_VERSION_CYCLE"],
-    )
-
-
-### Manifest creation
-
-
-def create_manifest(version: BlenderVersion, outpath: Path) -> None:
-    print(f'Building manifest of files:  "{outpath}"...', end="", flush=True)
-    with outpath.open("w", encoding="utf-8") as outfile:
-        main_files_to_manifest(outfile)
-        submodules_to_manifest(version, outfile)
-    print("OK")
-
-
-def main_files_to_manifest(outfile: TextIO) -> None:
-    for path in git_ls_files():
-        print(path, file=outfile)
-
-
-def submodules_to_manifest(version: BlenderVersion, outfile: TextIO) -> None:
-    skip_addon_contrib = version.is_release
-
-    for line in git_command("submodule"):
-        submodule = line.split()[1]
-
-        # Don't use native slashes as GIT for MS-Windows outputs forward slashes.
-        if skip_addon_contrib and submodule == "release/scripts/addons_contrib":
-            continue
-
-        for path in git_ls_files(Path(submodule)):
-            print(path, file=outfile)
-
-
-def create_tarball(version: BlenderVersion, tarball: Path, manifest: Path) -> None:
-    print(f'Creating archive:            "{tarball}" ...', end="", flush=True)
-    # Requires GNU `tar`, since `--transform` is used.
-    command = [
-        "tar",
-        "--transform",
-        f"s,^,blender-{version}/,g",
-        "--use-compress-program=xz -9",
-        "--create",
-        f"--file={tarball}",
-        f"--files-from={manifest}",
-        # Without owner/group args, extracting the files as root will
-        # use ownership from the tar archive:
-        "--owner=0",
-        "--group=0",
-    ]
-    subprocess.run(command, check=True, timeout=300)
-    print("OK")
-
-
-def create_checksum_file(tarball: Path) -> None:
-    md5_path = tarball.with_name(tarball.name + ".md5sum")
-    print(f'Creating checksum:           "{md5_path}" ...', end="", flush=True)
-    command = [
-        "md5sum",
-        # The name is enough, as the tarball resides in the same dir as the MD5
-        # file, and that's the current working directory.
-        tarball.name,
-    ]
-    md5_cmd = subprocess.run(
-        command, stdout=subprocess.PIPE, check=True, text=True, timeout=300
-    )
-    with md5_path.open("w", encoding="utf-8") as outfile:
-        outfile.write(md5_cmd.stdout)
-    print("OK")
-
-
-def cleanup(manifest: Path) -> None:
-    print("Cleaning up ...", end="", flush=True)
-    if manifest.exists():
-        manifest.unlink()
-    print("OK")
-
-
-## Low-level commands
-
-
-def git_ls_files(directory: Path = Path(".")) -> Iterable[Path]:
-    """Generator, yields lines of output from 'git ls-files'.
-
-    Only lines that are actually files (so no directories, sockets, etc.) are
-    returned, and never one from SKIP_NAMES.
-    """
-    for line in git_command("-C", str(directory), "ls-files"):
-        path = directory / line
-        if not path.is_file() or path.name in SKIP_NAMES:
-            continue
-        yield path
-
-
-def git_command(*cli_args) -> Iterable[str]:
-    """Generator, yields lines of output from a Git command."""
-    command = ("git", *cli_args)
-
-    # import shlex
-    # print(">", " ".join(shlex.quote(arg) for arg in command))
-
-    git = subprocess.run(
-        command, stdout=subprocess.PIPE, check=True, text=True, timeout=30
-    )
-    for line in git.stdout.split("\n"):
-        if line:
-            yield line
-
-
-if __name__ == "__main__":
-    import doctest
-
-    if doctest.testmod().failed:
-        raise SystemExit("ERROR: Self-test failed, refusing to run")
-
-    main()

build_files/utils/make_source_archive.sh

@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# This script can run from any location,
+# output is created in the $CWD
+
+BASE_DIR="$PWD"
+
+blender_srcdir=$(dirname -- $0)/../..
+blender_version=$(grep "BLENDER_VERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
+blender_version_patch=$(grep "BLENDER_VERSION_PATCH\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
+blender_version_cycle=$(grep "BLENDER_VERSION_CYCLE\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
+
+VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100).$blender_version_patch
+if [ "$blender_version_cycle" = "release" ] ; then
+  SUBMODULE_EXCLUDE="^\(release/scripts/addons_contrib\)$"
+else
+  VERSION=$VERSION-$blender_version_cycle
+  SUBMODULE_EXCLUDE="^$"  # dummy regex
+fi
+
+MANIFEST="blender-$VERSION-manifest.txt"
+TARBALL="blender-$VERSION.tar.xz"
+
+cd "$blender_srcdir"
+
+# not so nice, but works
+FILTER_FILES_PY=\
+"import os, sys; "\
+"[print(l[:-1]) for l in sys.stdin.readlines() "\
+"if os.path.isfile(l[:-1]) "\
+"if os.path.basename(l[:-1]) not in {"\
+"'.gitignore', "\
+"'.gitmodules', "\
+"'.arcconfig', "\
+"}"\
+"]"
+
+# Build master list
+echo -n "Building manifest of files:  \"$BASE_DIR/$MANIFEST\" ..."
+git ls-files | python3 -c "$FILTER_FILES_PY" > $BASE_DIR/$MANIFEST
+
+# Enumerate submodules
+for lcv in $(git submodule | awk '{print $2}' | grep -v "$SUBMODULE_EXCLUDE"); do
+  cd "$BASE_DIR"
+  cd "$blender_srcdir/$lcv"
+  git ls-files | python3 -c "$FILTER_FILES_PY" | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST
+  cd "$BASE_DIR"
+done
+echo "OK"
+
+
+# Create the tarball
+#
+# Without owner/group args, extracting the files as root will
+# use ownership from the tar archive.
+cd "$blender_srcdir"
+echo -n "Creating archive:            \"$BASE_DIR/$TARBALL\" ..."
+tar \
+  --transform "s,^,blender-$VERSION/,g" \
+  --use-compress-program="xz -9" \
+  --create \
+  --file="$BASE_DIR/$TARBALL" \
+  --files-from="$BASE_DIR/$MANIFEST" \
+  --owner=0 \
+  --group=0
+
+echo "OK"
+
+
+# Create checksum file
+cd "$BASE_DIR"
+echo -n "Creating checksum:           \"$BASE_DIR/$TARBALL.md5sum\" ..."
+md5sum "$TARBALL" > "$TARBALL.md5sum"
+echo "OK"
+
+
+# Cleanup
+echo -n "Cleaning up ..."
+rm "$BASE_DIR/$MANIFEST"
+echo "OK"
+
+echo "Done!"

doc/doxygen/doxygen.intern.h

@@ -54,21 +54,12 @@
  *  \ingroup intern undoc
  *  \todo add to doxygen
  */
-/** \defgroup audcoreaudio Audaspace CoreAudio
- *  \ingroup audaspace
- */
 /** \defgroup audfx Audaspace FX
  *  \ingroup audaspace
  */
 /** \defgroup audopenal Audaspace OpenAL
  *  \ingroup audaspace
  */
-/** \defgroup audpulseaudio Audaspace PulseAudio
- *  \ingroup audaspace
- */
-/** \defgroup audwasapi Audaspace WASAPI
- *  \ingroup audaspace
- */
 /** \defgroup audpython Audaspace Python
  *  \ingroup audaspace
  */

extern/audaspace/CMakeLists.txt

@@ -284,15 +284,6 @@ if(AUDASPACE_STANDALONE)
 	option(WITH_PYTHON "Build With Python Library" TRUE)
 	option(WITH_SDL "Build With SDL" TRUE)
 	option(WITH_STRICT_DEPENDENCIES "Error and abort instead of warning if a library is not found." FALSE)
-	if(APPLE)
-		option(WITH_COREAUDIO "Build With CoreAudio" TRUE)
-	endif()
-	if(NOT WIN32 AND NOT APPLE)
-		option(WITH_PULSEAUDIO "Build With PulseAudio" TRUE)
-	endif()
-	if(WIN32)
-		option(WITH_WASAPI "Build With WASAPI" TRUE)
-	endif()
 
 	if(WITH_STRICT_DEPENDENCIES)
 		set(PACKAGE_OPTION REQUIRED)
@@ -300,7 +291,7 @@ if(AUDASPACE_STANDALONE)
 endif()
 
 if(AUDASPACE_STANDALONE)
-	if(WIN32 OR APPLE)
+	if(WIN32)
 		set(DEFAULT_PLUGIN_PATH "." CACHE STRING "Default plugin installation and loading path.")
 		set(DOCUMENTATION_INSTALL_PATH "doc" CACHE PATH "Path where the documentation is installed.")
 	else()
@@ -311,18 +302,14 @@ endif()
 
 if(AUDASPACE_STANDALONE)
 	cmake_dependent_option(SEPARATE_C "Build C Binding as separate library" TRUE "WITH_C" FALSE)
-	cmake_dependent_option(PLUGIN_COREAUDIO "Build CoreAudio Plugin" TRUE "WITH_COREAUDIO;SHARED_LIBRARY" FALSE)
 	cmake_dependent_option(PLUGIN_FFMPEG "Build FFMPEG Plugin" TRUE "WITH_FFMPEG;SHARED_LIBRARY" FALSE)
 	cmake_dependent_option(PLUGIN_JACK "Build JACK Plugin" TRUE "WITH_JACK;SHARED_LIBRARY" FALSE)
 	cmake_dependent_option(PLUGIN_LIBSNDFILE "Build LibSndFile Plugin" TRUE "WITH_LIBSNDFILE;SHARED_LIBRARY" FALSE)
 	cmake_dependent_option(PLUGIN_OPENAL "Build OpenAL Plugin" TRUE "WITH_OPENAL;SHARED_LIBRARY" FALSE)
-	cmake_dependent_option(PLUGIN_PULSEAUDIO "Build PulseAudio Plugin" TRUE "WITH_PULSEAUDIO;SHARED_LIBRARY" FALSE)
 	cmake_dependent_option(PLUGIN_SDL "Build SDL Plugin" TRUE "WITH_SDL;SHARED_LIBRARY" FALSE)
-	cmake_dependent_option(PLUGIN_WASAPI "Build WASAPI Plugin" TRUE "WITH_WASAPI;SHARED_LIBRARY" FALSE)
 	cmake_dependent_option(WITH_PYTHON_MODULE "Build Python Module" TRUE "WITH_PYTHON" FALSE)
 	cmake_dependent_option(USE_SDL2 "Use SDL2 instead of 1 if available" TRUE "WITH_SDL" FALSE)
 	cmake_dependent_option(DYNLOAD_JACK "Dynamically load JACK" FALSE "WITH_JACK" FALSE)
-	cmake_dependent_option(DYNLOAD_PULSEAUDIO "Dynamically load PulseAudio" FALSE "WITH_PULSEAUDIO" FALSE)
 	cmake_dependent_option(WITH_BINDING_DOCS "Build C/Python HTML Documentation with Sphinx" TRUE "WITH_PYTHON_MODULE" FALSE)
 endif()
 
@@ -393,16 +380,16 @@ if(WITH_C)
 		bindings/C/AUD_Types.h
 	)
 
-	if(WITH_FFTW)
+if(WITH_FFTW)
-		list(APPEND C_SRC
+	list(APPEND C_SRC
 			bindings/C/AUD_HRTF.cpp
 			bindings/C/AUD_ImpulseResponse.cpp
-		)
+			)
 
 		list(APPEND C_HDR
 			bindings/C/AUD_HRTF.h
 			bindings/C/AUD_ImpulseResponse.h
-		)
+			)
 	endif()
 
 	if(NOT SEPARATE_C)
@@ -413,44 +400,6 @@ if(WITH_C)
 	endif()
 endif()
 
-# CoreAudio
-if(WITH_COREAUDIO)
-	find_library(COREAUDIO_LIBRARY CoreAudio)
-	find_library(AUDIOUNIT_LIBRARY AudioUnit)
-	find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
-	find_path(AUDIOUNIT_INCLUDE_DIR AudioUnit/AudioUnit.h)
-	find_path(AUDIOTOOLBOX_INCLUDE_DIR AudioToolbox/CoreAudioClock.h)
-
-	if(COREAUDIO_LIBRARY AND AUDIOUNIT_LIBRARY AND AUDIOUNIT_INCLUDE_DIR)
-		set(COREAUDIO_LIBRARIES ${COREAUDIO_LIBRARY} ${AUDIOUNIT_LIBRARY} ${AUDIOTOOLBOX_LIBRARY})
-		set(COREAUDIO_INCLUDE_DIRS ${AUDIOUNIT_INCLUDE_DIR} ${AUDIOTOOLBOX_INCLUDE_DIR})
-
-		set(COREAUDIO_SRC
-			plugins/coreaudio/CoreAudioDevice.cpp
-			plugins/coreaudio/CoreAudioSynchronizer.cpp
-		)
-		set(COREAUDIO_HDR
-			plugins/coreaudio/CoreAudioDevice.h
-			plugins/coreaudio/CoreAudioSynchronizer.h
-		)
-
-		if(NOT PLUGIN_COREAUDIO)
-			list(APPEND INCLUDE ${COREAUDIO_INCLUDE_DIRS})
-			list(APPEND LIBRARIES ${COREAUDIO_LIBRARIES})
-			list(APPEND SRC ${COREAUDIO_SRC})
-			list(APPEND HDR ${COREAUDIO_HDR})
-			list(APPEND STATIC_PLUGINS CoreAudioDevice)
-		endif()
-	else()
-		if(WITH_STRICT_DEPENDENCIES)
-			message(FATAL_ERROR "CoreAudio not found!")
-		else()
-			set(WITH_COREAUDIO FALSE CACHE BOOL "Build With CoreAudio" FORCE)
-			message(WARNING "CoreAudio not found, plugin will not be built.")
-		endif()
-	endif()
-endif()
-
 # FFMPEG
 if(WITH_FFMPEG)
 	if(AUDASPACE_STANDALONE)
@@ -555,7 +504,7 @@ if(WITH_JACK)
 			plugins/jack/JackSymbols.h
 		)
 
-		if(DYNLOAD_JACK)
+	if(DYNLOAD_JACK)
 			add_definitions(-DDYNLOAD_JACK)
 		endif()
 
@@ -649,42 +598,6 @@ if(WITH_OPENAL)
 	endif()
 endif()
 
-# PulseAudio
-if(WITH_PULSEAUDIO)
-	if(AUDASPACE_STANDALONE)
-		find_package(LibPulse ${PACKAGE_OPTION})
-	endif()
-
-	if(LIBPULSE_FOUND)
-		set(PULSEAUDIO_SRC
-			plugins/pulseaudio/PulseAudioDevice.cpp
-			plugins/pulseaudio/PulseAudioLibrary.cpp
-		)
-		set(PULSEAUDIO_HDR
-			plugins/pulseaudio/PulseAudioDevice.h
-			plugins/pulseaudio/PulseAudioLibrary.h
-			plugins/pulseaudio/PulseAudioSymbols.h
-		)
-
-		if(DYNLOAD_PULSEAUDIO)
-			add_definitions(-DDYNLOAD_PULSEAUDIO)
-		endif()
-
-		if(NOT PLUGIN_PULSEAUDIO)
-			list(APPEND INCLUDE ${LIBPULSE_INCLUDE_DIR})
-			if(NOT DYNLOAD_PULSEAUDIO)
-				list(APPEND LIBRARIES ${LIBPULSE_LIBRARY})
-			endif()
-			list(APPEND SRC ${PULSEAUDIO_SRC})
-			list(APPEND HDR ${PULSEAUDIO_HDR})
-			list(APPEND STATIC_PLUGINS PulseAudioDevice)
-		endif()
-	else()
-		set(WITH_PULSEAUDIO FALSE CACHE BOOL "Build With PulseAudio" FORCE)
-		message(WARNING "PulseAudio not found, plugin will not be built.")
-	endif()
-endif()
-
 # Python
 if(WITH_PYTHON)
 	if(AUDASPACE_STANDALONE)
@@ -759,23 +672,6 @@ if(WITH_SDL)
 	endif()
 endif()
 
-# WASAPI
-if(WITH_WASAPI)
-	set(WASAPI_SRC
-		plugins/wasapi/WASAPIDevice.cpp
-	)
-	set(WASAPI_HDR
-		plugins/wasapi/WASAPIDevice.h
-	)
-
-	if(NOT PLUGIN_WASAPI)
-		list(APPEND LIBRARIES ksuser)
-		list(APPEND SRC ${WASAPI_SRC})
-		list(APPEND HDR ${WASAPI_HDR})
-		list(APPEND STATIC_PLUGINS WASAPIDevice)
-	endif()
-endif()
-
 # library configuration
 
 if(SHARED_LIBRARY)
@@ -861,17 +757,6 @@ endif()
 
 # plugins
 
-if(WITH_COREAUDIO AND PLUGIN_COREAUDIO)
-	add_definitions(-DCOREAUDIO_PLUGIN)
-	include_directories(${INCLUDE} ${COREAUDIO_INCLUDE_DIRS})
-	add_library(audcoreaudio SHARED ${COREAUDIO_SRC} ${COREAUDIO_HDR} ${HDR})
-	if(WITH_VERSIONED_PLUGINS)
-		set_target_properties(audcoreaudio PROPERTIES SOVERSION ${AUDASPACE_VERSION})
-	endif()
-	target_link_libraries(audcoreaudio audaspace ${COREAUDIO_LIBRARIES})
-	install(TARGETS audcoreaudio DESTINATION ${DEFAULT_PLUGIN_PATH})
-endif()
-
 if(WITH_FFMPEG AND PLUGIN_FFMPEG)
 	add_definitions(-DFFMPEG_PLUGIN)
 	include_directories(${INCLUDE} ${FFMPEG_INCLUDE_DIRS})
@@ -912,19 +797,6 @@ if(WITH_OPENAL AND PLUGIN_OPENAL)
 	install(TARGETS audopenal DESTINATION ${DEFAULT_PLUGIN_PATH})
 endif()
 
-if(WITH_PULSEAUDIO AND PLUGIN_PULSEAUDIO)
-	add_definitions(-DPULSEAUDIO_PLUGIN)
-	include_directories(${INCLUDE} ${LIBPULSE_INCLUDE_DIR})
-	add_library(audpulseaudio SHARED ${PULSEAUDIO_SRC} ${PULSEAUDIO_HDR} ${HDR})
-	set_target_properties(audpulseaudio PROPERTIES SOVERSION ${AUDASPACE_VERSION})
-	if(DYNLOAD_PULSEAUDIO)
-		target_link_libraries(audpulseaudio audaspace)
-	else()
-		target_link_libraries(audpulseaudio audaspace ${LIBPULSE_LIBRARY})
-	endif()
-	install(TARGETS audpulseaudio DESTINATION ${DEFAULT_PLUGIN_PATH})
-endif()
-
 if(WITH_SDL AND PLUGIN_SDL)
 	add_definitions(-DSDL_PLUGIN)
 	include_directories(${INCLUDE} ${SDL_INCLUDE_DIR})
@@ -934,17 +806,6 @@ if(WITH_SDL AND PLUGIN_SDL)
 	install(TARGETS audsdl DESTINATION ${DEFAULT_PLUGIN_PATH})
 endif()
 
-if(WITH_WASAPI AND PLUGIN_WASAPI)
-	add_definitions(-DWASAPI_PLUGIN)
-	include_directories(${INCLUDE})
-	add_library(audwasapi SHARED ${WASAPI_SRC} ${WASAPI_HDR} ${HDR})
-	if(WITH_VERSIONED_PLUGINS)
-		set_target_properties(audwasapi PROPERTIES SOVERSION ${AUDASPACE_VERSION})
-	endif()
-	target_link_libraries(audwasapi audaspace ksuser)
-	install(TARGETS audwasapi DESTINATION ${DEFAULT_PLUGIN_PATH})
-endif()
-
 # dlls
 
 if(WIN32)

extern/audaspace/bindings/C/AUD_Special.cpp

@@ -376,7 +376,7 @@ AUD_API AUD_Device* AUD_init(const char* device, AUD_DeviceSpecs specs, int buff
 {
 	try
 	{
-		std::shared_ptr<IDeviceFactory> factory = device ? DeviceManager::getDeviceFactory(device) : DeviceManager::getDefaultDeviceFactory();
+		std::shared_ptr<IDeviceFactory> factory = DeviceManager::getDeviceFactory(device);
 
 		if(factory)
 		{

extern/audaspace/blender_config.cmake

@@ -10,24 +10,19 @@ set(WITH_FFMPEG ${WITH_CODEC_FFMPEG})  # "Build With FFMPEG"
 set(WITH_FFTW FALSE)  # "Build With FFTW"
 set(WITH_LIBSNDFILE ${WITH_CODEC_SNDFILE})  # "Build With LibSndFile"
 set(SEPARATE_C FALSE)  # "Build C Binding as separate library"
-set(PLUGIN_COREAUDIO FALSE)  # "Build CoreAudio Plugin"
 set(PLUGIN_FFMPEG FALSE)  # "Build FFMPEG Plugin"
 set(PLUGIN_JACK FALSE)  # "Build JACK Plugin"
 set(PLUGIN_LIBSNDFILE FALSE)  # "Build LibSndFile Plugin"
 set(PLUGIN_OPENAL FALSE)  # "Build OpenAL Plugin"
-set(PLUGIN_PULSEAUDIO FALSE)  # "Build PulseAudio Plugin"
 set(PLUGIN_SDL FALSE)  # "Build SDL Plugin"
-set(PLUGIN_WASAPI FALSE)  # "Build WASAPI Plugin"
 set(WITH_PYTHON_MODULE FALSE)  # "Build Python Module"
 set(DYNLOAD_JACK ${WITH_JACK_DYNLOAD})  # "Dynamically load JACK"
-set(DYNLOAD_PULSEAUDIO ${WITH_PULSEAUDIO_DYNLOAD})  # "Dynamically load PulseAudio"
 set(WITH_BINDING_DOCS FALSE)  # "Build C/Python HTML Documentation with Sphinx"
 set(DEFAULT_PLUGIN_PATH "plugins")  # "Default plugin installation and loading path."
 set(FFMPEG_FOUND ${WITH_CODEC_FFMPEG})
 set(JACK_FOUND ${WITH_JACK})
 set(LIBSNDFILE_FOUND ${WITH_CODEC_SNDFILE})
 set(OPENAL_FOUND ${WITH_OPENAL})
-set(LIBPULSE_FOUND ${WITH_PULSEAUDIO})
 set(PYTHONLIBS_FOUND TRUE)
 set(NUMPY_FOUND ${WITH_PYTHON_NUMPY})
 set(NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_INCLUDE_DIRS})

extern/audaspace/plugins/coreaudio/CoreAudioDevice.cpp

@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2021 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#include "CoreAudioDevice.h"
-#include "devices/DeviceManager.h"
-#include "devices/IDeviceFactory.h"
-#include "Exception.h"
-#include "IReader.h"
-
-AUD_NAMESPACE_BEGIN
-
-OSStatus CoreAudioDevice::CoreAudio_mix(void* data, AudioUnitRenderActionFlags* flags, const AudioTimeStamp* time_stamp, UInt32 bus_number, UInt32 number_frames, AudioBufferList* buffer_list)
-{
-	CoreAudioDevice* device = (CoreAudioDevice*)data;
-
-	for(int i = 0; i < buffer_list->mNumberBuffers; i++)
-	{
-		auto& buffer = buffer_list->mBuffers[i];
-
-		device->mix((data_t*)buffer.mData, buffer.mDataByteSize / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));
-	}
-
-	return noErr;
-}
-
-void CoreAudioDevice::playing(bool playing)
-{
-	if(m_playback != playing)
-	{
-		if(playing)
-			AudioOutputUnitStart(m_audio_unit);
-		else
-			AudioOutputUnitStop(m_audio_unit);
-	}
-
-	m_playback = playing;
-}
-
-CoreAudioDevice::CoreAudioDevice(DeviceSpecs specs, int buffersize) :
-m_playback(false),
-m_audio_unit(nullptr)
-{
-	AudioComponentDescription component_description = {};
-
-	component_description.componentType = kAudioUnitType_Output;
-	component_description.componentSubType = kAudioUnitSubType_DefaultOutput;
-	component_description.componentManufacturer = kAudioUnitManufacturer_Apple;
-
-	AudioComponent component = AudioComponentFindNext(nullptr, &component_description);
-
-	if(!component)
-		AUD_THROW(DeviceException, "The audio device couldn't be opened with CoreAudio.");
-
-	OSStatus status = AudioComponentInstanceNew(component, &m_audio_unit);
-
-	if(status != noErr)
-		AUD_THROW(DeviceException, "The audio device couldn't be opened with CoreAudio.");
-
-	AudioStreamBasicDescription stream_basic_description = {};
-
-	if(specs.channels == CHANNELS_INVALID)
-		specs.channels = CHANNELS_STEREO;
-	if(specs.format == FORMAT_INVALID)
-		specs.format = FORMAT_FLOAT32;
-	if(specs.rate == RATE_INVALID)
-		specs.rate = RATE_48000;
-
-	switch(specs.format)
-	{
-	case FORMAT_U8:
-		stream_basic_description.mFormatFlags = 0;
-		stream_basic_description.mBitsPerChannel = 8;
-		break;
-	case FORMAT_S16:
-		stream_basic_description.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;
-		stream_basic_description.mBitsPerChannel = 16;
-		break;
-	case FORMAT_S24:
-		stream_basic_description.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;
-		stream_basic_description.mBitsPerChannel = 24;
-		break;
-	case FORMAT_S32:
-		stream_basic_description.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;
-		stream_basic_description.mBitsPerChannel = 32;
-		break;
-	case FORMAT_FLOAT32:
-		stream_basic_description.mFormatFlags = kLinearPCMFormatFlagIsFloat;
-		stream_basic_description.mBitsPerChannel = 32;
-		break;
-	case FORMAT_FLOAT64:
-		stream_basic_description.mFormatFlags = kLinearPCMFormatFlagIsFloat;
-		stream_basic_description.mBitsPerChannel = 64;
-		break;
-	default:
-		specs.format = FORMAT_FLOAT32;
-		stream_basic_description.mFormatFlags = kLinearPCMFormatFlagIsFloat;
-		stream_basic_description.mBitsPerChannel = 32;
-		break;
-	}
-
-	stream_basic_description.mSampleRate = specs.rate;
-	stream_basic_description.mFormatID = kAudioFormatLinearPCM;
-	stream_basic_description.mFormatFlags |= kAudioFormatFlagsNativeEndian | kLinearPCMFormatFlagIsPacked;
-	stream_basic_description.mBytesPerPacket = stream_basic_description.mBytesPerFrame = AUD_DEVICE_SAMPLE_SIZE(specs);
-	stream_basic_description.mFramesPerPacket = 1;
-	stream_basic_description.mChannelsPerFrame = specs.channels;
-
-	status = AudioUnitSetProperty(m_audio_unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &stream_basic_description, sizeof(stream_basic_description));
-
-	if(status != noErr)
-	{
-		AudioComponentInstanceDispose(m_audio_unit);
-		AUD_THROW(DeviceException, "The audio device couldn't be opened with CoreAudio.");
-	}
-
-	m_specs = specs;
-
-	AURenderCallbackStruct render_callback_struct;
-	render_callback_struct.inputProc = CoreAudioDevice::CoreAudio_mix;
-	render_callback_struct.inputProcRefCon = this;
-
-	status = AudioUnitSetProperty(m_audio_unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &render_callback_struct, sizeof(render_callback_struct));
-
-	if(status != noErr)
-	{
-		AudioComponentInstanceDispose(m_audio_unit);
-		AUD_THROW(DeviceException, "The audio device couldn't be opened with CoreAudio.");
-	}
-
-	status = AudioUnitInitialize(m_audio_unit);
-
-	if(status != noErr)
-	{
-		AudioComponentInstanceDispose(m_audio_unit);
-		AUD_THROW(DeviceException, "The audio device couldn't be opened with CoreAudio.");
-	}
-
-	try
-	{
-		m_synchronizer = std::unique_ptr<CoreAudioSynchronizer>(new CoreAudioSynchronizer(m_audio_unit));
-	}
-	catch(Exception&)
-	{
-		AudioComponentInstanceDispose(m_audio_unit);
-		throw;
-	}
-
-	create();
-}
-
-CoreAudioDevice::~CoreAudioDevice()
-{
-	AudioOutputUnitStop(m_audio_unit);
-	AudioUnitUninitialize(m_audio_unit);
-	AudioComponentInstanceDispose(m_audio_unit);
-
-	destroy();
-}
-
-ISynchronizer* CoreAudioDevice::getSynchronizer()
-{
-	return m_synchronizer.get();
-}
-
-class CoreAudioDeviceFactory : public IDeviceFactory
-{
-private:
-	DeviceSpecs m_specs;
-	int m_buffersize;
-
-public:
-	CoreAudioDeviceFactory() :
-	m_buffersize(AUD_DEFAULT_BUFFER_SIZE)
-	{
-		m_specs.format = FORMAT_FLOAT32;
-		m_specs.channels = CHANNELS_STEREO;
-		m_specs.rate = RATE_48000;
-	}
-
-	virtual std::shared_ptr<IDevice> openDevice()
-	{
-		return std::shared_ptr<IDevice>(new CoreAudioDevice(m_specs, m_buffersize));
-	}
-
-	virtual int getPriority()
-	{
-		return 1 << 15;
-	}
-
-	virtual void setSpecs(DeviceSpecs specs)
-	{
-		m_specs = specs;
-	}
-
-	virtual void setBufferSize(int buffersize)
-	{
-		m_buffersize = buffersize;
-	}
-
-	virtual void setName(std::string name)
-	{
-	}
-};
-
-void CoreAudioDevice::registerPlugin()
-{
-	DeviceManager::registerDevice("CoreAudio", std::shared_ptr<IDeviceFactory>(new CoreAudioDeviceFactory));
-}
-
-#ifdef COREAUDIO_PLUGIN
-extern "C" AUD_PLUGIN_API void registerPlugin()
-{
-	CoreAudioDevice::registerPlugin();
-}
-
-extern "C" AUD_PLUGIN_API const char* getName()
-{
-	return "CoreAudio";
-}
-#endif
-
-AUD_NAMESPACE_END

extern/audaspace/plugins/coreaudio/CoreAudioDevice.h

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2021 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#pragma once
-
-#ifdef COREAUDIO_PLUGIN
-#define AUD_BUILD_PLUGIN
-#endif
-
-/**
- * @file CoreAudioDevice.h
- * @ingroup plugin
- * The CoreAudioDevice class.
- */
-
-#include "CoreAudioSynchronizer.h"
-#include "devices/SoftwareDevice.h"
-
-#include <memory>
-
-#include <AudioUnit/AudioUnit.h>
-
-AUD_NAMESPACE_BEGIN
-
-/**
- * This device plays back through CoreAudio, the Apple audio API.
- */
-class AUD_PLUGIN_API CoreAudioDevice : public SoftwareDevice
-{
-private:
-	/**
-	 * Whether there is currently playback.
-	 */
-	bool m_playback;
-
-	/**
-	 * The CoreAudio AudioUnit.
-	 */
-	AudioUnit m_audio_unit;
-
-	/**
-	 * The Synchronizer.
-	 */
-	std::unique_ptr<CoreAudioSynchronizer> m_synchronizer;
-
-	/**
-	 * Mixes the next bytes into the buffer.
-	 * \param data The CoreAudio device.
-	 * \param flags Unused flags.
-	 * \param time_stamp Unused time stamp.
-	 * \param bus_number Unused bus number.
-	 * \param number_frames Unused number of frames.
-	 * \param buffer_list The list of buffers to be filled.
-	 */
-	AUD_LOCAL static OSStatus CoreAudio_mix(void* data, AudioUnitRenderActionFlags* flags, const AudioTimeStamp* time_stamp, UInt32 bus_number, UInt32 number_frames, AudioBufferList* buffer_list);
-
-	// delete copy constructor and operator=
-	CoreAudioDevice(const CoreAudioDevice&) = delete;
-	CoreAudioDevice& operator=(const CoreAudioDevice&) = delete;
-
-protected:
-	virtual void playing(bool playing);
-
-public:
-	/**
-	 * Opens the CoreAudio audio device for playback.
-	 * \param specs The wanted audio specification.
-	 * \param buffersize The size of the internal buffer.
-	 * \note The specification really used for opening the device may differ.
-	 * \exception Exception Thrown if the audio device cannot be opened.
-	 */
-	CoreAudioDevice(DeviceSpecs specs, int buffersize = AUD_DEFAULT_BUFFER_SIZE);
-
-	/**
-	 * Closes the CoreAudio audio device.
-	 */
-	virtual ~CoreAudioDevice();
-
-	virtual ISynchronizer* getSynchronizer();
-
-	/**
-	 * Registers this plugin.
-	 */
-	static void registerPlugin();
-};
-
-AUD_NAMESPACE_END

extern/audaspace/plugins/coreaudio/CoreAudioSynchronizer.cpp

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2016 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#include "CoreAudioSynchronizer.h"
-
-#include "CoreAudioDevice.h"
-#include "Exception.h"
-
-AUD_NAMESPACE_BEGIN
-
-CoreAudioSynchronizer::CoreAudioSynchronizer(AudioUnit& audio_unit) :
-	m_clock_ref(nullptr),
-	m_playing(false)
-{
-	OSStatus status = CAClockNew(0, &m_clock_ref);
-
-	if(status != noErr)
-		AUD_THROW(DeviceException, "Could not create a CoreAudio clock.");
-
-	CAClockTimebase timebase = kCAClockTimebase_AudioOutputUnit;
-
-	status = CAClockSetProperty(m_clock_ref, kCAClockProperty_InternalTimebase, sizeof(timebase), &timebase);
-
-	if(status != noErr)
-	{
-		CAClockDispose(m_clock_ref);
-		AUD_THROW(DeviceException, "Could not create a CoreAudio clock.");
-	}
-
-	status = CAClockSetProperty(m_clock_ref, kCAClockProperty_TimebaseSource, sizeof(audio_unit), &audio_unit);
-
-	if(status != noErr)
-	{
-		CAClockDispose(m_clock_ref);
-		AUD_THROW(DeviceException, "Could not create a CoreAudio clock.");
-	}
-
-	CAClockSyncMode sync_mode = kCAClockSyncMode_Internal;
-
-	status = CAClockSetProperty(m_clock_ref, kCAClockProperty_SyncMode, sizeof(sync_mode), &sync_mode);
-
-	if(status != noErr)
-	{
-		CAClockDispose(m_clock_ref);
-		AUD_THROW(DeviceException, "Could not create a CoreAudio clock.");
-	}
-}
-
-CoreAudioSynchronizer::~CoreAudioSynchronizer()
-{
-	CAClockDispose(m_clock_ref);
-}
-
-void CoreAudioSynchronizer::seek(std::shared_ptr<IHandle> handle, double time)
-{
-	if(m_playing)
-		CAClockStop(m_clock_ref);
-
-	CAClockTime clock_time;
-	clock_time.format = kCAClockTimeFormat_Seconds;
-	clock_time.time.seconds = time;
-	CAClockSetCurrentTime(m_clock_ref, &clock_time);
-
-	handle->seek(time);
-
-	if(m_playing)
-		CAClockStart(m_clock_ref);
-}
-
-double CoreAudioSynchronizer::getPosition(std::shared_ptr<IHandle> handle)
-{
-	CAClockTime clock_time;
-
-	OSStatus status;
-
-	if(m_playing)
-		status = CAClockGetCurrentTime(m_clock_ref, kCAClockTimeFormat_Seconds, &clock_time);
-	else
-		status = CAClockGetStartTime(m_clock_ref, kCAClockTimeFormat_Seconds, &clock_time);
-
-	if(status != noErr)
-		return 0;
-
-	return clock_time.time.seconds;
-}
-
-void CoreAudioSynchronizer::play()
-{
-	if(m_playing)
-		return;
-
-	m_playing = true;
-	CAClockStart(m_clock_ref);
-}
-
-void CoreAudioSynchronizer::stop()
-{
-	if(!m_playing)
-		return;
-
-	m_playing = false;
-	CAClockStop(m_clock_ref);
-}
-
-void CoreAudioSynchronizer::setSyncCallback(ISynchronizer::syncFunction function, void* data)
-{
-}
-
-int CoreAudioSynchronizer::isPlaying()
-{
-	return m_playing;
-}
-
-AUD_NAMESPACE_END

extern/audaspace/plugins/coreaudio/CoreAudioSynchronizer.h

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2016 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#pragma once
-
-#ifdef COREAUDIO_PLUGIN
-#define AUD_BUILD_PLUGIN
-#endif
-
-/**
- * @file CoreAudioSynchronizer.h
- * @ingroup plugin
- * The CoreAudioSynchronizer class.
- */
-
-#include "devices/ISynchronizer.h"
-
-#include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/CoreAudioClock.h>
-
-AUD_NAMESPACE_BEGIN
-
-/**
- * This class is a Synchronizer implementation using a CoreAudio clock.
- */
-class AUD_PLUGIN_API CoreAudioSynchronizer : public ISynchronizer
-{
-private:
-    /// The CoreAudio clock referene.
-    CAClockRef m_clock_ref;
-
-	/// Whether the clock is currently playing.
-	bool m_playing;
-
-public:
-	/**
-	 * Creates a new CoreAudioSynchronizer.
-	 * @param device The device that should be synchronized.
-	 */
-    CoreAudioSynchronizer(AudioUnit& audio_unit);
-    virtual ~CoreAudioSynchronizer();
-
-	virtual void seek(std::shared_ptr<IHandle> handle, double time);
-	virtual double getPosition(std::shared_ptr<IHandle> handle);
-	virtual void play();
-	virtual void stop();
-	virtual void setSyncCallback(syncFunction function, void* data);
-	virtual int isPlaying();
-};
-
-AUD_NAMESPACE_END

extern/audaspace/plugins/jack/JackLibrary.h

@@ -21,8 +21,9 @@
 #endif
 
 /**
- * @file JackLibrary.h
+ * @file JackDevice.h
  * @ingroup plugin
+ * The JackDevice class.
  */
 
 #include "Audaspace.h"

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp

@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright 2009-2016 Jörg Müller
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-#include "PulseAudioDevice.h"
-#include "PulseAudioLibrary.h"
-#include "devices/DeviceManager.h"
-#include "devices/IDeviceFactory.h"
-#include "Exception.h"
-#include "IReader.h"
-
-AUD_NAMESPACE_BEGIN
-
-void PulseAudioDevice::PulseAudio_state_callback(pa_context *context, void *data)
-{
-	PulseAudioDevice* device = (PulseAudioDevice*)data;
-
-	device->m_state = AUD_pa_context_get_state(context);
-
-	AUD_pa_threaded_mainloop_signal(device->m_mainloop, 0);
-}
-
-void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t num_bytes, void *data)
-{
-	PulseAudioDevice* device = (PulseAudioDevice*)data;
-
-	void* buffer;
-
-	AUD_pa_stream_begin_write(stream, &buffer, &num_bytes);
-
-	device->mix((data_t*)buffer, num_bytes / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));
-
-	AUD_pa_stream_write(stream, buffer, num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
-}
-
-void PulseAudioDevice::PulseAudio_underflow(pa_stream *stream, void *data)
-{
-	PulseAudioDevice* device = (PulseAudioDevice*)data;
-
-	DeviceSpecs specs = device->getSpecs();
-
-	if(++device->m_underflows > 4 && device->m_buffersize < AUD_DEVICE_SAMPLE_SIZE(specs) * specs.rate * 2)
-	{
-		device->m_buffersize <<= 1;
-		device->m_underflows = 0;
-
-		pa_buffer_attr buffer_attr;
-
-		buffer_attr.fragsize = -1U;
-		buffer_attr.maxlength = -1U;
-		buffer_attr.minreq = -1U;
-		buffer_attr.prebuf = -1U;
-		buffer_attr.tlength = device->m_buffersize;
-
-		AUD_pa_stream_set_buffer_attr(stream, &buffer_attr, nullptr, nullptr);
-	}
-}
-
-void PulseAudioDevice::playing(bool playing)
-{
-	m_playback = playing;
-
-	AUD_pa_stream_cork(m_stream, playing ? 0 : 1, nullptr, nullptr);
-}
-
-PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buffersize) :
-	m_playback(false),
-	m_state(PA_CONTEXT_UNCONNECTED),
-	m_buffersize(buffersize),
-	m_underflows(0)
-{
-	m_mainloop = AUD_pa_threaded_mainloop_new();
-
-	AUD_pa_threaded_mainloop_lock(m_mainloop);
-
-	m_context = AUD_pa_context_new(AUD_pa_threaded_mainloop_get_api(m_mainloop), name.c_str());
-
-	if(!m_context)
-	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_free(m_mainloop);
-
-		AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
-	}
-
-	AUD_pa_context_set_state_callback(m_context, PulseAudio_state_callback, this);
-
-	AUD_pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr);
-
-	AUD_pa_threaded_mainloop_start(m_mainloop);
-
-	while(m_state != PA_CONTEXT_READY)
-	{
-		switch(m_state)
-		{
-		case PA_CONTEXT_FAILED:
-		case PA_CONTEXT_TERMINATED:
-			AUD_pa_threaded_mainloop_unlock(m_mainloop);
-			AUD_pa_threaded_mainloop_stop(m_mainloop);
-
-			AUD_pa_context_disconnect(m_context);
-			AUD_pa_context_unref(m_context);
-
-			AUD_pa_threaded_mainloop_free(m_mainloop);
-
-			AUD_THROW(DeviceException, "Could not connect to PulseAudio.");
-			break;
-		default:
-			AUD_pa_threaded_mainloop_wait(m_mainloop);
-			break;
-		}
-	}
-
-	if(specs.channels == CHANNELS_INVALID)
-		specs.channels = CHANNELS_STEREO;
-	if(specs.format == FORMAT_INVALID)
-		specs.format = FORMAT_FLOAT32;
-	if(specs.rate == RATE_INVALID)
-		specs.rate = RATE_48000;
-
-	m_specs = specs;
-
-	pa_sample_spec sample_spec;
-
-	sample_spec.channels = specs.channels;
-	sample_spec.format = PA_SAMPLE_FLOAT32;
-	sample_spec.rate = specs.rate;
-
-	switch(m_specs.format)
-	{
-	case FORMAT_U8:
-		sample_spec.format = PA_SAMPLE_U8;
-		break;
-	case FORMAT_S16:
-		sample_spec.format = PA_SAMPLE_S16NE;
-		break;
-	case FORMAT_S24:
-		sample_spec.format = PA_SAMPLE_S24NE;
-		break;
-	case FORMAT_S32:
-		sample_spec.format = PA_SAMPLE_S32NE;
-		break;
-	case FORMAT_FLOAT32:
-		sample_spec.format = PA_SAMPLE_FLOAT32;
-		break;
-	case FORMAT_FLOAT64:
-		m_specs.format = FORMAT_FLOAT32;
-		break;
-	default:
-		break;
-	}
-
-	m_stream = AUD_pa_stream_new(m_context, "Playback", &sample_spec, nullptr);
-
-	if(!m_stream)
-	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_stop(m_mainloop);
-
-		AUD_pa_context_disconnect(m_context);
-		AUD_pa_context_unref(m_context);
-
-		AUD_pa_threaded_mainloop_free(m_mainloop);
-
-		AUD_THROW(DeviceException, "Could not create PulseAudio stream.");
-	}
-
-	AUD_pa_stream_set_write_callback(m_stream, PulseAudio_request, this);
-	AUD_pa_stream_set_underflow_callback(m_stream, PulseAudio_underflow, this);
-
-	pa_buffer_attr buffer_attr;
-
-	buffer_attr.fragsize = -1U;
-	buffer_attr.maxlength = -1U;
-	buffer_attr.minreq = -1U;
-	buffer_attr.prebuf = -1U;
-	buffer_attr.tlength = buffersize;
-
-	if(AUD_pa_stream_connect_playback(m_stream, nullptr, &buffer_attr, static_cast<pa_stream_flags_t>(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
-	{
-		AUD_pa_threaded_mainloop_unlock(m_mainloop);
-		AUD_pa_threaded_mainloop_stop(m_mainloop);
-
-		AUD_pa_context_disconnect(m_context);
-		AUD_pa_context_unref(m_context);
-
-		AUD_pa_threaded_mainloop_free(m_mainloop);
-
-		AUD_THROW(DeviceException, "Could not connect PulseAudio stream.");
-	}
-
-	AUD_pa_threaded_mainloop_unlock(m_mainloop);
-
-	create();
-}
-
-PulseAudioDevice::~PulseAudioDevice()
-{
-	AUD_pa_threaded_mainloop_stop(m_mainloop);
-
-	AUD_pa_context_disconnect(m_context);
-	AUD_pa_context_unref(m_context);
-
-	AUD_pa_threaded_mainloop_free(m_mainloop);
-
-	destroy();
-}
-
-class PulseAudioDeviceFactory : public IDeviceFactory
-{
-private:
-	DeviceSpecs m_specs;
-	int m_buffersize;
-	std::string m_name;
-
-public:
-	PulseAudioDeviceFactory() :
-		m_buffersize(AUD_DEFAULT_BUFFER_SIZE),
-		m_name("Audaspace")
-	{
-		m_specs.format = FORMAT_FLOAT32;
-		m_specs.channels = CHANNELS_STEREO;
-		m_specs.rate = RATE_48000;
-	}
-
-	virtual std::shared_ptr<IDevice> openDevice()
-	{
-		return std::shared_ptr<IDevice>(new PulseAudioDevice(m_name, m_specs, m_buffersize));
-	}
-
-	virtual int getPriority()
-	{
-		return 1 << 15;
-	}
-
-	virtual void setSpecs(DeviceSpecs specs)
-	{
-		m_specs = specs;
-	}
-
-	virtual void setBufferSize(int buffersize)
-	{
-		m_buffersize = buffersize;
-	}
-
-	virtual void setName(std::string name)
-	{
-		m_name = name;
-	}
-};
-
-void PulseAudioDevice::registerPlugin()
-{
-	if(loadPulseAudio())
-		DeviceManager::registerDevice("PulseAudio", std::shared_ptr<IDeviceFactory>(new PulseAudioDeviceFactory));
-}
-
-#ifdef PULSEAUDIO_PLUGIN
-extern "C" AUD_PLUGIN_API void registerPlugin()
-{
-	PulseAudioDevice::registerPlugin();
-}
-
-extern "C" AUD_PLUGIN_API const char* getName()
-{
-	return "PulseAudio";
-}
-#endif
-
-AUD_NAMESPACE_END