From 6552828244061012cc74ca0df37382b6af76c2c4 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Sat, 4 May 2019 08:23:17 -0700
Subject: [PATCH 1/4] qb: Fix --disable-menu.

Menu widgets must also be disabled with --disable-menu, now
configure will do so or error if --disable-menu and
--enable-menu_widgets are explicitly used.
---
 qb/config.libs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 997081a894..17eb7ccf20 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -524,5 +524,6 @@ if [ "$HAVE_DEBUG" = 'yes' ]; then
    fi
 fi
 
+check_enabled MENU MENU_WIDGETS 'menu widgets' 'The menu is' false
 check_enabled ZLIB RPNG RPNG 'zlib is' false
 check_enabled V4L2 VIDEOPROCESSOR 'video processor' 'Video4linux2 is' true

From 9e9849170df2b1cf254ae505528265276c5b2061 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Sat, 4 May 2019 08:26:36 -0700
Subject: [PATCH 2/4] Silence unused function with --disable-menu.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gfx/drivers/gl_core.c:1529:13: warning: ‘gl_core_draw_menu_texture’ defined but not used [-Wunused-function]
 static void gl_core_draw_menu_texture(gl_core_t *gl, video_frame_info_t *video_info)
             ^~~~~~~~~~~~~~~~~~~~~~~~~
---
 gfx/drivers/gl_core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c
index 5d349cb15a..3dedb4fb21 100644
--- a/gfx/drivers/gl_core.c
+++ b/gfx/drivers/gl_core.c
@@ -1526,6 +1526,7 @@ static void gl_core_update_cpu_texture(gl_core_t *gl,
    }
 }
 
+#if defined(HAVE_MENU)
 static void gl_core_draw_menu_texture(gl_core_t *gl, video_frame_info_t *video_info)
 {
    const float vbo_data[] = {
@@ -1566,6 +1567,7 @@ static void gl_core_draw_menu_texture(gl_core_t *gl, video_frame_info_t *video_i
 
    glDisable(GL_BLEND);
 }
+#endif
 
 static bool gl_core_frame(void *data, const void *frame,
                           unsigned frame_width, unsigned frame_height,

From 5f8bf221c6d5aad28cc12c241e6d66454a527093 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Sat, 4 May 2019 08:38:10 -0700
Subject: [PATCH 3/4] travis: Refactor configure argument handling.

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ecdbf32887..0384385620 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,10 +69,9 @@ before_install:
 script:
   - |
      if [ -n "$CROSS_COMPILE" ]; then
-       ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib
-     else
-       ./configure
+       ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib"
      fi
+  - ./configure $ARGS
   - |
      if [ -n "$C89_BUILD" ]; then
        make C89_BUILD=1
@@ -84,6 +83,7 @@ script:
 
 env:
   global:
+   - ARGS=""
    - MAKEFLAGS="-j2"
    - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
 addons:

From 9a41ccd69484fdeddadb0dfb4d712c0333eb4f27 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Sat, 4 May 2019 08:48:30 -0700
Subject: [PATCH 4/4] travis: Test building with --disable-menu for linux.

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0384385620..f282708b2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,8 @@ matrix:
       env: C89_BUILD=1 CC=gcc-8 CXX=g++-8
     - compiler: gcc
       env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8
+    - compiler: gcc
+      env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8
     - compiler: clang
       env: CC=clang-6.0 CXX=clang++-6.0
     - compiler: clang
@@ -71,6 +73,10 @@ script:
      if [ -n "$CROSS_COMPILE" ]; then
        ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib"
      fi
+  - |
+     if [ -n "$DISABLE_MENU" ]; then
+       ARGS="$ARGS --disable-menu"
+     fi
   - ./configure $ARGS
   - |
      if [ -n "$C89_BUILD" ]; then