diff options
| author | joerg <joerg@pkgsrc.org> | 2013-02-26 11:27:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-02-26 11:27:28 +0000 |
| commit | b99c6588b5b64bafa8ef00a45c18fea38dd7b524 (patch) | |
| tree | 2cb69b319c437237ec711738b2a2fa47a6f1246c /multimedia | |
| parent | b628a06c8a20516588bbfbafd1e4728f17db7af7 (diff) | |
| download | pkgsrc-b99c6588b5b64bafa8ef00a45c18fea38dd7b524.tar.gz | |
Don't bail out on questionable constant compares. Add explicit () around ?:.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libdvbpsi/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/libdvbpsi/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c | 13 |
3 files changed, 21 insertions, 2 deletions
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile index 7c70431d883..9f2a05caffc 100644 --- a/multimedia/libdvbpsi/Makefile +++ b/multimedia/libdvbpsi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/01/21 14:41:27 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2013/02/26 11:27:28 joerg Exp $ DISTNAME= libdvbpsi-1.0.0 CATEGORIES= multimedia @@ -17,4 +17,9 @@ PKGCONFIG_OVERRIDE= libdvbpsi.pc.in LIBS.SunOS+= -lsocket -lnsl +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +_WRAP_EXTRA_ARGS.CC+= -Wno-error=tautological-constant-out-of-range-compare +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libdvbpsi/distinfo b/multimedia/libdvbpsi/distinfo index aa4e4bd7893..642e760b919 100644 --- a/multimedia/libdvbpsi/distinfo +++ b/multimedia/libdvbpsi/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.7 2013/01/21 14:41:27 wiz Exp $ +$NetBSD: distinfo,v 1.8 2013/02/26 11:27:28 joerg Exp $ SHA1 (libdvbpsi-1.0.0.tar.bz2) = aa07d8baacc1919b3f3840a8244d690bbe550bce RMD160 (libdvbpsi-1.0.0.tar.bz2) = 05a2dd2cda5bfc8a5eaae9cb8f54af43e4ea58b3 Size (libdvbpsi-1.0.0.tar.bz2) = 433327 bytes SHA1 (patch-Makefile.in) = 5e19ecbfce76b56ddbc6fde6e464e4bb47912155 SHA1 (patch-aa) = dc8c3b5a99e5e6dd73f0d0461e0924bcbdfbeb7d +SHA1 (patch-src_descriptors_dr__7c.c) = b052b5297806592676a655f5ec1690da762c6263 diff --git a/multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c b/multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c new file mode 100644 index 00000000000..e0ebc8b3f48 --- /dev/null +++ b/multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_descriptors_dr__7c.c,v 1.1 2013/02/26 11:27:28 joerg Exp $ + +--- src/descriptors/dr_7c.c.orig 2013-02-25 14:29:08.000000000 +0000 ++++ src/descriptors/dr_7c.c +@@ -245,7 +245,7 @@ dvbpsi_aac_dr_t *dvbpsi_DecodeAACDr(dvbp + /* Keep additional info bytes field */ + if (p_descriptor->i_length > 1) + { +- uint8_t i_info_length = p_descriptor->i_length - p_decoded->b_type ? 3 : 2; ++ uint8_t i_info_length = p_descriptor->i_length - (p_decoded->b_type ? 3 : 2); + dvbpsi_aac_dr_t *p_tmp = realloc(p_decoded, sizeof(dvbpsi_aac_dr_t) + i_info_length); + if (!p_tmp) + { |