Move libmythnvctrl to external/libXNVCtrl, and update references

Refs #11302
(cherry picked from commit ab3f8e6)

mythtv/configure

@@ -8919,6 +8919,11 @@ echo "Configuring minilzo..."
 echo "Configuring libmythsoundtouch..."
 (cd external/libmythsoundtouch ; \
        ${qmakeconf} -o Makefile)
+if ! disabled x11 ; then
+    echo "Configuring libXNVCtrl..."
+    (cd external/libXNVCtrl; \
+           ${qmakeconf} -o Makefile.lib)
+fi
 
 # generate the lists of enabled components
 print_enabled_components(){

mythtv/external/Makefile

@@ -10,6 +10,10 @@ ifdef CONFIG_HDHOMERUN
     SUBDIRS += libhdhomerun
 endif
 
+ifdef CONFIG_X11
+    SUBDIRS += libXNVCtrl
+endif
+
 SUBDIRS_ALL = $(addsuffix -all, ${SUBDIRS})
 SUBDIRS_INSTALL = $(addsuffix -install, ${SUBDIRS})
 SUBDIRS_UNINSTALL = $(addsuffix -uninstall, ${SUBDIRS})
@@ -64,3 +68,6 @@ minilzo-all minilzo-clean minilzo-distclean minilzo-install minilzo-uninstall:
 
 libmythsoundtouch-all libmythsoundtouch-clean libmythsoundtouch-distclean libmythsoundtouch-install libmythsoundtouch-uninstall:
 	${MAKE} -C libmythsoundtouch ${@:libmythsoundtouch-%=%}
+
+libXNVCtrl-all libXNVCtrl-install libXNVCtrl-uninstall libXNVCtrl-clean libXNVCtrl-distclean:
+	${MAKE} -C libXNVCtrl -f Makefile.lib ${@:libXNVCtrl-%=%}

mythtv/external/libXNVCtrl/.gitignore

@@ -0,0 +1 @@
+Makefile.lib

mythtv/libs/libmythnvctrl/libmythnvctrl.pro → mythtv/external/libXNVCtrl/libXNVCtrl.pro

@@ -1,18 +1,13 @@
 include ( ../../settings.pro )
 
 TEMPLATE = lib
-TARGET = mythnvctrl-$$LIBVERSION
+TARGET = mythXNVCtrl-$${LIBVERSION}
 CONFIG += staticlib warn_off
 CONFIG -= qt
 
-INCLUDEPATH += ../ ../../ 
-
-DEFINES += HAVE_AV_CONFIG_H
-
 QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
 
 # Input
 HEADERS += nv_control.h  NVCtrl.h  NVCtrlLib.h
 SOURCES += NVCtrl.c
 
-include ( ../libs-targetfix.pro )

mythtv/libs/libmythui/libmythui.pro

@@ -110,8 +110,9 @@ using_x11 {
     # Add nvidia XV-EXTENSION support
     HEADERS += util-nvctrl.h
     SOURCES += util-nvctrl.cpp
-    LIBS += -L../libmythnvctrl -lmythnvctrl-$${LIBVERSION}
-    POST_TARGETDEPS += ../libmythnvctrl/libmythnvctrl-$${MYTH_LIB_EXT}
+    INCLUDEPATH += ../../external/libXNVCtrl
+    LIBS += -L../../external/libXNVCtrl -lmythXNVCtrl-$${LIBVERSION}
+    POST_TARGETDEPS += ../../external/libXNVCtrl/libmythXNVCtrl-$${LIBVERSION}.$${QMAKE_EXTENSION_STATICLIB}
 }
 
 using_qtdbus {

mythtv/libs/libmythui/util-nvctrl.cpp

@@ -13,8 +13,8 @@
 
 #include "mythxdisplay.h"
 
-#include "libmythnvctrl/NVCtrl.h"
-#include "libmythnvctrl/NVCtrlLib.h"
+#include "NVCtrl.h"
+#include "NVCtrlLib.h"
 
 #ifdef USING_XRANDR
 #include "DisplayResX.h"

mythtv/libs/libs.pro

@@ -8,7 +8,6 @@ SUBDIRS += libmythservicecontracts
 libmythservicecontracts.depends = libmythbase
 
 using_mheg:SUBDIRS += libmythfreemheg
-using_x11:SUBDIRS += libmythnvctrl
 !contains( CONFIG_LIBMPEG2EXTERNAL, yes):SUBDIRS += libmythmpeg2
 
 # Libraries with dependencies