From 9b45b48c466765b6491778709a1c52e061480f76 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 25 Oct 2014 20:07:44 +0200
Subject: Drop libquvi support

No development activity (or even any sign of life) for almost a year.

A replacement based on youtube-dl will probably be provided before the
next mpv release. Ask on the IRC channel if you want to test.

Simplify the Lua check too: libquvi linking against a different Lua
version than mpv was a frequent issue, but with libquvi gone, no
direct dependency uses Lua, and such a clash is rather unlikely.
---
 waftools/checks/custom.py | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'waftools/checks/custom.py')

diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
index 20b18675db..fc57bd92d5 100644
--- a/waftools/checks/custom.py
+++ b/waftools/checks/custom.py
@@ -45,29 +45,12 @@ def check_iconv(ctx, dependency_identifier):
     return check_libs(libs, checkfn)(ctx, dependency_identifier)
 
 def check_lua(ctx, dependency_identifier):
-    if ctx.dependency_satisfied('libquvi4'):
-        quvi_lib_storage = [ 'libquvi4' ]
-        additional_lua_test_header = '#include <quvi/quvi.h>'
-        additional_lua_test_code   = load_fragment('lua_libquvi4.c')
-    elif ctx.dependency_satisfied('libquvi9'):
-        quvi_lib_storage = [ 'libquvi9' ]
-        additional_lua_test_header = '#include <quvi.h>'
-        additional_lua_test_code   = load_fragment('lua_libquvi9.c')
-    else:
-        quvi_lib_storage = []
-        additional_lua_test_header = ''
-        additional_lua_test_code   = ''
-
-    fragment = load_fragment('lua.c').format(
-        additional_lua_test_header=additional_lua_test_header,
-        additional_lua_test_code=additional_lua_test_code)
-
     lua_versions = [
         ( '51',     'lua >= 5.1.0 lua < 5.2.0'),
         ( '51deb',  'lua5.1 >= 5.1.0'), # debian
         ( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD
         ( 'luajit', 'luajit >= 2.0.0' ),
-        # assume all our dependencies (libquvi in particular) link with 5.1
+        # assume all our dependencies link with 5.1
         ( '52',     'lua >= 5.2.0' ),
         ( '52deb',  'lua5.2 >= 5.2.0'), # debian
         ( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD
@@ -78,11 +61,8 @@ def check_lua(ctx, dependency_identifier):
             [lv for lv in lua_versions if lv[0] == ctx.options.LUA_VER]
 
     for lua_version, pkgconfig_query in lua_versions:
-        if compose_checks(
-            check_pkg_config(pkgconfig_query, uselib_store=lua_version),
-            check_cc(fragment=fragment,
-                     use=[lua_version] + quvi_lib_storage,
-                     execute=True))(ctx, dependency_identifier):
+        if check_pkg_config(pkgconfig_query, uselib_store=lua_version) \
+            (ctx, dependency_identifier):
             # XXX: this is a bit of a hack, ask waf developers if I can copy
             # the uselib_store to 'lua'
             ctx.mark_satisfied(lua_version)
-- 
cgit v1.2.3