Attachment #175027 for bug #212785




# $FreeBSD$

PORTNAME=	mp4v2
PORTVERSION=	3.0.1.1
PORTREVISION=	2
CATEGORIES=	multimedia
DISTNAME=	${PORTNAME}-Release-MP4v2-${DISTVERSION}${EXTRACT_SUFIX}

MAINTAINER=	multimedia@FreeBSD.org
COMMENT=	Library and tools to read, create, and modify mp4 files

LICENSE=	MPL

CONFLICTS=	mpeg4ip-libmp4v2-[0-9.]*
USES=		compiler gmake libtool
MAKEFILE=	GNUmakefile
GNU_CONFIGURE=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	TechSmith
GH_PROJECT=	mp4v2
GH_TAGNAME=	6fda22f
USE_LDCONFIG=	yes

CONFIGURE_ENV=	"FOUND_HELP2MAN=no"

INSTALL_TARGET=	install-strip

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mp4v2-1.9.1.tar.bz2) = 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4	1	SHA256 (mp4v2-Release-MP4v2-3.0.1.1_GH0.tar.gz) = 619c61338ff999169258265e82f528fcf73fcbeb10cfaab665a742efd8c070c1
2	SIZE (mp4v2-1.9.1.tar.bz2) = 432943	2	SIZE (mp4v2-Release-MP4v2-3.0.1.1_GH0.tar.gz) = 1924201

Lines 1-11 Link Here

