Index: head/devel/libfmt/files/patch-test_posix-mock-test.cc =================================================================== --- head/devel/libfmt/files/patch-test_posix-mock-test.cc (revision 466178) +++ head/devel/libfmt/files/patch-test_posix-mock-test.cc (nonexistent) @@ -1,11 +0,0 @@ ---- test/posix-mock-test.cc.orig 2016-12-01 18:09:30 UTC -+++ test/posix-mock-test.cc -@@ -502,7 +502,7 @@ LocaleType newlocale(int category_mask, - return LocaleMock::instance->newlocale(category_mask, locale, base); - } - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - typedef int FreeLocaleResult; - #else - typedef void FreeLocaleResult; Property changes on: head/devel/libfmt/files/patch-test_posix-mock-test.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libfmt/Makefile =================================================================== --- head/devel/libfmt/Makefile (revision 466178) +++ head/devel/libfmt/Makefile (revision 466179) @@ -1,22 +1,28 @@ # $FreeBSD$ PORTNAME= libfmt -PORTVERSION= 3.0.1 -PORTREVISION= 3 +DISTVERSION= 4.1.0 CATEGORIES= devel MAINTAINER= SlavaMikerov@gmail.com COMMENT= Fmt is an open-source formatting library for C++ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst USES= cmake:outsource compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= fmtlib GH_PROJECT= fmt -CMAKE_ARGS= -DFMT_DOC=OFF -DBUILD_SHARED_LIBS=ON -OPTIONS_DEFINE= TEST -TEST_CMAKE_BOOL= FMT_TEST +USE_LDCONFIG= yes +CMAKE_ARGS= -DFMT_DOC:BOOL=OFF -DFMT_TEST:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON + +PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} + +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFMT_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include Index: head/devel/libfmt/distinfo =================================================================== --- head/devel/libfmt/distinfo (revision 466178) +++ head/devel/libfmt/distinfo (revision 466179) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480615869 -SHA256 (fmtlib-fmt-3.0.1_GH0.tar.gz) = dce62ab75a161dd4353a98364feb166d35e7eea382169d59d9ce842c49c55bad -SIZE (fmtlib-fmt-3.0.1_GH0.tar.gz) = 606603 +TIMESTAMP = 1521298377 +SHA256 (fmtlib-fmt-4.1.0_GH0.tar.gz) = 46628a2f068d0e33c716be0ed9dcae4370242df135aed663a180b9fd8e36733d +SIZE (fmtlib-fmt-4.1.0_GH0.tar.gz) = 620863 Index: head/devel/libfmt/pkg-plist =================================================================== --- head/devel/libfmt/pkg-plist (revision 466178) +++ head/devel/libfmt/pkg-plist (revision 466179) @@ -1,13 +1,17 @@ +include/fmt/container.h include/fmt/format.cc include/fmt/format.h include/fmt/ostream.cc include/fmt/ostream.h include/fmt/posix.h +include/fmt/printf.cc +include/fmt/printf.h +include/fmt/string.h include/fmt/time.h lib/cmake/fmt/fmt-config-version.cmake lib/cmake/fmt/fmt-config.cmake lib/cmake/fmt/fmt-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/fmt/fmt-targets.cmake lib/libfmt.so -lib/libfmt.so.3 -lib/libfmt.so.3.0.1 +lib/libfmt.so.%%SHL1%% +lib/libfmt.so.%%SHL3%% Index: head/multimedia/kodi-devel/Makefile =================================================================== --- head/multimedia/kodi-devel/Makefile (revision 466178) +++ head/multimedia/kodi-devel/Makefile (revision 466179) @@ -1,194 +1,194 @@ # $FreeBSD$ PORTNAME= kodi DISTVERSION= 18.0.g201803211302 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMESUFFIX?= -devel MAINTAINER= tobik@FreeBSD.org COMMENT= Award winning media center application LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.GPL BROKEN_FreeBSD_10= does not build ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 BUILD_DEPENDS= rapidjson>=0:devel/rapidjson \ swig3.0:devel/swig30 LIB_DEPENDS= libass.so:multimedia/libass \ libavcodec.so:multimedia/ffmpeg \ libavfilter.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libcdio.so:sysutils/libcdio \ libcrossguid.so:devel/libcrossguid \ libcurl.so:ftp/curl \ libdvdnav.so:multimedia/libdvdnav \ libdvdread.so:multimedia/libdvdread \ libexpat.so:textproc/expat2 \ libfmt.so:devel/libfmt \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libgif.so:graphics/giflib \ libgnutls.so:security/gnutls \ liblcms2.so:graphics/lcms2 \ liblzo2.so:archivers/lzo2 \ libpcre.so:devel/pcre \ libpcrecpp.so:devel/pcre \ libpng.so:graphics/png \ libpostproc.so:multimedia/ffmpeg \ libswresample.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ libtag.so:audio/taglib \ libtinyxml.so:textproc/tinyxml \ libuuid.so:misc/e2fsprogs-libuuid # Building libcpluff.a requires autoreconf and gmake. Using ninja # leads to dependency problems where libcpluff.a is not yet finished # building when it's required. USES= autoreconf:build cmake:outsource,noninja compiler:c++11-lib \ gettext gmake iconv:wchar_t jpeg libtool pkgconfig python:-2.7 \ ssl sqlite USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= xbmc GH_TAGNAME= d571386e6f848db993ac7f855fc911abc23e308a USE_GNOME= libxslt libxml2 USE_JAVA= yes JAVA_BUILD= yes USE_LDCONFIG= yes CONFLICTS_INSTALL= kodi-[0-9]* CMAKE_ARGS= -DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" \ -DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \ -DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" CMAKE_OFF= ENABLE_ALSA \ ENABLE_DVDCSS \ ENABLE_INTERNAL_FFMPEG \ ENABLE_INTERNAL_CROSSGUID CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB}" OPENSSL_CFLAGS="-I${OPENSSLINC}" KODIARCH_i386= x86 KODIARCH_amd64= x86_64 PLIST_SUB= ARCH=${KODIARCH_${ARCH}:U${ARCH}} OPSYS=${OPSYS:tl} OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSH UPNP VAAPI \ VDPAU WEBSERVER OPTIONS_DEFAULT= LIBBLURAY SNDIO SSH UPNP VAAPI VDPAU WEBSERVER X11 OPTIONS_SINGLE= PLATFORM OPTIONS_SINGLE_PLATFORM= GBM RPI WAYLAND X11 OPTIONS_EXCLUDE_amd64= RPI OPTIONS_EXCLUDE_i386= RPI OPTIONS_SUB= yes # Choosing one of SNDIO or PULSEAUDIO is mandatory right now if you # want audio output. The OSS backend is currently not hooked into # Kodi's audio sink factory due to recent refactorings. OPTIONS_MULTI= SOUND OPTIONS_MULTI_SOUND= PULSEAUDIO SNDIO CEC_DESC= CEC adapter support GBM_DESC= GBM support (requires a kernel with evdev support) PLATFORM_DESC= Platform RPI_DESC= Raspberry Pi support AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_CMAKE_BOOL= ENABLE_AVAHI CEC_LIB_DEPENDS= libcec.so:multimedia/libcec CEC_CMAKE_BOOL= ENABLE_CEC DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS GBM_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="gbm" LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CMAKE_BOOL= ENABLE_BLURAY MYSQL_USES= mysql MYSQL_CMAKE_BOOL= ENABLE_MYSQLCLIENT NFS_LIB_DEPENDS= libnfs.so:net/libnfs NFS_CMAKE_BOOL= ENABLE_NFS PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSEAUDIO # For RPI, disable VAAPI in multimedia/ffmpeg too, so that mesa-libs # is *not* installed via libva in the build environment. Both # mesa-libs and raspberrypi-userland conflict with each other. RPI_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="rbpi" RPI_LIB_DEPENDS= libbrcmEGL.so:misc/raspberrypi-userland RPI_LIB_DEPENDS_OFF= libdrm.so:graphics/libdrm RPI_PREVENTS= VAAPI VDPAU RPI_USE_OFF= GL=egl,gl,glu SMB_USES= samba:lib SMB_CMAKE_BOOL= ENABLE_SMBCLIENT SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= ENABLE_SNDIO SSH_LIB_DEPENDS= libssh.so:security/libssh SSH_CMAKE_BOOL= ENABLE_SSH UPNP_CMAKE_BOOL= ENABLE_UPNP # XXX: Upstream is https://github.com/plutinosoft/Neptune UPNP_CXXFLAGS= -DNPT_CONFIG_HAVE_ARPA_INET_H \ -DNPT_CONFIG_HAVE_GETADDRINFO \ -DNPT_CONFIG_HAVE_INET_NTOP \ -DNPT_CONFIG_HAVE_INET_PTON \ -DNPT_CONFIG_HAVE_NET_IF_DL_H \ -DNPT_CONFIG_HAVE_SOCKADDR_DL \ -DNPT_CONFIG_HAVE_SOCKADDR_IN_SIN_LEN VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CMAKE_BOOL= ENABLE_VAAPI VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CMAKE_BOOL= ENABLE_VDPAU WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAYLAND_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="wayland" \ -DWAYLAND_RENDER_SYSTEM:STRING="gl" WAYLAND_LIB_DEPENDS= libwayland-client++.so:graphics/waylandpp \ libxkbcommon.so:x11/libxkbcommon WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd WEBSERVER_CMAKE_BOOL= ENABLE_MICROHTTPD X11_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="x11" X11_USE= XORG=x11,xext,xrandr .include .if ${SLAVE_PORT} == no PORTDATA= * .endif post-patch: # Do not try to download dvdnav/dvdread during the build, instead # we'll manually point the build to the system's libdvd{nav,read}.so # (see CMAKE_ARGS). @${REINPLACE_CMD} 's@KODI_DEPENDSBUILD@true@' \ ${WRKSRC}/cmake/modules/FindLibDvd.cmake @${CP} ${WRKSRC}/cmake/platform/linux/gbm.cmake \ ${WRKSRC}/cmake/platform/linux/rbpi.cmake \ ${WRKSRC}/cmake/platform/freebsd .if ${SLAVE_PORT} == no post-install: ${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf kodi.bin.1.gz kodi.1.gz @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/TexturePacker @${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' | ${XARGS} ${STRIP_CMD} # Nothing useful here... @${RM} -rf ${STAGEDIR}${DOCSDIR} .endif .include