[pkgsrc/trunk]: pkgsrc/audio/cdparanoia Sync DragonFly/FreeBSD support with F...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/cdparanoia Sync DragonFly/FreeBSD support with F...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:09:36 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fad6db057a3b
branches:  trunk
changeset: 509249:fad6db057a3b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Mar 07 06:29:03 2006 +0000

description:
Sync DragonFly/FreeBSD support with FreeBSD ports by adding
cdda_device_name to struct cdrom_drive. This makes a number of
hacks in various places superfluous and should fix the KDE multimedia
issues. Bump revision. Recursive bump will follow, since the major
version changed.

diffstat:

 audio/cdparanoia/Makefile         |    4 +-
 audio/cdparanoia/distinfo         |   32 ++++-------
 audio/cdparanoia/patches/patch-ab |    4 +-
 audio/cdparanoia/patches/patch-ba |    8 +-
 audio/cdparanoia/patches/patch-ca |    4 +-
 audio/cdparanoia/patches/patch-cb |    8 +-
 audio/cdparanoia/patches/patch-cc |    4 +-
 audio/cdparanoia/patches/patch-cd |    6 +-
 audio/cdparanoia/patches/patch-ce |    8 +-
 audio/cdparanoia/patches/patch-cf |   64 ++++++++++++-----------
 audio/cdparanoia/patches/patch-cg |   22 ++++----
 audio/cdparanoia/patches/patch-ch |   11 +--
 audio/cdparanoia/patches/patch-ci |    4 +-
 audio/cdparanoia/patches/patch-da |   31 -----------
 audio/cdparanoia/patches/patch-db |   22 --------
 audio/cdparanoia/patches/patch-dc |   31 -----------
 audio/cdparanoia/patches/patch-dd |   13 ----
 audio/cdparanoia/patches/patch-de |   31 -----------
 audio/cdparanoia/patches/patch-df |   58 ---------------------
 audio/cdparanoia/patches/patch-dg |  103 --------------------------------------
 audio/cdparanoia/patches/patch-dh |   13 ----
 21 files changed, 87 insertions(+), 394 deletions(-)

diffs (truncated from 1008 to 300 lines):

diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/Makefile
--- a/audio/cdparanoia/Makefile Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/Makefile Tue Mar 07 06:29:03 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/07 06:29:03 joerg Exp $
 #
 
 DISTNAME=      cdparanoia-III-alpha9.8
 PKGNAME=       cdparanoia-3.0.9.8
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    audio
 MASTER_SITES=  http://www.xiph.org/paranoia/download/
 EXTRACT_SUFX=  .src.tgz
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/distinfo
--- a/audio/cdparanoia/distinfo Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/distinfo Tue Mar 07 06:29:03 2006 +0000
@@ -1,28 +1,20 @@
-$NetBSD: distinfo,v 1.12 2005/12/29 22:50:53 joerg Exp $
+$NetBSD: distinfo,v 1.13 2006/03/07 06:29:03 joerg Exp $
 
 SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
 RMD160 (cdparanoia-III-alpha9.8.src.tgz) = d9225165f83b5386c58db263d6918a7006df1481
 Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
 SHA1 (patch-aa) = 31b37e9fb7be1cb16249bcd6a8561ab64c2fbf39
-SHA1 (patch-ab) = 8753d808ef7afe077dde8a47053e04640d6c3e4d
+SHA1 (patch-ab) = 69d2996b7089cb87ce4e3de969da795ae041e720
 SHA1 (patch-ac) = 7de8b30c5b5ed2e82090115897d7c98e61776214
 SHA1 (patch-ad) = 45cb1d2d402f5769447507c8da24e289396021e7
 SHA1 (patch-ae) = ea4cbc4a13f36ba4da39bd9a944d4123f132b86e
