Merge pull request #331568 from emilazy/push-nxpypquxrpmk

mplayer: unstable-2022-02-03 -> 1.5-unstable-2024-07-03
This commit is contained in:
Marcus Ramberg 2024-08-07 00:31:00 +02:00 committed by GitHub
commit 0beb739f92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_4
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_6
, aalibSupport ? true, aalib
, fontconfigSupport ? true, fontconfig, freefont_ttf
, fribidiSupport ? true, fribidi
@ -70,12 +70,12 @@ in
stdenv.mkDerivation rec {
pname = "mplayer";
version = "unstable-2022-02-03";
version = "1.5-unstable-2024-07-03";
src = fetchsvn {
url = "svn://svn.mplayerhq.hu/mplayer/trunk";
rev = "38331";
sha256 = "1vpic8i6zvg0zsy50vhm45ysqag561bpn9jycfbvvwl9ji7l55zi";
rev = "38637";
hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE=";
};
prePatch = ''
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ];
buildInputs = with lib;
[ freetype ffmpeg_4 ]
[ freetype ffmpeg_6 ]
++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi