From 9076fd304c3fffdb88948170d36b13460367efff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Kita?= Date: Tue, 21 Nov 2023 11:32:57 +0100 Subject: [PATCH] Release v0.31.1 (#102) * Update bundlex to v1.3.0. Update os_deps definition in bundlex.exs --- bundlex.exs | 17 +++++++++++------ mix.exs | 2 +- mix.lock | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/bundlex.exs b/bundlex.exs index 9276089..00e6faf 100644 --- a/bundlex.exs +++ b/bundlex.exs @@ -11,14 +11,13 @@ defmodule Membrane.H264.FFmpeg.BundlexProject do "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-linuxarm64-gpl-shared-6.0.tar.xz"} %{os: "linux"} -> - {:precompiled, - "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-linux64-gpl-shared-6.0.tar.xz"} + "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-linux64-gpl-shared-6.0.tar.xz" %{architecture: "x86_64", os: "darwin" <> _rest_of_os_name} -> - {:precompiled, "#{membrane_precompiled_url_prefix}_macos_intel.tar.gz"} + "#{membrane_precompiled_url_prefix}_macos_intel.tar.gz" %{architecture: "aarch64", os: "darwin" <> _rest_of_os_name} -> - {:precompiled, "#{membrane_precompiled_url_prefix}_macos_arm.tar.gz"} + "#{membrane_precompiled_url_prefix}_macos_arm.tar.gz" _other -> nil @@ -37,7 +36,10 @@ defmodule Membrane.H264.FFmpeg.BundlexProject do interface: :nif, sources: ["decoder.c"], os_deps: [ - {[get_ffmpeg_url(), :pkg_config], ["libavcodec", "libavutil"]} + ffmpeg: [ + {:precompiled, get_ffmpeg_url(), ["libavcodec", "libavutil"]}, + {:pkg_config, ["libavcodec", "libavutil"]} + ] ], preprocessor: Unifex ], @@ -45,7 +47,10 @@ defmodule Membrane.H264.FFmpeg.BundlexProject do interface: :nif, sources: ["encoder.c"], os_deps: [ - {[get_ffmpeg_url(), :pkg_config], ["libavcodec", "libavutil"]} + ffmpeg: [ + {:precompiled, get_ffmpeg_url(), ["libavcodec", "libavutil"]}, + {:pkg_config, ["libavcodec", "libavutil"]} + ] ], preprocessor: Unifex ] diff --git a/mix.exs b/mix.exs index 7946821..72db75b 100644 --- a/mix.exs +++ b/mix.exs @@ -39,7 +39,7 @@ defmodule Membrane.H264.FFmpeg.Plugin.MixProject do defp deps do [ {:bunch, "~> 1.6"}, - {:bundlex, "~> 1.2.0"}, + {:bundlex, "~> 1.3"}, {:unifex, "~> 1.1.0"}, {:membrane_core, "~> 1.0"}, {:membrane_common_c, "~> 0.16.0"}, diff --git a/mix.lock b/mix.lock index 59babdd..da4be23 100644 --- a/mix.lock +++ b/mix.lock @@ -1,7 +1,7 @@ %{ "bunch": {:hex, :bunch, "1.6.0", "4775f8cdf5e801c06beed3913b0bd53fceec9d63380cdcccbda6be125a6cfd54", [:mix], [], "hexpm", "ef4e9abf83f0299d599daed3764d19e8eac5d27a5237e5e4d5e2c129cfeb9a22"}, "bunch_native": {:hex, :bunch_native, "0.5.0", "8ac1536789a597599c10b652e0b526d8833348c19e4739a0759a2bedfd924e63", [:mix], [{:bundlex, "~> 1.0", [hex: :bundlex, repo: "hexpm", optional: false]}], "hexpm", "24190c760e32b23b36edeb2dc4852515c7c5b3b8675b1a864e0715bdd1c8f80d"}, - "bundlex": {:hex, :bundlex, "1.2.0", "a89869208a019376a38e8a10e1bd573dcbeae8addd381c2cd74e2817010bef8f", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.5", [hex: :qex, repo: "hexpm", optional: false]}, {:req, "~> 0.4.0", [hex: :req, repo: "hexpm", optional: false]}, {:secure_random, "~> 0.5", [hex: :secure_random, repo: "hexpm", optional: false]}, {:zarex, "~> 1.0", [hex: :zarex, repo: "hexpm", optional: false]}], "hexpm", "d2182b91a2a53847baadf4745ad2291853e786ad28671f474a611e7703dbca9b"}, + "bundlex": {:hex, :bundlex, "1.3.0", "9f376ac6f997f0a30041b9e3b473390b464ffbb7b6c001353f0ce95bf1e32d7c", [:mix], [{:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.5", [hex: :qex, repo: "hexpm", optional: false]}, {:req, "~> 0.4.0", [hex: :req, repo: "hexpm", optional: false]}, {:secure_random, "~> 0.5", [hex: :secure_random, repo: "hexpm", optional: false]}, {:zarex, "~> 1.0", [hex: :zarex, repo: "hexpm", optional: false]}], "hexpm", "4e4849ecb658404d91b2305227cf73ca181a72bc4e602b9a0da90ffbd64cdf8b"}, "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"}, "castore": {:hex, :castore, "1.0.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"}, "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"},