-SHA1 (patch-ba) = 05f8efe4f0a2753217d3c1cf1014da64b1d92b73
-SHA1 (patch-ca) = 803673cc139cf1267bfa2af82dfef3071e58e0bc
-SHA1 (patch-cb) = 00215d433a86a35ae13f2092efefabadc5967bfb
-SHA1 (patch-cc) = 0980c20c8fcd11de11294dd8fed0f9555ea0ef0d
-SHA1 (patch-cd) = a2595237ddbaf35dfc1a5ce0bf7d1fa9244e1d67
-SHA1 (patch-ce) = 813f18a27808234a8a9139f0c53951b5fea83b37
-SHA1 (patch-cf) = dd96eddefca6a6cd5794a483efa94005fdf8b9f8
-SHA1 (patch-cg) = d57b8019fd14baf0701a9a9f824a4f4bd64ab3ad
-SHA1 (patch-ch) = 73c38418cd7ab5fa5a072abfc78479fdd1d87787
-SHA1 (patch-ci) = cff3eaff31ea324d7bde5d0d840df57453085bec
-SHA1 (patch-da) = 41636b882727e101980915a59382f2dc07ce2250
-SHA1 (patch-db) = ae806ddbc2fc8cfc6c2a911ea187715991ae2ea3
-SHA1 (patch-dc) = f1538a89f93fad029f2285370f74fa6899568452
-SHA1 (patch-dd) = 227a9092cf4896ce3f4fe0aa19460f4769bec033
-SHA1 (patch-de) = 7ef3e0a2286ee8a35794667b4123235382afe7a0
-SHA1 (patch-df) = 9312bf37493cfd3a1d67c94f495089f832514df3
-SHA1 (patch-dg) = 1dd22bf1b3525a43fa029e11e807088a877f236e
-SHA1 (patch-dh) = 979db75fc97e3403eca01f524bfad14e22f6f6dc
+SHA1 (patch-ba) = 51151796493c946e5bdafbd22005136ea7f27a09
+SHA1 (patch-ca) = cf29a467bd37bc642edd81f8a6aa76cfb0c15344
+SHA1 (patch-cb) = 2123635be4d7765419d62958365a6df621471439
+SHA1 (patch-cc) = 311f8e45a9c3bc86cdb106730295f28a856ae2ab
+SHA1 (patch-cd) = 81a35822f89b4f674f03cbcbd5831cac96c3aa92
+SHA1 (patch-ce) = 282e3169cc26ab11924c66a312d77d7c1f59f242
+SHA1 (patch-cf) = 3ccf5e52737cb449dbead92c582646d0ebe24500
+SHA1 (patch-cg) = b9786ee81dcb7bd2f6572a20f424dd5291a8720d
+SHA1 (patch-ch) = d28ec06a56499ff96491edc49d462f43c41d15fe
+SHA1 (patch-ci) = 5d92d43084b0d9ef9951f0b0ced6fe601b91cce9
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-ab
--- a/audio/cdparanoia/patches/patch-ab Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-ab Tue Mar 07 06:29:03 2006 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2002/03/04 14:45:13 itohy Exp $
+$NetBSD: patch-ab,v 1.5 2006/03/07 06:29:03 joerg Exp $
+
+Note tht VERSION is *not* used for the libtool versioning.
 
 --- Makefile.in.orig   Wed Mar 28 07:46:58 2001
 +++ Makefile.in        Sun Mar  3 23:08:01 2002
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-ba
--- a/audio/cdparanoia/patches/patch-ba Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-ba Tue Mar 07 06:29:03 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2001/04/29 09:47:03 skrll Exp $
+$NetBSD: patch-ba,v 1.3 2006/03/07 06:29:03 joerg Exp $
 
 --- paranoia/Makefile.in.orig  Tue Dec 14 04:28:04 1999
 +++ paranoia/Makefile.in
-@@ -21,10 +21,9 @@
+@@ -21,10 +21,9 @@ CPPFLAGS+=-D_REENTRANT
  OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
  #TFILES = isort.t gap.t p_block.t paranoia.t
  
