Wed Apr 18 00:09:44 2012 UTC ()
Fix build on newer NetBSD. Fix buffer overflow in faad logic. Bump
revision.


(joerg)
diff -r1.17 -r1.18 pkgsrc/multimedia/mpeg4ip/Makefile
diff -r1.16 -r1.17 pkgsrc/multimedia/mpeg4ip/distinfo
diff -r1.2 -r0 pkgsrc/multimedia/mpeg4ip/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/multimedia/mpeg4ip/patches/patch-ae
diff -r0 -r1.1 pkgsrc/multimedia/mpeg4ip/patches/patch-configure.in
diff -r0 -r1.1 pkgsrc/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h
cvs diff -r1.17 -r1.18 pkgsrc/multimedia/mpeg4ip/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mpeg4ip/Attic/Makefile 2010/09/27 09:09:28 1.17
+++ pkgsrc/multimedia/mpeg4ip/Attic/Makefile 2012/04/18 00:09:43 1.18
@@ -1,44 +1,54 @@ @@ -1,44 +1,54 @@
1# $NetBSD: Makefile,v 1.17 2010/09/27 09:09:28 obache Exp $ 1# $NetBSD: Makefile,v 1.18 2012/04/18 00:09:43 joerg Exp $
2 2
3DISTNAME= mpeg4ip-1.5.0.1 3DISTNAME= mpeg4ip-1.5.0.1
 4PKGREVISION= 1
4CATEGORIES= multimedia 5CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://mpeg4ip.sourceforge.net/ 9HOMEPAGE= http://mpeg4ip.sourceforge.net/
9COMMENT= Tools for streaming video and audio 10COMMENT= Tools for streaming video and audio
10 11
11PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
12 13
13CONFLICTS+= faad2<2.0nb6 14CONFLICTS+= faad2<2.0nb6
14 15
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config autoconf
19GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
20CONFIGURE_SCRIPT= bootstrap 21CONFIGURE_SCRIPT= bootstrap
21OVERRIDE_DIRDEPTH= 3 # */*/*/libtool 22OVERRIDE_DIRDEPTH= 3 # */*/*/libtool
22 23
23.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
24 25
25PLIST_VARS+= mpeg4ipSDL 26PLIST_VARS+= mpeg4ipSDL
26.if ${OPSYS} != "Darwin" 27.if ${OPSYS} != "Darwin"
27PLIST.mpeg4ipSDL= yes 28PLIST.mpeg4ipSDL= yes
28.endif 29.endif
29 30
30.if ${MACHINE_ARCH} == "i386" 31.if ${MACHINE_ARCH} == "i386"
31PKG_OPTIONS_VAR= PKG_OPTIONS.mpeg4ip 32PKG_OPTIONS_VAR= PKG_OPTIONS.mpeg4ip
32PKG_SUPPORTED_OPTIONS= mmx 33PKG_SUPPORTED_OPTIONS= mmx
33.include "../../mk/bsd.options.mk" 34.include "../../mk/bsd.options.mk"
34 35
35. if !empty(PKG_OPTIONS:Mmmx) 36. if !empty(PKG_OPTIONS:Mmmx)
36CONFIGURE_ARGS+= --enable-mmx 37CONFIGURE_ARGS+= --enable-mmx
37BUILD_DEPENDS+= nasm>=0.97.19:../../devel/nasm 38BUILD_DEPENDS+= nasm>=0.97.19:../../devel/nasm
38. else 39. else
39CONFIGURE_ARGS+= --disable-mmx 40CONFIGURE_ARGS+= --disable-mmx
40. endif 41. endif
41.endif 42.endif
42 43
 44.include "../../mk/compiler.mk"
 45
 46.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
 47CFLAGS+= -fno-strict-aliasing
 48.endif
 49
 50pre-configure:
 51 cd ${WRKSRC} && autoconf
 52
