r14766 - in /trunk/libaudio-flac-header-perl/debian: changelog patches/series patches/uint64

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Mon Feb 11 20:03:06 2008
New Revision: 14766

URL: http://svn.debian.org/wsvn/?sc=1&rev=14766
Log:
* debian/patches/uint64: fix FTBFS due to 64-bit integer proglems on
                         several 32-bit architectures. (Closes: #462249)

Added:
    trunk/libaudio-flac-header-perl/debian/patches/uint64
Modified:
    trunk/libaudio-flac-header-perl/debian/changelog
    trunk/libaudio-flac-header-perl/debian/patches/series

Modified: trunk/libaudio-flac-header-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libaudio-flac-header-perl/debian/changelog?rev=14766&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/changelog (original)
+++ trunk/libaudio-flac-header-perl/debian/changelog Mon Feb 11 20:03:06 2008
@@ -1,3 +1,10 @@
+libaudio-flac-header-perl (1.9-2) UNRELEASED; urgency=low
+
+  * debian/patches/uint64: fix FTBFS due to 64-bit integer proglems on
+                           several 32-bit architectures. (Closes: #462249)
+
+ -- Niko Tyni <ntyni at debian.org>  Mon, 11 Feb 2008 20:42:08 +0200
+
 libaudio-flac-header-perl (1.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libaudio-flac-header-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libaudio-flac-header-perl/debian/patches/series?rev=14766&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/patches/series (original)
+++ trunk/libaudio-flac-header-perl/debian/patches/series Mon Feb 11 20:03:06 2008
@@ -1,1 +1,2 @@
 pod-coverage-private
+uint64

Added: trunk/libaudio-flac-header-perl/debian/patches/uint64
URL: http://svn.debian.org/wsvn/trunk/libaudio-flac-header-perl/debian/patches/uint64?rev=14766&op=file
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/patches/uint64 (added)
+++ trunk/libaudio-flac-header-perl/debian/patches/uint64 Mon Feb 11 20:03:06 2008
@@ -1,0 +1,61 @@
+fix FTBFS due to 64-bit integer proglems on several 32-bit architectures.
+
+-- Niko Tyni <ntyni at debian.org> Mon, 11 Feb 2008 20:44:30 +0200
+
+--- libaudio-flac-header-perl.orig/Header.xs
++++ libaudio-flac-header-perl/Header.xs
+@@ -30,6 +30,9 @@
+ 
+ #include <FLAC/all.h>
+ 
++/* for PRIu64 */
++#include <inttypes.h>
++
+ #define FLACHEADERFLAG "fLaC"
+ #define ID3HEADERFLAG  "ID3"
+ 
+@@ -195,6 +198,19 @@
+ 		{
+ 			AV *cueArray = newAV();
+ 
++            /* 
++             * buffer for decimal representations of uint64_t values
++             *
++             * newSVpvf() and sv_catpvf() can't handle 64-bit values 
++             * in some cases, so we need to do the conversion "manually"
++             * with sprintf() and the PRIu64 format macro for portability
++             *
++             * see http://bugs.debian.org/462249
++             *
++             * maximum string length: ceil(log10(2**64)) == 20 (+trailing \0)
++             */
++            char decimal[21];
++
+ 			/* A lot of this comes from flac/src/share/grabbag/cuesheet.c */
+ 			const FLAC__StreamMetadata_CueSheet *cs;
+ 			unsigned track_num, index_num;
+@@ -239,7 +255,8 @@
+ 						sv_catpvf(indexSV, "%02u:%02u:%02u\n", m, s, f);
+ 
+ 					} else {
+-						sv_catpvf(indexSV, "%"UVuf"\n", track->offset + index->offset);
++						sprintf(decimal, "%"PRIu64, track->offset + index->offset);
++						sv_catpvf(indexSV, "%s\n", decimal);
+ 					}
+ 
+ 
+@@ -247,9 +264,11 @@
+ 				}
+ 			}
+ 
+-			av_push(cueArray, newSVpvf("REM FLAC__lead-in %"UVuf"\n", cs->lead_in));
+-			av_push(cueArray, newSVpvf("REM FLAC__lead-out %u %"UVuf"\n", 
+-				(unsigned)cs->tracks[track_num].number, cs->tracks[track_num].offset)
++			sprintf(decimal, "%"PRIu64, cs->lead_in);
++			av_push(cueArray, newSVpvf("REM FLAC__lead-in %s\n", decimal));
++			sprintf(decimal, "%"PRIu64, cs->tracks[track_num].offset);
++			av_push(cueArray, newSVpvf("REM FLAC__lead-out %u %s\n", 
++				(unsigned)cs->tracks[track_num].number, decimal)
+ 			);
+ 
+ 			my_hv_store(self, "cuesheet",  newRV_noinc((SV*) cueArray));