diff options
| -rw-r--r-- | sysutils/kfilemetadata5/Makefile | 15 | ||||
| -rw-r--r-- | sysutils/kfilemetadata5/PLIST | 5 | ||||
| -rw-r--r-- | sysutils/kfilemetadata5/distinfo | 11 | ||||
| -rw-r--r-- | sysutils/kfilemetadata5/patches/patch-CMakeLists.txt | 18 |
4 files changed, 29 insertions, 20 deletions
diff --git a/sysutils/kfilemetadata5/Makefile b/sysutils/kfilemetadata5/Makefile index d24191669ee..012d2d725ca 100644 --- a/sysutils/kfilemetadata5/Makefile +++ b/sysutils/kfilemetadata5/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2019/07/23 17:20:01 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2019/08/27 20:39:06 markd Exp $ DISTNAME= kfilemetadata-${KF5VER} PKGNAME= ${DISTNAME:S/-/5-/} -PKGREVISION= 4 CATEGORIES= sysutils HOMEPAGE= https://community.kde.org/Frameworks @@ -15,23 +14,13 @@ USE_TOOLS+= msgmerge pkg-config DEPENDS+= catdoc-[0-9]*:../../textproc/catdoc -SUBST_CLASSES+= xdg -SUBST_STAGE.xdg= pre-configure -SUBST_MESSAGE.xdg= Install via examples dir. -SUBST_FILES.xdg= CMakeLists.txt -SUBST_SED.xdg= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:' - -MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg -CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/kfilemetadata.categories \ - ${PKG_SYSCONFDIR}/xdg/kfilemetadata.categories - .include "../../lang/python/tool.mk" .include "../../archivers/karchive/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" .include "../../devel/kcoreaddons/buildlink3.mk" .include "../../devel/ki18n/buildlink3.mk" .include "../../graphics/exiv2/buildlink3.mk" -.include "../../multimedia/ffmpeg3/buildlink3.mk" +.include "../../multimedia/ffmpeg4/buildlink3.mk" .include "../../print/poppler-qt5/buildlink3.mk" .include "../../sysutils/attr/buildlink3.mk" .include "../../textproc/ebook-tools/buildlink3.mk" diff --git a/sysutils/kfilemetadata5/PLIST b/sysutils/kfilemetadata5/PLIST index 5910f4be1d0..1e0f1114d00 100644 --- a/sysutils/kfilemetadata5/PLIST +++ b/sysutils/kfilemetadata5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2019/04/25 21:05:22 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2019/08/27 20:39:06 markd Exp $ include/KF5/KFileMetaData/KFileMetaData/EmbeddedImageData include/KF5/KFileMetaData/KFileMetaData/ExtractionResult include/KF5/KFileMetaData/KFileMetaData/Extractor @@ -42,6 +42,7 @@ lib/libKF5FileMetaData.so.${PKGVERSION} qt5/mkspecs/modules/qt_KFileMetaData.pri qt5/plugins/kf5/kfilemetadata/kfilemetadata_epubextractor.so qt5/plugins/kf5/kfilemetadata/kfilemetadata_exiv2extractor.so +qt5/plugins/kf5/kfilemetadata/kfilemetadata_ffmpegextractor.so qt5/plugins/kf5/kfilemetadata/kfilemetadata_odfextractor.so qt5/plugins/kf5/kfilemetadata/kfilemetadata_office2007extractor.so qt5/plugins/kf5/kfilemetadata/kfilemetadata_officeextractor.so @@ -52,7 +53,6 @@ qt5/plugins/kf5/kfilemetadata/kfilemetadata_postscriptdscextractor.so qt5/plugins/kf5/kfilemetadata/kfilemetadata_taglibextractor.so qt5/plugins/kf5/kfilemetadata/kfilemetadata_xmlextractor.so qt5/plugins/kf5/kfilemetadata/writers/kfilemetadata_taglibwriter.so -share/examples/kde-xdg/kfilemetadata.categories share/locale/ar/LC_MESSAGES/kfilemetadata5.mo share/locale/bg/LC_MESSAGES/kfilemetadata5.mo share/locale/bs/LC_MESSAGES/kfilemetadata5.mo @@ -98,3 +98,4 @@ share/locale/tr/LC_MESSAGES/kfilemetadata5.mo share/locale/uk/LC_MESSAGES/kfilemetadata5.mo share/locale/zh_CN/LC_MESSAGES/kfilemetadata5.mo share/locale/zh_TW/LC_MESSAGES/kfilemetadata5.mo +share/qlogging-categories5/kfilemetadata.categories diff --git a/sysutils/kfilemetadata5/distinfo b/sysutils/kfilemetadata5/distinfo index f055f013bfc..208867c0789 100644 --- a/sysutils/kfilemetadata5/distinfo +++ b/sysutils/kfilemetadata5/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.6 2019/04/25 21:05:22 markd Exp $ +$NetBSD: distinfo,v 1.7 2019/08/27 20:39:06 markd Exp $ -SHA1 (kfilemetadata-5.57.0.tar.xz) = 604b70f7dca78562a31a4d86bff4d0102144ff03 -RMD160 (kfilemetadata-5.57.0.tar.xz) = e8482f2ff96b62e3760fe743ea98623debfa9036 -SHA512 (kfilemetadata-5.57.0.tar.xz) = a513a9e850758647e098177eeea793a2672644de531293b37d57ee216fd3048c124dbea99c5b469ce110fc538169fe72fcfd1b72a1296360d1f111d14bcf2b8e -Size (kfilemetadata-5.57.0.tar.xz) = 410556 bytes +SHA1 (kfilemetadata-5.61.0.tar.xz) = 5b9480ec4a014a3ef252968f1de25786f62cf367 +RMD160 (kfilemetadata-5.61.0.tar.xz) = edadcaf23b3fb8dbd5ae432448c43b63a5e24a6f +SHA512 (kfilemetadata-5.61.0.tar.xz) = 440e5215004451fbb982cb00f5d72d547af5e25a58c89a075f422f16295c6bb055f03abca6cbef60396d0e3a188788c7ebc7f5aca1c505702fddb9b6882f5e14 +Size (kfilemetadata-5.61.0.tar.xz) = 416760 bytes +SHA1 (patch-CMakeLists.txt) = 57d022aa86e532e9fe4185a2b5fc8b90b3e5e463 SHA1 (patch-cmake_FindFFmpeg.cmake) = 94c7699d9a62b86f3c188ad162385bc3319b7753 diff --git a/sysutils/kfilemetadata5/patches/patch-CMakeLists.txt b/sysutils/kfilemetadata5/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..b3cf3c55f28 --- /dev/null +++ b/sysutils/kfilemetadata5/patches/patch-CMakeLists.txt @@ -0,0 +1,18 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2019/08/27 20:39:06 markd Exp $ + +Something in FindFFmpeg is caching failures so test lowest +version first. + +--- CMakeLists.txt.orig 2019-08-03 19:54:00.000000000 +0000 ++++ CMakeLists.txt +@@ -72,9 +72,9 @@ set_package_properties(LibExiv2 PROPERTI + TYPE OPTIONAL + PURPOSE "Support for image metadata") + ++find_package(FFmpeg 55.27 COMPONENTS AVUTIL) + find_package(FFmpeg 57.48 COMPONENTS AVCODEC) + find_package(FFmpeg 57.40 COMPONENTS AVFORMAT) +-find_package(FFmpeg 55.27 COMPONENTS AVUTIL) + set_package_properties(FFmpeg PROPERTIES DESCRIPTION "Video Tag reader" + URL "https://ffmpeg.org/" TYPE OPTIONAL + PURPOSE "Support for video metadata") |