pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/cdparanoia update to 3.0.10.2 (which is III-10.2...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f58ef3c925eb
branches:  trunk
changeset: 397229:f58ef3c925eb
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sun Aug 09 16:00:53 2009 +0000

description:
update to 3.0.10.2 (which is III-10.2 upstream)
This is a major update (9.8 was released 2001), most significant changes
are support for new (Linux) kernel interfaces and improved drive cache
model.

pkgsrc note: I've tried to retain Darwin/FreeBSD/DragonFly support,
except in scsi_interface.c where the structure changed significantly.
Someone who can test please add it back.

diffstat:

 audio/cdparanoia/Makefile         |     9 +-
 audio/cdparanoia/distinfo         |    38 +-
 audio/cdparanoia/patches/patch-aa |    24 +-
 audio/cdparanoia/patches/patch-ab |    30 +-
 audio/cdparanoia/patches/patch-ac |  9362 ++++++++++++++++++++++++++++++++++++-
 audio/cdparanoia/patches/patch-ae |    83 +-
 audio/cdparanoia/patches/patch-ba |    18 +-
 audio/cdparanoia/patches/patch-ca |    17 +-
 audio/cdparanoia/patches/patch-cb |    15 +-
 audio/cdparanoia/patches/patch-cc |    36 +-
 audio/cdparanoia/patches/patch-cd |    27 +-
 audio/cdparanoia/patches/patch-ce |    38 +-
 audio/cdparanoia/patches/patch-cf |   235 +-
 audio/cdparanoia/patches/patch-cg |   654 +-
 audio/cdparanoia/patches/patch-ch |    36 +-
 audio/cdparanoia/patches/patch-ci |    24 +-
 audio/cdparanoia/patches/patch-cl |    13 -
 audio/cdparanoia/patches/patch-cm |    14 -
 18 files changed, 9676 insertions(+), 997 deletions(-)

diffs (truncated from 11381 to 300 lines):

diff -r dffc644f6e67 -r f58ef3c925eb audio/cdparanoia/Makefile
--- a/audio/cdparanoia/Makefile Sun Aug 09 15:11:02 2009 +0000
+++ b/audio/cdparanoia/Makefile Sun Aug 09 16:00:53 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2009/05/19 00:36:06 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2009/08/09 16:00:53 drochner Exp $
 #
 
-DISTNAME=      cdparanoia-III-alpha9.8
-PKGNAME=       cdparanoia-3.0.9.8
-PKGREVISION=   8
+DISTNAME=      cdparanoia-III-10.2
+PKGNAME=       cdparanoia-3.0.10.2
 CATEGORIES=    audio
-MASTER_SITES=  http://www.xiph.org/paranoia/download/
+MASTER_SITES=  http://downloads.xiph.org/releases/cdparanoia/
 EXTRACT_SUFX=  .src.tgz
 
 MAINTAINER=    kim%tac.nyc.ny.us@localhost
diff -r dffc644f6e67 -r f58ef3c925eb audio/cdparanoia/distinfo
--- a/audio/cdparanoia/distinfo Sun Aug 09 15:11:02 2009 +0000
+++ b/audio/cdparanoia/distinfo Sun Aug 09 16:00:53 2009 +0000
@@ -1,25 +1,23 @@
-$NetBSD: distinfo,v 1.22 2009/05/19 00:36:06 dholland Exp $
+$NetBSD: distinfo,v 1.23 2009/08/09 16:00:53 drochner 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) = 29fd5767b37360fe804013bb171fc7e5f4d8311f
-SHA1 (patch-ab) = d02dd70c45ec97e859c024d11d7bc74c79d96f62
-SHA1 (patch-ac) = 6bd7ad7a0e8bcd1f8354c73706cafb0e789b8252
+SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
+RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
+Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes
+SHA1 (patch-aa) = e47579c7c20d6170d7ef9c9952914309653fbeb1
+SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
+SHA1 (patch-ac) = 809a306e3ee07493167ee652efd8899fd38af15f
 SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
