From f13e1e1f65abf2703eb6ec9e40de8d6b4c967139 Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 19 Feb 2006 18:28:55 +0000 Subject: [PATCH] fix up header on OpenBSD with C++ --- devel/libdvdread/Makefile | 4 ++-- .../patches/patch-dvdread_ifo_types_h | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 devel/libdvdread/patches/patch-dvdread_ifo_types_h diff --git a/devel/libdvdread/Makefile b/devel/libdvdread/Makefile index 0ba4a3cff6b..3253ac8cccd 100644 --- a/devel/libdvdread/Makefile +++ b/devel/libdvdread/Makefile @@ -1,9 +1,9 @@ -#$OpenBSD: Makefile,v 1.12 2006/02/16 11:08:26 espie Exp $ +#$OpenBSD: Makefile,v 1.13 2006/02/19 18:28:55 espie Exp $ CATEGORIES= devel COMMENT= "accessing DVD files" DISTNAME= libdvdread-0.9.5 -PKGNAME= ${DISTNAME} +PKGNAME= ${DISTNAME}p0 SHARED_LIBS= dvdread 4.0 HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ MASTER_SITES= ${HOMEPAGE}dist/ diff --git a/devel/libdvdread/patches/patch-dvdread_ifo_types_h b/devel/libdvdread/patches/patch-dvdread_ifo_types_h new file mode 100644 index 00000000000..f687d968c28 --- /dev/null +++ b/devel/libdvdread/patches/patch-dvdread_ifo_types_h @@ -0,0 +1,17 @@ +$OpenBSD: patch-dvdread_ifo_types_h,v 1.1 2006/02/19 18:28:55 espie Exp $ +--- dvdread/ifo_types.h.orig Sun Feb 19 18:57:54 2006 ++++ dvdread/ifo_types.h Sun Feb 19 19:00:02 2006 +@@ -28,8 +28,12 @@ + #error "Must include or before any libdvdread header." + #endif + #else +-#if !defined(UINT8_MAX) || !defined(UINT16_MAX) || !defined(INT32_MAX) ++#if defined(UINT8_MAX) && defined(UINT16_MAX) && defined(INT32_MAX) ++#else ++#if defined(__OpenBSD__) && defined(__cplusplus) && defined(__BIT_TYPES_DEFINED__) ++#else + #error "Must include or before any libdvdread header." ++#endif + #endif + #endif +