From a63e2ea7389234d6f15c9054e972cc7155d19ff1 Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 2 Sep 2025 18:45:06 +0000 Subject: [PATCH] multimedia/libmediainfo: do not pick up fmt from ${prefix}/include The bundled ThirdParty/fmt would pick up the inline implementation from the different version of the devel/fmt headers, if installed, eventually breaking the build of multimedia/mediainfo. reported by tb@ --- multimedia/libmediainfo/Makefile | 1 + .../patches/patch-Project_GNU_Library_Makefile_am | 12 ++++++++++++ .../patches/patch-Project_GNU_Library_configure_ac | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 multimedia/libmediainfo/patches/patch-Project_GNU_Library_Makefile_am diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index 872c1afd62d..a653ebaeef7 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -2,6 +2,7 @@ COMMENT= read metadata from media files VERSION= 25.07.1 PKGNAME= libmediainfo-${VERSION} +REVISION= 0 SHARED_LIBS= mediainfo 20.0 # 0.0 CATEGORIES= multimedia diff --git a/multimedia/libmediainfo/patches/patch-Project_GNU_Library_Makefile_am b/multimedia/libmediainfo/patches/patch-Project_GNU_Library_Makefile_am new file mode 100644 index 00000000000..2ff5739670c --- /dev/null +++ b/multimedia/libmediainfo/patches/patch-Project_GNU_Library_Makefile_am @@ -0,0 +1,12 @@ +Index: Project/GNU/Library/Makefile.am +--- Project/GNU/Library/Makefile.am.orig ++++ Project/GNU/Library/Makefile.am +@@ -313,6 +313,8 @@ pkgconfig_DATA = libmediainfo.pc + + AM_CXXFLAGS = -std=c++11 + AM_CPPFLAGS = -I../../../Source -I../../../../ZenLib/Source ++# Do not pick up external fmt from ${prefix}/include ++AM_CPPFLAGS += -I../../../Source/ThirdParty + + TESTS_DIR = test + diff --git a/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac b/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac index 1512da812a7..46116b59b58 100644 --- a/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac +++ b/multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac @@ -1,7 +1,7 @@ Index: Project/GNU/Library/configure.ac --- Project/GNU/Library/configure.ac.orig +++ Project/GNU/Library/configure.ac -@@ -906,9 +906,6 @@ if test "$GXX" = yes ; then +@@ -931,9 +931,6 @@ if test "$GXX" = yes ; then if test "$enable_debug" = "yes"; then CFLAGS="$CFLAGS -O0 -g -Wall -Wundef" CXXFLAGS="$CXXFLAGS -O0 -g -Wall -W -Wundef -Wcast-qual -Wno-ctor-dtor-privacy"