svn remove files/patch-src__itmf__type.cpp files/patch-include__mp4v2__itmf_tags.h files/patch-src__bmff__typebmff.cpp svn diff Index: Makefile =================================================================== --- Makefile (revision 422546) +++ Makefile (working copy) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= mp4v2 -PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTVERSION= 3.0.1.1 CATEGORIES= multimedia -MASTER_SITES= LOCAL/riggs/mp4v2 +DISTNAME= ${PORTNAME}-Release-MP4v2-${DISTVERSION}${EXTRACT_SUFIX} MAINTAINER= multimedia@FreeBSD.org COMMENT= Library and tools to read, create, and modify mp4 files @@ -13,10 +12,15 @@ LICENSE= MPL CONFLICTS= mpeg4ip-libmp4v2-[0-9.]* -USES= compiler gmake libtool tar:bzip2 +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 Index: distinfo =================================================================== --- distinfo (revision 422546) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (mp4v2-1.9.1.tar.bz2) = 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4 -SIZE (mp4v2-1.9.1.tar.bz2) = 432943 +SHA256 (mp4v2-Release-MP4v2-3.0.1.1_GH0.tar.gz) = 619c61338ff999169258265e82f528fcf73fcbeb10cfaab665a742efd8c070c1 +SIZE (mp4v2-Release-MP4v2-3.0.1.1_GH0.tar.gz) = 1924201 Index: files/patch-include__mp4v2__itmf_tags.h =================================================================== --- files/patch-include__mp4v2__itmf_tags.h (revision 422546) +++ files/patch-include__mp4v2__itmf_tags.h (nonexistent) @@ -1,11 +0,0 @@ ---- ./include/mp4v2/itmf_tags.h.orig 2010-07-14 16:35:27.000000000 +0100 -+++ ./include/mp4v2/itmf_tags.h 2010-07-14 16:35:35.000000000 +0100 -@@ -122,7 +122,7 @@ - * @return structure with all tags missing. - */ - MP4V2_EXPORT --const MP4Tags* MP4TagsAlloc(); -+const MP4Tags* MP4TagsAlloc(void); - - /** Fetch data from mp4 file and populate structure. - * Property changes on: files/patch-include__mp4v2__itmf_tags.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src__bmff__typebmff.cpp =================================================================== --- files/patch-src__bmff__typebmff.cpp (revision 422546) +++ files/patch-src__bmff__typebmff.cpp (nonexistent) @@ -1,35 +0,0 @@ ---- ./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 { - - /////////////////////////////////////////////////////////////////////////////// - Property changes on: files/patch-src__bmff__typebmff.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src__itmf__type.cpp =================================================================== --- files/patch-src__itmf__type.cpp (revision 422546) +++ files/patch-src__itmf__type.cpp (nonexistent) @@ -1,80 +0,0 @@ ---- ./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 { - - /////////////////////////////////////////////////////////////////////////////// - Property changes on: files/patch-src__itmf__type.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 422546) +++ pkg-plist (working copy) @@ -15,7 +15,6 @@ include/mp4v2/isma.h include/mp4v2/itmf_generic.h include/mp4v2/itmf_tags.h -include/mp4v2/meta.h include/mp4v2/mp4v2.h include/mp4v2/platform.h include/mp4v2/sample.h @@ -24,8 +23,8 @@ include/mp4v2/track_prop.h lib/libmp4v2.a lib/libmp4v2.so -lib/libmp4v2.so.1 -lib/libmp4v2.so.1.9.1 +lib/libmp4v2.so.3 +lib/libmp4v2.so.3.0.1 man/man1/mp4art.1.gz man/man1/mp4file.1.gz man/man1/mp4subtitle.1.gz