vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Dec 3 15:47:33 2014 +0100| [eca862ff0f1b563da7f24c3636f92d5142a7d6ee] | committer: Hugo Beauzée-Luyssen
contribs: Fix mpcdec build with MSVC > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eca862ff0f1b563da7f24c3636f92d5142a7d6ee --- contrib/src/mpcdec/musepack-asinh-msvc.patch | 11 +++++++++++ contrib/src/mpcdec/rules.mak | 3 +++ 2 files changed, 14 insertions(+) diff --git a/contrib/src/mpcdec/musepack-asinh-msvc.patch b/contrib/src/mpcdec/musepack-asinh-msvc.patch new file mode 100644 index 0000000..c6bb01e --- /dev/null +++ b/contrib/src/mpcdec/musepack-asinh-msvc.patch @@ -0,0 +1,11 @@ +--- musepack.clean/libmpcpsy/psy_tab.c 2014-12-03 15:25:37.877616700 +0100 ++++ musepack/libmpcpsy/psy_tab.c 2014-12-03 15:20:59.300071300 +0100 +@@ -186,7 +187,7 @@ + } + } + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && _MSC_VER < 1800 + static double + asinh ( double x ) + { diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak index ab5a6b4..44cab85 100644 --- a/contrib/src/mpcdec/rules.mak +++ b/contrib/src/mpcdec/rules.mak @@ -28,6 +28,9 @@ musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec $(UNPACK) $(APPLY) $(SRC)/mpcdec/musepack-no-cflags-clobber.patch $(APPLY) $(SRC)/mpcdec/musepack-no-binaries.patch +ifdef HAVE_VISUALSTUDIO + $(APPLY) $(SRC)/mpcdec/musepack-asinh-msvc.patch +endif sed -i.orig \ -e 's,^add_subdirectory(mpcgain),,g' \ -e 's,^add_subdirectory(mpcchap),,g' \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
