Attachment #239196 for bug #268708

View | Details | Raw Unified | Return to bug 268708
Collapse All | Expand All




PORTNAME=	libmediainfo
DISTVERSION=	22.12
CATEGORIES=	multimedia
MASTER_SITES=	https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \
		LOCAL/sunpoet
DISTNAME=	${PORTNAME}_${DISTVERSION}

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	MediaInfo library
WWW=		https://mediaarea.net/en/MediaInfo

LICENSE=	BSD2CLAUSE
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
CFLAGS+=	-D_POSIX_PRIORITY_SCHEDULING
CONFIGURE_ARGS=	--enable-shared --enable-static
GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip
USE_CXXSTD=	c++11
USE_LDCONFIG=	yes
DOS2UNIX_GLOB=	*.c *.cmake.in *.cpp *.h *.pc.in *.txt
DOS2UNIX_WRKSRC=	${WRKDIR}

CXXFLAGS+=	-D_POSIX_PRIORITY_SCHEDULING

WRKSRC=		${WRKDIR}/MediaInfoLib/Project/CMake
PLIST_SUB=	DISTVERSION=${DISTVERSION:S|.||g}

CMAKE_ON=	BUILD_SHARED_LIBS

OPTIONS_DEFINE=	CURL
OPTIONS_DEFAULT=TINYXML2
TINYXML2_DESC=	Use textproc/tinyxml2 instead of bundled one

CURL_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
TINYXML2_CONFIGURE_ON=	--with-libtinyxml2=yes
TINYXML2_LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2

post-patch:
	@${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in
	${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/libmediainfo/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1665073086	1	TIMESTAMP = 1672601994
2	SHA256 (MediaInfo_CLI_22.09_GNU_FromSource.tar.xz) = 02070e50a9cde50180a31c0529435a0ac4fdc0cc823982395833472c6ef464e9	2	SHA256 (libmediainfo_22.12.tar.xz) = 0fc6d32f06d6ce5e144074d2e57e0db8dfa4e38e752d3123ada27ccaf89634bc
3	SIZE (MediaInfo_CLI_22.09_GNU_FromSource.tar.xz) = 3337624	3	SIZE (libmediainfo_22.12.tar.xz) = 1893340




--- configure.orig	2020-08-10 23:41:20 UTC
+++ configure
@@ -17656,8 +17656,8 @@ if test -d $with_libcurl; then
 	if test -f $with_libcurl/libcurl.pc; then
 		libcurlpcfile="$with_libcurl/libcurl.pc"
 	else
-		if test -f "$with_libcurl/lib/pkgconfig/libcurl.pc"; then
-			libcurlpcfile="$with_libcurl/lib/pkgconfig/libcurl.pc"
+		if test -f "$with_libcurl/libdata/pkgconfig/libcurl.pc"; then
+			libcurlpcfile="$with_libcurl/libdata/pkgconfig/libcurl.pc"
 		else
 			as_fn_error $? "Problem while configuring builtin curl (libcurl.pc not found)" "$LINENO" 5
 		fi
@@ -17739,16 +17739,16 @@ else
 fi
 
 if test -d $with_libmms; then
-	CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_FROMSOURCE -I$with_libmms/src $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)"
-	MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)"
+	CXXFLAGS="$CXXFLAGS  -I$with_libmms/src $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)"
+	MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)"
 	if test "$enable_staticlibs" = "yes"; then
 		using_libmms="custom (static)"
-		LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)"
-		MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)"
+		LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)"
+		MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)"
 	else
 		using_libmms="custom"
-		LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)"
-		MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)"
+		LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)"
+		MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)"
 	fi
 elif test "$with_libmms" = "no"; then
 	CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_NO"

Lines 2-9 include/MediaInfo/MediaInfo.h Link Here

(-)b/multimedia/libmediainfo/pkg-plist (-2 / +7 lines)
2	include/MediaInfo/MediaInfoList.h	2	include/MediaInfo/MediaInfoList.h
3	include/MediaInfo/MediaInfo_Const.h	3	include/MediaInfo/MediaInfo_Const.h
4	include/MediaInfo/MediaInfo_Events.h	4	include/MediaInfo/MediaInfo_Events.h
5	lib/libmediainfo.a	5	include/MediaInfoDLL/MediaInfoDLL.h
		6	include/MediaInfoDLL/MediaInfoDLL_Static.h
		7	lib/cmake/mediainfolib/MediaInfoLibConfig.cmake
		8	lib/cmake/mediainfolib/MediaInfoLibConfigVersion.cmake
		9	lib/cmake/mediainfolib/MediaInfoLibTargets-%%CMAKE_BUILD_TYPE%%.cmake
		10	lib/cmake/mediainfolib/MediaInfoLibTargets.cmake
6	lib/libmediainfo.so	11	lib/libmediainfo.so
7	lib/libmediainfo.so.0	12	lib/libmediainfo.so.0
8	lib/libmediainfo.so.0.0.0	13	lib/libmediainfo.so.0.%%DISTVERSION%%.0
9	libdata/pkgconfig/libmediainfo.pc	14	libdata/pkgconfig/libmediainfo.pc

Return to bug 268708

Lines 1-41 Link Here

