diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index d22b8f5ac548..558fa90bf887 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -1,36 +1,39 @@ PORTNAME= libmediainfo -PORTVERSION= 22.12 -PORTREVISION= 1 +DISTVERSION= 22.12 CATEGORIES= multimedia -MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ +MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \ LOCAL/sunpoet -DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource +DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= MediaInfo library -WWW= https://mediaarea.net/en/MediaInfo \ - https://github.com/MediaArea/MediaInfoLib +WWW= https://mediaarea.net/en/MediaInfo LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/../../../License.html +LICENSE_FILE= ${WRKSRC}/../../License.html LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 \ libzen.so:multimedia/libzen -USES= compiler:c++11-lang dos2unix libtool localbase pathfix pkgconfig tar:xz - -CONFIGURE_ARGS= --enable-shared --enable-static --disable-dll -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -PATHFIX_MAKEFILEIN+= configure +USES= cmake compiler:c++11-lang dos2unix localbase:ldflags pathfix \ + pkgconfig tar:xz USE_LDCONFIG= yes +DOS2UNIX_GLOB= *.c *.cmake.in *.cpp *.h *.pc.in *.txt +DOS2UNIX_WRKSRC= ${WRKDIR} + +CXXFLAGS+= -D_POSIX_PRIORITY_SCHEDULING -WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library +WRKSRC= ${WRKDIR}/MediaInfoLib/Project/CMake +PLIST_SUB= DISTVERSION=${DISTVERSION:S|.||g} + +CMAKE_ON= BUILD_SHARED_LIBS OPTIONS_DEFINE= CURL -OPTIONS_DEFAULT=CURL -CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} +CURL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True CURL_LIB_DEPENDS= libcurl.so:ftp/curl +post-patch: + @${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in + .include diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo index 4c7db7e82382..7f9e186b64ea 100644 --- a/multimedia/libmediainfo/distinfo +++ b/multimedia/libmediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589520 -SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947 -SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944 +TIMESTAMP = 1672601994 +SHA256 (libmediainfo_22.12.tar.xz) = 0fc6d32f06d6ce5e144074d2e57e0db8dfa4e38e752d3123ada27ccaf89634bc +SIZE (libmediainfo_22.12.tar.xz) = 1893340 diff --git a/multimedia/libmediainfo/pkg-descr b/multimedia/libmediainfo/pkg-descr index efdc90b6a90b..5cb4c16336d9 100644 --- a/multimedia/libmediainfo/pkg-descr +++ b/multimedia/libmediainfo/pkg-descr @@ -2,3 +2,5 @@ MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. Read http://mediaarea.net/en/MediaInfo/Support/Formats for supported formats. + +See also: https://github.com/MediaArea/MediaInfoLib diff --git a/multimedia/libmediainfo/pkg-plist b/multimedia/libmediainfo/pkg-plist index df45a20c7f0e..2aa1b99b2181 100644 --- a/multimedia/libmediainfo/pkg-plist +++ b/multimedia/libmediainfo/pkg-plist @@ -2,8 +2,13 @@ include/MediaInfo/MediaInfo.h include/MediaInfo/MediaInfoList.h include/MediaInfo/MediaInfo_Const.h include/MediaInfo/MediaInfo_Events.h -lib/libmediainfo.a +include/MediaInfoDLL/MediaInfoDLL.h +include/MediaInfoDLL/MediaInfoDLL_Static.h +lib/cmake/mediainfolib/MediaInfoLibConfig.cmake +lib/cmake/mediainfolib/MediaInfoLibConfigVersion.cmake +lib/cmake/mediainfolib/MediaInfoLibTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/mediainfolib/MediaInfoLibTargets.cmake lib/libmediainfo.so lib/libmediainfo.so.0 -lib/libmediainfo.so.0.0.0 +lib/libmediainfo.so.0.%%DISTVERSION%%.0 libdata/pkgconfig/libmediainfo.pc diff --git a/multimedia/libzen/Makefile b/multimedia/libzen/Makefile index 793cc8fd7c16..397f58a915e1 100644 --- a/multimedia/libzen/Makefile +++ b/multimedia/libzen/Makefile @@ -1,29 +1,28 @@ PORTNAME= libzen -PORTVERSION= 0.4.40 -PORTREVISION= 1 +DISTVERSION= 0.4.40 PORTEPOCH= 1 CATEGORIES= multimedia -MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${MEDIAINFO_PORTVERSION}/ \ +MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \ LOCAL/sunpoet -DISTNAME= MediaInfo_CLI_${MEDIAINFO_PORTVERSION}_GNU_FromSource +DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= ZenLib used by MediaInfo and its library -WWW= https://mediaarea.net/en/MediaInfo \ - https://github.com/MediaArea/ZenLib +WWW= https://mediaarea.net/en/MediaInfo LICENSE= ZLIB -LICENSE_FILE= ${WRKSRC}/../../../License.txt +LICENSE_FILE= ${WRKSRC}/../../License.txt -USES= compiler:c++11-lang dos2unix libtool pathfix tar:xz - -CONFIGURE_ARGS= --enable-shared --enable-static -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +USES= cmake compiler:c++11-lang dos2unix pathfix pkgconfig tar:bz2 USE_LDCONFIG= yes +DOS2UNIX_GLOB= *.c *.cmake.in *.cpp *.h *.pc.in *.txt +DOS2UNIX_WRKSRC= ${WRKDIR} + +WRKSRC= ${WRKDIR}/ZenLib/Project/CMake -WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library +PLIST_SUB= DISTVERSION=${DISTVERSION} -MEDIAINFO_PORTVERSION= 22.12 +post-patch: + @${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libzen.pc.in .include diff --git a/multimedia/libzen/distinfo b/multimedia/libzen/distinfo index 48a716a05881..b7acb712cb1d 100644 --- a/multimedia/libzen/distinfo +++ b/multimedia/libzen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589522 -SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947 -SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944 +TIMESTAMP = 1672600333 +SHA256 (libzen_0.4.40.tar.bz2) = 5543e2c45214b9d9f0ba4f43dee61d0296e1ff9f1427ed6c879ddd1b62b9f69e +SIZE (libzen_0.4.40.tar.bz2) = 137110 diff --git a/multimedia/libzen/pkg-descr b/multimedia/libzen/pkg-descr index efdc90b6a90b..101feef832a2 100644 --- a/multimedia/libzen/pkg-descr +++ b/multimedia/libzen/pkg-descr @@ -2,3 +2,5 @@ MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. Read http://mediaarea.net/en/MediaInfo/Support/Formats for supported formats. + +See also: https://github.com/MediaArea/ZenLib diff --git a/multimedia/libzen/pkg-plist b/multimedia/libzen/pkg-plist index 7be66e8fe0ef..5a6ccf2e270c 100644 --- a/multimedia/libzen/pkg-plist +++ b/multimedia/libzen/pkg-plist @@ -13,12 +13,6 @@ include/ZenLib/Format/Http/Http_Cookies.h include/ZenLib/Format/Http/Http_Handler.h include/ZenLib/Format/Http/Http_Request.h include/ZenLib/Format/Http/Http_Utils.h -include/ZenLib/HTTP_Client.h -include/ZenLib/HTTP_Client/HTTPClient.h -include/ZenLib/HTTP_Client/HTTPClientAuth.h -include/ZenLib/HTTP_Client/HTTPClientCommon.h -include/ZenLib/HTTP_Client/HTTPClientString.h -include/ZenLib/HTTP_Client/HTTPClientWrapper.h include/ZenLib/InfoMap.h include/ZenLib/MemoryDebug.h include/ZenLib/OS_Utils.h @@ -33,8 +27,11 @@ include/ZenLib/ZtringListList.h include/ZenLib/ZtringListListF.h include/ZenLib/int128s.h include/ZenLib/int128u.h -lib/libzen.a +lib/cmake/zenlib/ZenLibConfig.cmake +lib/cmake/zenlib/ZenLibConfigVersion.cmake +lib/cmake/zenlib/ZenLibTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/zenlib/ZenLibTargets.cmake lib/libzen.so lib/libzen.so.0 -lib/libzen.so.0.0.0 +lib/libzen.so.%%DISTVERSION%% libdata/pkgconfig/libzen.pc diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile index 9b7c3737d89f..5766752579b5 100644 --- a/multimedia/mediainfo/Makefile +++ b/multimedia/mediainfo/Makefile @@ -1,14 +1,13 @@ PORTNAME= mediainfo -PORTVERSION= 22.12 +DISTVERSION= 22.12 CATEGORIES= multimedia -MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ +MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \ LOCAL/sunpoet -DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource +DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Provides technical and tag information for video and audio files -WWW= https://mediaarea.net/en/MediaInfo \ - https://github.com/MediaArea/MediaInfo +WWW= https://mediaarea.net/en/MediaInfo LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/../../../License.html @@ -16,14 +15,17 @@ LICENSE_FILE= ${WRKSRC}/../../../License.html LIB_DEPENDS= libmediainfo.so:multimedia/libmediainfo \ libzen.so:multimedia/libzen -USES= compiler:c++11-lang cpe libtool pathfix pkgconfig tar:xz +USES= autoreconf compiler:c++11-lang cpe dos2unix libtool pathfix \ + pkgconfig tar:xz GNU_CONFIGURE= yes +USE_CXXSTD= c++11 USE_LDCONFIG= yes +CPE_VENDOR= mediaarea +DOS2UNIX_GLOB= *.c *.cpp *.h +DOS2UNIX_WRKSRC= ${WRKDIR} PLIST_FILES= bin/mediainfo -WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI - -CPE_VENDOR= mediaarea +WRKSRC= ${WRKDIR}/MediaInfo/Project/GNU/CLI .include diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo index 995778948454..0d9caebdc92b 100644 --- a/multimedia/mediainfo/distinfo +++ b/multimedia/mediainfo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589524 -SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947 -SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944 +TIMESTAMP = 1672606752 +SHA256 (mediainfo_22.12.tar.xz) = 932b82739f738e7db603cf5bb170720731a9e7c61d145c2a54aabb3cd0b753bc +SIZE (mediainfo_22.12.tar.xz) = 2026408