1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

- Let clang realign the stack on a 16 byte boundary on i386 to fix a crash

at libavcodec/x86/h264_deblock.asm:504 due to unaligned memory access
- Remove a patch that is no longer needed now

(Similar to r358825)

Reported by:	Joseph Olatt <joji@eskimo.com> (on freebsd-questions)
This commit is contained in:
Tijl Coosemans 2014-07-14 12:21:36 +00:00
parent 37c8ddd437
commit 9dab03575c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=361776
2 changed files with 3 additions and 13 deletions

View File

@ -4,6 +4,7 @@
PORTNAME= gstreamer1-libav
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/
DISTNAME= gst-libav-${PORTVERSION}
@ -31,8 +32,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin
.endif
.if ${COMPILER_TYPE} == "gcc"
CFLAGS+= -fno-force-addr
.if ${COMPILER_TYPE} == clang && ${ARCH} == i386
CFLAGS+= -mstack-alignment=16 -mstackrealign
.endif
post-patch:

View File

@ -1,11 +0,0 @@
--- gst-libs/ext/libav/libavutil/x86/asm.h.orig
+++ gst-libs/ext/libav/libavutil/x86/asm.h
@@ -68,7 +68,7 @@
typedef int x86_reg;
#endif
-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
#if ARCH_X86_64 && defined(PIC)