[gemrb] 04/06: DEBIAN: Don't look for unnecessary libvlccore-dev when looking for VLC.

[Beren Minor]

This is an automated email from the git hooks/post-receive script.

berenm-guest pushed a commit to branch patch-queue/master
in repository gemrb.

commit 26211cd22b96a576bd663ba2a638d6549567ac6c
Author: Beren Minor <beren.minor+git at gmail.com>
Date:   Sat Aug 30 14:54:37 2014 +0200

    DEBIAN: Don't look for unnecessary libvlccore-dev when looking for VLC.
---
 cmake/modules/FindLIBVLC.cmake | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/cmake/modules/FindLIBVLC.cmake b/cmake/modules/FindLIBVLC.cmake
index 04f05f3..f842fd0 100644
--- a/cmake/modules/FindLIBVLC.cmake
+++ b/cmake/modules/FindLIBVLC.cmake
@@ -41,16 +41,8 @@ FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc PATHS
   NO_DEFAULT_PATH
   )
 FIND_LIBRARY(LIBVLC_LIBRARY NAMES vlc)
-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore PATHS
-  "$ENV{LIBVLC_LIBRARY_PATH}"
-  "$ENV{LIB_DIR}/lib"
-  #mingw
-  c:/msys/local/lib
-  NO_DEFAULT_PATH
-  )
-FIND_LIBRARY(LIBVLCCORE_LIBRARY NAMES vlccore)
 
-IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
+IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY)
   # 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"
@@ -63,13 +55,12 @@ IF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY AND LIBVLCCORE_LIBRARY)
   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)
+ENDIF (LIBVLC_INCLUDE_DIR AND LIBVLC_LIBRARY)
 
 IF (LIBVLC_FOUND)
    IF (NOT LIBVLC_FIND_QUIETLY)
       MESSAGE(STATUS "Found LibVLC include-dir path: ${LIBVLC_INCLUDE_DIR}")
       MESSAGE(STATUS "Found LibVLC library path:${LIBVLC_LIBRARY}")
-      MESSAGE(STATUS "Found LibVLCcore library path:${LIBVLCCORE_LIBRARY}")
    ENDIF (NOT LIBVLC_FIND_QUIETLY)
 ELSE (LIBVLC_FOUND)
    IF (LIBVLC_FIND_REQUIRED)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git