43.include "../../devel/SDL/buildlink3.mk" 53.include "../../devel/SDL/buildlink3.mk"
44.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/multimedia/mpeg4ip/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mpeg4ip/Attic/distinfo 2011/12/22 14:44:42 1.16
+++ pkgsrc/multimedia/mpeg4ip/Attic/distinfo 2012/04/18 00:09:43 1.17
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1$NetBSD: distinfo,v 1.16 2011/12/22 14:44:42 dholland Exp $ 1$NetBSD: distinfo,v 1.17 2012/04/18 00:09:43 joerg Exp $
2 2
3SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3 3SHA1 (mpeg4ip-1.5.0.1.tar.gz) = 1271de695ed65284d9c39aa91bf26c5494603fd3
4RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a 4RMD160 (mpeg4ip-1.5.0.1.tar.gz) = fee5c21c17a470e6de349e07d233a1eb46b2064a
5Size (mpeg4ip-1.5.0.1.tar.gz) = 4826180 bytes 5Size (mpeg4ip-1.5.0.1.tar.gz) = 4826180 bytes
6SHA1 (patch-aa) = 5f494117fae307f4adc503fd880a762d82d771ff 6SHA1 (patch-aa) = 5f494117fae307f4adc503fd880a762d82d771ff
7SHA1 (patch-ab) = aaa7b2a542a91986f2b60fa348af928476d44f18 
8SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 7SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9
9SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 8SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56
10SHA1 (patch-ae) = 0418c4fa0fd966b3d5303d4f95a300d94fc48111 9SHA1 (patch-ae) = 779bf42b9df29a7deddca6db9b1b691e498fffe1
11SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85 10SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85
12SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 11SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1
13SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d 12SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d
14SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e 13SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e
15SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7 14SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7
16SHA1 (patch-ak) = 8a89f6eb4860b12479a062303c15a4f09416c964 15SHA1 (patch-ak) = 8a89f6eb4860b12479a062303c15a4f09416c964
17SHA1 (patch-al) = 5966b9c64a7d305b3e3b70717036ccebb5c3bdcd 16SHA1 (patch-al) = 5966b9c64a7d305b3e3b70717036ccebb5c3bdcd
18SHA1 (patch-am) = a0c9eb088b02d460925fb00e3f76b3fce186b187 17SHA1 (patch-am) = a0c9eb088b02d460925fb00e3f76b3fce186b187
19SHA1 (patch-common_video_iso-mpeg4_include_bitstrm_hpp) = 0706ccacbeefd9e416ad19e19a5db761166c3c18 18SHA1 (patch-common_video_iso-mpeg4_include_bitstrm_hpp) = 0706ccacbeefd9e416ad19e19a5db761166c3c18
20SHA1 (patch-common_video_iso-mpeg4_include_entropy_hpp) = b3fe3821186102a27ba70a6f7b2461909ecf7fb0 19SHA1 (patch-common_video_iso-mpeg4_include_entropy_hpp) = b3fe3821186102a27ba70a6f7b2461909ecf7fb0
21SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp) = cdc0eeeef9faf97aa8a9e29ed107b40dcf179efd 20SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp) = cdc0eeeef9faf97aa8a9e29ed107b40dcf179efd
22SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp) = 4452af67a3ac0352dcc78388b5f8cec7e17f1bbd 21SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp) = 4452af67a3ac0352dcc78388b5f8cec7e17f1bbd
23SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp) = c59fe6335a9e04539cedb1ef69844983065af39e 22SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp) = c59fe6335a9e04539cedb1ef69844983065af39e
@@ -29,13 +28,15 @@ SHA1 (patch-common_video_iso-mpeg4_src_s @@ -29,13 +28,15 @@ SHA1 (patch-common_video_iso-mpeg4_src_s
29SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp) = c4041cd35081a8419c0b81bf108b6cff93397d0b 28SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp) = c4041cd35081a8419c0b81bf108b6cff93397d0b
30SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp) = ce53fee8cb41f9bad6e1bccf514107a14336a585 29SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp) = ce53fee8cb41f9bad6e1bccf514107a14336a585
31SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp) = 2d7ba52bbe723ab30d8d243ed65727b77b757126 30SHA1 (patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp) = 2d7ba52bbe723ab30d8d243ed65727b77b757126
32SHA1 (patch-common_video_iso-mpeg4_src_sys__error_cpp) = e418ad95f222478e08d4e14a922a45063bac55c8 31SHA1 (patch-common_video_iso-mpeg4_src_sys__error_cpp) = e418ad95f222478e08d4e14a922a45063bac55c8
33SHA1 (patch-common_video_iso-mpeg4_src_sys__mode_cpp) = 9e51f0cb3c81fa1dbdc3fa5e4a7802eb8e1ae256 32SHA1 (patch-common_video_iso-mpeg4_src_sys__mode_cpp) = 9e51f0cb3c81fa1dbdc3fa5e4a7802eb8e1ae256
34SHA1 (patch-common_video_iso-mpeg4_src_sys__rrv_cpp) = 3a4a6b4b7caa63ecde5030376a86db28e04e1701 33SHA1 (patch-common_video_iso-mpeg4_src_sys__rrv_cpp) = 3a4a6b4b7caa63ecde5030376a86db28e04e1701
35SHA1 (patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp) = 3a400efaf50055cf8544a94d7b4fa05cb2d7ff58 34SHA1 (patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp) = 3a400efaf50055cf8544a94d7b4fa05cb2d7ff58
36SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp) = 27ccb1d800b35c6f641a794389e9a9c8f22500f1 35SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp) = 27ccb1d800b35c6f641a794389e9a9c8f22500f1
37SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp) = 2842a4c5c29be1d809c295d2484100706aeb1d9c 36SHA1 (patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp) = 2842a4c5c29be1d809c295d2484100706aeb1d9c
38SHA1 (patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp) = c1345fadb405a203542bb72df4bd0b47ecdb6ddd 37SHA1 (patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp) = c1345fadb405a203542bb72df4bd0b47ecdb6ddd
39SHA1 (patch-common_video_iso-mpeg4_src_type__yuvac_cpp) = 5ff0d2a25b42832bd11a42043b264e36dff8f5ac 38SHA1 (patch-common_video_iso-mpeg4_src_type__yuvac_cpp) = 5ff0d2a25b42832bd11a42043b264e36dff8f5ac
40SHA1 (patch-common_video_iso-mpeg4_src_type__yuvai_cpp) = ee62e50f089d9a198ac40045960b1e8c195641d9 39SHA1 (patch-common_video_iso-mpeg4_src_type__yuvai_cpp) = ee62e50f089d9a198ac40045960b1e8c195641d9
41SHA1 (patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp) = 8e9b3ce134ebad001d942152d2e4b88a88bb4144 40SHA1 (patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp) = 8e9b3ce134ebad001d942152d2e4b88a88bb4144
 41SHA1 (patch-configure.in) = 8fefa29c71a90ea4fb93ef782065b12644157e1d
 42SHA1 (patch-player_lib_audio_faad_all.h) = 8a5f4840b86c6ac90d65664476c94622ffa87b21
