Tue Oct 23 10:45:01 2018 UTC ()
libmp4v2: Fix build on SunOS.


(jperkin)
diff -r1.20 -r1.21 pkgsrc/multimedia/libmp4v2/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/libmp4v2/patches/patch-common_video_iso-mpeg4_src_vtc__ztq__QMInit.cpp
cvs diff -r1.20 -r1.21 pkgsrc/multimedia/libmp4v2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libmp4v2/Attic/distinfo 2018/02/05 18:37:21 1.20
+++ pkgsrc/multimedia/libmp4v2/Attic/distinfo 2018/10/23 10:45:01 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.20 2018/02/05 18:37:21 jperkin Exp $ 1$NetBSD: distinfo,v 1.21 2018/10/23 10:45:01 jperkin Exp $
2 2
3SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38 3SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38
4RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7 4RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7
5SHA512 (mpeg4ip-1.6.1.tar.gz) = e61e03dbef21ab3c5fe0cd865415d2dc2a5b1508837a245d511527f1ebae2e7d0e8e98f77cdc04f86f2f52e831b88954ad5d917c1f9e6ab2526564e2ab85ad0c 5SHA512 (mpeg4ip-1.6.1.tar.gz) = e61e03dbef21ab3c5fe0cd865415d2dc2a5b1508837a245d511527f1ebae2e7d0e8e98f77cdc04f86f2f52e831b88954ad5d917c1f9e6ab2526564e2ab85ad0c
6Size (mpeg4ip-1.6.1.tar.gz) = 6324289 bytes 6Size (mpeg4ip-1.6.1.tar.gz) = 6324289 bytes
7SHA1 (patch-aa) = d2bcba203cd373f02f9e7c6e45daf4c29c0b2c3a 7SHA1 (patch-aa) = d2bcba203cd373f02f9e7c6e45daf4c29c0b2c3a
8SHA1 (patch-ab) = ddf8650416757f161f156b0928062d39eae7fe3e 8SHA1 (patch-ab) = ddf8650416757f161f156b0928062d39eae7fe3e
9SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 9SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9
10SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 10SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56
11SHA1 (patch-ae) = ae22ab68419800bc3e90da8279645b3e50bc51f7 11SHA1 (patch-ae) = ae22ab68419800bc3e90da8279645b3e50bc51f7
12SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85 12SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85
13SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 13SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1
14SHA1 (patch-ah) = 9892b635bd38f4dcabe83d9b2228777df021fda8 14SHA1 (patch-ah) = 9892b635bd38f4dcabe83d9b2228777df021fda8
@@ -17,26 +17,27 @@ SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3 @@ -17,26 +17,27 @@ SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3
17SHA1 (patch-ak) = 36da5d4d2824cc8b3ac62e10924058dd651cb2a7 17SHA1 (patch-ak) = 36da5d4d2824cc8b3ac62e10924058dd651cb2a7
18SHA1 (patch-al) = 9ddfdeb35655c739c230d66f20e205b899af0b48 18SHA1 (patch-al) = 9ddfdeb35655c739c230d66f20e205b899af0b48
19SHA1 (patch-am) = be285a0678a36ea485398e25c22f659a1a781ac5 19SHA1 (patch-am) = be285a0678a36ea485398e25c22f659a1a781ac5
20SHA1 (patch-ao) = 6b1ff07f0c3af3804702c440644c119795e0c70e 20SHA1 (patch-ao) = 6b1ff07f0c3af3804702c440644c119795e0c70e
21SHA1 (patch-ap) = bbd3e292981b420b5372ce34515bf4e29ec101ab 21SHA1 (patch-ap) = bbd3e292981b420b5372ce34515bf4e29ec101ab
22SHA1 (patch-aq) = b68bf95f6500b490d3a7744a55e8b33c4b7eef3f 22SHA1 (patch-aq) = b68bf95f6500b490d3a7744a55e8b33c4b7eef3f
23SHA1 (patch-ar) = 82c8c885a4e2d0e4ae0e242d79045dedde191596 23SHA1 (patch-ar) = 82c8c885a4e2d0e4ae0e242d79045dedde191596
24SHA1 (patch-as) = 4025cd8e0407c851fa7f8d95e4188bd09dc66711 24SHA1 (patch-as) = 4025cd8e0407c851fa7f8d95e4188bd09dc66711
25SHA1 (patch-at) = ce3dfb958e5a5c46e01b8514b412277be01e40d4 25SHA1 (patch-at) = ce3dfb958e5a5c46e01b8514b412277be01e40d4
26SHA1 (patch-au) = f3eee9942c4f5ad716634edfa9535c8c9fda73ba 26SHA1 (patch-au) = f3eee9942c4f5ad716634edfa9535c8c9fda73ba
27SHA1 (patch-av) = 3b25351b26124c9a546c09d55900fe8df3224f6d 27SHA1 (patch-av) = 3b25351b26124c9a546c09d55900fe8df3224f6d
28SHA1 (patch-common_video_iso-mpeg4_include_basic.hpp) = 457aa492ef05abf0af8a17fea202ae18c28f1cc3 28SHA1 (patch-common_video_iso-mpeg4_include_basic.hpp) = 457aa492ef05abf0af8a17fea202ae18c28f1cc3
29SHA1 (patch-common_video_iso-mpeg4_src_type__basic.cpp) = 01f8b446af8cd7f012d2837bdbb13d13e4e6ac93 29SHA1 (patch-common_video_iso-mpeg4_src_type__basic.cpp) = 01f8b446af8cd7f012d2837bdbb13d13e4e6ac93
 30SHA1 (patch-common_video_iso-mpeg4_src_vtc__ztq__QMInit.cpp) = a25ac4c2f8a1335d9d4250d933150da5d1aa223a
