3.9.5-1

* Fix release contents by including `meson_options.txt` (PR #863). * Pin the version of meson PR #859). * Fix libuv build (PR #857).
versatica · Jul 11, 2022 · f337e80 · f337e80
1 parent 339946b
commit f337e80
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
 
+### 3.9.5-1
+
+* Fix release contents by including `meson_options.txt` (PR #863).
+* Pin the version of meson PR #859).
+* Fix libuv build (PR #857).
+
+
 ### 3.9.5
 
 * ICE renomination support (PR #756).

diff --git a/node/lib/Worker.js b/node/lib/Worker.js
@@ -81,7 +81,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.9.5',
+                MEDIASOUP_VERSION: '3.9.5-1',
                 // Let the worker process inherit all environment variables, useful
                 // if a custom and not in the path GCC is used so the user can set
                 // LD_LIBRARY_PATH environment variable for runtime.

diff --git a/node/lib/index.d.ts b/node/lib/index.d.ts
@@ -9,7 +9,7 @@ export { types };
 /**
  * Expose mediasoup version.
  */
-export declare const version = "3.9.5";
+export declare const version = "3.9.5-1";
 /**
  * Expose parseScalabilityMode() function.
  */

diff --git a/node/lib/index.js b/node/lib/index.js
@@ -11,7 +11,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.9.5';
+exports.version = '3.9.5-1';
 /**
  * Expose parseScalabilityMode() function.
  */

diff --git a/node/lib/types.js b/node/lib/types.js
@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.9.5",
+  "version": "3.9.5-1",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -36,6 +36,7 @@
     "worker/test/src",
     "worker/Makefile",
     "worker/meson.build",
+    "worker/meson_options.txt",
     "npm-scripts.js"
   ],
   "keywords": [

diff --git a/worker/Cargo.toml b/worker/Cargo.toml
@@ -23,6 +23,7 @@ include = [
     "/Cargo.toml",
     "/Makefile",
     "/meson.build",
+    "/meson_options.txt",
 ]
 
 [package.metadata.docs.rs]

diff --git a/worker/Makefile b/worker/Makefile
@@ -15,6 +15,7 @@ PIP_DIR = $(MEDIASOUP_OUT_DIR)/pip
 INSTALL_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
 BUILD_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/build
 MESON ?= $(PIP_DIR)/bin/meson
+MESON_VERSION ?= 0.61.5
 MESON_ARGS ?= ""
 # Workaround for NixOS and Guix that don't work with pre-built binaries, see:
 # https://github.com/NixOS/nixpkgs/issues/142383.
@@ -64,7 +65,7 @@ ifeq ($(wildcard $(PIP_DIR)),)
 		echo "Installation failed, likely because PIP is unavailable, if you are on Debian/Ubuntu or derivative please install the python3-pip package"
 	# Install `meson` and `ninja` using `pip` into custom location, so we don't
 	# depend on system-wide installation.
-	$(PYTHON) -m pip install --upgrade --target=$(PIP_DIR) $(PIP_BUILD_BINARIES) meson ninja
+	$(PYTHON) -m pip install --upgrade --target=$(PIP_DIR) $(PIP_BUILD_BINARIES) meson==$(MESON_VERSION) ninja
 endif
 
 setup: meson-ninja

diff --git a/worker/subprojects/libuv.wrap b/worker/subprojects/libuv.wrap
@@ -1,12 +1,11 @@
 [wrap-file]
-directory = libuv-v1.43.0
-source_url = https://dist.libuv.org/dist/v1.43.0/libuv-v1.43.0.tar.gz
-source_filename = libuv-v1.43.0.tar.gz
-source_hash = 90d72bb7ae18de2519d0cac70eb89c319351146b90cd3f91303a492707e693a4
-patch_filename = libuv_1.43.0-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.43.0-1/get_patch
-patch_hash = 9bd241c95110c67f9486f1a77a988216bf5ec192dc3002651a6ccefb2e6aba5a
+directory = libuv-v1.44.1
+source_url = https://dist.libuv.org/dist/v1.44.1/libuv-v1.44.1.tar.gz
+source_filename = libuv-v1.44.1.tar.gz
+source_hash = 9d37b63430fe3b92a9386b949bebd8f0b4784a39a16964c82c9566247a76f64a
+patch_filename = libuv_1.44.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.44.1-1/get_patch
+patch_hash = 8a105158cdabca2a54f1c7cc4c2f814c159271e10dc5e37ed1a08f13cfd67ff7
 
 [provide]
 libuv = libuv_dep
-