git: 080a95fcd3d7 - main - multimedia/libmediainfo: Re-apply 93d0a119a698aa76d582123be9d97c4fedadc6bd
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 Mar 2023 19:24:57 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=080a95fcd3d78c83120e4465792c042556a25dc0
commit 080a95fcd3d78c83120e4465792c042556a25dc0
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-03-21 18:40:03 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-03-21 19:20:07 +0000
multimedia/libmediainfo: Re-apply 93d0a119a698aa76d582123be9d97c4fedadc6bd
- Remove --disable-dll
- Bump PORTREVISION for package change
---
multimedia/libmediainfo/Makefile | 31 ++++++++++++++-----------------
multimedia/libmediainfo/distinfo | 6 +++---
multimedia/libmediainfo/pkg-plist | 7 ++-----
3 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index be1609a67db2..c8b73acce76a 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -1,10 +1,10 @@
PORTNAME= libmediainfo
-DISTVERSION= 22.12
-PORTREVISION= 2
+PORTVERSION= 22.12
+PORTREVISION= 3
CATEGORIES= multimedia
-MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \
+MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
LOCAL/sunpoet
-DISTNAME= ${PORTNAME}_${DISTVERSION}
+DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= MediaInfo library
@@ -12,28 +12,25 @@ WWW= https://mediaarea.net/en/MediaInfo \
https://github.com/MediaArea/MediaInfoLib
LICENSE= BSD2CLAUSE
-LICENSE_FILE= ${WRKSRC}/../../License.html
+LICENSE_FILE= ${WRKSRC}/../../../License.html
LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 \
libzen.so:multimedia/libzen
-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}
+USES= compiler:c++11-lang dos2unix libtool localbase pathfix pkgconfig tar:xz
-WRKSRC= ${WRKDIR}/MediaInfoLib/Project/CMake
-PLIST_SUB= DISTVERSION=${DISTVERSION:S|.||g}
+CONFIGURE_ARGS= --enable-shared --enable-static
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+PATHFIX_MAKEFILEIN+= configure
+USE_LDCONFIG= yes
-CMAKE_ON= BUILD_SHARED_LIBS
+WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library
OPTIONS_DEFINE= CURL
+OPTIONS_DEFAULT=CURL
-CURL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True
+CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-post-patch:
- @${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in
-
.include <bsd.port.mk>
diff --git a/multimedia/libmediainfo/distinfo b/multimedia/libmediainfo/distinfo
index ccc980a5614e..71eee4447932 100644
--- a/multimedia/libmediainfo/distinfo
+++ b/multimedia/libmediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678696235
-SHA256 (libmediainfo_22.12.tar.xz) = 0fc6d32f06d6ce5e144074d2e57e0db8dfa4e38e752d3123ada27ccaf89634bc
-SIZE (libmediainfo_22.12.tar.xz) = 1893340
+TIMESTAMP = 1677771027
+SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947
+SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944
diff --git a/multimedia/libmediainfo/pkg-plist b/multimedia/libmediainfo/pkg-plist
index 2aa1b99b2181..9ef4e9825f73 100644
--- a/multimedia/libmediainfo/pkg-plist
+++ b/multimedia/libmediainfo/pkg-plist
@@ -4,11 +4,8 @@ include/MediaInfo/MediaInfo_Const.h
include/MediaInfo/MediaInfo_Events.h
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.a
lib/libmediainfo.so
lib/libmediainfo.so.0
-lib/libmediainfo.so.0.%%DISTVERSION%%.0
+lib/libmediainfo.so.0.0.0
libdata/pkgconfig/libmediainfo.pc