Source: mediainfo
Version: 0.7.98-1
Tags: upstream patch
User: helm...@debian.org
Usertags: rebootstrap
mediainfo fails to cross build from source, because it uses the build
architecture pkg-config and thus fails finding required packages (e.g.
libzen). The issue here is that configure.ac hard codes "pkg-config"
rather than using PKG_PROG_PKG_CONFIG to discover the right $PKG_CONFIG
while considering $ac_tool_prefix. The attached patch fixes the
configure scripts. After applying it mediainfo still fails to cross
build, because #875827. Can you apply the patch nonetheless?
Helmut
Index: mediainfo-0.7.98/Project/GNU/CLI/configure.ac
===================================================================
--- mediainfo-0.7.98.orig/Project/GNU/CLI/configure.ac
+++ mediainfo-0.7.98/Project/GNU/CLI/configure.ac
@@ -28,6 +28,7 @@
AC_PROG_CXX
AC_PROG_LIBTOOL
AC_PROG_INSTALL
+PKG_PROG_PKG_CONFIG
dnl #########################################################################
dnl ### Options
@@ -70,8 +71,8 @@
elif test "$(libzen-config Exists)" = "yes" ; then
enable_unicode="$(libzen-config Unicode)"
else
- if pkg-config --exists libzen; then
- enable_unicode="$(pkg-config --variable=Unicode libzen)"
+ if $PKG_CONFIG --exists libzen; then
+ enable_unicode="$($PKG_CONFIG --variable=Unicode libzen)"
else
AC_MSG_ERROR([libzen configuration is not found])
fi
@@ -177,15 +178,15 @@
LIBS="$LIBS $(libmediainfo-config LIBS)"
fi
else
- if pkg-config --exists libmediainfo; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libmediainfo)"
+ if $PKG_CONFIG --exists libmediainfo; then
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags libmediainfo)"
if test "$enable_staticlibs" = "yes"; then
with_mediainfolib="system (static)"
- LIBS="$LIBS $(pkg-config --variable=Libs_Static libmediainfo)"
- LIBS="$LIBS $(pkg-config --static --libs libmediainfo)"
+ LIBS="$LIBS $($PKG_CONFIG --variable=Libs_Static libmediainfo)"
+ LIBS="$LIBS $($PKG_CONFIG --static --libs libmediainfo)"
else
with_mediainfolib="system"
- LIBS="$LIBS $(pkg-config --libs libmediainfo)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libmediainfo)"
fi
else
AC_MSG_ERROR([libmediainfo configuration is not found])
@@ -219,16 +220,16 @@
LIBS="$LIBS $(libzen-config LIBS)"
fi
else
- if pkg-config --exists libzen; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
+ if $PKG_CONFIG --exists libzen; then
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags libzen)"
+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $($PKG_CONFIG --cflags libzen)"
if test "$enable_staticlibs" = "yes"; then
with_zenlib="system (static)"
- LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
- LIBS="$LIBS $(pkg-config --static --libs libzen)"
+ LIBS="$LIBS $($PKG_CONFIG --variable=Libs_Static libzen)"
+ LIBS="$LIBS $($PKG_CONFIG --static --libs libzen)"
else
with_zenlib="system"
- LIBS="$LIBS $(pkg-config --libs libzen)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libzen)"
fi
else
AC_MSG_ERROR([libzen configuration is not found])
@@ -321,4 +322,4 @@
echo " Using libmediainfo? $with_mediainfolib"
echo ""
echo " CXXFLAGS: $CXXFLAGS"
-echo " LIBS: $LIBS"
\ No newline at end of file
+echo " LIBS: $LIBS"
Index: mediainfo-0.7.98/Project/GNU/GUI/configure.ac
===================================================================
--- mediainfo-0.7.98.orig/Project/GNU/GUI/configure.ac
+++ mediainfo-0.7.98/Project/GNU/GUI/configure.ac
@@ -27,6 +27,7 @@
AC_PROG_CXX
AC_PROG_LIBTOOL
AC_PROG_INSTALL
+PKG_PROG_PKG_CONFIG
dnl #########################################################################
dnl ### Configure
@@ -82,8 +83,8 @@
if test -e ../../../../ZenLib/Project/GNU/Library/libzen-config; then
enable_unicode="$(../../../../ZenLib/Project/GNU/Library/libzen-config Unicode)"
else
- if pkg-config --exists libzen; then
- enable_unicode="$(pkg-config --variable=Unicode libzen)"
+ if $PKG_CONFIG --exists libzen; then
+ enable_unicode="$($PKG_CONFIG --variable=Unicode libzen)"
else
AC_MSG_ERROR([libzen configuration is not found])
fi
@@ -291,15 +292,15 @@
LIBS="$LIBS $(../../../../MediaInfoLib/Project/GNU/Library/libmediainfo-config LIBS)"
fi
else
- if pkg-config --exists libmediainfo; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libmediainfo)"
+ if $PKG_CONFIG --exists libmediainfo; then
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags libmediainfo)"
if test "$enable_staticlibs" = "yes"; then
with_mediainfolib="system (static)"
- LIBS="$LIBS $(pkg-config --variable=Libs_Static libmediainfo)"
- LIBS="$LIBS $(pkg-config --static --libs libmediainfo)"
+ LIBS="$LIBS $($PKG_CONFIG --variable=Libs_Static libmediainfo)"
+ LIBS="$LIBS $($PKG_CONFIG --static --libs libmediainfo)"
else
with_mediainfolib="system"
- LIBS="$LIBS $(pkg-config --libs libmediainfo)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libmediainfo)"
fi
else
AC_MSG_ERROR([libmediainfo configuration is not found])
@@ -324,16 +325,16 @@
LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS)"
fi
else
- if pkg-config --exists libzen; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
+ if $PKG_CONFIG --exists libzen; then
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags libzen)"
+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $($PKG_CONFIG --cflags libzen)"
if test "$enable_staticlibs" = "yes"; then
with_zenlib="system (static)"
- LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)"
- LIBS="$LIBS $(pkg-config --static --libs libzen)"
+ LIBS="$LIBS $($PKG_CONFIG --variable=Libs_Static libzen)"
+ LIBS="$LIBS $($PKG_CONFIG --static --libs libzen)"
else
with_zenlib="system"
- LIBS="$LIBS $(pkg-config --libs libzen)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libzen)"
fi
else
AC_MSG_ERROR([libzen configuration is not found])
