Index: head/devel/fb-adb/Makefile =================================================================== --- head/devel/fb-adb/Makefile (revision 414538) +++ head/devel/fb-adb/Makefile (revision 414539) @@ -1,103 +1,99 @@ # $FreeBSD$ PORTNAME= fb-adb DISTVERSION= 1.4.4-124 DISTVERSIONSUFFIX= -gb230619 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Better shell for Android devices LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_powerpc64= Does not build - BUILD_DEPENDS= xxd:editors/vim-lite \ ${BASH_CMD}:shells/${BASH_CMD:T} RUN_DEPENDS= adb:devel/android-tools-adb USE_GITHUB= yes GH_ACCOUNT= facebook USES= autoreconf gmake ncurses perl5 python:3,build USE_PERL5= build # pod2man BASH_CMD?= bash # can be zsh GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes CONFIGURE_ENV= PYTHON3="${PYTHON_CMD}" INSTALL_TARGET= install-strip PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz # Cross-build sanitization CONFIG_SITE= /dev/null # XXX Only for AC_CONFIG_SUBDIRS CONFIGURE_ENV+= HOST_CFLAGS="${CPPFLAGS} ${CFLAGS:N-[Og]*:N-pipe}" \ STUB_CFLAGS="${STUB_CFLAGS}" \ CPPFLAGS="" CFLAGS="${CFLAGS:M-[Og]*} ${CFLAGS:M-pipe}" \ HOST_LDFLAGS="${LDFLAGS} ${LIBS}" \ STUB_LDFLAGS="${STUB_LDFLAGS}" \ LDFLAGS="" LIBS="" -OPTIONS_DEFINE= ASSERT BASH DEBUG -OPTIONS_DEFINE_amd64= NDK -OPTIONS_DEFINE_i386= NDK -OPTIONS_DEFAULT_amd64= NDK -OPTIONS_DEFAULT_i386= NDK +OPTIONS_DEFINE= ASSERT BASH DEBUG NDK +OPTIONS_DEFAULT=NDK +OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/NDK/} OPTIONS_EXCLUDE_DragonFly=NDK ASSERT_CONFIGURE_ENABLE=checking BASH_DESC= Install JSON parser used by bash-completion BASH_RUN_DEPENDS= jq:textproc/jq DEBUG_CONFIGURE_ENABLE= debuggable-stubs # XXX Convert into USES=android once more things depend on it NDK_DESC= Build target stubs using Android NDK NDK_MASTER_SITES= https://dl.google.com/android/ndk/:ndk .if defined(ANDROID_NDK) # Prefer NDK from environment WRKSRC_ndk= ${ANDROID_NDK} .else NDK_DISTFILES= ${DISTNAME_ndk}.bin:ndk,p7zip DISTNAME_ndk= android-ndk-r10e-linux-${LINUX_RPM_ARCH:C/i.86/x86/} WRKSRC_ndk= ${WRKDIR}/${DISTNAME_ndk:C/(-[^-]+){2}$//} .endif NDK_BUILD_DEPENDS= ${LINUX_BASE_PORT} NDK_USES= 7z:partial${NDK_7z_ARGS_${LINUX_RPM_ARCH}} NDK_USE= LINUX=yes # build NDK_SHELL= ${SETENV} UNAME_s=Linux UNAME_m=${LINUX_RPM_ARCH} ${SH} NDK_CONFIGURE_ENV= ANDROID_NDK="${WRKSRC_ndk}" \ ANDROID_NDK_SHELL="${NDK_SHELL}" \ NDK_TMPDIR="${WRKDIR}" NDK_7z_ARGS_x86_64= ,p7zip # libarchive fails to read NDK_BUILD_DEPENDS_OFF= ${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:lang/gnatdroid-armv7 \ ${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:lang/gnatdroid-x86 .if defined(.PARSEDIR) NDK_CONFIGURE_ENV_OFF= PATH="${NDK_BUILD_DEPENDS_OFF:C/:.*//:H:ts:}:$$PATH" .else NDK_CONFIGURE_ENV_OFF= PATH="${LOCALBASE}/android/ARMv7/bin:${LOCALBASE}/android-x86/x86_32/bin:$$PATH" .endif NDK_CONFIGURE_OFF= --with-android-ndk=system post-extract: # XXX gold: fatal error: a.out: Invalid argument @for f in $$(${FIND} ${WRKSRC_ndk} -type l -name '*-ld'); do \ (cd $${f%/*} && ${LN} -sf $${f##*/}.bfd $${f##*/}); \ done post-patch: # XXX Decouple -Werror from --enable-checking (ASSERT=on) @${REINPLACE_CMD} -e '/CPPFLAGS.*-Werror/d' ${WRKSRC}/configure.ac post-patch-NDK-off: @${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \ ${WRKSRC}/stub-*/configure .include # XXX Bug 204615: Teach USE_LINUX about build-only deps .if defined(.PARSEDIR) RUN_DEPENDS:= ${RUN_DEPENDS:N${LINUX_BASE_PORT}} .else RUN_DEPENDS:= ${RUN_DEPENDS:N*linux_base*} .endif Index: head/graphics/sekrit-twc-zimg/Makefile =================================================================== --- head/graphics/sekrit-twc-zimg/Makefile (revision 414538) +++ head/graphics/sekrit-twc-zimg/Makefile (revision 414539) @@ -1,61 +1,56 @@ # $FreeBSD$ PORTNAME= zimg PORTVERSION= 2.0.4 DISTVERSIONPREFIX= release- CATEGORIES= graphics PKGNAMEPREFIX= ${GH_ACCOUNT}- MAINTAINER= jbeich@FreeBSD.org COMMENT= Scaling, colorspace conversion, and dithering library LICENSE= WTFPL2 LICENSE_NAME= Do What The Fuck You Want To Public License version 2 LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} -BROKEN_powerpc64= Does not build - USE_GITHUB= yes GH_ACCOUNT= sekrit-twc CONFLICTS_INSTALL= zimg-[0-9]* # include/zimg.h USES= autoreconf compiler:c++11-lib gmake libtool pathfix EXTRACT_AFTER_ARGS= --exclude test/extra PATHFIX_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --enable-testapp CPPFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 INSTALL_TARGET= install-strip USE_LDCONFIG= yes -OPTIONS_DEFINE= TEST - -OPTIONS_DEFINE_amd64= SIMD -OPTIONS_DEFINE_i386= SIMD -OPTIONS_DEFAULT_amd64= SIMD -OPTIONS_DEFAULT_i386= SIMD # runtime detection +OPTIONS_DEFINE= SIMD TEST +OPTIONS_DEFAULT=SIMD +OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/} SIMD_CONFIGURE_ENABLE= x86simd TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest TEST_USES= localbase TEST_CONFIGURE_ENABLE= unit-test TEST_TEST_TARGET= check VERBOSE=1 post-patch: @${REINPLACE_CMD} -e 's/x86_64/&|amd64/g' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's/-O2 //' \ -e '/zimg-test/ { s/+=/=/; s/^noinst_/bin_/; } ' \ ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's/nullptr_t/std::&/' \ -e 's/off64_t/off_t/' \ ${WRKSRC}/src/testcommon/json.* \ ${WRKSRC}/src/testcommon/mmap.cpp pre-install-TEST-on: do-test .include Index: head/multimedia/vapoursynth/Makefile =================================================================== --- head/multimedia/vapoursynth/Makefile (revision 414538) +++ head/multimedia/vapoursynth/Makefile (revision 414539) @@ -1,124 +1,122 @@ # $FreeBSD$ PORTNAME= vapoursynth DISTVERSION= R32 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= Video processing framework with simplicity in mind LICENSE= LGPL21+ USE_GITHUB= yes USES= autoreconf gmake libtool localbase pathfix pkgconfig PATHFIX_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 INSTALL_TARGET= install-strip USE_LDCONFIG= yes DATADIR= ${PREFIX}/lib/vapoursynth -OPTIONS_DEFINE= DEBUG DOCS FRAME_GUARD +OPTIONS_DEFINE= DEBUG DOCS FRAME_GUARD SIMD OPTIONS_DEFAULT=${OPTIONS_GROUP_COMPS} ${OPTIONS_GROUP_PLUGINS} -OPTIONS_SUB= yes - -OPTIONS_DEFINE_amd64= SIMD -OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT_amd64= SIMD +OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/} +OPTIONS_SUB= yes OPTIONS_GROUP= COMPS PLUGINS COMPS_DESC= Components OPTIONS_GROUP_COMPS= CORE PYTHON VSPIPE VSSCRIPT PLUGINS_DESC= Plugins OPTIONS_GROUP_PLUGINS= ASS EEDI3 IMAGEMAGICK MORPHO TESSERACT REMOVEGRAIN VINVERSE VIVTC # General options DEBUG_CONFIGURE_ENABLE= debug DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_USES= makeinfo DOCS_INFO= VapourSynth DOCS_PORTDOCS= * FRAME_GUARD_DESC= Check integrity after each filter FRAME_GUARD_CONFIGURE_ENABLE= guard-pattern # VSSCRIPT or REMOVEGRAIN SIMD_BUILD_DEPENDS= yasm:devel/yasm SIMD_CONFIGURE_ENABLE= x86-asm # COMPS group CORE_DESC= Core library CORE_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg CORE_USES= compiler:c++11-lib CORE_CONFIGURE_ENABLE= core PYTHON_USES= python:3.3- PYTHON_BUILD_DEPENDS= cython:lang/cython PYTHON_CONFIGURE_ENABLE= python-module PYTHON_IMPLIES= CORE VSPIPE_DESC= Command line interface VSPIPE_USES= compiler:c++11-lib VSPIPE_CONFIGURE_ENABLE= vspipe VSPIPE_IMPLIES= VSSCRIPT VSSCRIPT_DESC= Scripting library VSSCRIPT_USES= compiler:c++11-lib python:3.3- VSSCRIPT_CONFIGURE_ENABLE= vsscript # PLUGINS group ASS_DESC= Subtitles rendering via libass ASS_LIB_DEPENDS= libass.so:multimedia/libass ASS_CONFIGURE_ENABLE= assvapour EEDI3_DESC= Very slow edge directed interpolation EEDI3_CONFIGURE_ENABLE= eedi3 IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick IMAGEMAGICK_USES= compiler:c++11-lib IMAGEMAGICK_CONFIGURE_ENABLE= imwri TESSERACT_DESC= Optical Character Recognition via Tesseract TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract TESSERACT_CONFIGURE_ENABLE= ocr MORPHO_DESC= Morphological filter MORPHO_CONFIGURE_ENABLE= morpho REMOVEGRAIN_DESC= 3x3 median and convolution denoising REMOVEGRAIN_CONFIGURE_ENABLE= removegrain VINVERSE_DESC= Remove residual combing VINVERSE_CONFIGURE_ENABLE= vinverse VIVTC_DESC= Field matching, inverse telecine and decimation VIVTC_CONFIGURE_ENABLE= vivtc post-patch: @${REINPLACE_CMD} -e 's/x86_64/&|amd64/' \ ${WRKSRC}/configure.ac post-build-DOCS-on: @${DO_MAKE_BUILD} html texinfo -C${WRKSRC}/doc @${DO_MAKE_BUILD} info -C${WRKSRC}/doc/_build/texinfo @if [ -n "${PORT_OPTIONS:MVSPIPE}" ]; then \ ${DO_MAKE_BUILD} man -C${WRKSRC}/doc; \ fi post-install-DOCS-on: ${INSTALL_MAN} ${WRKSRC}/doc/_build/texinfo/VapourSynth.info \ ${STAGEDIR}${PREFIX}/${INFO_PATH} (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) @if [ -n "${PORT_OPTIONS:MVSPIPE}" ]; then \ ${INSTALL_MAN} -v ${WRKSRC}/doc/_build/man/vspipe.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1; \ fi .include