[pkgsrc/trunk]: pkgsrc/audio/cdparanoia merge some patches from FreeBSD ports.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/cdparanoia merge some patches from FreeBSD ports.
From: grant <grant%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:06:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f94c7058253
branches:  trunk
changeset: 462956:2f94c7058253
user:      grant <grant%pkgsrc.org@localhost>
date:      Mon Oct 20 12:07:23 2003 +0000

description:
merge some patches from FreeBSD ports.

allows this to build on FreeBSD using the ATAPI/CAM subsystem.

diffstat:

 audio/cdparanoia/Makefile         |    6 +-
 audio/cdparanoia/buildlink2.mk    |    6 +-
 audio/cdparanoia/distinfo         |   16 +-
 audio/cdparanoia/patches/patch-cb |   38 +++-
 audio/cdparanoia/patches/patch-cc |   10 +-
 audio/cdparanoia/patches/patch-cd |   28 ++-
 audio/cdparanoia/patches/patch-ce |  169 ++++++++++++++++++++--
 audio/cdparanoia/patches/patch-cf |  233 +++++++++++++++++++++++++++---
 audio/cdparanoia/patches/patch-cg |  283 +++++++++++++++++++++++++++++++++----
 9 files changed, 674 insertions(+), 115 deletions(-)

diffs (truncated from 1258 to 300 lines):

diff -r c01bc5ed308f -r 2f94c7058253 audio/cdparanoia/Makefile
--- a/audio/cdparanoia/Makefile Mon Oct 20 09:39:37 2003 +0000
+++ b/audio/cdparanoia/Makefile Mon Oct 20 12:07:23 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:22:01 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/10/20 12:07:23 grant Exp $
 #
 
 DISTNAME=      cdparanoia-III-alpha9.8
@@ -11,7 +11,7 @@
 HOMEPAGE=      http://www.xiph.org/paranoia/
 COMMENT=       CDDA reading utility with extra data verification features
 
-ONLY_FOR_PLATFORM=     NetBSD-*-* Linux-*-*
+ONLY_FOR_PLATFORM=     FreeBSD-*-* NetBSD-*-* Linux-*-*
 
 USE_GMAKE=     YES
 USE_LIBTOOL=   YES
@@ -21,4 +21,6 @@
 
 MAKE_ENV+=     GCC=yes
 
+LDFLAGS.FreeBSD+=      -lcam
+
 .include "../../mk/bsd.pkg.mk"
diff -r c01bc5ed308f -r 2f94c7058253 audio/cdparanoia/buildlink2.mk
--- a/audio/cdparanoia/buildlink2.mk    Mon Oct 20 09:39:37 2003 +0000
+++ b/audio/cdparanoia/buildlink2.mk    Mon Oct 20 12:07:23 2003 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/10/18 11:53:48 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/10/20 12:07:23 grant Exp $
 
 .if !defined(CDPARANOIA_BUILDLINK2_MK)
 CDPARANOIA_BUILDLINK2_MK=      # defined
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
 BUILDLINK_PACKAGES+=                   cdparanoia
 BUILDLINK_DEPENDS.cdparanoia?=         cdparanoia>=3.0
 BUILDLINK_PKGSRCDIR.cdparanoia?=       ../../audio/cdparanoia
@@ -19,6 +19,6 @@
 BUILDLINK_TARGETS+=    cdparanoia-buildlink
 
 cdparanoia-buildlink: _BUILDLINK_USE
-.endif # OPSYS == Linux || NetBSD
+.endif # OPSYS == FreeBSD || NetBSD || Linux
 
 .endif # CDPARANOIA_BUILDLINK2_MK
diff -r c01bc5ed308f -r 2f94c7058253 audio/cdparanoia/distinfo
--- a/audio/cdparanoia/distinfo Mon Oct 20 09:39:37 2003 +0000
+++ b/audio/cdparanoia/distinfo Mon Oct 20 12:07:23 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/03/04 14:45:12 itohy Exp $
+$NetBSD: distinfo,v 1.6 2003/10/20 12:07:23 grant Exp $
 
 SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
 Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
