haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 14:08:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

libmp4v2: enable x86_64

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

51
media-libs/libmp4v2/libmp4v2-2.0.0.recipe
View File

@@ -5,22 +5,36 @@ A library that provides functions to read, create, and modify mp4 files.
HOMEPAGE="https://code.google.com/p/mp4v2/" HOMEPAGE="https://code.google.com/p/mp4v2/"
LICENSE="MPL v1.1" LICENSE="MPL v1.1"
COPYRIGHT="Kona Blend, Copyright (C) 2008." COPYRIGHT="Kona Blend, Copyright (C) 2008."
SRC_URI="https://mp4v2.googlecode.com/files/mp4v2-2.0.0.tar.bz2" SRC_URI="https://mp4v2.googlecode.com/files/mp4v2-$portVersion.tar.bz2"
CHECKSUM_SHA256="0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338" CHECKSUM_SHA256="0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338"
REVISION="1" REVISION="2"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64" ARCHITECTURES="x86 x86_64"
SECONDARY_ARCHITECTURES="!x86_gcc2 x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PATCHES="libmp4v2-${portVersion}.patch" PATCHES="libmp4v2-$portVersion.patchset"
PROVIDES=" PROVIDES="
libmp4v2${secondaryArchSuffix} = $portVersion libmp4v2$secondaryArchSuffix = $portVersion compat >= 2
lib:libmp4v2 lib:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2
cmd:dvdcss_config cmd:mp4art$secondaryArchSuffix
cmd:mp4chaps$secondaryArchSuffix
cmd:mp4extract$secondaryArchSuffix
cmd:mp4file$secondaryArchSuffix
cmd:mp4info$secondaryArchSuffix
cmd:mp4subtitle$secondaryArchSuffix
cmd:mp4tags$secondaryArchSuffix
cmd:mp4track$secondaryArchSuffix
cmd:mp4trackdump$secondaryArchSuffix
" "
REQUIRES=" REQUIRES="
haiku${secondaryArchSuffix} >= $haikuVersion haiku$secondaryArchSuffix >= $haikuVersion
lib:libstdc++$secondaryArchSuffix
" "
BUILD_REQUIRES=" BUILD_REQUIRES="
@@ -28,24 +42,21 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc${secondaryArchSuffix} cmd:gcc$secondaryArchSuffix
cmd:ld${secondaryArchSuffix} cmd:ld$secondaryArchSuffix
cmd:make cmd:make
cmd:libtoolize cmd:libtoolize
cmd:aclocal cmd:aclocal
cmd:autoconf cmd:autoconf
" "
SOURCE_DIR="mp4v2-${portVersion}" SOURCE_DIR="mp4v2-$portVersion"
BUILD() BUILD()
{ {
libtoolize --force --copy --install autoreconf -fi
aclocal
autoconf
automake
runConfigure ./configure runConfigure ./configure
make make $jobArgs
} }
INSTALL() INSTALL()
@@ -63,9 +74,9 @@ INSTALL()
# ----- devel package ------------------------------------------------------- # ----- devel package -------------------------------------------------------
PROVIDES_devel=" PROVIDES_devel="
libmp4v2${secondaryArchSuffix}_devel = $portVersion libmp4v2${secondaryArchSuffix}_devel = $portVersion compat >= 2
devel:libmp4v2${secondaryArchSuffix} = $portVersion devel:libmp4v2$secondaryArchSuffix = 2.0.0 compat >= 2
" "
REQUIRES_devel=" REQUIRES_devel="
libmp4v2${secondaryArchSuffix} == $portVersion base libmp4v2$secondaryArchSuffix == $portVersion base
" "

89
media-libs/libmp4v2/patches/libmp4v2-2.0.0.patch → media-libs/libmp4v2/patches/libmp4v2-2.0.0.patchset
View File

@@ -1,6 +1,13 @@
diff -Naur mp4v2-2.0.0/configure.ac mp4v2-2.0.0-haiku/configure.ac From 101dc16a0705978ca39fb46c455a1694dedf1108 Mon Sep 17 00:00:00 2001
--- mp4v2-2.0.0/configure.ac 2012-05-20 17:11:55.039845888 -0500 From: Jerome Duval <jerome.duval@gmail.com>
+++ mp4v2-2.0.0-haiku/configure.ac 2013-11-26 23:36:14.129761280 -0600 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 @@ @@ -4,23 +4,23 @@
m4_include([project/project.m4sugar]) 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 # initialization
diff -Naur mp4v2-2.0.0/libplatform/platform_base.h mp4v2-2.0.0-haiku/libplatform/platform_base.h diff --git a/libplatform/platform_base.h b/libplatform/platform_base.h
--- mp4v2-2.0.0/libplatform/platform_base.h 2012-05-20 17:11:55.021495808 -0500 index 5b6a263..22efab4 100644
+++ mp4v2-2.0.0-haiku/libplatform/platform_base.h 2013-11-26 23:49:07.969670656 -0600 --- a/libplatform/platform_base.h
+++ b/libplatform/platform_base.h
@@ -6,9 +6,7 @@ @@ -6,9 +6,7 @@
#include <fstream> #include <fstream>
#include <iomanip> #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 <map>
#include <set> #include <set>
#include <sstream> #include <sstream>
diff -Naur mp4v2-2.0.0/libutil/Utility.cpp mp4v2-2.0.0-haiku/libutil/Utility.cpp diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp
--- mp4v2-2.0.0/libutil/Utility.cpp 2012-05-20 17:11:53.025690112 -0500 index 76cdd12..47066fd 100644
+++ mp4v2-2.0.0-haiku/libutil/Utility.cpp 2013-11-26 23:36:33.651427840 -0600 --- a/libutil/Utility.cpp
@@ -431,7 +431,6 @@ +++ 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 URL:" << MP4V2_PROJECT_repo_url
<< '\n' << setw(18) << "repository root:" << MP4V2_PROJECT_repo_root << '\n' << setw(18) << "repository root:" << MP4V2_PROJECT_repo_root
<< '\n' << setw(18) << "repository UUID:" << MP4V2_PROJECT_repo_uuid << '\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 date:" << MP4V2_PROJECT_repo_date
<< '\n' << setw(18) << "repository type:" << MP4V2_PROJECT_repo_type; << '\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 diff --git a/src/itmf/CoverArtBox.h b/src/itmf/CoverArtBox.h
--- mp4v2-2.0.0/src/itmf/CoverArtBox.h 2012-05-20 17:11:53.038797312 -0500 index 023e3c9..369b55d 100644
+++ mp4v2-2.0.0-haiku/src/itmf/CoverArtBox.h 2013-11-26 23:49:50.736886784 -0600 --- a/src/itmf/CoverArtBox.h
@@ -111,7 +111,7 @@ +++ b/src/itmf/CoverArtBox.h
@@ -111,7 +111,7 @@ public:
/// ///
/// @return <b>true</b> on failure, <b>false</b> on success. /// @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