File Deleted: pkgsrc/multimedia/mpeg4ip/patches/Attic/patch-ab
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/mpeg4ip/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/multimedia/mpeg4ip/patches/Attic/patch-ae 2006/06/08 09:17:02 1.1
+++ pkgsrc/multimedia/mpeg4ip/patches/Attic/patch-ae 2012/04/18 00:09:44 1.2
@@ -1,14 +1,24 @@ @@ -1,14 +1,24 @@
1$NetBSD: patch-ae,v 1.1 2006/06/08 09:17:02 hira Exp $ 1$NetBSD: patch-ae,v 1.2 2012/04/18 00:09:44 joerg Exp $
2 2
3--- include/mpeg4ip.h.orig 2006-06-08 12:22:14.000000000 +0900 3--- include/mpeg4ip.h.orig 2005-03-11 23:13:29.000000000 +0000
4+++ include/mpeg4ip.h 2006-06-08 12:23:04.000000000 +0900 4+++ include/mpeg4ip.h
5@@ -233,7 +233,8 @@ 5@@ -156,6 +156,9 @@ char *strcasestr(const char *haystack, c
 6 #ifdef HAVE_FPOS_T___POS
 7 #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos).__pos)
 8 #define VAR_TO_FPOS(fpos, var) (fpos).__pos = (var)
 9+#elif defined(HAVE_FPOS_T__POS)
 10+#define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos)._pos)
 11+#define VAR_TO_FPOS(fpos, var) (fpos)._pos = (var)
 12 #else
 13 #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)(fpos)
 14 #define VAR_TO_FPOS(fpos, var) (fpos) = (var)
 15@@ -233,7 +236,8 @@ char *strsep(char **strp, const char *de
6  16
7 #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;} 17 #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;}
8  18
9-#ifndef HAVE_GTK 19-#ifndef HAVE_GTK
10+#ifndef __G_LIB_H__ 20+#ifndef __G_LIB_H__
11+/* #ifndef HAVE_GTK */ 21+/* #ifndef HAVE_GTK */
12 typedef char gchar; 22 typedef char gchar;
13 typedef unsigned char guchar; 23 typedef unsigned char guchar;
14  24
File Added: pkgsrc/multimedia/mpeg4ip/patches/Attic/patch-configure.in
$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
File Added: pkgsrc/multimedia/mpeg4ip/patches/Attic/patch-player_lib_audio_faad_all.h
$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