@@ -9,9 +9,11 @@
 SHA1 (patch-ae) = ea4cbc4a13f36ba4da39bd9a944d4123f132b86e
 SHA1 (patch-ba) = 05f8efe4f0a2753217d3c1cf1014da64b1d92b73
 SHA1 (patch-ca) = 4d7c183aae36fd525a1294be4b6f9a76401c524e
-SHA1 (patch-cb) = 9a28bd78dc5df011717da9bb3006f84635c29edb
-SHA1 (patch-cc) = 4132884598e845aa9ea0a501dd1635f9030cc104
-SHA1 (patch-cd) = 44b8050dddae449b4e16c5aab9cfcaccb62f9031
-SHA1 (patch-ce) = 83d0f1505bc019b6fb83584ad4f6571fccf3e2a2
-SHA1 (patch-cf) = ca8b2f4d13104ca387fa6205153a41cea405b9f8
-SHA1 (patch-cg) = a113dde9b6b6e1e73dd2a8cbff21318f44085529
+SHA1 (patch-cb) = 00215d433a86a35ae13f2092efefabadc5967bfb
+SHA1 (patch-cc) = 6ee7d4842d178491ecf5285c429f932f2f854799
+SHA1 (patch-cd) = a2595237ddbaf35dfc1a5ce0bf7d1fa9244e1d67
+SHA1 (patch-ce) = 813f18a27808234a8a9139f0c53951b5fea83b37
+SHA1 (patch-cf) = ce4dc32047c2e382482a38d05144abefb376a87a
+SHA1 (patch-cg) = d57b8019fd14baf0701a9a9f824a4f4bd64ab3ad
+SHA1 (patch-ch) = 73c38418cd7ab5fa5a072abfc78479fdd1d87787
+SHA1 (patch-ci) = cff3eaff31ea324d7bde5d0d840df57453085bec
diff -r c01bc5ed308f -r 2f94c7058253 audio/cdparanoia/patches/patch-cb
--- a/audio/cdparanoia/patches/patch-cb Mon Oct 20 09:39:37 2003 +0000
+++ b/audio/cdparanoia/patches/patch-cb Mon Oct 20 12:07:23 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-cb,v 1.2 2002/03/04 14:45:14 itohy Exp $
+$NetBSD: patch-cb,v 1.3 2003/10/20 12:07:23 grant Exp $
 
---- interface/low_interface.h.orig     Mon Mar 26 15:12:11 2001
-+++ interface/low_interface.h  Mon Mar  4 22:47:22 2002
+--- interface/low_interface.h.orig     2001-03-26 16:12:11.000000000 +1000
++++ interface/low_interface.h
 @@ -25,6 +25,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
@@ -10,17 +10,24 @@
  #include <linux/major.h>
  #include <linux/version.h>
  
-@@ -47,13 +48,24 @@
- 
+@@ -48,12 +49,32 @@
  #include <linux/cdrom.h>
  #include <linux/major.h>
-+#endif
+ 
++#elif defined(__FreeBSD__)
++
++#include <sys/cdio.h>
++#include <sys/cdrio.h>
 +
-+#ifdef __NetBSD__
++#include <cam/scsi/scsi_message.h>
++#include <camlib.h>
++
++#elif defined(__NetBSD__)
++
 +#include <sys/scsiio.h>
 +#include <sys/cdio.h>
 +#endif
- 
++
  #include "cdda_interface.h"
  
  #define MAX_RETRIES 8
@@ -28,10 +35,21 @@
  #define MIN_BIG_BUFF_SIZE 4096
 +#ifdef __linux__
  #define SG_OFF sizeof(struct sg_header)
