[pkgsrc/pkgsrc-2008Q3]: pkgsrc/misc/libcdio Pullup ticket #2565 - requested b...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7239c814add9
branches:  pkgsrc-2008Q3
changeset: 547853:7239c814add9
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Nov 02 12:15:38 2008 +0000

description:
Pullup ticket #2565 - requested by is
libcdio: build fix for Solaris

Revisions pulled up:
- misc/libcdio/distinfo         1.18
- misc/libcdio/patches/patch-ae 1.1
- misc/libcdio/patches/patch-af 1.1
---
Module Name:    pkgsrc
Committed By:   is
Date:           Thu Oct 30 09:04:20 UTC 2008

Modified Files:
        pkgsrc/misc/libcdio: distinfo
Added Files:
        pkgsrc/misc/libcdio/patches: patch-ae patch-af

Log Message:
Only use one sort of fixed-size integer types. This way, it even
compiles on Solaris 10.

diffstat:

 misc/libcdio/distinfo         |   4 +++-
 misc/libcdio/patches/patch-ae |  13 +++++++++++++
 misc/libcdio/patches/patch-af |  13 +++++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diffs (49 lines):

diff -r 999ed1db473a -r 7239c814add9 misc/libcdio/distinfo
--- a/misc/libcdio/distinfo     Sun Nov 02 12:04:47 2008 +0000
+++ b/misc/libcdio/distinfo     Sun Nov 02 12:15:38 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/05/22 13:18:55 drochner Exp $
+$NetBSD: distinfo,v 1.17.8.1 2008/11/02 12:15:38 tron Exp $
 
 SHA1 (libcdio-0.80.tar.gz) = 40c1558a65a9eca2b693d1951ed2664efbe7d1ed
 RMD160 (libcdio-0.80.tar.gz) = 3ca404bffb107ad950505b8ccd9e659e306545cb
@@ -7,3 +7,5 @@
 SHA1 (patch-ab) = a2bcb4fec5acf46ede7386287dec3d0d4aa0d81e
 SHA1 (patch-ac) = 7932908d34f8d1cc7946bce6a6d61d5036d102d6
 SHA1 (patch-ad) = c675f7413a672cb7b37c073b01d43339467e636c
+SHA1 (patch-ae) = 2d9248077d271640aa89327d716c0434f114d580
+SHA1 (patch-af) = 112d329207e2dfdbd792113caef8dc03a71a294f
diff -r 999ed1db473a -r 7239c814add9 misc/libcdio/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libcdio/patches/patch-ae     Sun Nov 02 12:15:38 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.2.2 2008/11/02 12:15:38 tron Exp $
+
+--- src/cddb.h.orig    2007-06-16 22:12:16.000000000 +0200
++++ src/cddb.h
+@@ -38,7 +38,7 @@ cddb_opts_t cddb_opts;
+       the total length of the disk, and 
+       the number of tracks.
+ */
+-u_int32_t cddb_discid(CdIo_t *p_cdio, track_t i_tracks);
++uint32_t cddb_discid(CdIo_t *p_cdio, track_t i_tracks);
+ 
+ #ifdef HAVE_CDDB
+ #include <cddb/cddb.h>
diff -r 999ed1db473a -r 7239c814add9 misc/libcdio/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libcdio/patches/patch-af     Sun Nov 02 12:15:38 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.2.2 2008/11/02 12:15:38 tron Exp $
+
+--- src/cddb.c.orig    2007-06-16 22:12:16.000000000 +0200
++++ src/cddb.c
+@@ -48,7 +48,7 @@ cddb_dec_digit_sum(int n)
+       the total length of the disk, and 
+       the number of tracks.
+ */
+-u_int32_t
++uint32_t
+ cddb_discid(CdIo_t *p_cdio, track_t i_tracks)
+ {
+   int i,t,n=0;