[Gemrb-commits] gemrb: branch master updated. v0.7.0-781-gf2fb924

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  f2fb924bce095cae4cca8e67b009dd277d4efbb8 (commit)

Summary of changes:
 cmake/modules/FindLIBVLC.cmake |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
      from  7a68217fa6a87b4c93cd886beedae1000ce30ce1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=f2fb924bce095cae4cca8e67b009dd277d4efbb8

commit f2fb924bce095cae4cca8e67b009dd277d4efbb8
Author: Jaka Kranjc <lyn...@us...>
Date:   Fri Jul 13 20:48:31 2012 +0200

    cmake to vlc < 2.0: you shall not pass!

diff --git a/cmake/modules/FindLIBVLC.cmake b/cmake/modules/FindLIBVLC.cmake
index b312cd6..04f05f3 100644
--- a/cmake/modules/FindLIBVLC.cmake
+++ b/cmake/modules/FindLIBVLC.cmake
@@ -51,7 +51,18 @@ FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore PATHS
 FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore)
 
 IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
-   SET(LIBVLC_FOUND TRUE)
+  # we require this function from 2.0
+  execute_process(
+    COMMAND grep -sq libvlc_video_set_format_callbacks "${LIBVLC_INCLUDE_DIR}/vlc/libvlc_media_player.h" "${LIBVLC_INCLUDE_DIR}/libvlc_media_player.h"
+    RESULT_VARIABLE LIBVLC_GOOD
+    OUTPUT_VARIABLE TM
+  )
+  #message("1111111: ${LIBVLC_LIBRARY} + ${LIBVLC_INCLUDE_DIR} : ${LIBVLC_GOOD} ~ ${TM}")
+  IF (LIBVLC_GOOD EQUAL 0)
+     SET(LIBVLC_FOUND TRUE)
+  ELSE (LIBVLC_GOOD EQUAL 0)
+     message ("The VLCPlayer plugin requires at least VLC 2.0.0 to build, skipping!")
+  ENDIF (LIBVLC_GOOD EQUAL 0)
 ENDIF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
 
 IF (LIBVLC_FOUND)

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator