From owner-svn-ports-all@freebsd.org Wed Dec 12 00:18:43 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02C3D1323F6C; Wed, 12 Dec 2018 00:18:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 97A4375826; Wed, 12 Dec 2018 00:18:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6DB53789B; Wed, 12 Dec 2018 00:18:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBC0IgTY026267; Wed, 12 Dec 2018 00:18:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBC0IgYZ026265; Wed, 12 Dec 2018 00:18:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201812120018.wBC0IgYZ026265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 12 Dec 2018 00:18:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487267 - in head/multimedia/libva: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia/libva: . files X-SVN-Commit-Revision: 487267 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 97A4375826 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-0.69 / 15.00]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.69)[-0.687,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2018 00:18:43 -0000 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 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 = \