Date: Wed, 12 Dec 2018 00:18:42 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487267 - in head/multimedia/libva: . files Message-ID: <201812120018.wBC0IgYZ026265@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Dec 12 00:18:41 2018 New Revision: 487267 URL: https://svnweb.freebsd.org/changeset/ports/487267 Log: multimedia/libva: drop dependency on GNU sed Approved by: madpilot (maintainer) Differential Revision: https://reviews.freebsd.org/D18510 Added: head/multimedia/libva/files/patch-va_wayland_Makefile.am (contents, props changed) Modified: head/multimedia/libva/Makefile (contents, props changed) Modified: head/multimedia/libva/Makefile ============================================================================== --- head/multimedia/libva/Makefile Wed Dec 12 00:15:49 2018 (r487266) +++ head/multimedia/libva/Makefile Wed Dec 12 00:18:41 2018 (r487267) @@ -40,7 +40,6 @@ DEBUG_CFLAGS_OFF= -DNDEBUG WAYLAND_CONFIGURE_ENABLE= wayland WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland -WAYLAND_BUILD_DEPENDS= gsed:textproc/gsed post-patch: .SILENT ${REINPLACE_CMD} -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \ @@ -48,9 +47,5 @@ post-patch: .SILENT ${REINPLACE_CMD} '/^export VA_HEADER_/d' \ ${WRKSRC}/doc/Makefile.am ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am - -post-configure-WAYLAND-on: .SILENT - ${REINPLACE_CMD} -e 's|\(SED = \).*|\1${LOCALBASE}/bin/gsed|' \ - ${WRKSRC}/va/wayland/Makefile .include <bsd.port.mk> Added: head/multimedia/libva/files/patch-va_wayland_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libva/files/patch-va_wayland_Makefile.am Wed Dec 12 00:18:41 2018 (r487267) @@ -0,0 +1,20 @@ +BSD sed doesn't support inlining argument for i command, so embed +newlines via C-style quoting as proposed for POSIX[1]. + +$ echo '/* comment */' | sed -e '1i#include "sysdeps.h"' +sed: 1: "1i#include "sysdeps.h" +": command i expects \ followed by text + +[1] http://austingroupbugs.net/view.php?id=249 + +--- va/wayland/Makefile.am.orig 2018-10-01 23:31:25 UTC ++++ va/wayland/Makefile.am +@@ -70,7 +70,7 @@ va_wayland_drm.c: $(protocol_source_h) + %-client-protocol-export.c : %.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ + %-client-protocol.c: %-client-protocol-export.c +- $(AM_V_GEN)$(SED) -e '1i#include "sysdeps.h"' \ ++ $(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \ + -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@ + + EXTRA_DIST = \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812120018.wBC0IgYZ026265>