summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2008-11-02 12:15:38 +0000
committertron <tron@pkgsrc.org>2008-11-02 12:15:38 +0000
commit62b4ec93398402a6003649794d458f413e128e56 (patch)
treecc37eaa3dc5be7db4e3ad66b5303aafb93a1019d
parent2bfdc30a3637169c229380adb956a038b7671f06 (diff)
downloadpkgsrc-62b4ec93398402a6003649794d458f413e128e56.tar.gz
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.
-rw-r--r--misc/libcdio/distinfo4
-rw-r--r--misc/libcdio/patches/patch-ae13
-rw-r--r--misc/libcdio/patches/patch-af13
3 files changed, 29 insertions, 1 deletions
diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index 6f55b419385..5cffbf655da 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.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-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..b4f23c317c3
--- /dev/null
+++ b/misc/libcdio/patches/patch-ae
@@ -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 --git a/misc/libcdio/patches/patch-af b/misc/libcdio/patches/patch-af
new file mode 100644
index 00000000000..4a143289d3d
--- /dev/null
+++ b/misc/libcdio/patches/patch-af
@@ -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;