[vlc-commits] contrib:mpg123: don't bump the Windows version if we're already higher

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Tue May 17 08:13:06 2016 +0200| [09b61cdd4f43efc308ab4e557037318e782a0b6a] | committer: Jean-Baptiste Kempf

contrib:mpg123: don't bump the Windows version if we're already higher

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=09b61cdd4f43efc308ab4e557037318e782a0b6a
---

 contrib/src/mpg123/winstore.patch |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/contrib/src/mpg123/winstore.patch b/contrib/src/mpg123/winstore.patch
index e55642d..c194409 100644
--- a/contrib/src/mpg123/winstore.patch
+++ b/contrib/src/mpg123/winstore.patch
@@ -1,6 +1,6 @@
 --- mpg123/configure.ac	2015-08-12 07:38:31.000000000 +0200
 +++ mpg123/configure.ac.winstore	2016-05-16 16:23:05.234325900 +0200
-@@ -2290,23 +2292,41 @@ win32_fifo_working=no
+@@ -2294,23 +2294,41 @@ win32_fifo_working=no
  if test x$win32_specific_codes = xenabled; then
    AC_MSG_CHECKING([if we have Named Pipes])
    if test "x$fifo" != "xdisabled"; then
@@ -44,3 +44,14 @@
      fi
    fi
    have_mkfifo=$win32_fifo_working
+@@ -2324,6 +2342,10 @@ fi
+ 
+ #### WINVER Bump
+ if test x$win32_specific_codes = xenabled; then
++  AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
++  #if defined(WINVER) && WINVER > 0x0501
++  #error don't bump
++  #endif]])],[],[win32_winver_bump=no])
+   AC_MSG_CHECKING([if WINVER and _WIN32_WINNT needs version bumps])
+   if test "x$win32_winver_bump" = "xyes"; then
+     AC_MSG_RESULT([yes])