faac: strings.h fixes.

This commit is contained in:
Adrien Destugues
2014-09-13 11:45:56 +02:00
parent b93f8605e2
commit c511b96d27
3 changed files with 82 additions and 34 deletions

View File

@@ -39,7 +39,7 @@ BUILD_PREREQUIRES="
SOURCE_DIR="faac-${portVersion}"
#PATCHES="faac-${portVersion}.patch"
PATCHES="faac-${portVersion}.patchset"
PATCH()
{

View File

@@ -1,33 +0,0 @@
diff -Naur faac-1.28/configure.in faac-1.28-haiku/configure.in
--- faac-1.28/configure.in 2009-02-04 18:55:38.033816576 -0600
+++ faac-1.28-haiku/configure.in 2013-11-26 17:01:55.148373504 -0600
@@ -3,7 +3,7 @@
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
AC_ARG_ENABLE( drm, [ --enable-drm Digital Radio Mondiale support], enable_drm=$enableval, enable_drm=no)
@@ -31,7 +31,7 @@
AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
- external_mp4v2=no, -lstdc++),
+ external_mp4v2=no),
external_mp4v2=no, [#include <mp4.h>])
if test x$external_mp4v2 = xyes; then
diff -Naur faac-1.28/frontend/Makefile.am faac-1.28-haiku/frontend/Makefile.am
--- faac-1.28/frontend/Makefile.am 2008-12-15 18:56:00.034603008 -0600
+++ faac-1.28-haiku/frontend/Makefile.am 2013-11-26 17:06:24.569114624 -0600
@@ -5,7 +5,7 @@
if WITH_MP4V2
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
-LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm
else
INCLUDES = -I$(top_srcdir)/include
LDADD = $(top_builddir)/libfaac/libfaac.la -lm

View File

@@ -0,0 +1,81 @@
From c17c64630783c787faa155b5a266fbf384934c7d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 13 Sep 2014 11:44:11 +0200
Subject: Strings.h fixes.
diff --git a/common/mp4v2/mp4.cpp b/common/mp4v2/mp4.cpp
index 42dc874..a8c9b4f 100644
--- a/common/mp4v2/mp4.cpp
+++ b/common/mp4v2/mp4.cpp
@@ -37,6 +37,7 @@
*/
#include "mp4common.h"
+#include <strings.h>
#define PRINT_ERROR(e) \
VERBOSE_ERROR(((MP4File*)hFile)->GetVerbosity(), e->Print());
diff --git a/common/mp4v2/mp4file.cpp b/common/mp4v2/mp4file.cpp
index aed2963..bfa7b35 100644
--- a/common/mp4v2/mp4file.cpp
+++ b/common/mp4v2/mp4file.cpp
@@ -29,6 +29,7 @@
*/
#include "mp4common.h"
+#include <strings.h>
MP4File::MP4File(u_int32_t verbosity)
{
diff --git a/common/mp4v2/mp4info.cpp b/common/mp4v2/mp4info.cpp
index c14cbab..06ceb79 100644
--- a/common/mp4v2/mp4info.cpp
+++ b/common/mp4v2/mp4info.cpp
@@ -26,6 +26,7 @@
*/
#include "mp4common.h"
+#include <strings.h>
static char* PrintAudioInfo(
MP4FileHandle mp4File,
diff --git a/common/mp4v2/mp4meta.cpp b/common/mp4v2/mp4meta.cpp
index 8d4c414..e5f88cf 100644
--- a/common/mp4v2/mp4meta.cpp
+++ b/common/mp4v2/mp4meta.cpp
@@ -61,6 +61,7 @@
**/
#include "mp4common.h"
+#include <strings.h>
bool MP4File::GetMetadataByIndex(u_int32_t index,
char** ppName,
diff --git a/common/mp4v2/mp4property.cpp b/common/mp4v2/mp4property.cpp
index a32b415..24958c3 100644
--- a/common/mp4v2/mp4property.cpp
+++ b/common/mp4v2/mp4property.cpp
@@ -20,6 +20,7 @@
*/
#include "mp4common.h"
+#include <strings.h>
MP4Property::MP4Property(const char* name)
{
diff --git a/common/mp4v2/mp4util.cpp b/common/mp4v2/mp4util.cpp
index 8fddff1..c3bfeed 100644
--- a/common/mp4v2/mp4util.cpp
+++ b/common/mp4v2/mp4util.cpp
@@ -21,6 +21,7 @@
*/
#include "mp4common.h"
+#include <strings.h>
static lib_message_func_t libfunc = NULL;
extern "C" void MP4SetLibFunc(lib_message_func_t libf)
--
1.8.3.4