From 9aab834435265fc94c4321e132b6f70169dc0c5e Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 30 Jun 2007 18:42:24 +0000 Subject: Fix build on DragonFly. --- graphics/koverartist/distinfo | 8 ++++---- graphics/koverartist/patches/patch-aa | 18 ++++++++++-------- graphics/koverartist/patches/patch-ab | 4 ++-- graphics/koverartist/patches/patch-ac | 4 ++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/graphics/koverartist/distinfo b/graphics/koverartist/distinfo index 552358de60d..dd62f014dab 100644 --- a/graphics/koverartist/distinfo +++ b/graphics/koverartist/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ +$NetBSD: distinfo,v 1.2 2007/06/30 18:42:24 joerg Exp $ SHA1 (koverartist-0.5.tar.bz2) = 2fff3824c7b72a769dd2960bdc38d4dd5ff9e263 RMD160 (koverartist-0.5.tar.bz2) = 63ee6623b04dabdf8661e2f7eea162b1f15e9802 Size (koverartist-0.5.tar.bz2) = 748401 bytes -SHA1 (patch-aa) = df486d8bb25d21d257537130477a57328c1b3e29 -SHA1 (patch-ab) = 27d0aff76b1a8bce2dfa35563e913cd201afe83b -SHA1 (patch-ac) = 0cf59f7d9b6ae9b6e616398a11fd322ef87edff4 +SHA1 (patch-aa) = 11873caa4b0bea8a58bc8f336b29550af1ff0058 +SHA1 (patch-ab) = 96600feb023b1adaa6ad0001c8c657c25bb9a9c8 +SHA1 (patch-ac) = fafcbbe0a9373dc0782345bf47fb81c4c7afe23f diff --git a/graphics/koverartist/patches/patch-aa b/graphics/koverartist/patches/patch-aa index 26dcec931c6..31574b2bb43 100644 --- a/graphics/koverartist/patches/patch-aa +++ b/graphics/koverartist/patches/patch-aa @@ -1,17 +1,19 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ +$NetBSD: patch-aa,v 1.2 2007/06/30 18:42:24 joerg Exp $ ---- src/cdinfo.cpp.orig 2007-05-28 19:36:06.000000000 +1200 +--- src/cdinfo.cpp.orig 2006-04-28 07:18:54.000000000 +0000 +++ src/cdinfo.cpp -@@ -33,7 +33,7 @@ +@@ -32,8 +32,9 @@ + #include #include #include ++#include -#ifdef __FreeBSD__ +#if defined(HAVE_SYS_CDIO_H) # include # define CDROM_LEADOUT 0xAA #else -@@ -91,8 +91,10 @@ bool CdInfo::open() +@@ -91,8 +92,10 @@ bool CdInfo::open() mErrorCode = errno; if (mErrorCode==EACCES) mErrorText = i18n("You do not have permission to read from %1").arg(mDevice); @@ -22,16 +24,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ else if (mErrorCode==EBUSY) mErrorText = i18n("%1 is busy").arg(mDevice); else mErrorText = i18n("Cannot open %1: %2").arg(mDevice).arg(strerror(mErrorCode)); -@@ -100,7 +102,7 @@ bool CdInfo::open() +@@ -100,7 +103,7 @@ bool CdInfo::open() return false; } -#ifndef __FreeBSD__ -+#if !(defined(__FreeBSD__) || defined(__NetBSD__)) ++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)) int st = ioctl(mFd, CDROM_DISC_STATUS); if (st!=CDS_AUDIO && st!=CDS_MIXED && st!=CDS_NO_INFO) { -@@ -194,7 +196,7 @@ int CdInfo::cddbSum(int n) +@@ -194,7 +197,7 @@ int CdInfo::cddbSum(int n) int CdInfo::readTocHeader() { @@ -40,7 +42,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ ioc_toc_header hdr; if (ioctl(mFd, CDIOREADTOCHEADER, &hdr)<0) return -1; return hdr.ending_track; -@@ -212,14 +214,17 @@ bool CdInfo::readTocEntry(int aEntryTrac +@@ -212,14 +215,17 @@ bool CdInfo::readTocEntry(int aEntryTrac { int frame = 0; diff --git a/graphics/koverartist/patches/patch-ab b/graphics/koverartist/patches/patch-ab index 5df32285001..e7acb853103 100644 --- a/graphics/koverartist/patches/patch-ab +++ b/graphics/koverartist/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ +$NetBSD: patch-ab,v 1.2 2007/06/30 18:42:24 joerg Exp $ --- src/renderer.cpp.orig 2006-06-21 19:10:03.000000000 +1200 +++ src/renderer.cpp @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ #include -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__DragonFly__) +#define fmin(a,b) ((a)<(b)?(a):(b)) +#endif diff --git a/graphics/koverartist/patches/patch-ac b/graphics/koverartist/patches/patch-ac index 681ed1cf98b..604410eedb7 100644 --- a/graphics/koverartist/patches/patch-ac +++ b/graphics/koverartist/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ +$NetBSD: patch-ac,v 1.2 2007/06/30 18:42:24 joerg Exp $ --- src/rendererbase.cpp.orig 2006-04-28 00:52:30.000000000 +1200 +++ src/rendererbase.cpp @@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $ #include -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__DragonFly__) +#define fmin(a,b) ((a)<(b)?(a):(b)) +#define fmax(a,b) ((a)>(b)?(a):(b)) +#endif -- cgit v1.2.3