vlc | branch: master | David Fuhrmann <[email protected]> | Wed Aug 14 09:23:04 2019 +0200| [b20af5ad95dacb6a857fc1c93345977e9a34ef90] | committer: Hugo Beauzée-Luyssen
contribs: modplug: Do not force old minimum macosx version VLC already sets the minimum version, forcing an older version makes compilation fail with our flags. Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b20af5ad95dacb6a857fc1c93345977e9a34ef90 --- contrib/src/modplug/macosx-do-not-force-min-version.patch | 15 +++++++++++++++ contrib/src/modplug/rules.mak | 1 + 2 files changed, 16 insertions(+) diff --git a/contrib/src/modplug/macosx-do-not-force-min-version.patch b/contrib/src/modplug/macosx-do-not-force-min-version.patch new file mode 100644 index 0000000000..ee0e63d9e4 --- /dev/null +++ b/contrib/src/modplug/macosx-do-not-force-min-version.patch @@ -0,0 +1,15 @@ +--- libmodplug/configure.ac.old 2019-08-14 09:18:02.000000000 +0200 ++++ libmodplug/configure.ac 2019-08-14 09:18:28.000000000 +0200 +@@ -44,12 +44,6 @@ + esac + AC_SUBST(LT_LDFLAGS) + +-# require 10.5+ for osx/x86_64 builds +-case "$host" in +- x86_64-*-darwin*) +- CXXFLAGS="$CXXFLAGS -mmacosx-version-min=10.5" +- LDFLAGS="$LDFLAGS -mmacosx-version-min=10.5" ;; +-esac + + # symbol visibility + ac_save_CXXFLAGS="$CXXFLAGS" diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak index 60a759794d..61e5374ff0 100644 --- a/contrib/src/modplug/rules.mak +++ b/contrib/src/modplug/rules.mak @@ -16,6 +16,7 @@ $(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz: libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug $(UNPACK) $(APPLY) $(SRC)/modplug/modplug-win32-static.patch + $(APPLY) $(SRC)/modplug/macosx-do-not-force-min-version.patch $(call pkg_static,"libmodplug.pc.in") $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
