public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dvdisaster: 0.72.6 -> 0.79.5

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-12-27 06:33:35 +01:00
parent bd8731ab9d
commit d4406237a9
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/tools/cd-dvd/dvdisaster/default.nix
View File

@ -1,16 +1,20 @@
{ stdenv, fetchurl, pkgconfig, which, gettext, intltool { stdenv, fetchurl, pkgconfig, gettext, which
, glib, gtk2 , glib, gtk2
, enableSoftening ? true , enableSoftening ? true
}: }:
let version = "0.79.5"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dvdisaster-0.72.6"; name = "dvdisaster-${version}";
src = fetchurl { src = fetchurl {
url = "http://dvdisaster.net/downloads/${name}.tar.bz2"; url = "http://dvdisaster.net/downloads/${name}.tar.bz2";
sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b"; sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w";
}; };
nativeBuildInputs = [ gettext pkgconfig which ];
buildInputs = [ glib gtk2 ];
patches = stdenv.lib.optional enableSoftening [ patches = stdenv.lib.optional enableSoftening [
./encryption.patch ./encryption.patch
./dvdrom.patch ./dvdrom.patch
@ -21,8 +25,13 @@ stdenv.mkDerivation rec {
sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop
''; '';
# Explicit --docdir= is required for on-line help to work: configureFlags = [
configureFlags = [ "--docdir=$out/share/doc" ]; # Explicit --docdir= is required for on-line help to work:
"--docdir=$out/share/doc"
"--with-nls=yes"
"--with-embedded-src-path=no"
] ++ stdenv.lib.optional (builtins.elem stdenv.system
stdenv.lib.platforms.x86_64) "--with-sse2=yes";
buildInputs = [ buildInputs = [
pkgconfig which gettext intltool pkgconfig which gettext intltool
@ -35,11 +44,13 @@ stdenv.mkDerivation rec {
for size in 16 24 32 48 64; do for size in 16 24 32 48 64; do
mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps/ mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps/
cp contrib/dvdisaster"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png cp contrib/dvdisaster"$size".png \
$out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png
done done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit version;
homepage = http://dvdisaster.net/; homepage = http://dvdisaster.net/;
description = "Data loss/scratch/aging protection for CD/DVD media"; description = "Data loss/scratch/aging protection for CD/DVD media";
longDescription = '' longDescription = ''
@ -48,8 +59,8 @@ stdenv.mkDerivation rec {
data which is used to recover unreadable sectors if the disc becomes data which is used to recover unreadable sectors if the disc becomes
damaged at a later time. damaged at a later time.
''; '';
license = licenses.gpl2; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ jgeerds ]; maintainers = with maintainers; [ jgeerds nckx ];
}; };
} }

24
pkgs/tools/cd-dvd/dvdisaster/encryption.patch
View File

@ -1,21 +1,19 @@
Author: n/a Author: n/a
Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption). Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
Index: dvdisaster/scsi-layer.c diff -Naur dvdisaster-0.79.5.orig/scsi-layer.c dvdisaster-0.79.5/scsi-layer.c
=================================================================== --- dvdisaster-0.79.5.orig/scsi-layer.c 2015-10-28 21:56:57.000000000 +0100
--- dvdisaster.orig/scsi-layer.c 2012-04-08 21:51:10.995588783 +0900 +++ dvdisaster-0.79.5/scsi-layer.c 2015-12-27 06:19:32.012253661 +0100
+++ dvdisaster/scsi-layer.c 2012-04-08 21:51:29.259678075 +0900 @@ -2712,12 +2712,6 @@
@@ -2693,11 +2693,12 @@
return NULL;
} }
} }
-
+/*
if(dh->mainType == DVD && query_copyright(dh))
{ CloseDevice(dh);
Stop(_("This software does not support encrypted media.\n"));
}
+*/
- if(dh->mainType == DVD && query_copyright(dh))
- { CloseImage(image);
- Stop(_("This software does not support encrypted media.\n"));
- return NULL;
- }
-
/* Create the bitmap of simulated defects */ /* Create the bitmap of simulated defects */
if(Closure->simulateDefects)