libmp4v2: enable x86_64

This commit is contained in:
Jerome Duval
2014-09-04 15:32:34 +00:00
parent 26212d6d42
commit 18f1195c5a
2 changed files with 106 additions and 34 deletions

View File

@@ -1,6 +1,13 @@
diff -Naur mp4v2-2.0.0/configure.ac mp4v2-2.0.0-haiku/configure.ac
--- mp4v2-2.0.0/configure.ac 2012-05-20 17:11:55.039845888 -0500
+++ mp4v2-2.0.0-haiku/configure.ac 2013-11-26 23:36:14.129761280 -0600
From 101dc16a0705978ca39fb46c455a1694dedf1108 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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])
@@ -42,9 +49,10 @@ diff -Naur mp4v2-2.0.0/configure.ac mp4v2-2.0.0-haiku/configure.ac
###############################################################################
# initialization
diff -Naur mp4v2-2.0.0/libplatform/platform_base.h mp4v2-2.0.0-haiku/libplatform/platform_base.h
--- mp4v2-2.0.0/libplatform/platform_base.h 2012-05-20 17:11:55.021495808 -0500
+++ mp4v2-2.0.0-haiku/libplatform/platform_base.h 2013-11-26 23:49:07.969670656 -0600
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 <fstream>
#include <iomanip>
@@ -55,10 +63,11 @@ diff -Naur mp4v2-2.0.0/libplatform/platform_base.h mp4v2-2.0.0-haiku/libplatform
#include <map>
#include <set>
#include <sstream>
diff -Naur mp4v2-2.0.0/libutil/Utility.cpp mp4v2-2.0.0-haiku/libutil/Utility.cpp
--- mp4v2-2.0.0/libutil/Utility.cpp 2012-05-20 17:11:53.025690112 -0500
+++ mp4v2-2.0.0-haiku/libutil/Utility.cpp 2013-11-26 23:36:33.651427840 -0600
@@ -431,7 +431,6 @@
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
@@ -66,10 +75,11 @@ diff -Naur mp4v2-2.0.0/libutil/Utility.cpp mp4v2-2.0.0-haiku/libutil/Utility.cpp
<< '\n' << setw(18) << "repository date:" << MP4V2_PROJECT_repo_date
<< '\n' << setw(18) << "repository type:" << MP4V2_PROJECT_repo_type;
}
diff -Naur mp4v2-2.0.0/src/itmf/CoverArtBox.h mp4v2-2.0.0-haiku/src/itmf/CoverArtBox.h
--- mp4v2-2.0.0/src/itmf/CoverArtBox.h 2012-05-20 17:11:53.038797312 -0500
+++ mp4v2-2.0.0-haiku/src/itmf/CoverArtBox.h 2013-11-26 23:49:50.736886784 -0600
@@ -111,7 +111,7 @@
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 <b>true</b> on failure, <b>false</b> on success.
///
@@ -78,3 +88,54 @@ diff -Naur mp4v2-2.0.0/src/itmf/CoverArtBox.h mp4v2-2.0.0-haiku/src/itmf/CoverAr
};
///////////////////////////////////////////////////////////////////////////////
--
1.8.3.4
From 33faaa0be34dcd2eb66fa05cbff57593c987acb9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 <stdint.h>
#include <fcntl.h>
#include <unistd.h>
+#ifdef HAVE_STRINGS_H
+ #include <strings.h>
+#endif
#include <mp4v2/mp4v2.h>
--
1.8.3.4
From 85e5236d89a0ed724fb0a89fe46198d242687981 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 <fstream>
#include <iomanip>
#include <iostream>
+#include <limits>
#include <list>
+#include <locale>
#include <map>
#include <set>
#include <sstream>
--
1.8.3.4