-+#endif
-+#ifdef __NetBSD__
++#elif defined(__FreeBSD__)
++#define SG_OFF (0)
++#elif defined(__NetBSD__)
 +#define SG_OFF sizeof(scsireq_t)
 +#endif
  
  #ifndef SG_EMULATED_HOST
  /* old kernel version; the check for the ioctl is still runtime, this
+@@ -64,7 +85,9 @@
+ #endif
+ 
+ extern int  cooked_init_drive (cdrom_drive *d);
++#ifndef __FreeBSD__
+ extern unsigned char *scsi_inquiry (cdrom_drive *d);
++#endif
+ extern int  scsi_init_drive (cdrom_drive *d);
+ #ifdef CDDA_TEST
+ extern int  test_init_drive (cdrom_drive *d);
diff -r c01bc5ed308f -r 2f94c7058253 audio/cdparanoia/patches/patch-cc
--- a/audio/cdparanoia/patches/patch-cc Mon Oct 20 09:39:37 2003 +0000
+++ b/audio/cdparanoia/patches/patch-cc Mon Oct 20 12:07:23 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-cc,v 1.2 2000/01/28 07:18:38 rh Exp $
+$NetBSD: patch-cc,v 1.3 2003/10/20 12:07:23 grant Exp $
 
---- interface/utils.h.orig     Mon Aug 16 00:13:44 1999
-+++ interface/utils.h  Fri Jan 28 08:04:27 2000
-@@ -1,4 +1,16 @@
+--- interface/utils.h.orig     2000-04-20 08:41:04.000000000 +1000
++++ interface/utils.h
+@@ -1,4 +1,18 @@
 +#ifdef __linux__
  #include <endian.h>
 +#endif
@@ -15,6 +15,8 @@
 +#include <machine/bswap.h>
 +#endif
 +#include <err.h>      /* XXX */
++#elif defined(__FreeBSD__)
++#include <machine/endian.h>
 +#endif
  #include <stdio.h>
  #include <errno.h>
diff -r c01bc5ed308f -r 2f94c7058253 audio/cdparanoia/patches/patch-cd
--- a/audio/cdparanoia/patches/patch-cd Mon Oct 20 09:39:37 2003 +0000
+++ b/audio/cdparanoia/patches/patch-cd Mon Oct 20 12:07:23 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-cd,v 1.2 2003/10/20 12:07:23 grant Exp $
 
---- interface/common_interface.c.orig  Tue Dec 14 13:28:00 1999
-+++ interface/common_interface.c       Sat Jan 15 16:55:18 2000
-@@ -13,19 +13,29 @@
+--- interface/common_interface.c.orig  2000-04-20 08:41:04.000000000 +1000
++++ interface/common_interface.c
+@@ -13,19 +13,28 @@
  #include "utils.h"
  #include "smallft.h"
  
@@ -16,8 +16,7 @@
    struct cdrom_volctrl volctl;
    if (ioctl(fd, CDROMVOLREAD, &volctl)) 
      return(1); /* failure */
-+#endif
-+#ifdef __NetBSD__
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
 +  struct ioc_vol volctl;
 +  if (ioctl(fd, CDIOCGETVOL, &volctl)) 
 +    return(1); /* failure */
