Sun Aug 18 07:19:47 2019 UTC ()
dvdread: fix build on darwin.

XXX: I'm not sure that Darwin is reading the POSIX recommendations correctly
in defining _POSIX_PRIORITY_SCHEDULING to -1.

From clement bouvier in PR pkg/54442.


(maya)
diff -r1.19 -r1.20 pkgsrc/sysutils/dvdrecord/Makefile
diff -r1.8 -r1.9 pkgsrc/sysutils/dvdrecord/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/dvdrecord/patches/patch-cdrecord_cdrecord.c
diff -r0 -r1.1 pkgsrc/sysutils/dvdrecord/patches/patch-libscg_scsi-mac-iokit.c
cvs diff -r1.19 -r1.20 pkgsrc/sysutils/dvdrecord/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dvdrecord/Makefile 2012/10/23 19:50:59 1.19
+++ pkgsrc/sysutils/dvdrecord/Makefile 2019/08/18 07:19:47 1.20
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.19 2012/10/23 19:50:59 asau Exp $ 1# $NetBSD: Makefile,v 1.20 2019/08/18 07:19:47 maya Exp $
2 2
3DISTNAME= dvdrtools-${VERSION} 3DISTNAME= dvdrtools-${VERSION}
4PKGNAME= ${DISTNAME:S/dvdrtools/dvdrecord/} 4PKGNAME= ${DISTNAME:S/dvdrtools/dvdrecord/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= http://freesoftware.fsf.org/download/dvdrtools/dvdrtools.pkg/${VERSION}/ 7MASTER_SITES= http://freesoftware.fsf.org/download/dvdrtools/dvdrtools.pkg/${VERSION}/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.nongnu.org/dvdrtools/ 11HOMEPAGE= http://www.nongnu.org/dvdrtools/
12COMMENT= This program allows you to create DVDs on a DVD-Recorder 12COMMENT= This program allows you to create DVDs on a DVD-Recorder
13 13
14VERSION= 0.1.5 14VERSION= 0.1.5
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17# Override wrong usage of AC_DEFINE_UNQUOTED: 17# Override wrong usage of AC_DEFINE_UNQUOTED:
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
19LIBS.SunOS+= -lsocket 19LIBS.SunOS+= -lsocket
 20LIBS.Darwin+= -framework IOKit -framework CoreFoundation
20INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 21INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
21 22
22.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
23 24
24.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h) 25.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
25LIBS.NetBSD+= -lrt 26LIBS.NetBSD+= -lrt
26.endif 27.endif
27 28
28do-install: 29do-install:
29 ${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/dvdrecord ${DESTDIR}${PREFIX}/bin 30 ${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/dvdrecord ${DESTDIR}${PREFIX}/bin
30 ${INSTALL_MAN} ${WRKSRC}/cdrecord/dvdrecord.1 \ 31 ${INSTALL_MAN} ${WRKSRC}/cdrecord/dvdrecord.1 \
31 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 32 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
32 33
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/dvdrecord/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dvdrecord/distinfo 2015/11/04 01:32:12 1.8
+++ pkgsrc/sysutils/dvdrecord/distinfo 2019/08/18 07:19:47 1.9
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.8 2015/11/04 01:32:12 agc Exp $ 1$NetBSD: distinfo,v 1.9 2019/08/18 07:19:47 maya Exp $
2 2
3SHA1 (dvdrtools-0.1.5.tar.bz2) = 7cab32797e10ca7ddfab226c4463a1d275fe513b 3SHA1 (dvdrtools-0.1.5.tar.bz2) = 7cab32797e10ca7ddfab226c4463a1d275fe513b
4RMD160 (dvdrtools-0.1.5.tar.bz2) = ca39253f7bc553b147dadce1c608f577e97fe320 4RMD160 (dvdrtools-0.1.5.tar.bz2) = ca39253f7bc553b147dadce1c608f577e97fe320
5SHA512 (dvdrtools-0.1.5.tar.bz2) = 8adbf5d7d83f90b80e27ee9af7afe2a06107440f596ce8c3e294d949edc7fc2063b9ab3987033ce438e2f43b39e3061c48f57527345c118e97a4b16907d6da8d 5SHA512 (dvdrtools-0.1.5.tar.bz2) = 8adbf5d7d83f90b80e27ee9af7afe2a06107440f596ce8c3e294d949edc7fc2063b9ab3987033ce438e2f43b39e3061c48f57527345c118e97a4b16907d6da8d
6Size (dvdrtools-0.1.5.tar.bz2) = 1166308 bytes 6Size (dvdrtools-0.1.5.tar.bz2) = 1166308 bytes
7SHA1 (patch-aa) = 6463dd7852df43089724976c75a24ea41d9a66bc 7SHA1 (patch-aa) = 6463dd7852df43089724976c75a24ea41d9a66bc
8SHA1 (patch-ab) = 39b5cf16f3f1c8d191b0de6b25ff8bb2c5eba2da 8SHA1 (patch-ab) = 39b5cf16f3f1c8d191b0de6b25ff8bb2c5eba2da
9SHA1 (patch-ac) = 4fe2505adb6ac24a859dc88cc86f91e9bf28f7da 9SHA1 (patch-ac) = 4fe2505adb6ac24a859dc88cc86f91e9bf28f7da
 10SHA1 (patch-cdrecord_cdrecord.c) = 66aa5115b84e74f00f05837b21ee12ce14477276
 11SHA1 (patch-libscg_scsi-mac-iokit.c) = 791fede1a5b82ed1a484b6176030d702842ada7f
File Added: pkgsrc/sysutils/dvdrecord/patches/patch-cdrecord_cdrecord.c
$NetBSD: patch-cdrecord_cdrecord.c,v 1.1 2019/08/18 07:19:47 maya Exp $

- _POSIX_PRIORITY_SCHEDULING is set to -1 if options is not supported (like on darwin)

--- cdrecord/cdrecord.c.orig	2003-06-12 19:05:46.000000000 +0000
+++ cdrecord/cdrecord.c
@@ -2935,7 +2935,7 @@ EXPORT	void raisepri(int pri)
 
 #else	/* HAVE_SYS_PRIOCNTL_H */
 
-#if defined(_POSIX_PRIORITY_SCHEDULING)
+#if defined(_POSIX_PRIORITY_SCHEDULING) && (_POSIX_PRIORITY_SCHEDULING != (-1))
 /*
  * XXX Ugly but needed because of a typo in /usr/iclude/sched.h on Linux.
  * XXX This should be removed as soon as we are sure that Linux-2.0.29 is gone.
File Added: pkgsrc/sysutils/dvdrecord/patches/patch-libscg_scsi-mac-iokit.c
$NetBSD: patch-libscg_scsi-mac-iokit.c,v 1.1 2019/08/18 07:19:47 maya Exp $

- IOkit header location location changes with the macos version.
  IOKit/scsi from macosx Snow Leopard.

--- libscg/scsi-mac-iokit.c.orig	2002-01-29 17:23:22.000000000 +0000
+++ libscg/scsi-mac-iokit.c
@@ -50,12 +50,21 @@ LOCAL	char	_scg_trans_version[] = "scsi-
 #define	MAX_TGT		16
 #define	MAX_LUN		8
 
+#include <AvailabilityMacros.h>
 #include <statdefs.h>
 #include <mach/mach.h>
 #include <Carbon/Carbon.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOCFPlugIn.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+#define COLLISION_VERSION VERSION
+#undef VERSION
+#include <IOKit/scsi/SCSITaskLib.h>
+#define VERSION COLLISION_VERSION
+#undef COLLISION_VERSION
+#else
 #include <IOKit/scsi-commands/SCSITaskLib.h>
+#endif
 #include <mach/mach_error.h>
 
 struct scg_local {