(-)files/patch-include__mp4v2__itmf_tags.h (-11 lines)
1	--- ./include/mp4v2/itmf_tags.h.orig 2010-07-14 16:35:27.000000000 +0100
2	+++ ./include/mp4v2/itmf_tags.h 2010-07-14 16:35:35.000000000 +0100
3	@@ -122,7 +122,7 @@
4	* @return structure with all tags missing.
5	*/
6	MP4V2_EXPORT
7	-const MP4Tags* MP4TagsAlloc();
8	+const MP4Tags* MP4TagsAlloc(void);
9
10	/** Fetch data from mp4 file and populate structure.
11	*




--- ./src/bmff/typebmff.cpp.orig	2009-07-14 03:07:10.000000000 +0400
+++ ./src/bmff/typebmff.cpp	2012-01-15 22:14:12.057757646 +0400
@@ -23,19 +23,12 @@
 
 #include "impl.h"
 
-// VStudio idiocy prevents defining template instanced static data
-// in a namespace. Workaround it by defining in global scope.
-// Other platforms will continue to put things in the proper namespace.
-#if defined( _MSC_VER )
-using namespace mp4v2::impl::bmff;
-#else
-namespace mp4v2 { namespace impl { namespace bmff {
-#endif
+namespace mp4v2 { namespace impl {
 
 ///////////////////////////////////////////////////////////////////////////////
 
 template <>
-const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
+const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
     { mp4v2::impl::bmff::ILC_AAR,  "aar",  "Afar" },
     { mp4v2::impl::bmff::ILC_ABK,  "abk",  "Abkhazian" },
     { mp4v2::impl::bmff::ILC_ACE,  "ace",  "Achinese" },
@@ -526,9 +519,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined( _MSC_VER )
-namespace mp4v2 { namespace impl { namespace bmff {
-#endif
+namespace bmff {
 
 ///////////////////////////////////////////////////////////////////////////////
 




--- ./src/itmf/type.cpp.orig	2009-07-14 03:07:08.000000000 +0400
+++ ./src/itmf/type.cpp	2012-01-15 22:14:12.054748862 +0400
@@ -24,19 +24,12 @@
 
 #include "impl.h"
 
-// VStudio idiocy prevents defining template instanced static data
-// in a namespace. Workaround it by defining in global scope.
-// Other platforms will continue to put things in the proper namespace.
-#if defined( _MSC_VER )
-using namespace mp4v2::impl::itmf;
-#else
-namespace mp4v2 { namespace impl { namespace itmf {
-#endif
+namespace mp4v2 { namespace impl {
 
 ///////////////////////////////////////////////////////////////////////////////
 
 template <>
-const EnumBasicType::Entry EnumBasicType::data[] = {
+const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
     { mp4v2::impl::itmf::BT_IMPLICIT,  "implicit",  "implicit" },
     { mp4v2::impl::itmf::BT_UTF8,      "utf8",      "UTF-8" },
     { mp4v2::impl::itmf::BT_UTF16,     "utf16",     "UTF-16" },
@@ -64,7 +57,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 template <>
-const EnumGenreType::Entry EnumGenreType::data[] = {
+const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
     { mp4v2::impl::itmf::GENRE_BLUES,             "blues",             "Blues" },
     { mp4v2::impl::itmf::GENRE_CLASSIC_ROCK,      "classicrock",       "Classic Rock" },
     { mp4v2::impl::itmf::GENRE_COUNTRY,           "country",           "Country" },
@@ -200,7 +193,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 template <>
-const EnumStikType::Entry EnumStikType::data[] = {
+const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
     { mp4v2::impl::itmf::STIK_OLD_MOVIE,    "oldmovie",    "Movie" },
     { mp4v2::impl::itmf::STIK_NORMAL,       "normal",      "Normal" },
     { mp4v2::impl::itmf::STIK_AUDIOBOOK,    "audiobook",   "Audio Book" },
@@ -216,7 +209,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 template <>
-const EnumAccountType::Entry EnumAccountType::data[] = {
+const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
     { mp4v2::impl::itmf::AT_ITUNES,  "itunes",   "iTunes" },
     { mp4v2::impl::itmf::AT_AOL,     "aol",      "AOL" },
 
@@ -226,7 +219,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 template <>
-const EnumCountryCode::Entry EnumCountryCode::data[] = {
+const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
     { mp4v2::impl::itmf::CC_USA,  "usa",   "United States" },
     { mp4v2::impl::itmf::CC_USA,  "fra",   "France" },
     { mp4v2::impl::itmf::CC_DEU,  "ger",   "Germany" },
@@ -256,7 +249,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 template <>
-const EnumContentRating::Entry EnumContentRating::data[] = {
+const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
     { mp4v2::impl::itmf::CR_NONE,      "none",       "None" },
     { mp4v2::impl::itmf::CR_CLEAN,     "clean",      "Clean" },
     { mp4v2::impl::itmf::CR_EXPLICIT,  "explicit",   "Explicit" },
@@ -266,9 +259,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined( _MSC_VER )
-namespace mp4v2 { namespace impl { namespace itmf {
-#endif
+namespace itmf {
 
 ///////////////////////////////////////////////////////////////////////////////
 

Lines 15-21 Link Here

(-)pkg-plist (-3 / +2 lines)
15	include/mp4v2/isma.h	15	include/mp4v2/isma.h
16	include/mp4v2/itmf_generic.h	16	include/mp4v2/itmf_generic.h
17	include/mp4v2/itmf_tags.h	17	include/mp4v2/itmf_tags.h
18	include/mp4v2/meta.h
19	include/mp4v2/mp4v2.h	18	include/mp4v2/mp4v2.h
20	include/mp4v2/platform.h	19	include/mp4v2/platform.h
21	include/mp4v2/sample.h	20	include/mp4v2/sample.h
Lines 24-31 Link Here
24	include/mp4v2/track_prop.h	23	include/mp4v2/track_prop.h
25	lib/libmp4v2.a	24	lib/libmp4v2.a
26	lib/libmp4v2.so	25	lib/libmp4v2.so
27	lib/libmp4v2.so.1	26	lib/libmp4v2.so.3
28	lib/libmp4v2.so.1.9.1	27	lib/libmp4v2.so.3.0.1
29	man/man1/mp4art.1.gz	28	man/man1/mp4art.1.gz
30	man/man1/mp4file.1.gz	29	man/man1/mp4file.1.gz
31	man/man1/mp4subtitle.1.gz	30	man/man1/mp4subtitle.1.gz

Return to bug 212785

Lines 2-11 Link Here

(-)Makefile (-4 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mp4v2	4	PORTNAME= mp4v2
5	PORTVERSION= 1.9.1	5	PORTVERSION= 3.0.1.1
6	PORTREVISION= 2
7	CATEGORIES= multimedia	6	CATEGORIES= multimedia
8	MASTER_SITES= LOCAL/riggs/mp4v2	7	DISTNAME= ${PORTNAME}-Release-MP4v2-${DISTVERSION}${EXTRACT_SUFIX}
9		8
10	MAINTAINER= multimedia@FreeBSD.org	9	MAINTAINER= multimedia@FreeBSD.org
11	COMMENT= Library and tools to read, create, and modify mp4 files	10	COMMENT= Library and tools to read, create, and modify mp4 files
Lines 13-22 Link Here
13	LICENSE= MPL	12	LICENSE= MPL
14		13
15	CONFLICTS= mpeg4ip-libmp4v2-[0-9.]*	14	CONFLICTS= mpeg4ip-libmp4v2-[0-9.]*
16	USES= compiler gmake libtool tar:bzip2	15	USES= compiler gmake libtool
17	MAKEFILE= GNUmakefile	16	MAKEFILE= GNUmakefile
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
		18	USE_GITHUB= yes
		19	GH_ACCOUNT= TechSmith
		20	GH_PROJECT= mp4v2
		21	GH_TAGNAME= 6fda22f
19	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
		23
20	CONFIGURE_ENV= "FOUND_HELP2MAN=no"	24	CONFIGURE_ENV= "FOUND_HELP2MAN=no"
21		25
22	INSTALL_TARGET= install-strip	26	INSTALL_TARGET= install-strip

Lines 1-35 Link Here

(-)files/patch-src__bmff__typebmff.cpp (-35 lines)
1	--- ./src/bmff/typebmff.cpp.orig 2009-07-14 03:07:10.000000000 +0400
2	+++ ./src/bmff/typebmff.cpp 2012-01-15 22:14:12.057757646 +0400
3	@@ -23,19 +23,12 @@
4
5	#include "impl.h"
6
7	-// VStudio idiocy prevents defining template instanced static data
8	-// in a namespace. Workaround it by defining in global scope.
9	-// Other platforms will continue to put things in the proper namespace.
10	-#if defined( _MSC_VER )
11	-using namespace mp4v2::impl::bmff;
12	-#else
13	-namespace mp4v2 { namespace impl { namespace bmff {
14	-#endif
15	+namespace mp4v2 { namespace impl {
16
17	///////////////////////////////////////////////////////////////////////////////
18
19	template <>
20	-const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
21	+const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
22	{ mp4v2::impl::bmff::ILC_AAR, "aar", "Afar" },
23	{ mp4v2::impl::bmff::ILC_ABK, "abk", "Abkhazian" },
24	{ mp4v2::impl::bmff::ILC_ACE, "ace", "Achinese" },
25	@@ -526,9 +519,7 @@
26
27	///////////////////////////////////////////////////////////////////////////////
28
29	-#if defined( _MSC_VER )
30	-namespace mp4v2 { namespace impl { namespace bmff {
31	-#endif
32	+namespace bmff {
33
34	///////////////////////////////////////////////////////////////////////////////
35

Lines 1-80 Link Here

(-)files/patch-src__itmf__type.cpp (-80 lines)
1	--- ./src/itmf/type.cpp.orig 2009-07-14 03:07:08.000000000 +0400
2	+++ ./src/itmf/type.cpp 2012-01-15 22:14:12.054748862 +0400
3	@@ -24,19 +24,12 @@
4
5	#include "impl.h"
6
7	-// VStudio idiocy prevents defining template instanced static data
8	-// in a namespace. Workaround it by defining in global scope.
9	-// Other platforms will continue to put things in the proper namespace.
10	-#if defined( _MSC_VER )
11	-using namespace mp4v2::impl::itmf;
12	-#else
13	-namespace mp4v2 { namespace impl { namespace itmf {
14	-#endif
15	+namespace mp4v2 { namespace impl {
16
17	///////////////////////////////////////////////////////////////////////////////
18
19	template <>
20	-const EnumBasicType::Entry EnumBasicType::data[] = {
21	+const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
22	{ mp4v2::impl::itmf::BT_IMPLICIT, "implicit", "implicit" },
23	{ mp4v2::impl::itmf::BT_UTF8, "utf8", "UTF-8" },
24	{ mp4v2::impl::itmf::BT_UTF16, "utf16", "UTF-16" },
25	@@ -64,7 +57,7 @@
26	///////////////////////////////////////////////////////////////////////////////
27
28	template <>
29	-const EnumGenreType::Entry EnumGenreType::data[] = {
30	+const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
31	{ mp4v2::impl::itmf::GENRE_BLUES, "blues", "Blues" },
32	{ mp4v2::impl::itmf::GENRE_CLASSIC_ROCK, "classicrock", "Classic Rock" },
33	{ mp4v2::impl::itmf::GENRE_COUNTRY, "country", "Country" },
34	@@ -200,7 +193,7 @@
35	///////////////////////////////////////////////////////////////////////////////
36
37	template <>
38	-const EnumStikType::Entry EnumStikType::data[] = {
39	+const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
40	{ mp4v2::impl::itmf::STIK_OLD_MOVIE, "oldmovie", "Movie" },
41	{ mp4v2::impl::itmf::STIK_NORMAL, "normal", "Normal" },
42	{ mp4v2::impl::itmf::STIK_AUDIOBOOK, "audiobook", "Audio Book" },
43	@@ -216,7 +209,7 @@
44	///////////////////////////////////////////////////////////////////////////////
45
46	template <>
47	-const EnumAccountType::Entry EnumAccountType::data[] = {
48	+const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
49	{ mp4v2::impl::itmf::AT_ITUNES, "itunes", "iTunes" },
50	{ mp4v2::impl::itmf::AT_AOL, "aol", "AOL" },
51
52	@@ -226,7 +219,7 @@
53	///////////////////////////////////////////////////////////////////////////////
54
55	template <>
56	-const EnumCountryCode::Entry EnumCountryCode::data[] = {
57	+const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
58	{ mp4v2::impl::itmf::CC_USA, "usa", "United States" },
59	{ mp4v2::impl::itmf::CC_USA, "fra", "France" },
60	{ mp4v2::impl::itmf::CC_DEU, "ger", "Germany" },
61	@@ -256,7 +249,7 @@
62	///////////////////////////////////////////////////////////////////////////////
63
64	template <>
65	-const EnumContentRating::Entry EnumContentRating::data[] = {
66	+const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
67	{ mp4v2::impl::itmf::CR_NONE, "none", "None" },
68	{ mp4v2::impl::itmf::CR_CLEAN, "clean", "Clean" },
69	{ mp4v2::impl::itmf::CR_EXPLICIT, "explicit", "Explicit" },
70	@@ -266,9 +259,7 @@
71
72	///////////////////////////////////////////////////////////////////////////////
73
74	-#if defined( _MSC_VER )
75	-namespace mp4v2 { namespace impl { namespace itmf {
76	-#endif
77	+namespace itmf {
78
79	///////////////////////////////////////////////////////////////////////////////
80