CVS commit: pkgsrc/multimedia/libmp4v2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Apr 26 14:38:31 UTC 2017

Modified Files:
        pkgsrc/multimedia/libmp4v2: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libmp4v2/patches:
            patch-common_video_iso-mpeg4_src_type__basic.cpp

Log Message:
libmp4v2: No longer require a new GCC version

Use -Wno-return-type to silence compiler errors on clang 4.0.

patch function prototype to fix error in prototype with GCC 4.5.3:
error: prototype for 'Void CMotionVector::setToZero(<type error>)'

Successfully tested clang 4.0, GCC 5.4, GCC 4.5.3.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/libmp4v2/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/libmp4v2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/libmp4v2/Makefile
diff -u pkgsrc/multimedia/libmp4v2/Makefile:1.15 pkgsrc/multimedia/libmp4v2/Makefile:1.16
--- pkgsrc/multimedia/libmp4v2/Makefile:1.15    Wed Apr 26 14:04:08 2017
+++ pkgsrc/multimedia/libmp4v2/Makefile Wed Apr 26 14:38:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/04/26 14:04:08 maya Exp $
+# $NetBSD: Makefile,v 1.16 2017/04/26 14:38:30 maya Exp $
 
 DISTNAME=              mpeg4ip-1.6.1
 PKGNAME=               libmp4v2-1.6.1
@@ -20,8 +20,6 @@ CONFIGURE_ARGS+=      USENASM=no
 # the "bootstrap" script checks too much, and isn't useful anyway
 #CONFIGURE_SCRIPT=     bootstrap
 
-GCC_REQD+=             5.4
-
 # libmp4v2 has config.{guess,sub} also in common/video/iso-mpeg4
 # (unused by libmp4v2 build)
 OVERRIDE_DIRDEPTH=     3
@@ -29,7 +27,9 @@ OVERRIDE_DIRDEPTH=    3
 # to install mp4* tools
 BUILD_DIRS=            . lib/mp4v2/util
 
-BUILDLINK_TRANSFORM+=   rm:-Werror
+# It's an unmaintained old library
+BUILDLINK_TRANSFORM+=  rm:-Werror
+CFLAGS+=               -Wno-return-type
 
 pre-configure:
        ${TOUCH} ${WRKSRC}/bootstrapped

Index: pkgsrc/multimedia/libmp4v2/distinfo
diff -u pkgsrc/multimedia/libmp4v2/distinfo:1.13 pkgsrc/multimedia/libmp4v2/distinfo:1.14
--- pkgsrc/multimedia/libmp4v2/distinfo:1.13    Mon Apr 17 08:40:56 2017
+++ pkgsrc/multimedia/libmp4v2/distinfo Wed Apr 26 14:38:30 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2017/04/17 08:40:56 wiz Exp $
+$NetBSD: distinfo,v 1.14 2017/04/26 14:38:30 maya Exp $
 
 SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38
 RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7
@@ -25,4 +25,5 @@ SHA1 (patch-as) = 4025cd8e0407c851fa7f8d
 SHA1 (patch-at) = ce3dfb958e5a5c46e01b8514b412277be01e40d4
 SHA1 (patch-au) = f3eee9942c4f5ad716634edfa9535c8c9fda73ba
 SHA1 (patch-av) = 3b25351b26124c9a546c09d55900fe8df3224f6d
+SHA1 (patch-common_video_iso-mpeg4_src_type__basic.cpp) = 0a83438ab4666a0284879b7fe994a58ba945de47
 SHA1 (patch-doc_mp4v2_MP4.3) = e799c63f63cdb1d360077b6f1410a081c1a49c5a

Added files:

Index: pkgsrc/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp
diff -u /dev/null pkgsrc/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp:1.1
--- /dev/null   Wed Apr 26 14:38:31 2017
+++ pkgsrc/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp Wed Apr 26 14:38:31 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_video_iso-mpeg4_src_type__basic.cpp,v 1.1 2017/04/26 14:38:31 maya Exp $
+
+Make GCC 4.5 happier about the prototype
+
+--- common/video/iso-mpeg4/src/type_basic.cpp.orig     2006-08-07 18:26:58.000000000 +0000
++++ common/video/iso-mpeg4/src/type_basic.cpp
+@@ -317,7 +317,7 @@ Void CMotionVector::computeMV ()
+       iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+ 
+-Void CMotionVector::setToZero (Void)
++Void CMotionVector::setToZero ()
+ {
+       memset (this, 0, sizeof (*this));
+ }