mplayer: 1.4 -> unstable-2022-02-03
Needed for FFmpeg 5.0 compatibility. Last release was in 2019.
This commit is contained in:
parent
6eda56c367
commit
5ab0b425f6
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg
|
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
|
||||||
, aalibSupport ? true, aalib ? null
|
, aalibSupport ? true, aalib ? null
|
||||||
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
|
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
|
||||||
, fribidiSupport ? true, fribidi ? null
|
, fribidiSupport ? true, fribidi ? null
|
||||||
|
@ -93,11 +93,12 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mplayer";
|
pname = "mplayer";
|
||||||
version = "1.4";
|
version = "unstable-2022-02-03";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchsvn {
|
||||||
url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz";
|
url = "svn://svn.mplayerhq.hu/mplayer/trunk";
|
||||||
sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2";
|
rev = "38331";
|
||||||
|
sha256 = "1vpic8i6zvg0zsy50vhm45ysqag561bpn9jycfbvvwl9ji7l55zi";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
|
@ -106,8 +107,6 @@ stdenv.mkDerivation rec {
|
||||||
rm -rf ffmpeg
|
rm -rf ffmpeg
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = [ ./svn-r38199-ffmpeg44fix.patch ];
|
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||||
nativeBuildInputs = [ pkg-config yasm ];
|
nativeBuildInputs = [ pkg-config yasm ];
|
||||||
buildInputs = with lib;
|
buildInputs = with lib;
|
||||||
|
@ -163,7 +162,6 @@ stdenv.mkDerivation rec {
|
||||||
(if pulseSupport then "--enable-pulse" else "--disable-pulse")
|
(if pulseSupport then "--enable-pulse" else "--disable-pulse")
|
||||||
(if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2")
|
(if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2")
|
||||||
"--disable-xanim"
|
"--disable-xanim"
|
||||||
"--disable-ivtv"
|
|
||||||
"--disable-xvid --disable-xvid-lavc"
|
"--disable-xvid --disable-xvid-lavc"
|
||||||
"--disable-ossaudio"
|
"--disable-ossaudio"
|
||||||
"--disable-ffmpeg_a"
|
"--disable-ffmpeg_a"
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
Index: libmpcodecs/ad_spdif.c
|
|
||||||
===================================================================
|
|
||||||
diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c
|
|
||||||
--- a/libmpcodecs/ad_spdif.c (revision 38198)
|
|
||||||
+++ b/libmpcodecs/ad_spdif.c (revision 38199)
|
|
||||||
@@ -298,14 +298,8 @@
|
|
||||||
if (spdif_ctx->header_written)
|
|
||||||
av_write_trailer(lavf_ctx);
|
|
||||||
av_freep(&lavf_ctx->pb);
|
|
||||||
- if (lavf_ctx->streams) {
|
|
||||||
- av_freep(&lavf_ctx->streams[0]->codec);
|
|
||||||
- av_freep(&lavf_ctx->streams[0]->info);
|
|
||||||
- av_freep(&lavf_ctx->streams[0]);
|
|
||||||
- }
|
|
||||||
- av_freep(&lavf_ctx->streams);
|
|
||||||
- av_freep(&lavf_ctx->priv_data);
|
|
||||||
+ avformat_free_context(lavf_ctx);
|
|
||||||
+ lavf_ctx = NULL;
|
|
||||||
}
|
|
||||||
- av_freep(&lavf_ctx);
|
|
||||||
av_freep(&spdif_ctx);
|
|
||||||
}
|
|
Loading…
Reference in a new issue