From fc5745e18c2ef915a2714794494bc005f0075889 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 21 Jun 2006 19:19:36 +0000
Subject: Fix build on DragonFly and FreeBSD due to different cdparanoia
 headers. Patch obtained from FreeBSD ports.

---
 multimedia/kdemultimedia3/distinfo         |  4 ++--
 multimedia/kdemultimedia3/patches/patch-cu | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 6bfad32b110..4dce2bcae4b 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2006/06/01 13:57:08 markd Exp $
+$NetBSD: distinfo,v 1.30 2006/06/21 19:19:36 joerg Exp $
 
 SHA1 (kdemultimedia-3.5.3.tar.bz2) = 2a75ba49bbc513b4ab5cb0d039949984742f94f5
 RMD160 (kdemultimedia-3.5.3.tar.bz2) = 2ae4ba9266b84b972e3bcd106896b6ea0124aa32
@@ -20,4 +20,4 @@ SHA1 (patch-an) = 79b26912aeeacb881664cd1557417bd99b96451e
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
-SHA1 (patch-cu) = 332029860aab3f34cf0b202958b09c2564d5e913
+SHA1 (patch-cu) = a1f6dc932f51251b278d995115ae2c316e861daa
diff --git a/multimedia/kdemultimedia3/patches/patch-cu b/multimedia/kdemultimedia3/patches/patch-cu
index 1bc406c537a..890f022db26 100644
--- a/multimedia/kdemultimedia3/patches/patch-cu
+++ b/multimedia/kdemultimedia3/patches/patch-cu
@@ -1,6 +1,6 @@
-$NetBSD: patch-cu,v 1.6 2006/01/31 22:33:03 markd Exp $
+$NetBSD: patch-cu,v 1.7 2006/06/21 19:19:36 joerg Exp $
 
---- kioslave/audiocd/audiocd.cpp.orig	2006-01-20 05:40:34.000000000 +1300
+--- kioslave/audiocd/audiocd.cpp.orig	2006-05-22 18:06:24.000000000 +0000
 +++ kioslave/audiocd/audiocd.cpp
 @@ -26,8 +26,8 @@
  
@@ -13,7 +13,19 @@ $NetBSD: patch-cu,v 1.6 2006/01/31 22:33:03 markd Exp $
  	void paranoiaCallback(long, int);
  
  	#include <kdemacros.h>
-@@ -859,7 +859,7 @@ void AudioCDProtocol::paranoiaRead(
+@@ -213,7 +213,11 @@ struct cdrom_drive * AudioCDProtocol::in
+ 		return 0;
+ 
+ 	// Update our knowledge of the disc
++#if defined(Q_OS_FREEBSD)
++	d->cd.setDevice(drive->cdda_device_name, 50, false);
++#else
+ 	d->cd.setDevice(drive->ioctl_device_name, 50, false);
++#endif
+ #if 0
+ 	// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
+ 	// support for non-SCSI devices. Although it finds ATA cdroms just
+@@ -857,7 +861,7 @@ void AudioCDProtocol::paranoiaRead(
  		 * 2) Only increase in size unless the decrease is %5 of last estimate.
  		 * This prevents continues small changes which is just annoying.
  		 */
-- 
cgit v1.2.3