@@ -15,7 +15,7 @@
  
  debug: 
        $(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
-@@ -33,23 +32,21 @@
+@@ -33,23 +32,21 @@ lib:       
        $(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" 
  
  slib: 
@@ -36,7 +36,7 @@
 -      [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
 +libcdda_paranoia.la:  $(OFILES)       
 +      $(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
-+          -version-info 0:$(VERSION) -rpath $(PREFIX)/lib
++          -version-info 1:0 -rpath $(PREFIX)/lib
 +
 +libcdda_paranoia.a:   libcdda_paranoia.la
 +
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-ca
--- a/audio/cdparanoia/patches/patch-ca Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-ca Tue Mar 07 06:29:03 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.3 2005/12/29 22:50:53 joerg Exp $
+$NetBSD: patch-ca,v 1.4 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/Makefile.in.orig 1999-12-14 04:27:59.000000000 +0000
 +++ interface/Makefile.in
@@ -31,7 +31,7 @@
 +
 +libcdda_interface.la:         $(OFILES)       
 +      $(LIBTOOL) --mode=link $(CC) -o libcdda_interface.la $(OFILES:.o=.lo) \
-+          -version-info 0:$(VERSION) -rpath $(PREFIX)/lib $(LDFLAGS)
++          -version-info 1:0 -rpath $(PREFIX)/lib $(LDFLAGS)
 +
 +libcdda_interface.a:  libcdda_interface.la
  
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-cb
--- a/audio/cdparanoia/patches/patch-cb Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-cb Tue Mar 07 06:29:03 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cb,v 1.3 2003/10/20 12:07:23 grant Exp $
+$NetBSD: patch-cb,v 1.4 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/low_interface.h.orig     2001-03-26 16:12:11.000000000 +1000
 +++ interface/low_interface.h
@@ -14,7 +14,7 @@
  #include <linux/cdrom.h>
  #include <linux/major.h>
  
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +
 +#include <sys/cdio.h>
 +#include <sys/cdrio.h>
@@ -35,7 +35,7 @@
  #define MIN_BIG_BUFF_SIZE 4096
 +#ifdef __linux__
  #define SG_OFF sizeof(struct sg_header)
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#define SG_OFF (0)
 +#elif defined(__NetBSD__)
 +#define SG_OFF sizeof(scsireq_t)
@@ -47,7 +47,7 @@
  #endif
  
  extern int  cooked_init_drive (cdrom_drive *d);
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  extern unsigned char *scsi_inquiry (cdrom_drive *d);
 +#endif
  extern int  scsi_init_drive (cdrom_drive *d);
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-cc
--- a/audio/cdparanoia/patches/patch-cc Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-cc Tue Mar 07 06:29:03 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cc,v 1.4 2004/06/01 20:58:38 shannonjr Exp $
+$NetBSD: patch-cc,v 1.5 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/utils.h.orig     2000-04-19 16:41:04.000000000 -0600
 +++ interface/utils.h
@@ -15,7 +15,7 @@
 +#include <machine/bswap.h>
 +#endif
 +#include <err.h>      /* XXX */
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <machine/endian.h>
 +#endif
  #include <stdio.h>
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-cd
--- a/audio/cdparanoia/patches/patch-cd Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-cd Tue Mar 07 06:29:03 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.2 2003/10/20 12:07:23 grant Exp $
+$NetBSD: patch-cd,v 1.3 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/common_interface.c.orig  2000-04-20 08:41:04.000000000 +1000
 +++ interface/common_interface.c
@@ -16,7 +16,7 @@
    struct cdrom_volctrl volctl;
    if (ioctl(fd, CDROMVOLREAD, &volctl)) 
      return(1); /* failure */
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +  struct ioc_vol volctl;
 +  if (ioctl(fd, CDIOCGETVOL, &volctl)) 
 +    return(1); /* failure */
@@ -53,7 +53,7 @@
    /* For a scsi device, the ioctl must go to the specialized SCSI
       CDROM device, not the generic device. */
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
    if (d->ioctl_fd != -1) {
 +#ifdef __linux__
      int result;
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-ce
--- a/audio/cdparanoia/patches/patch-ce Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-ce Tue Mar 07 06:29:03 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ce,v 1.2 2003/10/20 12:07:23 grant Exp $
+$NetBSD: patch-ce,v 1.3 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/cooked_interface.c.orig  2000-04-20 08:41:04.000000000 +1000
 +++ interface/cooked_interface.c
@@ -6,7 +6,7 @@
  #include "common_interface.h"
  #include "utils.h"
  
-+#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  static int cooked_readtoc (cdrom_drive *d){
    int i;
    int tracks;
@@ -93,7 +93,7 @@
 +  errx(1, "cooked_read: not implemented");
 +#endif
 +}
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static int
 +cooked_readtoc(cdrom_drive *d)
 +{
@@ -235,7 +235,7 @@
    default:
      d->nsectors=40; 
    }
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +  d->nsectors = 26;   /* FreeBSD only supports 64K I/O transfer size */
 +#endif
    d->enable_cdda = Dummy;
diff -r 113a7b4a84c3 -r fad6db057a3b audio/cdparanoia/patches/patch-cf
--- a/audio/cdparanoia/patches/patch-cf Tue Mar 07 04:36:21 2006 +0000
+++ b/audio/cdparanoia/patches/patch-cf Tue Mar 07 06:29:03 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cf,v 1.5 2004/10/10 10:48:39 mycroft Exp $
+$NetBSD: patch-cf,v 1.6 2006/03/07 06:29:03 joerg Exp $
 
 --- interface/scan_devices.c.orig      2001-03-26 15:44:01.000000000 +1000
 +++ interface/scan_devices.c
@@ -11,11 +11,11 @@
  #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
  /* must be absolute paths! */
  static char *scsi_cdrom_prefixes[]={
-@@ -49,10 +51,18 @@
+@@ -49,10 +51,18 @@ static char *cdrom_devices[]={
    "/dev/cm206cd",
    "/dev/gscd",
    "/dev/optcd",NULL};
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +static char *cdrom_devices[] = {
 +      "/dev/cd?c",
 +      "/dev/acd?c",
@@ -26,11 +26,11 @@
  /* Functions here look for a cdrom drive; full init of a drive type
     happens in interface.c */
  
-+#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
  cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){
    /* Brute force... */
    
-@@ -75,10 +85,12 @@
+@@ -75,10 +85,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa
        if((d=cdda_identify(buffer,messagedest,messages)))
          return(d);
        idmessage(messagedest,messages,"",NULL);
@@ -43,7 +43,7 @@
        }
      }else{
        /* Name.  Go for it. */
-@@ -98,6 +110,16 @@
+@@ -98,6 +110,16 @@ cdrom_drive *cdda_find_a_cdrom(int messa
    }
    return(NULL);
  }
@@ -60,14 +60,14 @@
  
  cdrom_drive *cdda_identify(const char *device, int messagedest,char **messages){
    struct stat st;
-@@ -117,8 +139,14 @@
+@@ -117,8 +139,14 @@ cdrom_drive *cdda_identify(const char *d
    }
  #endif
  
 +#if defined(__linux__) || defined(__NetBSD__)
    d=cdda_identify_cooked(device,messagedest,messages);
    if(!d)d=cdda_identify_scsi(device,NULL,messagedest,messages);
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +  d = cdda_identify_scsi(device, NULL, messagedest, messages);
 +  if (d == NULL)
 +      d = cdda_identify_cooked(device, messagedest, messages);
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc revbump updated to 1.4.
Next by Date: [pkgsrc/trunk]: pkgsrc/math/antixls Initial import of antixls, an Excel file ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc revbump updated to 1.4.
Next by Thread: [pkgsrc/trunk]: pkgsrc/math/antixls Initial import of antixls, an Excel file ...
Indexes:
Home | Main Index | Thread Index | Old Index