(-)b/multimedia/libmediainfo/Makefile (-22 / +20 lines)
1	PORTNAME= libmediainfo	1	PORTNAME= libmediainfo
2	PORTVERSION= 22.09	2	DISTVERSION= 22.12
3	CATEGORIES= multimedia	3	CATEGORIES= multimedia
4	MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \	4	MASTER_SITES= https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \
5	LOCAL/sunpoet	5	LOCAL/sunpoet
6	DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource	6	DISTNAME= ${PORTNAME}_${DISTVERSION}
7		7
8	MAINTAINER= sunpoet@FreeBSD.org	8	MAINTAINER= sunpoet@FreeBSD.org
9	COMMENT= MediaInfo library	9	COMMENT= MediaInfo library
10	WWW= https://mediaarea.net/en/MediaInfo	10	WWW= https://mediaarea.net/en/MediaInfo
11		11
12	LICENSE= BSD2CLAUSE	12	LICENSE= BSD2CLAUSE
13	LICENSE_FILE= ${WRKSRC}/../../../License.html	13	LICENSE_FILE= ${WRKSRC}/../../License.html
14		14
15	LIB_DEPENDS= libzen.so:multimedia/libzen	15	LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 \
		16	libzen.so:multimedia/libzen
16		17
17	USES= alias compiler:c++11-lang libtool localbase pathfix pkgconfig tar:xz	18	USES= cmake compiler:c++11-lang dos2unix localbase:ldflags pathfix \
18		19	pkgconfig tar:xz
19	CFLAGS+= -D_POSIX_PRIORITY_SCHEDULING
20	CONFIGURE_ARGS= --enable-shared --enable-static
21	GNU_CONFIGURE= yes
22	INSTALL_TARGET= install-strip
23	USE_CXXSTD= c++11
24	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
		21	DOS2UNIX_GLOB= .c .cmake.in .cpp .h .pc.in .txt
		22	DOS2UNIX_WRKSRC= ${WRKDIR}
		23
		24	CXXFLAGS+= -D_POSIX_PRIORITY_SCHEDULING
		25
		26	WRKSRC= ${WRKDIR}/MediaInfoLib/Project/CMake
		27	PLIST_SUB= DISTVERSION=${DISTVERSION:S\|.\|\|g}
25		28
26	WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library	29	CMAKE_ON= BUILD_SHARED_LIBS
27		30
28	OPTIONS_DEFINE= CURL TINYXML2	31	OPTIONS_DEFINE= CURL
29	OPTIONS_DEFAULT=TINYXML2
30	TINYXML2_DESC= Use textproc/tinyxml2 instead of bundled one
31		32
32	CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}	33	CURL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CURL:BOOL=True
33	CURL_LIB_DEPENDS= libcurl.so:ftp/curl	34	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
34	TINYXML2_CONFIGURE_ON= --with-libtinyxml2=yes
35	TINYXML2_LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2
36		35
37	post-install:	36	post-patch:
38	${INSTALL_DATA} ${WRKSRC}/libmediainfo.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libmediainfo.pc	37	@${REINPLACE_CMD} -e '/^Libs_Static/d' ${PATCH_WRKSRC}/libmediainfo.pc.in
39	${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/
40		38
41	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Removed Link Here

(-)a/multimedia/libmediainfo/files/patch-configure (-36 lines)
1	--- configure.orig 2020-08-10 23:41:20 UTC
2	+++ configure
3	@@ -17656,8 +17656,8 @@ if test -d $with_libcurl; then
4	if test -f $with_libcurl/libcurl.pc; then
5	libcurlpcfile="$with_libcurl/libcurl.pc"
6	else
7	- if test -f "$with_libcurl/lib/pkgconfig/libcurl.pc"; then
8	- libcurlpcfile="$with_libcurl/lib/pkgconfig/libcurl.pc"
9	+ if test -f "$with_libcurl/libdata/pkgconfig/libcurl.pc"; then
10	+ libcurlpcfile="$with_libcurl/libdata/pkgconfig/libcurl.pc"
11	else
12	as_fn_error $? "Problem while configuring builtin curl (libcurl.pc not found)" "$LINENO" 5
13	fi
14	@@ -17739,16 +17739,16 @@ else
15	fi
16
17	if test -d $with_libmms; then
18	- CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_FROMSOURCE -I$with_libmms/src $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)"
19	- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/pkgconfig/libmms.pc)"
20	+ CXXFLAGS="$CXXFLAGS -I$with_libmms/src $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)"
21	+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS -I$with_libmms $(pkg-config --cflags $with_libmms/libdata/pkgconfig/libmms.pc)"
22	if test "$enable_staticlibs" = "yes"; then
23	using_libmms="custom (static)"
24	- LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)"
25	- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/src/.libs $(pkg-config --libs --static $with_libmms/pkgconfig/libmms.pc)"
26	+ LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)"
27	+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L$with_libmms/lib $(pkg-config --libs --static $with_libmms/libdata/pkgconfig/libmms.pc)"
28	else
29	using_libmms="custom"
30	- LIBS="$LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)"
31	- MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/src/.libs $(pkg-config --libs $with_libmms/pkgconfig/libmms.pc)"
32	+ LIBS="$LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)"
33	+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L$with_libmms/lib $(pkg-config --libs $with_libmms/libdata/pkgconfig/libmms.pc)"
34	fi
35	elif test "$with_libmms" = "no"; then
36	CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_NO"