diff options
| author | maya <maya> | 2017-04-26 14:38:30 +0000 |
|---|---|---|
| committer | maya <maya> | 2017-04-26 14:38:30 +0000 |
| commit | 68a377b24181cf154951a4830c6ff5d88d71dab2 (patch) | |
| tree | ae1d3d3736f964dc69ba6ebd4e385d665e97f20d /multimedia | |
| parent | 0e17b94a1ed6ed8d8ff3fa95d9eeea6277b92565 (diff) | |
| download | pkgsrc-68a377b24181cf154951a4830c6ff5d88d71dab2.tar.gz | |
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.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libmp4v2/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/libmp4v2/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp | 15 |
3 files changed, 21 insertions, 5 deletions
diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile index 41dd02ebc4c..a179913c656 100644 --- a/multimedia/libmp4v2/Makefile +++ b/multimedia/libmp4v2/Makefile @@ -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 diff --git a/multimedia/libmp4v2/distinfo b/multimedia/libmp4v2/distinfo index 12de536d87b..edc14414bcc 100644 --- a/multimedia/libmp4v2/distinfo +++ b/multimedia/libmp4v2/distinfo @@ -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) = 4025cd8e0407c851fa7f8d95e4188bd09dc66711 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 diff --git a/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp b/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp new file mode 100644 index 00000000000..80ebef1b556 --- /dev/null +++ b/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_type__basic.cpp @@ -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)); + } |