From e0ffca820ea00db18b54eb5f458ee94c6016e96d Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Thu, 30 Nov 2006 14:03:13 +0000
Subject: Fix path to cdda_interface.h and cdda_paranoia.h in the #ifndef
 HAVE_LIBCDIO case

---
 multimedia/gmplayer/distinfo              |  3 ++-
 multimedia/mplayer-share/distinfo         |  3 ++-
 multimedia/mplayer-share/patches/patch-ad | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 multimedia/mplayer-share/patches/patch-ad

(limited to 'multimedia')

diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 1344145cb72..2b2f2de6f4c 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2006/10/31 22:33:28 wiz Exp $
+$NetBSD: distinfo,v 1.43 2006/11/30 14:03:13 abs Exp $
 
 SHA1 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -66,5 +66,6 @@ Size (gmplayer-1.0rc9-20060123/xine-lcd-1.2.tar.bz2) = 172270 bytes
 SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
+SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-tc) = e67443cec273d7aa168fb160e2409d2ce352a8bf
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 6a5ce771068..ab0218cc110 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2006/10/31 22:33:28 wiz Exp $
+$NetBSD: distinfo,v 1.35 2006/11/30 14:03:13 abs Exp $
 
 SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
 RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
@@ -6,5 +6,6 @@ Size (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8414213 bytes
 SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
+SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-tc) = e67443cec273d7aa168fb160e2409d2ce352a8bf
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
new file mode 100644
index 00000000000..05aab22e8d7
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.8 2006/11/30 14:03:13 abs Exp $
+
+--- stream/cdd.h.orig	2006-11-21 10:26:56.000000000 +0000
++++ stream/cdd.h
+@@ -3,8 +3,8 @@
+ 
+ #include "config.h"
+ #ifndef HAVE_LIBCDIO
+-#include <cdda_interface.h>
+-#include <cdda_paranoia.h>
++#include <cdparanoia/cdda_interface.h>
++#include <cdparanoia/cdda_paranoia.h>
+ #else
+ #include <cdio/cdda.h>
+ #include <cdio/paranoia.h>
-- 
cgit v1.2.3