-SHA1 (patch-ae) = 59d74c0392d5bcc37299326efa8ba700722d5cf4
-SHA1 (patch-ba) = 51151796493c946e5bdafbd22005136ea7f27a09
-SHA1 (patch-ca) = 9c35254c09a96b622cac44198443f66f7bc0e428
-SHA1 (patch-cb) = c19ee04017b836842bb0f2d2c77e8f35aad0f9bb
-SHA1 (patch-cc) = adea4fd9682c0543e5749c6f3fe73697d8663c6c
-SHA1 (patch-cd) = 81d31fb55db0f982959395cdecc3da826bf23bfb
-SHA1 (patch-ce) = 3a4e9a83753e2eb6595bcb4e7a47c42b72ef5702
-SHA1 (patch-cf) = 6236318d39f9d3d1e5f93a91048ec2777291dc63
-SHA1 (patch-cg) = c962cbc84f021e399b6f210d0e7a140fd7004222
-SHA1 (patch-ch) = 8d16dd8c80e8f1ee35ccc299ba927d685adde01c
-SHA1 (patch-ci) = 60db1d1d2e8ec9c6d446543762218b22c597d986
+SHA1 (patch-ae) = dda320ca0817b06cb25be86b2a891776550603ae
+SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
+SHA1 (patch-ca) = 39b06a65f1feed4170c0f7305f7a56f104c4a043
+SHA1 (patch-cb) = b38b9119273aef002e1fde8f84888b303d7833d9
+SHA1 (patch-cc) = a2f78daf62ecae73ab3cc264f39b367dfa249129
+SHA1 (patch-cd) = 7141563e10b0d23dbd4ff824224a10908741be5b
+SHA1 (patch-ce) = 75b152acaf730eafa76dffc44e2bec95c0ae6397
+SHA1 (patch-cf) = 73cdff1ab6b9857cd3299f3eb152c399a7e38227
+SHA1 (patch-cg) = 9a979bcac06da564e6d86d0ffc04848e529367cf
+SHA1 (patch-ch) = 1e17f98007b7e566dd88e30bea27247a9be6cc28
+SHA1 (patch-ci) = d8a85b0e5858650050a05fdca612bc0fadd42065
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
 SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
-SHA1 (patch-cl) = f511570233524feac434db160e51099316618058
-SHA1 (patch-cm) = 18001a6cf96dd6bfde8e1208be56a40fac9aa0d5
 SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475
diff -r dffc644f6e67 -r f58ef3c925eb audio/cdparanoia/patches/patch-aa
--- a/audio/cdparanoia/patches/patch-aa Sun Aug 09 15:11:02 2009 +0000
+++ b/audio/cdparanoia/patches/patch-aa Sun Aug 09 16:00:53 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2006/09/03 17:13:30 ben Exp $
+$NetBSD: patch-aa,v 1.5 2009/08/09 16:00:53 drochner Exp $
 
---- configure.in.orig  2000-03-25 23:33:22.000000000 -0800
+--- configure.in.orig  2006-08-16 20:02:25.000000000 +0200
 +++ configure.in
 @@ -12,6 +12,17 @@ AC_PROG_RANLIB
  AC_CHECK_PROG(AR,ar,ar)
@@ -12,7 +12,7 @@
 +  EXTRA_LIBS=-framework CoreFoundation -framework IOKit
 +  ;;
 +*)
-+  EXTRA_OBJS=cooked_interface.o scsi_interface.o
++  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
 +  EXTRA_LIBS=
 +  ;;
 +esac
@@ -23,7 +23,7 @@
 @@ -20,6 +31,12 @@ else
        i?86-*-linux*)
                DEBUG="-g -Wall -fsigned-char"
-               OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
+               OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
 +      i?86-*-netbsd*)
 +              DEBUG="-g -Wall -fsigned-char"
 +              OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
@@ -32,20 +32,8 @@
 +              OPT="-O";;
        *)
                DEBUG="-g -Wall -fsigned-char"
-               OPT="-O20 -fsigned-char";;
-@@ -28,7 +45,10 @@ fi
- 
- AC_HEADER_STDC
- 
--CFLAGS=""
-+dnl Uncomment the following if you don't want to honor CFLAGS passed in from
-+dnl the environment.
-+dnl
-+dnl CFLAGS=""
- 
- TYPESIZES="" 
- 
-@@ -62,15 +82,27 @@ fi
+               OPT="-O2 -fsigned-char";;
+@@ -56,15 +73,27 @@ fi
        
  AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ")
  AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ")