@@ -32,7 +31,7 @@
  /* Use the ioctl thingy above ping the cdrom; this will get model info */
  char *atapi_drive_info(int fd){
    /* Work around the fact that the struct grew without warning in
-@@ -46,6 +56,7 @@
+@@ -46,6 +55,7 @@ char *atapi_drive_info(int fd){
    free(id);
    return(ret);
  }
@@ -40,7 +39,7 @@
  
  int data_bigendianp(cdrom_drive *d){
    float lsb_votes=0;
-@@ -171,7 +182,9 @@
+@@ -171,7 +181,9 @@ int data_bigendianp(cdrom_drive *d){
     knows the leasoud/leadin size. */
  
  int FixupTOC(cdrom_drive *d,int tracks){
@@ -50,9 +49,11 @@
    int j;
    
    /* First off, make sure the 'starting sector' is >=0 */
-@@ -209,13 +222,24 @@
+@@ -208,14 +220,26 @@ int FixupTOC(cdrom_drive *d,int tracks){
+   /* For a scsi device, the ioctl must go to the specialized SCSI
       CDROM device, not the generic device. */
  
++#ifndef __FreeBSD__
    if (d->ioctl_fd != -1) {
 +#ifdef __linux__
      int result;
@@ -76,7 +77,7 @@
  
        /* This is an odd little piece of code --Monty */
  
-@@ -223,8 +247,8 @@
+@@ -223,14 +247,15 @@ int FixupTOC(cdrom_drive *d,int tracks){
        /* 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)) {
@@ -87,3 +88,10 @@
          break;
        }
        }
+       return 1;
+     }
+   }
++#endif
+   return 0;
+ }
+ 
diff -r c01bc5ed308f -r 2f94c7058253 audio/cdparanoia/patches/patch-ce
--- a/audio/cdparanoia/patches/patch-ce Mon Oct 20 09:39:37 2003 +0000
+++ b/audio/cdparanoia/patches/patch-ce Mon Oct 20 12:07:23 2003 +0000
@@ -1,8 +1,12 @@
-$NetBSD: patch-ce,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-ce,v 1.2 2003/10/20 12:07:23 grant Exp $
 
---- interface/cooked_interface.c.orig  Wed Aug 18 15:54:32 1999
-+++ interface/cooked_interface.c       Mon Jan 17 23:43:14 2000
-@@ -13,6 +13,7 @@
+--- interface/cooked_interface.c.orig  2000-04-20 08:41:04.000000000 +1000
++++ interface/cooked_interface.c
+@@ -10,9 +10,11 @@
+ #include "common_interface.h"
+ #include "utils.h"
+ 
++#ifndef __FreeBSD__
  static int cooked_readtoc (cdrom_drive *d){
    int i;
    int tracks;
@@ -10,7 +14,7 @@
    struct cdrom_tochdr hdr;
    struct cdrom_tocentry entry;
  
-@@ -52,6 +53,45 @@
+@@ -52,6 +54,45 @@ static int cooked_readtoc (cdrom_drive *
    d->disc_toc[i].dwStartSector = entry.cdte_addr.lba;
  
    tracks=hdr.cdth_trk1+1;
@@ -56,7 +60,7 @@
    d->cd_extra=FixupTOC(d,tracks);
    return(--tracks);  /* without lead-out */
  }
-@@ -60,10 +100,15 @@
+@@ -60,10 +101,15 @@ static int cooked_readtoc (cdrom_drive *
  /* Set operating speed */
  static int cooked_setspeed(cdrom_drive *d, int speed)
  {
@@ -72,7 +76,7 @@
  }
  
  
-@@ -72,6 +117,7 @@
+@@ -72,6 +118,7 @@ static int cooked_setspeed(cdrom_drive *
   */
  
  static long cooked_read (cdrom_drive *d, void *p, long begin, long sectors){
@@ -80,7 +84,7 @@
    int retry_count,err;
    struct cdrom_read_audio arg;
    char *buffer=(char *)p;
-@@ -127,6 +173,10 @@
+@@ -127,7 +174,133 @@ static long cooked_read (cdrom_drive *d,
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/dmesg2gif Update to dmesg2gif V1.1. Changes:
Next by Date: [pkgsrc/trunk]: pkgsrc/archivers/gsharutils For some reason, the digest needs...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/dmesg2gif Update to dmesg2gif V1.1. Changes:
Next by Thread: [pkgsrc/trunk]: pkgsrc/archivers/gsharutils For some reason, the digest needs...
Indexes:
Home | Main Index | Thread Index | Old Index