From bf365b9cf214ca430bb87984f77babcc3684f212 Mon Sep 17 00:00:00 2001
From: is <is@pkgsrc.org>
Date: Thu, 30 Oct 2008 09:04:20 +0000
Subject: Only use one sort of fixed-size integer types. This way, it even
 compiles on Solaris 10.

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

(limited to 'misc/libcdio')

diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index 6f55b419385..30bf7143994 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/05/22 13:18:55 drochner Exp $
+$NetBSD: distinfo,v 1.18 2008/10/30 09:04:20 is Exp $
 
 SHA1 (libcdio-0.80.tar.gz) = 40c1558a65a9eca2b693d1951ed2664efbe7d1ed
 RMD160 (libcdio-0.80.tar.gz) = 3ca404bffb107ad950505b8ccd9e659e306545cb
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
 SHA1 (patch-ab) = a2bcb4fec5acf46ede7386287dec3d0d4aa0d81e
 SHA1 (patch-ac) = 7932908d34f8d1cc7946bce6a6d61d5036d102d6
 SHA1 (patch-ad) = c675f7413a672cb7b37c073b01d43339467e636c
+SHA1 (patch-ae) = 2d9248077d271640aa89327d716c0434f114d580
+SHA1 (patch-af) = 112d329207e2dfdbd792113caef8dc03a71a294f
diff --git a/misc/libcdio/patches/patch-ae b/misc/libcdio/patches/patch-ae
new file mode 100644
index 00000000000..8a87ad97dd4
--- /dev/null
+++ b/misc/libcdio/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2008/10/30 09:04:20 is 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 --git a/misc/libcdio/patches/patch-af b/misc/libcdio/patches/patch-af
new file mode 100644
index 00000000000..ac7a259deb6
--- /dev/null
+++ b/misc/libcdio/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/10/30 09:04:20 is 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;
-- 
cgit v1.2.3