From 1bb24245cec08ade876f9177b3a78fa95a20e314 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Wed, 15 Apr 2015 19:08:51 -0400
Subject: [PATCH] Only use -lva for StepMania, not ffmpeg.

---
 CMakeLists.txt     | 6 ------
 src/CMakeLists.txt | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 320092db37..23a1107211 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,12 +297,6 @@ elseif(LINUX)
         )
       endif()
 
-      if(WITH_LIBVA AND VA_FOUND)
-        list(APPEND FFMPEG_CONFIGURE
-          "--extra-ldflags=-lva"
-        )
-      endif()
-
       if (IS_DIRECTORY "${SM_FFMPEG_SRC_DIR}")
         externalproject_add("ffmpeg"
           SOURCE_DIR "${SM_FFMPEG_SRC_DIR}"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0d5e71368d..dab40f09c7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -456,6 +456,10 @@ else() # Unix / Linux
         "${SM_FFMPEG_ROOT}/libavutil/libavutil.a"
       )
     endif()
+
+    if(WITH_LIBVA AND VA_FOUND)
+      list(APPEND SMDATA_LINK_LIB ${VA_LIBRARY})
+    endif()
   endif()
 
   list(APPEND SMDATA_LINK_LIB
@@ -525,6 +529,7 @@ else() # Unix / Linux
   list(APPEND SMDATA_LINK_LIB
     ${XRANDR_LIBRARIES}
   )
+
   list(REMOVE_ITEM SMDATA_LINK_LIB "zlib")
 endif()