pyrox.dev
vobcopy: 1.2.0 -> 1.2.1; change upstream (#416156)
+28
pkgs/by-name/vo/vobcopy/fix-darwin.patch
+28
pkgs/by-name/vo/vobcopy/fix-darwin.patch
···
···
1
+
diff --git a/vobcopy.h b/vobcopy.h
2
+
index dcf4266..d34c2b4 100644
3
+
--- a/vobcopy.h
4
+
+++ b/vobcopy.h
5
+
@@ -115,6 +115,7 @@ typedef enum { FALSE=0, TRUE=1 } bool;
6
+
7
+
#ifdef HAVE_SYS_STATVFS_H
8
+
#include <sys/statvfs.h>
9
+
+#ifndef __APPLE__
10
+
#ifndef USE_STATFS
11
+
#define USE_STATVFS
12
+
#ifndef USE_STATFS_FOR_DEV
13
+
@@ -122,6 +123,7 @@ typedef enum { FALSE=0, TRUE=1 } bool;
14
+
#endif
15
+
#endif
16
+
#endif
17
+
+#endif
18
+
19
+
#ifdef HAVE_MNTENT_H
20
+
#include <mntent.h>
21
+
@@ -164,6 +166,6 @@ char *safestrncpy(char *dest, const char *src, size_t n);
22
+
int check_progress( void ); /* this can be removed because the one below supersedes it */
23
+
int progressUpdate( int starttime, int cur, int tot, int force );
24
+
25
+
-#ifndef HAVE_FDATASYNC
26
+
+#if !defined(HAVE_FDATASYNC) || defined(__APPLE__)
27
+
#define fdatasync(fd) 0
28
+
#endif
+20
-11
pkgs/by-name/vo/vobcopy/package.nix
+20
-11
pkgs/by-name/vo/vobcopy/package.nix
···
1
{
2
lib,
3
stdenv,
4
-
fetchurl,
5
libdvdread,
6
libdvdcss,
7
}:
8
9
-
stdenv.mkDerivation rec {
10
pname = "vobcopy";
11
-
version = "1.2.0";
12
13
-
src = fetchurl {
14
-
url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2";
15
-
sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9";
16
};
17
18
buildInputs = [
19
libdvdread
20
libdvdcss
21
];
22
-
makeFlags = [
23
-
"DESTDIR=$(out)"
24
-
"PREFIX=/"
25
-
];
26
27
meta = {
28
description = "Copies DVD .vob files to harddisk, decrypting them on the way";
29
-
homepage = "http://vobcopy.org/projects/c/c.shtml";
30
license = lib.licenses.gpl2Plus;
31
platforms = lib.platforms.all;
32
mainProgram = "vobcopy";
···
1
{
2
lib,
3
stdenv,
4
+
fetchFromGitHub,
5
+
autoreconfHook,
6
+
gettext,
7
libdvdread,
8
libdvdcss,
9
}:
10
11
+
stdenv.mkDerivation {
12
pname = "vobcopy";
13
+
version = "1.2.1-unstable-2023-08-29";
14
15
+
src = fetchFromGitHub {
16
+
owner = "barak";
17
+
repo = "vobcopy";
18
+
rev = "cb560b3a67358f51d51ecc0e511f49f09f304a13";
19
+
hash = "sha256-2EtSO39yOFoCZ5GMqtp+SvmzqSevlqYDo73p0lVHZ3o=";
20
};
21
22
+
# Based on https://github.com/barak/vobcopy/issues/14, but also fixes
23
+
# "error: call to undeclared function 'fdatasync'". The latter patch
24
+
# is inspired by https://github.com/php/php-src/commit/e69729f2ba02ddc26c70b4bd88ef86c0a2277bdc
25
+
patches = [ ./fix-darwin.patch ];
26
+
27
+
nativeBuildInputs = [
28
+
autoreconfHook
29
+
];
30
buildInputs = [
31
+
gettext # Fails on Darwin otherwise
32
libdvdread
33
libdvdcss
34
];
35
36
meta = {
37
description = "Copies DVD .vob files to harddisk, decrypting them on the way";
38
+
homepage = "https://github.com/barak/vobcopy";
39
license = lib.licenses.gpl2Plus;
40
platforms = lib.platforms.all;
41
mainProgram = "vobcopy";