head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.112 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.110 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.108 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.106 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.104 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.102 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.100 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.98 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.96 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.94 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.92 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.90 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.88 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.86 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.84 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.82 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.80 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.78 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.76 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.74 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.72 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.70 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.68 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.64 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.44 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.66 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.62 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.60 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.58 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.56 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.54 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.52 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.50 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.48 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.46 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.42 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.40 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.38 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.36 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.34 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.32 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.30 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.28 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.26 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.24 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.22 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.20 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.18 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.16 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.14 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.12 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.10 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.8 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.4 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.2 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.2.0.44 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.42 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.40 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.38 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.36 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.34 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.32 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.30 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.28 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.26 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.24 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.22 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.20 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.18 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.16 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.14 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.12 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.10 pkgsrc-2008Q1:1.2.0.8 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.6 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.4 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.2 pkgsrc-2007Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2012.04.15.04.19.20; author markd; state Exp; branches; next 1.2; 1.2 date 2007.06.30.18.42.24; author joerg; state Exp; branches; next 1.1; 1.1 date 2007.06.06.11.23.09; author markd; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.06.06.11.23.09; author markd; state Exp; branches; next ; desc @@ 1.3 log @Update to 0.7.6 KDE4 version. @ text @$NetBSD: patch-aa,v 1.2 2007/06/30 18:42:24 joerg Exp $ --- cdinfo.cpp.orig 2006-04-28 07:18:54.000000000 +0000 +++ cdinfo.cpp @@@@ -32,8 +32,9 @@@@ #include #include #include +#include -#ifdef __FreeBSD__ +#if defined(CDIO_H) # include # define CDROM_LEADOUT 0xAA #else @@@@ -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); +#ifdef ENOMEDIUM else if (mErrorCode==ENOMEDIUM) mErrorText = i18n("Please insert a disc into %1 and try again").arg(mDevice); +#endif 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 +103,7 @@@@ bool CdInfo::open() return false; } -#ifndef __FreeBSD__ +#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 +197,7 @@@@ int CdInfo::cddbSum(int n) int CdInfo::readTocHeader() { -#ifdef __FreeBSD__ +#ifdef CDIO_H ioc_toc_header hdr; if (ioctl(mFd, CDIOREADTOCHEADER, &hdr)<0) return -1; return hdr.ending_track; @@@@ -212,14 +215,17 @@@@ bool CdInfo::readTocEntry(int aEntryTrac { int frame = 0; -#ifdef __FreeBSD__ - ioc_read_toc_single_entry entry; - entry.track = aEntryTrack; - entry.format = CD_MSF_FORMAT; - if (ioctl(mFd, CDIOREADTOCENTRY, &entry)) return false; - aTrack.min = entry.entry.addr.msf.minute; - aTrack.sec = entry.entry.addr.msf.second; - frame = entry.entry.addr.msf.frame; +#ifdef CDIO_H + struct cd_toc_entry toc_buffer; + ioc_read_toc_entry entry; + entry.starting_track = aEntryTrack; + entry.address_format = CD_MSF_FORMAT; + entry.data = &toc_buffer; + entry.data_len = sizeof(toc_buffer); + if (ioctl(mFd, CDIOREADTOCENTRYS, &entry)) return false; + aTrack.min = toc_buffer.addr.msf.minute; + aTrack.sec = toc_buffer.addr.msf.second; + frame = toc_buffer.addr.msf.frame; #else /* not __FreeBSD__*/ @ 1.2 log @Fix build on DragonFly. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- src/cdinfo.cpp.orig 2006-04-28 07:18:54.000000000 +0000 +++ src/cdinfo.cpp d12 1 a12 1 +#if defined(HAVE_SYS_CDIO_H) d41 1 a41 1 +#ifdef HAVE_SYS_CDIO_H d57 1 a57 1 +#ifdef HAVE_SYS_CDIO_H @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- src/cdinfo.cpp.orig 2007-05-28 19:36:06.000000000 +1200 d5 2 a6 1 @@@@ -33,7 +33,7 @@@@ d9 1 d16 1 a16 1 @@@@ -91,8 +91,10 @@@@ bool CdInfo::open() d27 1 a27 1 @@@@ -100,7 +102,7 @@@@ bool CdInfo::open() d32 1 a32 1 +#if !(defined(__FreeBSD__) || defined(__NetBSD__)) d36 1 a36 1 @@@@ -194,7 +196,7 @@@@ int CdInfo::cddbSum(int n) d45 1 a45 1 @@@@ -212,14 +214,17 @@@@ bool CdInfo::readTocEntry(int aEntryTrac @ 1.1.1.1 log @Import of koverartist-0.5 KoverArtist is a program for the fast creation of covers for cd/dvd cases and boxes. The main idea behind it is to be able to create decent looking covers with some mouseclicks. @ text @@