openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

multimedia/libmediainfo: do not pick up fmt from ${prefix}/include

Browse Source 
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@
This commit is contained in:
naddy
2025-09-02 18:45:06 +00:00
parent e49d8e0c34
commit a63e2ea738
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/libmediainfo/Makefile
+1
View File
@@ -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
multimedia/libmediainfo/patches/patch-Project_GNU_Library_Makefile_am
+12
View File
@@ -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
multimedia/libmediainfo/patches/patch-Project_GNU_Library_configure_ac
+1 -1
View File
@@ -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"