Index: head/multimedia/libvpx/Makefile =================================================================== --- head/multimedia/libvpx/Makefile (revision 472310) +++ head/multimedia/libvpx/Makefile (revision 472311) @@ -1,76 +1,77 @@ # Created by: Ashish SHUKLA # $FreeBSD$ PORTNAME= libvpx DISTVERSIONPREFIX= v DISTVERSION= 1.7.0 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= VP8/VP9 Codec SDK LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nasm:devel/nasm USE_GITHUB= yes GH_ACCOUNT= webmproject -USES= cpe gmake perl5 shebangfix +USES= compiler:c++11-lib 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}" CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-install-docs \ --disable-install-srcs \ --enable-pic \ --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 OPTIONS_DEFAULT=MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT THREADS OPTIONS_EXCLUDE_aarch64=RTCPU +OPTIONS_EXCLUDE_powerpcspe=RTCPU OPTIONS_SUB= yes 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} -E '/gcctarget|link_with_cc/s/gcc[[:>:]]/$${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-libs.mk =================================================================== --- head/multimedia/libvpx/files/patch-libs.mk (revision 472310) +++ head/multimedia/libvpx/files/patch-libs.mk (revision 472311) @@ -1,24 +1,13 @@ --- libs.mk.orig 2017-01-12 20:27:27 UTC +++ libs.mk -@@ -117,8 +117,8 @@ endif - $(BUILD_PFX)third_party/googletest/%.cc.o: CXXFLAGS += -Wno-missing-field-initializers - # Suppress -Wextra warnings in first party code pending investigation. - # https://bugs.chromium.org/p/webm/issues/detail?id=1069 --$(BUILD_PFX)vp8/encoder/onyx_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered --$(BUILD_PFX)vp8/decoder/onyxd_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered -+$(BUILD_PFX)vp8/encoder/onyx_if.c.o: CFLAGS += -Wno-extra -+$(BUILD_PFX)vp8/decoder/onyxd_if.c.o: CFLAGS += -Wno-extra - - ifeq ($(CONFIG_MSVS),yes) - CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd) @@ -339,8 +339,8 @@ else $(qexec)echo 'Libs.private: -lm' >> $@ endif $(qexec)echo 'Cflags: -I$${includedir}' >> $@ -INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc -INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc +INSTALL-LIBS-yes += libdata/pkgconfig/vpx.pc +INSTALL_MAPS += libdata/pkgconfig/%.pc %.pc CLEAN-OBJS += vpx.pc endif Index: head/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c =================================================================== --- head/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c (nonexistent) +++ head/multimedia/libvpx/files/patch-vpx__ports_ppc__cpudetect.c (revision 472311) @@ -0,0 +1,66 @@ +--- vpx_ports/ppc_cpudetect.c.orig 2018-01-24 22:25:44 UTC ++++ vpx_ports/ppc_cpudetect.c +@@ -8,12 +8,6 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include +-#include +-#include +-#include +-#include +- + #include "./vpx_config.h" + #include "vpx_ports/ppc.h" + +@@ -35,6 +29,13 @@ static int cpu_env_mask(void) { + return env && *env ? (int)strtol(env, NULL, 0) : ~0; + } + ++#if defined(__linux__) ++#include ++#include ++#include ++#include ++#include ++ + int ppc_simd_caps(void) { + int flags; + int mask; +@@ -73,6 +74,36 @@ out_close: + close(fd); + return flags & mask; + } ++#elif defined(__FreeBSD__) ++#include ++#include ++#include ++ ++int ppc_simd_caps(void) { ++ int flags; ++ int mask; ++ u_long cpu_features = 0; ++ size_t sz = sizeof(cpu_features); ++ ++ // If VPX_SIMD_CAPS is set then allow only those capabilities. ++ if (!cpu_env_flags(&flags)) { ++ return flags; ++ } ++ ++ mask = cpu_env_mask(); ++ ++ sysctlbyname("hw.cpu_features", &cpu_features, &sz, NULL, 0); ++#if HAVE_VSX ++ if (cpu_features & PPC_FEATURE_HAS_VSX) flags |= HAS_VSX; ++#endif ++ ++ return flags & mask; ++} ++#else ++#error \ ++ "--enable-runtime-cpu-detect selected, but no CPU detection method " \ ++"available for your platform. Reconfigure with --disable-runtime-cpu-detect." ++#endif /* end __linux__ */ + #else + // If there is no RTCD the function pointers are not used and can not be + // changed. Property changes on: head/multimedia/libvpx/files/patch-vpx__ports_ppc__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