Skip to content

Commit ae54b64

Browse files
authored
Fix precompiled FFmpeg URL (#83)
1 parent 140ae05 commit ae54b64

File tree

4 files changed

+6
-25
lines changed

4 files changed

+6
-25
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The package can be installed by adding `membrane_rtmp_plugin` to your list of de
1414
```elixir
1515
def deps do
1616
[
17-
{:membrane_rtmp_plugin, "~> 0.20.1"}
17+
{:membrane_rtmp_plugin, "~> 0.20.2"}
1818
]
1919
end
2020
```

bundlex.exs

+2-23
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
defmodule Membrane.RTMP.BundlexProject do
22
use Bundlex.Project
33

4-
defp get_ffmpeg_url() do
5-
membrane_precompiled_url_prefix =
6-
"https://github.com/membraneframework-precompiled/precompiled_ffmpeg/releases/latest/download/ffmpeg"
7-
8-
case Bundlex.get_target() do
9-
%{architecture: "aarch64", os: "linux"} ->
10-
"https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-linuxarm64-gpl-shared-6.0.tar.xz"
11-
12-
%{os: "linux"} ->
13-
"https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-linux64-gpl-shared-6.0.tar.xz"
14-
15-
%{architecture: "x86_64", os: "darwin" <> _rest_of_os_name} ->
16-
"#{membrane_precompiled_url_prefix}_macos_intel.tar.gz"
17-
18-
%{architecture: "aarch64", os: "darwin" <> _rest_of_os_name} ->
19-
"#{membrane_precompiled_url_prefix}_macos_arm.tar.gz"
20-
21-
_other ->
22-
nil
23-
end
24-
end
25-
264
def project do
275
[
286
natives: natives()
@@ -38,7 +16,8 @@ defmodule Membrane.RTMP.BundlexProject do
3816
preprocessor: Unifex,
3917
os_deps: [
4018
ffmpeg: [
41-
{:precompiled, get_ffmpeg_url(), ["libavformat", "libavutil"]},
19+
{:precompiled, Membrane.PrecompiledDependencyProvider.get_dependency_url(:ffmpeg),
20+
["libavformat", "libavutil"]},
4221
{:pkg_config, ["libavformat", "libavutil"]}
4322
]
4423
]

mix.exs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule Membrane.RTMP.Mixfile do
22
use Mix.Project
33

4-
@version "0.20.1"
4+
@version "0.20.2"
55
@github_url "https://github.com/membraneframework/membrane_rtmp_plugin"
66

77
def project do
@@ -40,6 +40,7 @@ defmodule Membrane.RTMP.Mixfile do
4040
[
4141
{:membrane_core, "~> 1.0"},
4242
{:unifex, "~> 1.1.0"},
43+
{:membrane_precompiled_dependency_provider, "~> 0.1.0"},
4344
{:membrane_h264_plugin, "~> 0.9.0"},
4445
{:membrane_h264_format, "~> 0.6.1"},
4546
{:membrane_aac_plugin, "~> 0.18.0"},

mix.lock

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"membrane_h264_format": {:hex, :membrane_h264_format, "0.6.1", "44836cd9de0abe989b146df1e114507787efc0cf0da2368f17a10c47b4e0738c", [:mix], [], "hexpm", "4b79be56465a876d2eac2c3af99e115374bbdc03eb1dea4f696ee9a8033cd4b0"},
3232
"membrane_h264_plugin": {:hex, :membrane_h264_plugin, "0.9.1", "ea140ab1ca21c528563675fdd7e14c80607e120e320dc930cac3dcfb4db3fc2b", [:mix], [{:bunch, "~> 1.4", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}], "hexpm", "8f10db817e691fc1234ed85fe674b3f8718d3a410e4582736dcdd53664cae725"},
3333
"membrane_hackney_plugin": {:hex, :membrane_hackney_plugin, "0.11.0", "54b368333a23394e7cac2f4d6b701bf8c5ee6614670a31f4ebe009b5e691a5c1", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:mockery, "~> 2.3", [hex: :mockery, repo: "hexpm", optional: false]}], "hexpm", "2b28fd1be3c889d5824d7d985598386c7673828c88f49a91221df3626af8a998"},
34+
"membrane_precompiled_dependency_provider": {:hex, :membrane_precompiled_dependency_provider, "0.1.1", "a0d5b7942f8be452c30744207f78284f6a0e0c84c968aba7d76e206fbf75bc5d", [:mix], [{:bundlex, "~> 1.4", [hex: :bundlex, repo: "hexpm", optional: false]}], "hexpm", "87ad44752e2cf0fa3b31c5aac15b863343c2f6e0f0fd201f5ec4c0bcda8c6fa3"},
3435
"membrane_stream_plugin": {:hex, :membrane_stream_plugin, "0.4.0", "0c4ab72a4e13bf0faa0f1166fbaf68d2e34167dbec345aedb74ce1eb7497bdda", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "5a9a9c17783e18ad740e6ddfed364581bdb7ebdab8e61ba2c19a1830356f7eb8"},
3536
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
3637
"mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},

0 commit comments

Comments
 (0)