[pkgsrc/trunk]: pkgsrc/audio/cdparanoia some fixes and cleanup:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/cdparanoia some fixes and cleanup:
From: drochner <drochner%pkgsrc.org@localhost>
Date: Mon, 16 Jan 2023 19:38:27 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d98171898b5
branches:  trunk
changeset: 397495:2d98171898b5
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Aug 14 15:51:05 2009 +0000

description:
some fixes and cleanup:
-replace a struct member name "private" in a public header, it is
 reserved in C+, fixes build problems reported by joerg and wiz
-link against librt on Linux (needed for clock_gettime()), should
 fix build problem reported by dsainty
-don't even compile cooked_interface.c on NetBSD, and g/c patches
 which added NetBSD support code which was never used
bump PKGREVISION

diffstat:

 audio/cdparanoia/Makefile         |    4 +-
 audio/cdparanoia/distinfo         |   14 +-
 audio/cdparanoia/patches/patch-aa |   16 ++-
 audio/cdparanoia/patches/patch-ac |  190 +++++++++++++++++++------------------
 audio/cdparanoia/patches/patch-ca |   12 +-
 audio/cdparanoia/patches/patch-ce |  104 +-------------------
 audio/cdparanoia/patches/patch-ch |   11 ++-
 audio/cdparanoia/patches/patch-ci |   17 ++-
 8 files changed, 159 insertions(+), 209 deletions(-)

diffs (truncated from 1173 to 300 lines):

diff -r 2ca0d091c7b4 -r 2d98171898b5 audio/cdparanoia/Makefile
--- a/audio/cdparanoia/Makefile Fri Aug 14 15:47:43 2009 +0000
+++ b/audio/cdparanoia/Makefile Fri Aug 14 15:51:05 2009 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2009/08/09 16:00:53 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2009/08/14 15:51:05 drochner Exp $
 #
 
 DISTNAME=      cdparanoia-III-10.2
 PKGNAME=       cdparanoia-3.0.10.2
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  http://downloads.xiph.org/releases/cdparanoia/
 EXTRACT_SUFX=  .src.tgz
@@ -23,6 +24,7 @@
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/cdparanoia
 
 MAKE_ENV+=     GCC=yes
+CFLAGS+=       -Dprivate_data=private
 
 LDFLAGS.FreeBSD+=      -lcam
 LDFLAGS.DragonFly+=    -lcam
diff -r 2ca0d091c7b4 -r 2d98171898b5 audio/cdparanoia/distinfo
--- a/audio/cdparanoia/distinfo Fri Aug 14 15:47:43 2009 +0000
+++ b/audio/cdparanoia/distinfo Fri Aug 14 15:51:05 2009 +0000
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.23 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: distinfo,v 1.24 2009/08/14 15:51:05 drochner Exp $
 
 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-aa) = c8e66327a8566afff37313941db2b3175beb57fa
 SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
-SHA1 (patch-ac) = 809a306e3ee07493167ee652efd8899fd38af15f
+SHA1 (patch-ac) = f6f28caf71c68462955fa308ae01b6e4888c1724
 SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
 SHA1 (patch-ae) = dda320ca0817b06cb25be86b2a891776550603ae
 SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
-SHA1 (patch-ca) = 39b06a65f1feed4170c0f7305f7a56f104c4a043
+SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
 SHA1 (patch-cb) = b38b9119273aef002e1fde8f84888b303d7833d9
 SHA1 (patch-cc) = a2f78daf62ecae73ab3cc264f39b367dfa249129
 SHA1 (patch-cd) = 7141563e10b0d23dbd4ff824224a10908741be5b
-SHA1 (patch-ce) = 75b152acaf730eafa76dffc44e2bec95c0ae6397
+SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
 SHA1 (patch-cf) = 73cdff1ab6b9857cd3299f3eb152c399a7e38227
 SHA1 (patch-cg) = 9a979bcac06da564e6d86d0ffc04848e529367cf
-SHA1 (patch-ch) = 1e17f98007b7e566dd88e30bea27247a9be6cc28
-SHA1 (patch-ci) = d8a85b0e5858650050a05fdca612bc0fadd42065
+SHA1 (patch-ch) = e7ec16fe9c7ff805104d68678a2576370cc4c0e7
+SHA1 (patch-ci) = 614b428a3bf330ccb5850149549fb98e8e1b90c0
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
 SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
 SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475
diff -r 2ca0d091c7b4 -r 2d98171898b5 audio/cdparanoia/patches/patch-aa
--- a/audio/cdparanoia/patches/patch-aa Fri Aug 14 15:47:43 2009 +0000
+++ b/audio/cdparanoia/patches/patch-aa Fri Aug 14 15:51:05 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2009/08/14 15:51:06 drochner Exp $
 
 --- configure.in.orig  2006-08-16 20:02:25.000000000 +0200
 +++ configure.in
-@@ -12,6 +12,17 @@ AC_PROG_RANLIB
+@@ -12,6 +12,25 @@ AC_PROG_RANLIB
  AC_CHECK_PROG(AR,ar,ar)
  AC_CHECK_PROG(INSTALL,install,install)
  
@@ -11,6 +11,14 @@
 +  EXTRA_OBJS=osx_interface.o
 +  EXTRA_LIBS=-framework CoreFoundation -framework IOKit
 +  ;;
