mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
bombono: 1.2.4 -> 1.2.4-unstable-2022-02-06
Includes all the fixes we previously bundled AUR patches for, and with another PR from the same author, works with FFmpeg 6.
This commit is contained in:
parent
c6a4f2c6cd
commit
ef150d021c
@ -2,13 +2,14 @@
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, fetchpatch
|
||||
, fetchpatch2
|
||||
, scons
|
||||
, boost
|
||||
, dvdauthor
|
||||
, dvdplusrwtools
|
||||
, enca
|
||||
, cdrkit
|
||||
, ffmpeg_4
|
||||
, ffmpeg_6
|
||||
, gettext
|
||||
, gtk2
|
||||
, gtkmm2
|
||||
@ -18,22 +19,15 @@
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
let
|
||||
fetchPatchFromAur = {name, sha256}:
|
||||
fetchpatch {
|
||||
inherit name sha256;
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=766dd4ba1715fc921fe26ce1bdcf22c30f4fc073";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "bombono";
|
||||
version = "1.2.4";
|
||||
version = "1.2.4-unstable-2022-02-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bombono-dvd";
|
||||
repo = "bombono-dvd";
|
||||
rev = version;
|
||||
sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM=";
|
||||
rev = "8680f5803314e4bcfbdae44f555c47ad345dae72";
|
||||
hash = "sha256-8AxXIvShH4HwlPZWAszku33rts13HiNoRsHiLYdZAHA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -42,17 +36,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457";
|
||||
sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA=";
|
||||
})
|
||||
] ++ (map fetchPatchFromAur [
|
||||
{name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";}
|
||||
{name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";}
|
||||
{name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";}
|
||||
{name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";}
|
||||
{name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";}
|
||||
{name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";}
|
||||
{name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";}
|
||||
{name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";}
|
||||
{name="inc_boost_header.patch"; sha256="sha256-76vjkf62VsNJ5FmBEs+X7ZBqjvJ372mjSIreBxNQym8=";}
|
||||
]);
|
||||
|
||||
# Fix compilation errors having ffmpeg 2:5.1
|
||||
# https://github.com/bombono-dvd/bombono-dvd/pull/28
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/bombono-dvd/bombono-dvd/commit/9f2cde1ddc22705bf58264739685086755b2138b.patch?full_index=1";
|
||||
hash = "sha256-ks6c04HEYF4nPfSOjzG+dUt9v7ZmNBb0XH6byPYqX5I=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/mbase/SConscript \
|
||||
@ -66,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
dvdauthor
|
||||
dvdplusrwtools
|
||||
enca
|
||||
ffmpeg_4
|
||||
ffmpeg_6
|
||||
gtk2
|
||||
gtkmm2
|
||||
libdvdread
|
||||
@ -82,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
# fix iso authoring
|
||||
install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py
|
||||
|
||||
wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_4 dvdauthor cdrkit ]}
|
||||
wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_6 dvdauthor cdrkit ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
Loading…
Reference in New Issue
Block a user