sync with update-patches
This commit is contained in:
jakemsr
parent
6f2bb187b7
commit
29b70fcc3d
@ -1,13 +1,13 @@
|
||||
$OpenBSD: patch-configure_in,v 1.8 2004/02/25 23:24:35 espie Exp $
|
||||
--- configure.in.orig 2000-03-26 09:33:22.000000000 +0200
|
||||
+++ configure.in 2004-02-26 00:18:11.000000000 +0100
|
||||
$OpenBSD: patch-configure_in,v 1.9 2005/12/23 06:31:31 jakemsr Exp $
|
||||
--- configure.in.orig Sat Mar 25 23:33:22 2000
|
||||
+++ configure.in Thu Dec 22 22:30:04 2005
|
||||
@@ -1,34 +1,33 @@
|
||||
AC_INIT(interface/interface.c)
|
||||
-
|
||||
-cp $srcdir/configure.guess $srcdir/config.guess
|
||||
-cp $srcdir/configure.sub $srcdir/config.sub
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
-cp $srcdir/configure.guess $srcdir/config.guess
|
||||
-cp $srcdir/configure.sub $srcdir/config.sub
|
||||
-
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
-if test -z "$CC"; then
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-interface_common_interface_c,v 1.3 2002/09/16 13:35:52 lebel Exp $
|
||||
--- interface/common_interface.c.orig Thu Apr 20 00:41:04 2000
|
||||
+++ interface/common_interface.c Sat Sep 7 20:49:15 2002
|
||||
$OpenBSD: patch-interface_common_interface_c,v 1.4 2005/12/23 06:31:31 jakemsr Exp $
|
||||
--- interface/common_interface.c.orig Wed Apr 19 15:41:04 2000
|
||||
+++ interface/common_interface.c Thu Dec 22 22:30:01 2005
|
||||
@@ -13,19 +13,29 @@
|
||||
#include "utils.h"
|
||||
#include "smallft.h"
|
||||
@ -49,7 +49,7 @@ $OpenBSD: patch-interface_common_interface_c,v 1.3 2002/09/16 13:35:52 lebel Exp
|
||||
int j;
|
||||
|
||||
/* First off, make sure the 'starting sector' is >=0 */
|
||||
@@ -209,13 +222,24 @@ int FixupTOC(cdrom_drive *d,int tracks){
|
||||
@@ -209,22 +222,33 @@ int FixupTOC(cdrom_drive *d,int tracks){
|
||||
CDROM device, not the generic device. */
|
||||
|
||||
if (d->ioctl_fd != -1) {
|
||||
@ -61,21 +61,21 @@ $OpenBSD: patch-interface_common_interface_c,v 1.3 2002/09/16 13:35:52 lebel Exp
|
||||
if (result == -1) return -1;
|
||||
+# define ms_addr (ms_str.addr.lba)
|
||||
+#endif
|
||||
+
|
||||
|
||||
- if (ms_str.addr.lba > 100) {
|
||||
+#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
+ int ms_addr;
|
||||
+
|
||||
|
||||
+ ms_addr = 0; /* last session */
|
||||
+ if (ioctl(d->ioctl_fd, CDIOREADMSADDR, &ms_addr) == -1)
|
||||
+ return -1;
|
||||
+#endif
|
||||
|
||||
- if (ms_str.addr.lba > 100) {
|
||||
+
|
||||
+ if (ms_addr > 100) {
|
||||
|
||||
+
|
||||
/* This is an odd little piece of code --Monty */
|
||||
|
||||
@@ -223,8 +247,8 @@ int FixupTOC(cdrom_drive *d,int tracks){
|
||||
/* believe the multisession offset :-) */
|
||||
/* adjust end of last audio track to be in the first session */
|
||||
for (j = tracks-1; j >= 0; j--) {
|
||||
if (j > 0 && !IS_AUDIO(d,j) && IS_AUDIO(d,j-1)) {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-interface_low_interface_h,v 1.2 2002/09/16 13:35:52 lebel Exp $
|
||||
--- interface/low_interface.h.orig Mon Mar 26 08:12:11 2001
|
||||
+++ interface/low_interface.h Sat Sep 7 20:49:33 2002
|
||||
$OpenBSD: patch-interface_low_interface_h,v 1.3 2005/12/23 06:31:31 jakemsr Exp $
|
||||
--- interface/low_interface.h.orig Sun Mar 25 22:12:11 2001
|
||||
+++ interface/low_interface.h Thu Dec 22 22:30:01 2005
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
@ -14,12 +14,12 @@ $OpenBSD: patch-interface_low_interface_h,v 1.2 2002/09/16 13:35:52 lebel Exp $
|
||||
#include <linux/cdrom.h>
|
||||
#include <linux/major.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
+#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
+#include <sys/scsiio.h>
|
||||
+#include <sys/cdio.h>
|
||||
+#endif
|
||||
|
||||
+
|
||||
#include "cdda_interface.h"
|
||||
|
||||
#define MAX_RETRIES 8
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-interface_scsi_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp $
|
||||
--- interface/scsi_interface.c.orig Sat Mar 24 02:15:46 2001
|
||||
+++ interface/scsi_interface.c Mon Sep 16 14:02:54 2002
|
||||
$OpenBSD: patch-interface_scsi_interface_c,v 1.3 2005/12/23 06:31:31 jakemsr Exp $
|
||||
--- interface/scsi_interface.c.orig Fri Mar 23 17:15:46 2001
|
||||
+++ interface/scsi_interface.c Thu Dec 22 22:30:02 2005
|
||||
@@ -23,6 +23,7 @@ static void tweak_SG_buffer(cdrom_drive
|
||||
int table,reserved;
|
||||
char buffer[256];
|
||||
@ -88,7 +88,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp $
|
||||
}
|
||||
}
|
||||
+#endif /* __linux__ */
|
||||
+
|
||||
|
||||
+#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
+ if (in_size && out_size) {
|
||||
+ warnx("handle_scsi_cmd: in and out is not supported");
|
||||
@ -116,7 +116,7 @@ $OpenBSD: patch-interface_scsi_interface_c,v 1.2 2002/09/16 13:35:52 lebel Exp $
|
||||
+ if (status < 0)
|
||||
+ return(TR_ILLEGAL);
|
||||
+#endif
|
||||
|
||||
+
|
||||
errno=0;
|
||||
+#ifdef __linux__
|
||||
status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
$OpenBSD: patch-paranoia_Makefile_in,v 1.3 2002/09/16 13:35:52 lebel Exp $
|
||||
--- paranoia/Makefile.in.orig Tue Dec 14 05:28:04 1999
|
||||
+++ paranoia/Makefile.in Sat Sep 7 21:06:10 2002
|
||||
@@ -22,7 +22,9 @@ OFILES = paranoia.o p_block.o overlap.o
|
||||
$OpenBSD: patch-paranoia_Makefile_in,v 1.4 2005/12/23 06:31:31 jakemsr Exp $
|
||||
--- paranoia/Makefile.in.orig Mon Dec 13 20:28:04 1999
|
||||
+++ paranoia/Makefile.in Thu Dec 22 22:30:04 2005
|
||||
@@ -22,8 +22,10 @@ OFILES = paranoia.o p_block.o overlap.o
|
||||
#TFILES = isort.t gap.t p_block.t paranoia.t
|
||||
|
||||
LIBS = ../interface/libcdda_interface.a -lm
|
||||
-export VERSION
|
||||
+
|
||||
|
||||
+MAJOR=0
|
||||
+MINOR=0
|
||||
|
||||
+
|
||||
all: lib slib
|
||||
|
||||
debug:
|
||||
@@ -34,7 +36,7 @@ lib:
|
||||
|
||||
slib:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user