++*-*-linux*)
++  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
++  EXTRA_LIBS=-lrt
++  ;;
++*-*-netbsd*)
++  EXTRA_OBJS=scsi_interface.o
++  EXTRA_LIBS=
++  ;;
 +*)
 +  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
 +  EXTRA_LIBS=
@@ -20,7 +28,7 @@
  if test -z "$GCC"; then
        DEBUG="-g"
        OPT="-O"
-@@ -20,6 +31,12 @@ else
+@@ -20,6 +39,12 @@ else
        i?86-*-linux*)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
@@ -33,7 +41,7 @@
        *)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O2 -fsigned-char";;
-@@ -56,15 +73,27 @@ fi
+@@ -56,15 +81,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 2ca0d091c7b4 -r 2d98171898b5 audio/cdparanoia/patches/patch-ac
--- a/audio/cdparanoia/patches/patch-ac Fri Aug 14 15:47:43 2009 +0000
+++ b/audio/cdparanoia/patches/patch-ac Fri Aug 14 15:51:05 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2009/08/14 15:51:06 drochner Exp $
 
 --- configure.orig     2006-08-16 20:02:25.000000000 +0200
 +++ configure
@@ -3493,7 +3493,7 @@
  else
    if test -n "$INSTALL"; then
    ac_cv_prog_INSTALL="$INSTALL" # Let the user override the test.
-@@ -2435,26 +2986,39 @@ do
+@@ -2435,26 +2986,47 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3530,6 +3530,14 @@
 +  EXTRA_OBJS=osx_interface.o
 +  EXTRA_LIBS=-framework CoreFoundation -framework IOKit
 +  ;;
++*-*-linux*)
++  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
++  EXTRA_LIBS=-lrt
++  ;;
++*-*-netbsd*)
++  EXTRA_OBJS=scsi_interface.o
++  EXTRA_LIBS=
++  ;;
 +*)
 +  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
 +  EXTRA_LIBS=
@@ -3539,7 +3547,7 @@
  if test -z "$GCC"; then
        DEBUG="-g"
        OPT="-O"
-@@ -2463,6 +3027,12 @@ else
+@@ -2463,6 +3035,12 @@ else
        i?86-*-linux*)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
@@ -3552,7 +3560,7 @@
        *)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O2 -fsigned-char";;
-@@ -2475,15 +3045,15 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -2475,15 +3053,15 @@ ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3571,7 +3579,7 @@
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2510,35 +3080,35 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2510,35 +3088,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
                     Syntax error
  _ACEOF
@@ -3623,7 +3631,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2548,34 +3118,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2548,34 +3126,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -3673,7 +3681,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -2593,8 +3163,8 @@ fi
+@@ -2593,8 +3171,8 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -3684,7 +3692,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -2617,35 +3187,35 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2617,35 +3195,35 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
                     Syntax error
  _ACEOF
@@ -3736,7 +3744,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2655,34 +3225,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -2655,34 +3233,34 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -3786,7 +3794,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -2691,11 +3261,13 @@ rm -f conftest.err conftest.$ac_ext
+@@ -2691,11 +3269,13 @@ rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then
    :
  else
@@ -3803,7 +3811,7 @@
  fi
  
  ac_ext=c
-@@ -2705,25 +3277,144 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -2705,25 +3285,144 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -3962,7 +3970,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2745,35 +3436,32 @@ main ()
+@@ -2745,35 +3444,32 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4015,7 +4023,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -2829,6 +3517,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -2829,6 +3525,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -4023,7 +4031,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -2848,36 +3537,50 @@ main ()
+@@ -2848,36 +3545,50 @@ main ()
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
        || toupper (i) != TOUPPER (i))
@@ -4087,7 +4095,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -2900,11 +3603,11 @@ fi
+@@ -2900,11 +3611,11 @@ fi
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                  inttypes.h stdint.h unistd.h
  do
@@ -4104,7 +4112,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2917,41 +3620,42 @@ $ac_includes_default
+@@ -2917,41 +3628,42 @@ $ac_includes_default
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4171,7 +4179,7 @@
  _ACEOF
  
  fi
-@@ -2959,73 +3663,15 @@ fi
+@@ -2959,73 +3671,15 @@ fi
  done
  
  
@@ -4252,7 +4260,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3038,7 +3684,7 @@ $ac_includes_default
+@@ -3038,7 +3692,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4261,7 +4269,7 @@
  test_array [0] = 0
  
    ;
-@@ -3046,27 +3692,23 @@ test_array [0] = 0
+@@ -3046,27 +3700,23 @@ test_array [0] = 0
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -4302,7 +4310,7 @@
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -3079,7 +3721,7 @@ $ac_includes_default
+@@ -3079,7 +3729,7 @@ $ac_includes_default
  int
  main ()
  {
@@ -4311,7 +4319,7 @@
  test_array [0] = 0
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/opal to 3.6.4
Next by Date: [pkgsrc/trunk]: pkgsrc/math/fftw Update to 3.2.2. Set LICENSE to gnu-gpl-v2.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/opal to 3.6.4
Next by Thread: [pkgsrc/trunk]: pkgsrc/math/fftw Update to 3.2.2. Set LICENSE to gnu-gpl-v2.
Indexes:
Home | Main Index | Thread Index | Old Index