Deinterlace: Use proper ASM output format for *BSD OS

from Brad
This commit is contained in:
ajacoutot 2021-08-27 08:28:02 +00:00
parent 8871e65155
commit e347f84f40
2 changed files with 24 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.71 2021/06/21 14:30:41 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.72 2021/08/27 08:28:02 ajacoutot Exp $
# Reenable that port on non-rust archs at the cost of pulseaudio support:
# pulseaudio -> [...] -> spidermonkey>=78 -> rust
@ -13,7 +13,7 @@ PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-good-${V}
PKGNAME-main= ${PKGNAME}
PKGNAME-pulse= ${GST_PKGNAME_PREFIX}-plugins-pulse-${V}
REVISION-main= 0
REVISION-main= 1
MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-good/}
@ -75,13 +75,9 @@ CONFIGURE_ARGS= -Daalib=disabled \
-Dv4l2-gudev=disabled \
-Drpicamsrc=disabled
# XXX
# ../gst-plugins-good-1.18.0/gst/deinterlace/x86/yadif.asm:28: error: segment name `.rodata align=16' not recognized
# ../gst-plugins-good-1.18.0/gst/deinterlace/x86/yadif.asm:124: ... from macro `SECTION_RODATA' defined here
#.if ${MACHINE_ARCH} == "amd64"
#BUILD_DEPENDS += devel/nasm
#.endif
CONFIGURE_ARGS += -Dasm=disabled
.if ${MACHINE_ARCH} == "amd64"
BUILD_DEPENDS += devel/nasm
.endif
DEBUG_PACKAGES= ${BUILD_PACKAGES}

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-gst_deinterlace_meson_build,v 1.1 2021/08/27 08:28:02 ajacoutot Exp $
From 7db10403468fab512de45ccfaca8f0579f6ea6d9 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Fri, 27 Aug 2021 02:05:45 -0400
Subject: [PATCH] deinterlace: Use proper ASM output format for *BSD OS
Index: gst/deinterlace/meson.build
--- gst/deinterlace/meson.build.orig
+++ gst/deinterlace/meson.build
@@ -65,8 +65,6 @@ if have_nasm and host_cpu == 'x86_64'
asm_outformat = 'win64'
elif ['darwin', 'ios'].contains(host_system)
asm_outformat = 'macho64'
- elif host_system.endswith('bsd')
- asm_outformat = 'aoutb'
else
asm_outformat = 'elf64'
endif