From 101dc16a0705978ca39fb46c455a1694dedf1108 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Sep 2014 15:37:01 +0000 Subject: applying patch libmp4v2-2.0.0.patch diff --git a/configure.ac b/configure.ac index 7c514eb..9fcca75 100644 --- a/configure.ac +++ b/configure.ac @@ -4,23 +4,23 @@ m4_include([project/project.m4sugar]) -m4_define([SVNINFO],m4_esyscmd([LANG=en svn info 2>/dev/null])) - -changequote(<<,>>)dnl - m4_define(<>,m4_bregexp(SVNINFO,<<^URL: *\(.+\)>>,<<\1>>)) - m4_define(<>,m4_bregexp(PRJ_repo_url,<<\([^/]+\)$>>,<<\1>>)) - m4_define(<>,m4_bregexp(SVNINFO,<<^Repository Root: *\(.+\)>>,<<\1>>)) - m4_define(<>,m4_bregexp(SVNINFO,<<^Repository UUID: *\(.+\)>>,<<\1>>)) - m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Rev: *\(.+\)>>,<<\1>>)) - m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Date: *\(.+\)>>,<<\1>>)) - m4_define(<>,ifelse(m4_bregexp(PRJ_repo_url,<>),<<-1>>,<>,<>)) -changequote([,])dnl - -m4_define([PRJ_version_hex],m4_format([0x%04x%02x%02x],PRJ_version_major,PRJ_version_minor,PRJ_version_point)) - -m4_define([PRJ_version],ifelse( - PRJ_repo_type,[stable],m4_format([%s],PRJ_repo_branch), - m4_format([%s-r%d],PRJ_repo_branch,PRJ_repo_rev))) +#m4_define([SVNINFO],m4_esyscmd([LANG=en svn info 2>/dev/null])) +# +#changequote(<<,>>)dnl +# m4_define(<>,m4_bregexp(SVNINFO,<<^URL: *\(.+\)>>,<<\1>>)) +# m4_define(<>,m4_bregexp(PRJ_repo_url,<<\([^/]+\)$>>,<<\1>>)) +# m4_define(<>,m4_bregexp(SVNINFO,<<^Repository Root: *\(.+\)>>,<<\1>>)) +# m4_define(<>,m4_bregexp(SVNINFO,<<^Repository UUID: *\(.+\)>>,<<\1>>)) +# m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Rev: *\(.+\)>>,<<\1>>)) +# m4_define(<>,m4_bregexp(SVNINFO,<<^Last Changed Date: *\(.+\)>>,<<\1>>)) +# m4_define(<>,ifelse(m4_bregexp(PRJ_repo_url,<>),<<-1>>,<>,<>)) +#changequote([,])dnl +# +#m4_define([PRJ_version_hex],m4_format([0x%04x%02x%02x],PRJ_version_major,PRJ_version_minor,PRJ_version_point)) +# +#m4_define([PRJ_version],ifelse( +# PRJ_repo_type,[stable],m4_format([%s],PRJ_repo_branch), +# m4_format([%s-r%d],PRJ_repo_branch,PRJ_repo_rev))) ############################################################################### # initialization diff --git a/libplatform/platform_base.h b/libplatform/platform_base.h index 5b6a263..22efab4 100644 --- a/libplatform/platform_base.h +++ b/libplatform/platform_base.h @@ -6,9 +6,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp index 76cdd12..47066fd 100644 --- a/libutil/Utility.cpp +++ b/libutil/Utility.cpp @@ -431,7 +431,6 @@ Utility::printVersion( bool extended ) << '\n' << setw(18) << "repository URL:" << MP4V2_PROJECT_repo_url << '\n' << setw(18) << "repository root:" << MP4V2_PROJECT_repo_root << '\n' << setw(18) << "repository UUID:" << MP4V2_PROJECT_repo_uuid - << '\n' << setw(18) << "repository rev:" << MP4V2_PROJECT_repo_rev << '\n' << setw(18) << "repository date:" << MP4V2_PROJECT_repo_date << '\n' << setw(18) << "repository type:" << MP4V2_PROJECT_repo_type; } diff --git a/src/itmf/CoverArtBox.h b/src/itmf/CoverArtBox.h index 023e3c9..369b55d 100644 --- a/src/itmf/CoverArtBox.h +++ b/src/itmf/CoverArtBox.h @@ -111,7 +111,7 @@ public: /// /// @return true on failure, false on success. /// - static bool remove( MP4FileHandle hFile, uint32_t index = numeric_limits::max() ); + static bool remove( MP4FileHandle hFile, uint32_t index = 2147483647); }; /////////////////////////////////////////////////////////////////////////////// -- 1.8.3.4 From 33faaa0be34dcd2eb66fa05cbff57593c987acb9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Sep 2014 15:47:14 +0000 Subject: strings.h isn't included diff --git a/libplatform/platform_posix.h b/libplatform/platform_posix.h index af5901a..8863ba4 100644 --- a/libplatform/platform_posix.h +++ b/libplatform/platform_posix.h @@ -33,6 +33,9 @@ #include #include #include +#ifdef HAVE_STRINGS_H + #include +#endif #include -- 1.8.3.4 From 85e5236d89a0ed724fb0a89fe46198d242687981 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 4 Sep 2014 15:22:17 +0000 Subject: build fix diff --git a/libplatform/platform_base.h b/libplatform/platform_base.h index 22efab4..5b6a263 100644 --- a/libplatform/platform_base.h +++ b/libplatform/platform_base.h @@ -6,7 +6,9 @@ #include #include #include +#include #include +#include #include #include #include -- 1.8.3.4