ffmpeg: use memalign and posix_memalign

Otherwise we get misaligned allocations.
This gets ffplay working on Haiku, so we have at least one simple media
player to cover basic needs.
This commit is contained in:
Adrien Destugues
2018-02-02 13:01:54 +01:00
parent 2ca70f5093
commit 4050f6659f
2 changed files with 35 additions and 7 deletions

View File

@@ -7,7 +7,7 @@ COPYRIGHT="2000-2003 Fabrice Bellard
2003-2017 the FFmpeg developers"
LICENSE="GNU LGPL v2.1
GNU GPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="5a77278a63741efa74e26bf197b9bb09ac6381b9757391b922407210f0f991c0"
PATCHES="ffmpeg-$portVersion.patchset"

View File

@@ -1,14 +1,14 @@
From a3a73c183d740c6b9e3f52dc26e401ca2a0ad11b Mon Sep 17 00:00:00 2001
From 6ed8a346799f20ba114b314d1054a30add1c4044 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 16 Oct 2017 18:31:07 +0200
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 18d80ee..1547cf8 100755
index 1797c5d..63ea916 100755
--- a/configure
+++ b/configure
@@ -6594,6 +6594,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
@@ -6595,6 +6595,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
@@ -17,10 +17,10 @@ index 18d80ee..1547cf8 100755
# add_dep lib dep
--
2.14.2
2.15.1
From 54d69f3a0979721f61b46c3beb13c50b8836ae62 Mon Sep 17 00:00:00 2001
From 3780da8297339a332322d7c38e16f7dd42337bd9 Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Fri, 27 Oct 2017 20:46:28 +0200
Subject: lavf/avio: temporarily accept 0 as EOF.
@@ -119,5 +119,33 @@ index 878917d..ba400e1 100644
#ifndef FF_API_R_FRAME_RATE
--
2.14.2
2.15.1
From f449ce0153359ef24e5afbf49144c539be92f789 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku
This had been disabled in 2011:
https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2011-June/038362.html
If there are still problems with it we should rather fix them on Haiku
side.
diff --git a/configure b/configure
index 63ea916..e8f55bf 100755
--- a/configure
+++ b/configure
@@ -6593,8 +6593,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
fi
--
2.15.1