From owner-svn-ports-all@freebsd.org Tue Dec 4 00:52:00 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 292A913102E4; Tue, 4 Dec 2018 00:52:00 +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 A159D77002; Tue, 4 Dec 2018 00:51:59 +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 837251DB31; Tue, 4 Dec 2018 00:51:59 +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 wB40px4N035773; Tue, 4 Dec 2018 00:51:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB40pwiJ035770; Tue, 4 Dec 2018 00:51:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201812040051.wB40pwiJ035770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 4 Dec 2018 00:51:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486566 - in head/multimedia: aom/files libvpx/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia: aom/files libvpx/files X-SVN-Commit-Revision: 486566 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A159D77002 X-Spamd-Result: default: False [0.05 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.48)[-0.475,0]; NEURAL_SPAM_LONG(0.05)[0.050,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.47)[0.475,0] X-Rspamd-Server: mx1.freebsd.org 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: Tue, 04 Dec 2018 00:52:00 -0000 Author: jbeich Date: Tue Dec 4 00:51:58 2018 New Revision: 486566 URL: https://svnweb.freebsd.org/changeset/ports/486566 Log: multimedia/libvpx: standardize variable name holding AT_HWCAP value Modified: head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c (contents, props changed) head/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c (contents, props changed) head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c (contents, props changed) head/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c (contents, props changed) Modified: head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c ============================================================================== --- head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c Tue Dec 4 00:51:44 2018 (r486565) +++ head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c Tue Dec 4 00:51:58 2018 (r486566) @@ -52,18 +52,18 @@ +int aom_arm_cpu_caps(void) { + int flags; + int mask; -+ u_long hwcaps = 0; ++ u_long hwcap = 0; + if (!arm_cpu_env_flags(&flags)) { + return flags; + } + mask = arm_cpu_env_mask(); +#if __FreeBSD__ < 12 -+ hwcaps = getauxval(AT_HWCAP); ++ hwcap = getauxval(AT_HWCAP); +#else -+ elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps)); ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); +#endif +#if HAVE_NEON -+ if (hwcaps & HWCAP_NEON) flags |= HAS_NEON; ++ if (hwcap & HWCAP_NEON) flags |= HAS_NEON; +#endif + return flags & mask; +} Modified: head/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c ============================================================================== --- head/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c Tue Dec 4 00:51:44 2018 (r486565) +++ head/multimedia/aom/files/patch-aom__ports_ppc__cpudetect.c Tue Dec 4 00:51:58 2018 (r486566) @@ -45,7 +45,7 @@ +int ppc_simd_caps(void) { + int flags; + int mask; -+ u_long cpu_features = 0; ++ u_long hwcap = 0; + + // If AOM_SIMD_CAPS is set then allow only those capabilities. + if (!cpu_env_flags(&flags)) { @@ -55,13 +55,13 @@ + mask = cpu_env_mask(); + +#if __FreeBSD__ < 12 -+ size_t sz = sizeof(cpu_features); -+ sysctlbyname("hw.cpu_features", &cpu_features, &sz, NULL, 0); ++ size_t sz = sizeof(hwcap); ++ sysctlbyname("hw.cpu_features", &hwcap, &sz, NULL, 0); +#else -+ elf_aux_info(AT_HWCAP, &cpu_features, sizeof(cpu_features)); ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); +#endif +#if HAVE_VSX -+ if (cpu_features & PPC_FEATURE_HAS_VSX) flags |= HAS_VSX; ++ if (hwcap & PPC_FEATURE_HAS_VSX) flags |= HAS_VSX; +#endif + + return flags & mask; Modified: head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c ============================================================================== --- head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c Tue Dec 4 00:51:44 2018 (r486565) +++ head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c Tue Dec 4 00:51:58 2018 (r486566) @@ -49,18 +49,18 @@ +int arm_cpu_caps(void) { + int flags; + int mask; -+ u_long hwcaps = 0; ++ u_long hwcap = 0; + if (!arm_cpu_env_flags(&flags)) { + return flags; + } + mask = arm_cpu_env_mask(); +#if __FreeBSD__ < 12 -+ hwcaps = getauxval(AT_HWCAP); ++ hwcap = getauxval(AT_HWCAP); +#else -+ elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps)); ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); +#endif +#if HAVE_NEON || HAVE_NEON_ASM -+ if (hwcaps & HWCAP_NEON) flags |= HAS_NEON; ++ if (hwcap & HWCAP_NEON) flags |= HAS_NEON; +#endif + return flags & mask; +} Modified: head/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c ============================================================================== --- head/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c Tue Dec 4 00:51:44 2018 (r486565) +++ head/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c Tue Dec 4 00:51:58 2018 (r486566) @@ -43,7 +43,7 @@ +int ppc_simd_caps(void) { + int flags; + int mask; -+ u_long cpu_features = 0; ++ u_long hwcap = 0; + + // If VPX_SIMD_CAPS is set then allow only those capabilities. + if (!cpu_env_flags(&flags)) { @@ -53,13 +53,13 @@ + mask = cpu_env_mask(); + +#if __FreeBSD__ < 12 -+ size_t sz = sizeof(cpu_features); -+ sysctlbyname("hw.cpu_features", &cpu_features, &sz, NULL, 0); ++ size_t sz = sizeof(hwcap); ++ sysctlbyname("hw.cpu_features", &hwcap, &sz, NULL, 0); +#else -+ elf_aux_info(AT_HWCAP, &cpu_features, sizeof(cpu_features)); ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); +#endif +#if HAVE_VSX -+ if (cpu_features & PPC_FEATURE_HAS_VSX) flags |= HAS_VSX; ++ if (hwcap & PPC_FEATURE_HAS_VSX) flags |= HAS_VSX; +#endif + + return flags & mask;