From owner-svn-ports-head@freebsd.org Sun Nov 11 19:49:23 2018 Return-Path: Delivered-To: svn-ports-head@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 912EE11222D1; Sun, 11 Nov 2018 19:49:23 +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 EF9426B093; Sun, 11 Nov 2018 19:49:22 +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 D1667169D3; Sun, 11 Nov 2018 19:49:22 +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 wABJnM57081590; Sun, 11 Nov 2018 19:49:22 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wABJnMdw081588; Sun, 11 Nov 2018 19:49:22 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811111949.wABJnMdw081588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 11 Nov 2018 19:49:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484762 - in head/multimedia/gstreamer1-libav: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia/gstreamer1-libav: . files X-SVN-Commit-Revision: 484762 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EF9426B093 X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.90), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2018 19:49:23 -0000 Author: jbeich Date: Sun Nov 11 19:49:22 2018 New Revision: 484762 URL: https://svnweb.freebsd.org/changeset/ports/484762 Log: multimedia/gstreamer1-libav: unbreak FFMPEG=OFF on aarch64 after r483887 - Drop GNU as(1) dependency as it's no longer required PR: 233137 Submitted by: Mikaël Urankar (based on) Added: head/multimedia/gstreamer1-libav/files/patch-clang-neon (contents, props changed) Modified: head/multimedia/gstreamer1-libav/Makefile (contents, props changed) Modified: head/multimedia/gstreamer1-libav/Makefile ============================================================================== --- head/multimedia/gstreamer1-libav/Makefile Sun Nov 11 18:53:50 2018 (r484761) +++ head/multimedia/gstreamer1-libav/Makefile Sun Nov 11 19:49:22 2018 (r484762) @@ -34,11 +34,9 @@ OPTIONS_DEFAULT=FFMPEG FFMPEG_DESC?= Use system ffmpeg instead of internal libav FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_WITH= system-libav -FFMPEG_BUILD_DEPENDS_OFF=as:devel/binutils nasm:devel/nasm -FFMPEG_CONFIGURE_ENV_OFF=${MACHINE:Marm*:C/.+/ASFLAGS=-no-integrated-as/} +FFMPEG_BUILD_DEPENDS_OFF= nasm:devel/nasm FFMPEG_MAKE_ENV_OFF= V=1 FFMPEG_VARS_OFF+= NOPRECIOUSMAKEVARS=yes # ARCH -FFMPEG_VARS_OFF+= LLD_UNSAFE=yes # aarch64 post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ Added: head/multimedia/gstreamer1-libav/files/patch-clang-neon ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gstreamer1-libav/files/patch-clang-neon Sun Nov 11 19:49:22 2018 (r484762) @@ -0,0 +1,53 @@ +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/f33f72847043 + +--- gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_16.S.orig 2018-10-02 22:10:05 UTC ++++ gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_16.S +@@ -18,6 +18,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include "config.h" ++#if HAVE_AS_DN_DIRECTIVE + #include "rgb2yuv_neon_common.S" + + /* downsampled R16G16B16 x8 */ +@@ -78,3 +80,4 @@ alias_qw c8x8x2, q10 + .endm + + loop_420sp rgbx, nv12, init, kernel_420_16x2, 16 ++#endif +--- gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_32.S.orig 2018-10-02 22:10:05 UTC ++++ gst-libs/ext/libav/libswscale/arm/rgb2yuv_neon_32.S +@@ -18,6 +18,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include "config.h" ++#if HAVE_AS_DN_DIRECTIVE + #include "rgb2yuv_neon_common.S" + + /* downsampled R16G16B16 x8 */ +@@ -117,3 +119,4 @@ alias_qw c8x8x2, q10 + + + loop_420sp rgbx, nv12, init, kernel_420_16x2, 32 ++#endif +--- gst-libs/ext/libav/libswscale/arm/swscale_unscaled.c.orig 2018-10-02 22:10:05 UTC ++++ gst-libs/ext/libav/libswscale/arm/swscale_unscaled.c +@@ -23,6 +23,7 @@ + #include "libswscale/swscale_internal.h" + #include "libavutil/arm/cpu.h" + ++#if HAVE_AS_DN_DIRECTIVE + extern void rgbx_to_nv12_neon_32(const uint8_t *src, uint8_t *y, uint8_t *chroma, + int width, int height, + int y_stride, int c_stride, int src_stride, +@@ -178,3 +179,8 @@ void ff_get_unscaled_swscale_arm(SwsContext *c) + if (have_neon(cpu_flags)) + get_unscaled_swscale_neon(c); + } ++#else ++void ff_get_unscaled_swscale_arm(SwsContext *c) ++{ ++} ++#endif