Index: head/multimedia/libmatroska/Makefile =================================================================== --- head/multimedia/libmatroska/Makefile (revision 502707) +++ head/multimedia/libmatroska/Makefile (revision 502708) @@ -1,23 +1,24 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= libmatroska DISTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/ \ http://www.bunkus.org/videotools/mkvtoolnix/sources/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Extensible Multimedia Container Format LICENSE= LGPL21 LIB_DEPENDS= libebml.so:textproc/libebml USES= cmake compiler:c++11-lang pathfix pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CMAKE_ARGS= -DBUILD_SHARED_LIBS=YES .include Index: head/multimedia/libmatroska/files/patch-CMakeLists.txt =================================================================== --- head/multimedia/libmatroska/files/patch-CMakeLists.txt (nonexistent) +++ head/multimedia/libmatroska/files/patch-CMakeLists.txt (revision 502708) @@ -0,0 +1,15 @@ +Revert of upstream commit 51648b. It breaks linkage of multimedia/mkvtoolnix + +[1] https://github.com/Matroska-Org/libmatroska/commit/51648bb73e4f6a81be754c9a271fc681a1c78f7 + +--- CMakeLists.txt.orig 2019-05-26 10:14:31 UTC ++++ CMakeLists.txt +@@ -74,7 +74,7 @@ if(BUILD_SHARED_LIBS) + target_compile_definitions(matroska PUBLIC MATROSKA_DLL) + set_target_properties(matroska PROPERTIES + DEFINE_SYMBOL "MATROSKA_DLL_EXPORT" +- CXX_VISIBILITY_PRESET hidden ++ C_VISIBILITY_PRESET hidden + VISIBILITY_INLINES_HIDDEN 1) + endif() + Property changes on: head/multimedia/libmatroska/files/patch-CMakeLists.txt ___________________________________________________________________ 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 Index: head/multimedia/mkvtoolnix/Makefile =================================================================== --- head/multimedia/mkvtoolnix/Makefile (revision 502707) +++ head/multimedia/mkvtoolnix/Makefile (revision 502708) @@ -1,79 +1,80 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= mkvtoolnix PORTVERSION= 34.0.0 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ MAINTAINER= riggs@FreeBSD.org COMMENT= Tools to extract from/get info about/create Matroska media streams LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_sparc64= does not install BUILD_DEPENDS= rake:devel/rubygem-rake \ docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ libebml.so:textproc/libebml \ libboost_regex.so:devel/boost-libs \ libpugixml.so:textproc/pugixml \ libmatroska.so:multimedia/libmatroska USES= compiler:c++17-lang iconv localbase pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PO4A=no CONFIGURE_ARGS= --with-boost=${LOCALBASE} \ --with-boost-filesystem=boost_filesystem \ --with-boost-system=boost_system \ --with-boost-regex=boost_regex \ --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook MAKE_ENV= V=1 MAKE_CMD= rake -v MAKEFILE= Rakefile ALL_TARGET= #Empty OPTIONS_DEFINE= FLAC NLS QT5 MANTRANS OPTIONS_DEFAULT= FLAC QT5 OPTIONS_SUB= yes FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_WITH= flac NLS_USES= gettext NLS_CONFIGURE_WITH= gettext QT5_DESC= Build and install GUI application (Qt 5) QT5_USES= desktop-file-utils qt:5 shared-mime-info QT5_USE= QT=buildtools_build,concurrent,core,dbus,declarative,gui,multimedia,network,widgets QT5_CONFIGURE_ENABLE= qt QT5_BUILD_DEPENDS= qmake:devel/qt5-qmake QT5_LIB_DEPENDS= libcmark.so:textproc/cmark MANTRANS_DESC= Build and install manpage translations MANTRANS_BUILD_DEPENDS= po4a:textproc/po4a .include .if ${CHOSEN_COMPILER_TYPE} != clang USE_CXXSTD= c++17 .endif post-patch: @${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \ ${WRKSRC}/configure post-configure-NLS-off: # https://github.com/mbunkus/mkvtoolnix/issues/1501 # Fixed in 8.6.0 @${REINPLACE_CMD} -e 's|LIBINTL_LIBS =|#LIBINTL_LIBS =|g' ${WRKSRC}/build-config @${REINPLACE_CMD} -e 's|#define HAVE_LIBINTL_H|//#define HAVE_LIBINTL_H|g' ${WRKSRC}/config.h @${REINPLACE_CMD} -e 's|S["LIBINTL_LIBS"]=|#S["LIBINTL_LIBS"]=|g' ${WRKSRC}/config.status .include Index: head/textproc/libebml/Makefile =================================================================== --- head/textproc/libebml/Makefile (revision 502707) +++ head/textproc/libebml/Makefile (revision 502708) @@ -1,23 +1,24 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= libebml DISTVERSION= 1.3.8 DISTVERSIONPREFIX= release- +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= multimedia@FreeBSD.org COMMENT= EBML (Extensible Binary Meta Language), sort of binary version of XML LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE.LGPL USES= cmake compiler:c++11-lang pathfix tar:bzip2 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= Matroska-Org CMAKE_ARGS= -DBUILD_SHARED_LIBS=YES .include Index: head/textproc/libebml/files/patch-CMakeLists.txt =================================================================== --- head/textproc/libebml/files/patch-CMakeLists.txt (nonexistent) +++ head/textproc/libebml/files/patch-CMakeLists.txt (revision 502708) @@ -0,0 +1,15 @@ +Revert of upstream commit b0eb7a. It breaks linkage of multimedia/mkvtoolnix + +[1] https://github.com/Matroska-Org/libebml/commit/b0eb7ab1160441b8156fb26d96a35ccd61e8a548 + +--- CMakeLists.txt.orig 2019-05-26 09:30:30 UTC ++++ CMakeLists.txt +@@ -100,7 +100,7 @@ target_sources(ebml + if(BUILD_SHARED_LIBS) + set_target_properties(ebml + PROPERTIES +- CXX_VISIBILITY_PRESET hidden ++ C_VISIBILITY_PRESET hidden + VISIBILITY_INLINES_HIDDEN 1) + else() + target_compile_definitions(ebml PUBLIC EBML_STATIC_DEFINE) Property changes on: head/textproc/libebml/files/patch-CMakeLists.txt ___________________________________________________________________ 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