From owner-svn-ports-head@freebsd.org Wed Jan 2 08:10:09 2019 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 1CBC11439F89; Wed, 2 Jan 2019 08:10:09 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B26F980970; Wed, 2 Jan 2019 08:10:08 +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 A654A6C2D; Wed, 2 Jan 2019 08:10:08 +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 x028A8Dv021244; Wed, 2 Jan 2019 08:10:08 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x028A8SV021242; Wed, 2 Jan 2019 08:10:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201901020810.x028A8SV021242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 Jan 2019 08:10:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489061 - in head/multimedia/libvpx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia/libvpx: . files X-SVN-Commit-Revision: 489061 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B26F980970 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Wed, 02 Jan 2019 08:10:09 -0000 Author: jbeich Date: Wed Jan 2 08:10:07 2019 New Revision: 489061 URL: https://svnweb.freebsd.org/changeset/ports/489061 Log: multimedia/libvpx: restore NEON on armv6 after r466922 - Only armv6 needs -meabi=5 - Build NEON files on armv6 - Respect CPUTYPE on armv7 and aarch64 Modified: head/multimedia/libvpx/Makefile (contents, props changed) head/multimedia/libvpx/files/patch-build_make_Makefile (contents, props changed) head/multimedia/libvpx/files/patch-build_make_configure.sh (contents, props changed) Modified: head/multimedia/libvpx/Makefile ============================================================================== --- head/multimedia/libvpx/Makefile Wed Jan 2 08:01:27 2019 (r489060) +++ head/multimedia/libvpx/Makefile Wed Jan 2 08:10:07 2019 (r489061) @@ -4,7 +4,7 @@ PORTNAME= libvpx DISTVERSIONPREFIX= v DISTVERSION= 1.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -24,7 +24,6 @@ HAS_CONFIGURE= yes USE_PERL5= build USE_LDCONFIG= yes SHEBANG_FILES= build/make/ads2gas.pl -CONFIGURE_ENV= ASFLAGS="${ASFLAGS}" CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-install-docs \ --disable-install-srcs \ @@ -32,8 +31,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --enable-vp8 \ --enable-vp9 MAKE_ARGS+= verbose=yes -ASFLAGS+= ${ASFLAGS_${MACHINE}} -ASFLAGS_arm= -meabi=5 ALL_TARGET= # empty OPTIONS_DEFINE= DEBUG MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT TEST THREADS Modified: head/multimedia/libvpx/files/patch-build_make_Makefile ============================================================================== --- head/multimedia/libvpx/files/patch-build_make_Makefile Wed Jan 2 08:01:27 2019 (r489060) +++ head/multimedia/libvpx/files/patch-build_make_Makefile Wed Jan 2 08:10:07 2019 (r489061) @@ -1,5 +1,36 @@ +- Make sure NEON is available when building with intrinsics + --- build/make/Makefile.orig +++ build/make/Makefile +@@ -142,6 +142,28 @@ $(BUILD_PFX)%_avx2.c.o: CFLAGS += -mavx2 + $(BUILD_PFX)%_avx512.c.d: CFLAGS += -mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl + $(BUILD_PFX)%_avx512.c.o: CFLAGS += -mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl + ++# ARM ++ifeq ($(TGT_ISA),armv6) ++ifeq (,$(filter -march=%,$(CFLAGS))) ++$(BUILD_PFX)%_neon.c.d: CFLAGS += -march=armv7-a ++$(BUILD_PFX)%_neon.c.o: CFLAGS += -march=armv7-a ++$(BUILD_PFX)%_neon.asm.S.d: ASFLAGS += -march=armv7-a ++$(BUILD_PFX)%_neon.asm.S.o: ASFLAGS += -march=armv7-a ++$(BUILD_PFX)%_neon_asm.asm.S.d: ASFLAGS += -march=armv7-a ++$(BUILD_PFX)%_neon_asm.asm.S.o: ASFLAGS += -march=armv7-a ++endif ++$(BUILD_PFX)%_neon.asm.S.d: ASFLAGS += -meabi=5 ++$(BUILD_PFX)%_neon.asm.S.o: ASFLAGS += -meabi=5 ++$(BUILD_PFX)%_neon_asm.asm.S.d: ASFLAGS += -meabi=5 ++$(BUILD_PFX)%_neon_asm.asm.S.o: ASFLAGS += -meabi=5 ++endif ++ifneq (,$(filter arm%,$(TGT_ISA))) ++$(BUILD_PFX)%_neon.asm.S.d: ASFLAGS += -mfpu=neon ++$(BUILD_PFX)%_neon.asm.S.o: ASFLAGS += -mfpu=neon ++$(BUILD_PFX)%_neon_asm.asm.S.d: ASFLAGS += -mfpu=neon ++$(BUILD_PFX)%_neon_asm.asm.S.o: ASFLAGS += -mfpu=neon ++endif ++ + # POWER + $(BUILD_PFX)%_vsx.c.d: CFLAGS += -maltivec -mvsx + $(BUILD_PFX)%_vsx.c.o: CFLAGS += -maltivec -mvsx @@ -230,8 +230,8 @@ define install_map_template $(DIST_DIR)/$(1): $(2) Modified: head/multimedia/libvpx/files/patch-build_make_configure.sh ============================================================================== --- head/multimedia/libvpx/files/patch-build_make_configure.sh Wed Jan 2 08:01:27 2019 (r489060) +++ head/multimedia/libvpx/files/patch-build_make_configure.sh Wed Jan 2 08:10:07 2019 (r489061) @@ -1,5 +1,6 @@ -- Add armv6 targets where NEON depends on CFLAGS +- Add armv6 targets and try NEON there - Recognize DragonFly as x86_64-linux-gcc target by default +- Don't override -march= on armv6, armv7 and aarch64 --- build/make/configure.sh.orig 2018-01-24 22:25:44 UTC +++ build/make/configure.sh @@ -27,3 +28,42 @@ tgt_os=linux ;; *solaris2.10) +@@ -914,7 +922,7 @@ process_common_toolchain() { + arm64|armv8) + soft_enable neon + ;; +- armv7|armv7s) ++ armv6|armv7|armv7s) + soft_enable neon + # Only enable neon_asm when neon is also enabled. + enabled neon && soft_enable neon_asm +@@ -935,29 +943,6 @@ + arch_int=${arch_int%%te} + check_add_asflags --defsym ARCHITECTURE=${arch_int} + tune_cflags="-mtune=" +- if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then +- if [ -z "${float_abi}" ]; then +- check_cpp <