30SHA1 (patch-doc_mp4v2_MP4.3) = e799c63f63cdb1d360077b6f1410a081c1a49c5a 31SHA1 (patch-doc_mp4v2_MP4.3) = e799c63f63cdb1d360077b6f1410a081c1a49c5a
31SHA1 (patch-lib_mp4_atom.c) = 31e691f5f8bf8e7cf40ac2c55d61be1e5265ac2e 32SHA1 (patch-lib_mp4_atom.c) = 31e691f5f8bf8e7cf40ac2c55d61be1e5265ac2e
32SHA1 (patch-lib_mp4_ctab.c) = 334ee9a4d85705cb5fb029fd6925113328066b88 33SHA1 (patch-lib_mp4_ctab.c) = 334ee9a4d85705cb5fb029fd6925113328066b88
33SHA1 (patch-lib_mp4_ctts.c) = 0d4ac3bfa577859488af3e271593cf2f166646bb 34SHA1 (patch-lib_mp4_ctts.c) = 0d4ac3bfa577859488af3e271593cf2f166646bb
34SHA1 (patch-lib_mp4_dimm.c) = 7f979d27d4c1b665746a716177afcd4dd81b28b4 35SHA1 (patch-lib_mp4_dimm.c) = 7f979d27d4c1b665746a716177afcd4dd81b28b4
35SHA1 (patch-lib_mp4_dinf.c) = b93b807df312400992432817ef4fdf3feab17f06 36SHA1 (patch-lib_mp4_dinf.c) = b93b807df312400992432817ef4fdf3feab17f06
36SHA1 (patch-lib_mp4_dmax.c) = e9590efb35150afb43087fc2615393bd03a38db5 37SHA1 (patch-lib_mp4_dmax.c) = e9590efb35150afb43087fc2615393bd03a38db5
37SHA1 (patch-lib_mp4_dmed.c) = 6beea57b94b5ff78e6f498caf5de509a40f9ca5c 38SHA1 (patch-lib_mp4_dmed.c) = 6beea57b94b5ff78e6f498caf5de509a40f9ca5c
38SHA1 (patch-lib_mp4_dref.c) = 6cb51d22e6e69d126cdcccf11a7723fd1fd41b80 39SHA1 (patch-lib_mp4_dref.c) = 6cb51d22e6e69d126cdcccf11a7723fd1fd41b80
39SHA1 (patch-lib_mp4_drep.c) = 965f45241ff79d14e290b9edb686484dabc4ad8c 40SHA1 (patch-lib_mp4_drep.c) = 965f45241ff79d14e290b9edb686484dabc4ad8c
40SHA1 (patch-lib_mp4_edts.c) = 3ad554b6f85e9ddf82cb906a53ac90c74936bfe4 41SHA1 (patch-lib_mp4_edts.c) = 3ad554b6f85e9ddf82cb906a53ac90c74936bfe4
41SHA1 (patch-lib_mp4_elst.c) = d31b88b0c3779fccdd5627e7b977b65c062c4bb4 42SHA1 (patch-lib_mp4_elst.c) = d31b88b0c3779fccdd5627e7b977b65c062c4bb4
42SHA1 (patch-lib_mp4_esds.c) = 41b3083c64fc5c47d541406e179158044ca95c42 43SHA1 (patch-lib_mp4_esds.c) = 41b3083c64fc5c47d541406e179158044ca95c42
File Added: pkgsrc/multimedia/libmp4v2/patches/Attic/patch-common_video_iso-mpeg4_src_vtc__ztq__QMInit.cpp
$NetBSD: patch-common_video_iso-mpeg4_src_vtc__ztq__QMInit.cpp,v 1.1 2018/10/23 10:45:01 jperkin Exp $

Avoid ERR redefinition.

--- common/video/iso-mpeg4/src/vtc_ztq_QMInit.cpp.orig	2005-05-09 21:29:49.000000000 +0000
+++ common/video/iso-mpeg4/src/vtc_ztq_QMInit.cpp
@@ -64,6 +64,9 @@
 #include "QMUtils.hpp"
 #include "QM.hpp"
 
+#ifdef __sun
+#undef ERR
+#endif
 
 Int CVTCCommon::ztqQListInit()
 {