Index: head/multimedia/libvpx/Makefile =================================================================== --- head/multimedia/libvpx/Makefile (revision 451560) +++ head/multimedia/libvpx/Makefile (revision 451561) @@ -1,91 +1,89 @@ # Created by: Ashish SHUKLA # $FreeBSD$ PORTNAME= libvpx DISTVERSIONPREFIX= v DISTVERSION= 1.6.1 PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= VP8/VP9 Codec SDK LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= yasm:devel/yasm USE_GITHUB= yes GH_ACCOUNT= webmproject USES= compiler:c11 cpe gmake perl5 shebangfix CPE_VENDOR= john_koleszar HAS_CONFIGURE= yes USE_PERL5= build USE_LDCONFIG= yes SHEBANG_FILES= build/make/ads2gas.pl CONFIGURE_ENV= ASFLAGS="${ASFLAGS}" # Only explicitly list ARCHs with SIMD optimizations CONFIGURE_ARGS_aarch64= --target=arm64-linux-gcc CONFIGURE_ARGS_amd64= --target=x86_64-linux-gcc CONFIGURE_ARGS_armv7= --target=armv7-linux-gcc CONFIGURE_ARGS_i386= --target=x86-linux-gcc CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} \ --prefix=${PREFIX} \ --disable-install-docs \ --disable-install-srcs \ --enable-pic \ --enable-vp8 \ --enable-vp9 MAKE_ARGS+= verbose=yes ASFLAGS+= ${ASFLAGS_${ARCH}} ASFLAGS_armv7= -meabi=5 ALL_TARGET= # empty # armv7 is actually armv6 target before FreeBSD 12.0 .if ${CFLAGS:M-march=armv7*} CONFIGURE_ARGS+= ${CONFIGURE_ARGS_armv7} ASFLAGS+= ${ASFLAGS_armv7} .endif OPTIONS_DEFINE= DEBUG MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT TEST THREADS OPTIONS_DEFAULT=MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT THREADS OPTIONS_EXCLUDE_aarch64=RTCPU -OPTIONS_EXCLUDE_armv6= RTCPU -OPTIONS_EXCLUDE_armv7= RTCPU OPTIONS_SUB= SHARED DEBUG_CONFIGURE_ON= --enable-debug MULTIRES_DESC= Enable multi-resolution encoding MULTIRES_CONFIGURE_ON= --enable-multi-res-encoding POSTPROC_DESC= Enable postprocessing POSTPROC_CONFIGURE_ON= --enable-postproc --enable-vp9-postproc \ --enable-vp9-temporal-denoising RTCPU_DESC= Detect CPU capabilities at runtime RTCPU_CONFIGURE_ON= --enable-runtime-cpu-detect SHARED_DESC= Enable shared-library support SHARED_CONFIGURE_ON= --enable-shared SIZE_LIMIT_DESC= Maximum size allowed by decoder: ${SIZE_LIMIT} SIZE_LIMIT_CONFIGURE_ON=--size-limit=${SIZE_LIMIT} SIZE_LIMIT?= 16384x16384 # Chromium; Firefox has 4000x3000 TEST_CONFIGURE_OFF= --disable-unit-tests THREADS_CONFIGURE_OFF= --disable-multithread post-patch: @${REINPLACE_CMD} 's|\(link_with_cc\)=gcc|\1=$${CC}|' \ ${WRKSRC}/build/make/configure.sh post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vpx* post-install-SHARED-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvpx.so.*.*.* .include Index: head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c =================================================================== --- head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c (nonexistent) +++ head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c (revision 451561) @@ -0,0 +1,60 @@ +--- vpx_ports/arm_cpudetect.c.orig 2017-01-12 20:27:27 UTC ++++ vpx_ports/arm_cpudetect.c +@@ -147,6 +147,57 @@ int arm_cpu_caps(void) { + } + return flags & mask; + } ++#elif defined(__FreeBSD__) ++ ++#if __has_include() ++#include ++#else ++#include ++#include ++#include ++#include ++ ++static unsigned long getauxval(unsigned long type) { ++ Elf_Auxinfo auxv[AT_COUNT]; ++ size_t len = sizeof(auxv); ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_AUXV, ++ getpid(), ++ }; ++ ++ if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) { ++ for (size_t i = 0; i < nitems(auxv); i++) ++ if (auxv[i].a_type == (long)type) ++ return auxv[i].a_un.a_val; ++ } ++ return 0; ++} ++#endif ++ ++#ifndef AT_HWCAP ++#define AT_HWCAP 25 /* 16 on Linux */ ++#endif ++ ++#ifndef HWCAP_NEON ++#define HWCAP_NEON (1 << 12) ++#endif ++ ++int arm_cpu_caps(void) { ++ int flags; ++ int mask; ++ unsigned long hwcaps; ++ if (!arm_cpu_env_flags(&flags)) { ++ return flags; ++ } ++ mask = arm_cpu_env_mask(); ++ hwcaps = getauxval(AT_HWCAP); ++#if HAVE_NEON || HAVE_NEON_ASM ++ if (hwcaps & HWCAP_NEON) flags |= HAS_NEON; ++#endif ++ return flags & mask; ++} + #else /* end __linux__ */ + #error \ + "--enable-runtime-cpu-detect selected, but no CPU detection method " \ Property changes on: head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property