diff -r dffc644f6e67 -r f58ef3c925eb audio/cdparanoia/patches/patch-ab
--- a/audio/cdparanoia/patches/patch-ab Sun Aug 09 15:11:02 2009 +0000
+++ b/audio/cdparanoia/patches/patch-ab Sun Aug 09 16:00:53 2009 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.9 2009/05/19 00:36:06 dholland Exp $
+$NetBSD: patch-ab,v 1.10 2009/08/09 16:00:53 drochner Exp $
 
---- Makefile.in.orig   2001-03-27 17:46:58.000000000 -0500
-+++ Makefile.in        2009-05-17 17:21:32.000000000 -0400
+--- Makefile.in.orig   2008-09-11 22:33:30.000000000 +0200
++++ Makefile.in
 @@ -3,12 +3,12 @@
  # DO NOT EDIT BELOW! ##########################################################
  # (unless, of course, you know what you are doing :) ##########################
  
--VERSION=9.8
-+VERSION=98
+-VERSION=10.2
++VERSION=102
  VPATH=@srcdir@
  srcdir=@srcdir@
  
@@ -17,19 +17,19 @@
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ $(FLAGS)
  CC=@CC@
-@@ -27,29 +27,29 @@ PWD = $(shell pwd)
+@@ -27,28 +27,28 @@ PWD = $(shell pwd)
  
- OFILES = main.o report.o header.o buffering_write.o
+ OFILES = main.o report.o header.o buffering_write.o cachetest.o
  
 -export STATIC 
  export VERSION
  
 -ifeq ($(STATIC),TRUE)
 -      LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
--              -static -lm
+-              -static -lm -lrt
 -      LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
 -else
--      LIBS = -lcdda_interface -lcdda_paranoia -lm
+-      LIBS = -lcdda_interface -lcdda_paranoia -lm -lrt
 -      LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so
 -endif
 +STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a -lm
@@ -39,20 +39,18 @@
 +SHLIBS = $(SHLIBDEP) @EXTRA_LIBS@ -lm
  
 -all:  
-+
 +all:
        cd interface && $(MAKE) all
        cd paranoia && $(MAKE) all
 -      $(MAKE) cdparanoia CFLAGS="$(OPT)" 
--      strip cdparanoia
 +      $(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
-+
+ 
+-debug:  
 +static:
 +      cd interface && $(MAKE) lib
 +      cd paranoia && $(MAKE) lib
 +      $(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
- 
--debug:  
++
 +debug:
        cd interface && $(MAKE) debug
        cd paranoia && $(MAKE) debug
@@ -61,12 +59,12 @@
  
  test: 
        cd interface && $(MAKE) all
-@@ -64,32 +64,20 @@ slib:
+@@ -63,32 +63,20 @@ slib:
        cd paranoia && $(MAKE) slib
  
  install:
 -      $(INSTALL) -d -m 0755 $(BINDIR)
--      $(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
+-      $(INSTALL) -m 755 $(srcdir)/cdparanoia $(BINDIR)
 -      $(INSTALL) -d -m 0755 $(MANDIR)
 -      $(INSTALL) -d -m 0755 $(MANDIR)/man1
 -      $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
diff -r dffc644f6e67 -r f58ef3c925eb audio/cdparanoia/patches/patch-ac
--- a/audio/cdparanoia/patches/patch-ac Sun Aug 09 15:11:02 2009 +0000
+++ b/audio/cdparanoia/patches/patch-ac Sun Aug 09 16:00:53 2009 +0000
@@ -1,28 +1,3548 @@
-$NetBSD: patch-ac,v 1.7 2007/03/08 19:24:24 rillig Exp $
+$NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
 
---- configure.orig     2000-04-15 08:13:01.000000000 -0700
+--- configure.orig     2006-08-16 20:02:25.000000000 +0200
 +++ configure
-@@ -884,6 +884,16 @@ else
-   echo "$ac_t""no" 1>&6
- fi
- 
+@@ -1,25 +1,82 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.63.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
++fi
++
++
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++      expr "X$arg" : "X\\(.*\\)$as_nl";
++      arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {



Home | Main Index | Thread Index | Old Index