Skip to content

Commit

Permalink
most conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
@bartkrak
bartkrak committed Mar 18, 2024
1 parent c0ec7aa commit 03e231e
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 86 deletions.
116 changes: 66 additions & 50 deletions mix.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,56 +36,72 @@ defmodule Membrane.SDK.Mixfile do

defp deps do
membrane_deps = [
{:membrane_core, "~> 1.0"},
{:membrane_h264_ffmpeg_plugin, "~> 0.31.0"},
{:membrane_file_plugin, "~> 0.16.0"},
{:membrane_common_c, "~> 0.16.0"},
{:membrane_mp4_plugin, "~> 0.31.0"},
{:membrane_tee_plugin, "~> 0.12.0"},
{:membrane_aac_plugin, "~> 0.18.0"},
{:membrane_rtp_h264_plugin, "~> 0.19.0"},
{:membrane_rtp_opus_plugin, "~> 0.9.0"},
{:membrane_rtp_plugin, "~> 0.24.0"},
{:membrane_funnel_plugin, "~> 0.9.0"},
{:membrane_rtp_vp8_plugin, "~> 0.9.0"},
{:membrane_opus_plugin, "~> 0.19.0"},
{:membrane_aac_fdk_plugin, "~> 0.18.0"},
{:membrane_realtimer_plugin, "~> 0.9.0"},
{:membrane_framerate_converter_plugin, "~> 0.8.0"},
{:membrane_generator_plugin, "~> 0.10.0"},
{:membrane_audio_mix_plugin, "~> 0.16.0"},
{:membrane_audio_filler_plugin, "~> 0.3.0"},
{:membrane_flv_plugin, "~> 0.11.0"},
{:membrane_ffmpeg_swscale_plugin, "~> 0.15.0"},
{:membrane_video_merger_plugin, "~> 0.9.0"},
{:membrane_stream_plugin, "~> 0.4.0"},
{:membrane_sdl_plugin, "~> 0.18.0"},
{:membrane_ffmpeg_swresample_plugin, "~> 0.19.0"},
{:membrane_udp_plugin, "~> 0.12.0"},
{:membrane_h264_plugin, "~> 0.9.0"},
{:bunch, "~> 1.6"},
{:membrane_mp3_mad_plugin, "~> 0.18.0"},
{:membrane_mp3_lame_plugin, "~> 0.18.0"},
{:membrane_fake_plugin, "~> 0.11.0"},
{:membrane_hackney_plugin, "~> 0.11.0"},
{:membrane_raw_video_parser_plugin, "~> 0.12.0"},
{:membrane_wav_plugin, "~> 0.10.0"},
{:membrane_rtp_mpegaudio_plugin, "~> 0.14.0"},
{:membrane_audiometer_plugin, "~> 0.12.0"},
{:membrane_raw_audio_format, "~> 0.12.0"},
{:membrane_ivf_plugin, "~> 0.7.0"},
{:membrane_matroska_plugin, "~> 0.5.0"},
{:membrane_scissors_plugin, "~> 0.8.0"},
{:membrane_flac_plugin, "~> 0.11.0"},
{:membrane_ogg_plugin, "~> 0.3.0"},
{:membrane_rtsp, "~> 0.5.0"},
{:ex_sdp, "~> 0.13.0"},
{:ex_libsrtp, "~> 0.7.0"},
{:membrane_http_adaptive_stream_plugin, "~> 0.18.0"},
{:membrane_camera_capture_plugin, "~> 0.7.0"},
{:membrane_ffmpeg_video_filter_plugin, "~> 0.13.0"},
{:membrane_rtmp_plugin, "~> 0.19.0"},
{:membrane_portaudio_plugin, "~> 0.18.0"}
# {:membrane_http_adaptive_stream_plugin, path: "/Users/bartekch/Desktop/membrane_http_adaptive_stream_plugin"}, # after mp4_plugin update tests fail
# {:membrane_http_adaptive_stream_plugin, "~> 0.18.3"}, # update version after new release

# {:membrane_rtp_plugin, path: "/Users/bartekch/Desktop/membrane_rtp_plugin"}, # deps.get fail (git checkout)
# {:membrane_rtp_plugin, "~> 0.27.2"}, # update version after new release

# {:membrane_rtmp_plugin, path: "/Users/bartekch/Desktop/membrane_rtmp_plugin"}, # tests fail (localhost failed to connect)
# {:membrane_rtmp_plugin, "~> 0.23.1"}, # update version after new release

{:membrane_rtsp, path: "/Users/bartekch/Desktop/membrane_rtsp"}, # updated, release as 0.6.2
# {:membrane_rtsp, "~> 0.6.1"}, # update version after new release

{:membrane_matroska_plugin, path: "/Users/bartekch/Desktop/membrane_matroska_plugin"}, # updated, release as 0.5.1
# {:membrane_matroska_plugin, "~> 0.5.0"}, # update version after new release

{:membrane_mp4_plugin, path: "/Users/bartekch/Desktop/membrane_mp4_plugin"}, # updated, release as 0.34.1
# {:membrane_mp4_plugin, "~> 0.34.0"}, # update version after new release

{:membrane_raw_video_parser_plugin, path: "/Users/bartekch/Desktop/membrane_raw_video_parser_plugin"}, # updated, release as 0.12.1
# {:membrane_raw_video_parser_plugin, "~> 0.12.0"}, # update version after new release

{:membrane_wav_plugin, path: "/Users/bartekch/Desktop/membrane_wav_plugin"}, # updated, release as 0.10.1
# {:membrane_wav_plugin, "~> 0.10.0"}, # update version after new release

{:membrane_file_plugin, "~> 0.17.0"}, # done
{:membrane_core, "~> 1.0.1"}, # done
{:membrane_h26x_plugin, "~> 0.10.0"}, # done
{:membrane_h264_ffmpeg_plugin, "~> 0.31.5"}, # done
{:membrane_common_c, "~> 0.16.0"}, # done
{:membrane_tee_plugin, "~> 0.12.0"}, # done
{:membrane_aac_plugin, "~> 0.18.1"}, # done
{:membrane_rtp_h264_plugin, "~> 0.19.0"}, # done
{:membrane_rtp_opus_plugin, "~> 0.9.0"}, # done
{:ex_sdp, "~> 0.15.0"}, # done
{:membrane_funnel_plugin, "~> 0.9.0"}, # done
{:membrane_rtp_vp8_plugin, "~> 0.9.0"}, # done
{:membrane_opus_plugin, "~> 0.20.1"}, # done
{:membrane_aac_fdk_plugin, "~> 0.18.6"}, # done
{:membrane_realtimer_plugin, "~> 0.9.0"}, # done
{:membrane_framerate_converter_plugin, "~> 0.8.0"}, # done
{:membrane_generator_plugin, "~> 0.10.0"}, # done
{:membrane_audio_mix_plugin, "~> 0.16.0"}, # done
{:membrane_audio_filler_plugin, "~> 0.3.0"}, # done
{:membrane_flv_plugin, "~> 0.12.0"}, # done
{:membrane_ffmpeg_swscale_plugin, "~> 0.15.1"}, # done
{:membrane_video_merger_plugin, "~> 0.9.0"}, # done
{:membrane_stream_plugin, "~> 0.4.0"}, # done
{:membrane_sdl_plugin, "~> 0.18.2"}, # done
{:membrane_ffmpeg_swresample_plugin, "~> 0.19.2"}, # done
{:membrane_udp_plugin, "~> 0.13.0"}, # done
{:bunch, "~> 1.6.1"}, # done
{:membrane_mp3_mad_plugin, "~> 0.18.2"}, # done
{:membrane_mp3_lame_plugin, "~> 0.18.1"}, # done
{:membrane_fake_plugin, "~> 0.11.0"}, # done
{:membrane_hackney_plugin, "~> 0.11.0"}, # done
{:membrane_rtp_mpegaudio_plugin, "~> 0.14.0"}, # done
{:membrane_audiometer_plugin, "~> 0.12.0"}, # done
{:membrane_raw_audio_format, "~> 0.12.0"}, # done
{:membrane_ivf_plugin, "~> 0.7.0"}, # done
{:membrane_scissors_plugin, "~> 0.8.0"}, # done
{:membrane_flac_plugin, "~> 0.11.0"}, # done
{:membrane_ogg_plugin, "~> 0.3.0"}, # done
{:ex_libsrtp, "~> 0.7.2"}, # done
{:membrane_camera_capture_plugin, "~> 0.7.2"}, # done
{:membrane_ffmpeg_video_filter_plugin, "~> 0.13.1"}, # done
{:membrane_portaudio_plugin, "~> 0.19.0"} # done
]

membrane_deps ++
Expand Down
Loading

0 comments on commit 03e231e

Please sign in to comment.