diff options
author | joerg <joerg> | 2012-04-18 00:09:43 +0000 |
---|---|---|
committer | joerg <joerg> | 2012-04-18 00:09:43 +0000 |
commit | c2c04d774604b9aac182e05262571a09b21d8d12 (patch) | |
tree | 5d3615fbfafc22b3402516431cc322493ddaa43a /multimedia | |
parent | 8a9215a1872de64520f4641c26b915b26540afe6 (diff) | |
download | pkgsrc-c2c04d774604b9aac182e05262571a09b21d8d12.tar.gz |
Fix build on newer NetBSD. Fix buffer overflow in faad logic. Bump
revision.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/mpeg4ip/Makefile | 14 | ||||
-rw-r--r-- | multimedia/mpeg4ip/distinfo | 7 | ||||
-rw-r--r-- | multimedia/mpeg4ip/patches/patch-ab | 25 | ||||
-rw-r--r-- | multimedia/mpeg4ip/patches/patch-ae | 18 | ||||
-rw-r--r-- | multimedia/mpeg4ip/patches/patch-configure.in | 34 | ||||
-rw-r--r-- | multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h | 24 |
6 files changed, 88 insertions, 34 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 7ea6acfde77..86a8d8e056d 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2010/09/27 09:09:28 obache Exp $ +# $NetBSD: Makefile,v 1.18 2012/04/18 00:09:43 joerg Exp $ DISTNAME= mpeg4ip-1.5.0.1 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/} @@ -15,7 +16,7 @@ CONFLICTS+= faad2<2.0nb6 USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config autoconf GNU_CONFIGURE= yes CONFIGURE_SCRIPT= bootstrap OVERRIDE_DIRDEPTH= 3 # */*/*/libtool @@ -40,5 +41,14 @@ CONFIGURE_ARGS+= --disable-mmx . endif .endif +.include "../../mk/compiler.mk" + +.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang) +CFLAGS+= -fno-strict-aliasing +.endif + +pre-configure: + cd ${WRKSRC} && autoconf + .include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo index 6da47a2a393..02a3824507d 100644 --- a/multimedia/mpeg4ip/distinfo +++ b/multimedia/mpeg4ip/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.16 2011/12/22 14:44:42 dholland Exp $ +$NetBSD: distinfo,v 1.17 2012/04/18 00:09:43 joerg Exp $ SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3 RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a Size (mpeg4ip-1.5.0.1.tar.gz) = 4826180 bytes SHA1 (patch-aa) = 5f494117fae307f4adc503fd880a762d82d771ff -SHA1 (patch-ab) = aaa7b2a542a91986f2b60fa348af928476d44f18 SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 -SHA1 (patch-ae) = 0418c4fa0fd966b3d5303d4f95a300d94fc48111 +SHA1 (patch-ae) = 779bf42b9df29a7deddca6db9b1b691e498fffe1 SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85 SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d @@ -39,3 +38,5 @@ SHA1 (patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp) = c1345fadb405a2 SHA1 (patch-common_video_iso-mpeg4_src_type__yuvac_cpp) = 5ff0d2a25b42832bd11a42043b264e36dff8f5ac SHA1 (patch-common_video_iso-mpeg4_src_type__yuvai_cpp) = ee62e50f089d9a198ac40045960b1e8c195641d9 SHA1 (patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp) = 8e9b3ce134ebad001d942152d2e4b88a88bb4144 +SHA1 (patch-configure.in) = 8fefa29c71a90ea4fb93ef782065b12644157e1d +SHA1 (patch-player_lib_audio_faad_all.h) = 8a5f4840b86c6ac90d65664476c94622ffa87b21 diff --git a/multimedia/mpeg4ip/patches/patch-ab b/multimedia/mpeg4ip/patches/patch-ab deleted file mode 100644 index 622c9442863..00000000000 --- a/multimedia/mpeg4ip/patches/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2010/09/27 09:09:29 obache Exp $ - -* XXX -* replace obsoleted `-r' option for nasm with `-v'. - ---- configure.orig 2006-06-08 19:17:51.000000000 +0000 -+++ configure -@@ -1570,7 +1570,7 @@ echo "$as_me: error: Please run bootstra - { (exit 1); exit 1; }; } - exit -1 - fi --rm -f config.h >&/dev/null -+rm -f config.h >/dev/null - touch config.h - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -@@ -28881,7 +28881,7 @@ fi - if test x$USENASM = xtrue; then - echo "$as_me:$LINENO: checking nasm version..." >&5 - echo $ECHO_N "checking nasm version...... $ECHO_C" >&6 -- BILLSNASM_arg=`nasm -r | tr '.' ' '` -+ BILLSNASM_arg=`nasm -v | tr '.' ' '` - BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` - if test x$BILLSNASM_ret = x"yes"; then - USENASM=true diff --git a/multimedia/mpeg4ip/patches/patch-ae b/multimedia/mpeg4ip/patches/patch-ae index 82c504165c9..73cdff6ac8d 100644 --- a/multimedia/mpeg4ip/patches/patch-ae +++ b/multimedia/mpeg4ip/patches/patch-ae @@ -1,8 +1,18 @@ -$NetBSD: patch-ae,v 1.1 2006/06/08 09:17:02 hira Exp $ +$NetBSD: patch-ae,v 1.2 2012/04/18 00:09:44 joerg Exp $ ---- include/mpeg4ip.h.orig 2006-06-08 12:22:14.000000000 +0900 -+++ include/mpeg4ip.h 2006-06-08 12:23:04.000000000 +0900 -@@ -233,7 +233,8 @@ +--- include/mpeg4ip.h.orig 2005-03-11 23:13:29.000000000 +0000 ++++ include/mpeg4ip.h +@@ -156,6 +156,9 @@ char *strcasestr(const char *haystack, c + #ifdef HAVE_FPOS_T___POS + #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos).__pos) + #define VAR_TO_FPOS(fpos, var) (fpos).__pos = (var) ++#elif defined(HAVE_FPOS_T__POS) ++#define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos)._pos) ++#define VAR_TO_FPOS(fpos, var) (fpos)._pos = (var) + #else + #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)(fpos) + #define VAR_TO_FPOS(fpos, var) (fpos) = (var) +@@ -233,7 +236,8 @@ char *strsep(char **strp, const char *de #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;} diff --git a/multimedia/mpeg4ip/patches/patch-configure.in b/multimedia/mpeg4ip/patches/patch-configure.in new file mode 100644 index 00000000000..7cba7ff15d9 --- /dev/null +++ b/multimedia/mpeg4ip/patches/patch-configure.in @@ -0,0 +1,34 @@ +$NetBSD: patch-configure.in,v 1.1 2012/04/18 00:09:44 joerg Exp $ + +- Fix shell redirection to work with any Bourne shell +- Check for _pos in fpos_t as used by NetBSD +- nasm -r has been removed, use modern -v. + +--- configure.in.orig 2012-04-17 21:03:44.000000000 +0000 ++++ configure.in +@@ -7,7 +7,7 @@ if test x$did_bootstrap = xno; then + AC_MSG_ERROR([Please run bootstrap first]) + exit -1 + fi +-rm -f config.h >&/dev/null ++rm -f config.h 2> /dev/null + touch config.h + dnl Detect the canonical host and target build environment + AC_CANONICAL_HOST +@@ -278,6 +278,7 @@ AC_CHECK_TYPES([struct ip_mreq_source], + [#include <netinet/in.h>]) + + AC_CHECK_MEMBERS(fpos_t.__pos,,, [#include <stdio.h>]) ++AC_CHECK_MEMBERS(fpos_t._pos,,, [#include <stdio.h>]) + + dnl borrowed from ac-archive.sourceforge.net + dnl @author Guido Draheim <guidod@gmx.de> +@@ -682,7 +683,7 @@ if test x$enable_mmx = xyes; then + + if test x$USENASM = xtrue; then + AC_MSG_CHECKING(nasm version...) +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`nasm -v | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true diff --git a/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h b/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h new file mode 100644 index 00000000000..e15f89d927a --- /dev/null +++ b/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h @@ -0,0 +1,24 @@ +$NetBSD: patch-player_lib_audio_faad_all.h,v 1.1 2012/04/18 00:09:44 joerg Exp $ + +config.c needs two scratch channels. + +--- player/lib/audio/faad/all.h.orig 2012-04-17 21:37:48.000000000 +0000 ++++ player/lib/audio/faad/all.h +@@ -59,7 +59,7 @@ enum + BChans = 15, /* back channels: left surround, right surround */ + BCenter = 1, /* 1 if decoder has back center channel */ + LChans = 1, /* LFE channels */ +- XChans = 1, /* scratch space for parsing unused channels */ ++ XChans = 2, /* scratch space for parsing unused channels */ + #else + FChans = 3, /* front channels: left, center, right */ + FCenter = 0, /* 1 if decoder has front center channel */ +@@ -67,7 +67,7 @@ enum + BChans = 1, /* back channels: left surround, right surround */ + BCenter = 0, /* 1 if decoder has back center channel */ + LChans = 1, /* LFE channels */ +- XChans = 1, /* scratch space for parsing unused channels */ ++ XChans = 2, /* scratch space for parsing unused channels */ + #endif + + Chans = FChans + SChans + BChans + LChans + XChans |