summaryrefslogtreecommitdiff
path: root/misc/libcdio
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2010-07-30 07:10:50 +0000
committerdholland <dholland@pkgsrc.org>2010-07-30 07:10:50 +0000
commitaf86682ac8b784301b4d2f0c0a277176bb393bbd (patch)
tree17854c3232c756e51a043a262270999777de754c /misc/libcdio
parent0258e88299a9ddd735764397fee983c260590855 (diff)
downloadpkgsrc-af86682ac8b784301b4d2f0c0a277176bb393bbd.tar.gz
Work around namespace pollution breaking the build on OpenSolaris.
From Aleksey Cheusov in PR 43638.
Diffstat (limited to 'misc/libcdio')
-rw-r--r--misc/libcdio/distinfo3
-rw-r--r--misc/libcdio/patches/patch-ab17
2 files changed, 19 insertions, 1 deletions
diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index da845e3f58c..e8ac90f5780 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.20 2009/10/31 02:49:09 wiz Exp $
+$NetBSD: distinfo,v 1.21 2010/07/30 07:10:50 dholland Exp $
SHA1 (libcdio-0.82.tar.gz) = b3a87283a373eed816c15584c373ad6d2f95f09a
RMD160 (libcdio-0.82.tar.gz) = 48dc71f349235ab501985a296fd3deee295c167f
Size (libcdio-0.82.tar.gz) = 2240599 bytes
SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
+SHA1 (patch-ab) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c
SHA1 (patch-ac) = 7bea49d753bb88d8fa2b5b87a4e9a327c5d7f05f
diff --git a/misc/libcdio/patches/patch-ab b/misc/libcdio/patches/patch-ab
new file mode 100644
index 00000000000..e6173b32521
--- /dev/null
+++ b/misc/libcdio/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.7 2010/07/30 07:10:50 dholland Exp $
+
+Work around namespace pollution on OpenSolaris (PR 43638, Aleksey Cheusov)
+
+--- include/cdio++/iso9660.hpp.orig 2008-11-29 04:52:43.000000000 +0000
++++ include/cdio++/iso9660.hpp
+@@ -33,6 +33,10 @@
+ #include <cstring>
+ using namespace std;
+
++#ifdef FS
++#undef FS
++#endif
++
+ /** ISO 9660 class.
+ */
+ class ISO9660