Skip to content

Instantly share code, notes, and snippets.

@darealshinji

darealshinji/libmediainfo-1-fixes.patch

Created May 14, 2017 21:26
Show Gist options
  • Save darealshinji/6b5dcba1d6569b67f2ff1ac549e8de56 to your computer and use it in GitHub Desktop.
Save darealshinji/6b5dcba1d6569b67f2ff1ac549e8de56 to your computer and use it in GitHub Desktop.
Download ZIP
libmediainfo build files for MXE
Raw
libmediainfo-1-fixes.patch
diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
index 9aa1dfe..4927388 100644
--- a/Project/GNU/Library/configure.ac
+++ b/Project/GNU/Library/configure.ac
@@ -359,8 +359,8 @@ if test -e ../../../../ZenLib/Project/GNU/Library/libzen-config; then
elif test "$(command -v libzen-config)" ; 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
@@ -440,15 +440,15 @@ elif test "$(command -v libzen-config)" ; then
MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(libzen-config LIBS)"
fi
else
- if pkg-config --exists libzen; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
+ if $PKG_CONFIG --exists libzen; then
+ CXXFLAGS="$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 --variable=LIBS_Static libzen)"
else
with_zenlib="system"
- LIBS="$LIBS $(pkg-config --libs libzen)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --variable=LIBS libzen)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libzen)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $($PKG_CONFIG --variable=LIBS libzen)"
fi
else
AC_MSG_ERROR([libzen configuration is not found])
@@ -468,15 +468,15 @@ if test -d $with_libcurl; then
AC_MSG_ERROR([Problem while configuring builtin curl (libcurl.pc not found)])
fi
fi
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags $libcurlpcfile)"
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags $libcurlpcfile)"
if test "$enable_staticlibs" = "yes"; then
using_libcurl="custom (static)"
- LIBS="$LIBS $(pkg-config --libs --static $libcurlpcfile)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --libs --static $libcurlpcfile)"
+ LIBS="$LIBS $($PKG_CONFIG --libs --static $libcurlpcfile)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $($PKG_CONFIG --libs --static $libcurlpcfile)"
else
using_libcurl="custom"
- LIBS="$LIBS $with_libcurl/lib $(pkg-config --libs $libcurlpcfile)"
- MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs $libcurlpcfile)"
+ LIBS="$LIBS $with_libcurl/lib $($PKG_CONFIG --libs $libcurlpcfile)"
+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS $($PKG_CONFIG --libs $libcurlpcfile)"
fi
elif test "$with_libcurl" = "no"; then
CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBCURL_NO"
@@ -488,23 +488,23 @@ elif test -e ../../../../curl/libcurl.pc; then
CXXFLAGS="$CXXFLAGS -I../../../../curl/include"
if test "$enable_staticlibs" = "yes"; then
using_libcurl="builtin (static)"
- LIBS="$LIBS $(pkg-config --libs --static ../../../../curl/libcurl.pc)"
+ LIBS="$LIBS $($PKG_CONFIG --libs --static ../../../../curl/libcurl.pc)"
else
using_libcurl="builtin"
- LIBS="$LIBS $(pkg-config --libs ../../../../curl/libcurl.pc)"
- MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs ../../../../curl/libcurl.pc)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --libs ../../../../curl/libcurl.pc)"
+ LIBS="$LIBS $($PKG_CONFIG --libs ../../../../curl/libcurl.pc)"
+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS $($PKG_CONFIG --libs ../../../../curl/libcurl.pc)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $($PKG_CONFIG --libs ../../../../curl/libcurl.pc)"
fi
-elif pkg-config --exists libcurl; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libcurl)"
+elif $PKG_CONFIG --exists libcurl; then
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags libcurl)"
if test "$enable_staticlibs" = "yes"; then
using_libcurl="system (static)"
- LIBS="$LIBS $(pkg-config --libs --static libcurl)"
+ LIBS="$LIBS $($PKG_CONFIG --libs --static libcurl)"
else
using_libcurl="system"
- LIBS="$LIBS $(pkg-config --libs libcurl)"
- MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs libcurl)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --libs libcurl)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libcurl)"
+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS $($PKG_CONFIG --libs libcurl)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $($PKG_CONFIG --libs libcurl)"
fi
elif test -e /usr/bin/curl-config; then
CXXFLAGS="$CXXFLAGS $(/usr/bin/curl-config --cflags)"
@@ -513,7 +513,7 @@ elif test -e /usr/bin/curl-config; then
LIBS="$LIBS $(/usr/bin/curl-config --libs)"
else
using_libcurl="system"
- LIBS="$LIBS $(pkg-config --libs libcurl)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libcurl)"
MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(/usr/bin/curl-config --libs)"
MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(/usr/bin/curl-config --libs)"
fi
@@ -526,14 +526,14 @@ elif test -e ../../../../Shared/Project/curl/Compile.sh; then
CXXFLAGS="$CXXFLAGS -I../../../../Shared/Source/curl/include"
if test "$enable_staticlibs" = "yes"; then
using_libcurl="builtin (static)"
- LIBS="$LIBS -L../../../../Shared/Source/curl/lib $(pkg-config --libs --static ../../../../Shared/Source/curl/libcurl.pc)"
- MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L../../../../Shared/Source/curl/lib $(pkg-config --libs --static ../../../../Shared/Source/curl/libcurl.pc)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L../../../../Shared/Source/curl/lib $(pkg-config --libs --static ../../../../Shared/Source/curl/libcurl.pc)"
+ LIBS="$LIBS -L../../../../Shared/Source/curl/lib $($PKG_CONFIG --libs --static ../../../../Shared/Source/curl/libcurl.pc)"
+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L../../../../Shared/Source/curl/lib $($PKG_CONFIG --libs --static ../../../../Shared/Source/curl/libcurl.pc)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L../../../../Shared/Source/curl/lib $($PKG_CONFIG --libs --static ../../../../Shared/Source/curl/libcurl.pc)"
else
using_libcurl="builtin"
- LIBS="$LIBS -L../../../../Shared/Source/curl/lib $(pkg-config --libs ../../../../Shared/Source/curl/libcurl.pc)"
- MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L../../../../Shared/Source/curl/lib $(pkg-config --libs ../../../../Shared/Source/curl/libcurl.pc)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L../../../../Shared/Source/curl/lib $(pkg-config --libs ../../../../Shared/Source/curl/libcurl.pc)"
+ LIBS="$LIBS -L../../../../Shared/Source/curl/lib $($PKG_CONFIG --libs ../../../../Shared/Source/curl/libcurl.pc)"
+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L../../../../Shared/Source/curl/lib $($PKG_CONFIG --libs ../../../../Shared/Source/curl/libcurl.pc)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L../../../../Shared/Source/curl/lib $($PKG_CONFIG --libs ../../../../Shared/Source/curl/libcurl.pc)"
fi
else
AC_MSG_ERROR([Problem while compiling builtin curl])
@@ -546,43 +546,43 @@ dnl -------------------------------------------------------------------------
dnl libmms
dnl
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 -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)"
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/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)"
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/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)"
fi
elif test "$with_libmms" = "no"; then
CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_NO"
using_libmms="no"
elif test -e ../../../../libmms/libmms.pc; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags ../../../../libmms/libmms.pc)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags ../../../../libmms/libmms.pc)"
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags ../../../../libmms/libmms.pc)"
+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $($PKG_CONFIG --cflags ../../../../libmms/libmms.pc)"
if test "$enable_staticlibs" = "yes"; then
using_libmms="builtin (static)"
- LIBS="$LIBS $(pkg-config --libs --static ../../../../libmms/libmms.pc)"
+ LIBS="$LIBS $($PKG_CONFIG --libs --static ../../../../libmms/libmms.pc)"
else
using_libmms="builtin"
- LIBS="$LIBS $(pkg-config --libs ../../../../libmms/libmms.pc)"
- MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs ../../../../libmms/libmms.pc)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --libs ../../../../libmms/libmms.pc)"
+ LIBS="$LIBS $($PKG_CONFIG --libs ../../../../libmms/libmms.pc)"
+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS $($PKG_CONFIG --libs ../../../../libmms/libmms.pc)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $($PKG_CONFIG --libs ../../../../libmms/libmms.pc)"
fi
-elif pkg-config --exists libmms; then
- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libmms)"
- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libmms)"
+elif $PKG_CONFIG --exists libmms; then
+ CXXFLAGS="$CXXFLAGS $($PKG_CONFIG --cflags libmms)"
+ MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $($PKG_CONFIG --cflags libmms)"
if test "$enable_staticlibs" = "yes"; then
using_libmms="system (static)"
- LIBS="$LIBS $(pkg-config --libs --static libmms)"
+ LIBS="$LIBS $($PKG_CONFIG --libs --static libmms)"
else
using_libmms="system"
- LIBS="$LIBS $(pkg-config --libs libmms)"
- MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs libmms)"
- MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --libs libmms)"
+ LIBS="$LIBS $($PKG_CONFIG --libs libmms)"
+ MediaInfoLib_LIBS="$MediaInfoLib_LIBS $($PKG_CONFIG --libs libmms)"
+ MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $($PKG_CONFIG --libs libmms)"
fi
else
CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBMMS_NO"
diff --git a/Source/MediaInfo/Reader/Reader_File.cpp b/Source/MediaInfo/Reader/Reader_File.cpp
index 529a2b9..b834bdb 100644
--- a/Source/MediaInfo/Reader/Reader_File.cpp
+++ b/Source/MediaInfo/Reader/Reader_File.cpp
@@ -27,7 +27,7 @@
#include "ZenLib/FileName.h"
#ifdef WINDOWS
#undef __TEXT
- #include "Windows.h"
+ #include "windows.h"
#endif //WINDOWS
using namespace ZenLib;
using namespace std;
diff --git a/Source/MediaInfo/Reader/Reader_File.h b/Source/MediaInfo/Reader/Reader_File.h
index 867ac51..7cd7882 100644
--- a/Source/MediaInfo/Reader/Reader_File.h
+++ b/Source/MediaInfo/Reader/Reader_File.h
@@ -24,7 +24,7 @@
#if MEDIAINFO_READTHREAD
#ifdef WINDOWS
#undef __TEXT
- #include "Windows.h"
+ #include "windows.h"
#endif //WINDOWS
#endif //MEDIAINFO_READTHREAD
//---------------------------------------------------------------------------
Raw
libmediainfo.mk
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := libmediainfo
$(PKG)_WEBSITE := https://mediaarea.net
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.7.95
$(PKG)_CHECKSUM := 432cd106d93fa067d61b36bad5376a431448fea1fa40b7397b851506b562d96a
$(PKG)_SUBDIR := MediaInfoLib
$(PKG)_FILE := $(PKG)_$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://mediaarea.net/download/source/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libzen zlib
define $(PKG)_UPDATE
$(WGET) -q -O - "https://mediaarea.net/MediaInfo/Download/Source" | \
grep -e 'mediaarea\.net/download/source/libmediainfo/' | \
cut -d '"' -f2 | \
$(SED) 's|.*mediaarea\.net|https://mediaarea.net|' | \
cut -d '/' -f7 | \
tail -1
endef
define $(PKG)_BUILD
cd '$(1)/Project/GNU/Library' && ./autogen.sh && \
PKG_CONFIG='$(TARGET)-pkg-config' \
./configure $(MXE_CONFIGURE_OPTS)
$(MAKE) -C '$(1)/Project/GNU/Library' -j '$(JOBS)'
$(MAKE) -C '$(1)/Project/GNU/Library' -j 1 install
endef
Raw
libzen-1-fixes.patch
--- a/Project/GNU/Library/configure.ac
+++ b/Project/GNU/Library/configure.ac
@@ -172,21 +172,6 @@
dnl
dnl -------------------------------------------------------------------------
-dnl Check if size_t is long
-dnl
-AC_LANG([C++])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <cstdlib>
- void foo(signed int) {}
- void foo(unsigned int) {}
- int main () {foo(size_t(0)); return 0;}])], [size_t_is_long="no"], [size_t_is_long="yes"])
-
-if test "$size_t_is_long" = "yes"; then
- CXXFLAGS="$CXXFLAGS -DSIZE_T_IS_LONG"
- ZenLib_CXXFLAGS="$ZenLib_CXXFLAGS -DSIZE_T_IS_LONG"
-fi
-
-dnl -------------------------------------------------------------------------
dnl Check if stream is available
dnl
AC_LANG([C++])
Raw
libzen.mk
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := libzen
$(PKG)_WEBSITE := https://mediaarea.net
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.4.35
$(PKG)_CHECKSUM := 8dfec76261e4dfab438bc285f4f84b3d0632c96b60ce8208ed1b58d9814dbfbf
$(PKG)_SUBDIR := ZenLib
$(PKG)_FILE := $(PKG)_$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://mediaarea.net/download/source/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
define $(PKG)_UPDATE
$(WGET) -q -O - "https://mediaarea.net/MediaInfo/Download/Source" | \
grep -e 'mediaarea\.net/download/source/libzen/' | \
cut -d '"' -f2 | \
$(SED) 's|.*mediaarea\.net|https://mediaarea.net|' | \
cut -d '/' -f7 | \
tail -1
endef
define $(PKG)_BUILD
cd '$(1)/Project/GNU/Library' && ./autogen.sh && \
./configure $(MXE_CONFIGURE_OPTS)
$(MAKE) -C '$(1)/Project/GNU/Library' -j '$(JOBS)'
$(MAKE) -C '$(1)/Project/GNU/Library' -j 1 install
endef
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment