Rename libs/libmythhdhomerun to external/libhdhomerun, and update ref…

…erences

Signed-off-by: Daniel Thor Kristjansson <danielk@cuymedia.net>

mythtv/configure

@@ -5535,6 +5535,11 @@ echo "Configuring nzmqt..."
 echo "Configuring qjson..."
 (cd external/qjson ; \
        ${qmake} -o Makefile)
+if ! disabled hdhomerun ; then
+    echo "Configuring libhdhomerun..."
+    (cd external/libhdhomerun; \
+           ${qmake} -o Makefile)
+fi
 
 test -n "$WARNINGS" && printf "\n$WARNINGS" || exit 0
 

mythtv/docs/doxygen-architecture-document.cpp

@@ -161,10 +161,6 @@ There are also a few simple \ref testing "testing shortcuts".
 
       This library does not depend on any of our libraries.
 
-  <dt>libmythhdhomerun       <dd>Support for the HDHomeRun recorder device.
-
-      This library does not depend on any of our libraries.
-
 </dl>
 Two libraries libmythmpeg2 and libmythsamplerate appear redundant, but
 libmpeg2 decodes MPEG-2 more quickly than ffmpeg on some systems, and

mythtv/external/Makefile

@@ -2,6 +2,10 @@ include ../config.mak
 
 SUBDIRS = FFmpeg zeromq nzmqt qjson
 
+ifdef CONFIG_HDHOMERUN
+    SUBDIRS += libhdhomerun
+endif
+
 SUBDIRS_ALL = $(addsuffix -all, ${SUBDIRS})
 SUBDIRS_INSTALL = $(addsuffix -install, ${SUBDIRS})
 SUBDIRS_UNINSTALL = $(addsuffix -uninstall, ${SUBDIRS})
@@ -46,3 +50,6 @@ qjson-all:
 qjson-install qjson-uninstall qjson-clean qjson-distclean:
 	${MAKE} -C qjson ${@:qjson-%=%} 
 
+libhdhomerun-all libhdhomerun-clean libhdhomerun-distclean libhdhomerun-install libhdhomerun-uninstall:
+	${MAKE} -C libhdhomerun ${@:libhdhomerun-%=%}
+

mythtv/libs/libmythhdhomerun/.gitignore → mythtv/external/libhdhomerun/.gitignore

@@ -1 +1,2 @@
+Makefile
 hdhomerun_config

mythtv/libs/libmythhdhomerun/libmythhdhomerun.pro → mythtv/external/libhdhomerun/libhdhomerun.pro

@@ -1,10 +1,8 @@
 include ( ../../settings.pro )
 
-INCLUDEPATH += ../libmythtv
-
 TEMPLATE = lib
-TARGET = mythhdhomerun-$$LIBVERSION
-CONFIG += thread dll
+TARGET = mythhdhomerun
+CONFIG += thread dll plugin
 CONFIG -= qt
 target.path = $${LIBDIR}
 INSTALLS = target
@@ -31,8 +29,20 @@ mingw {
     SOURCES += hdhomerun_os_windows.c hdhomerun_sock_windows.c
     SOURCES -= hdhomerun_os_posix.c
     LIBS += -lws2_32 -liphlpapi
+
+    # Qt under Linux/UnixMac OS X builds libBlah.a and libBlah.so,
+    # but is using the Windows defaults  libBlah.a and    Blah.dll.
+    #
+    # So that our dependency targets work between SUBDIRS, override:
+    #
+    TARGET = lib$${TARGET}
+
+    # Windows doesnt have a nice variable like LD_LIBRARY_PATH,
+    # which means make install would be broken without extra steps.
+    # As a workaround, we store dlls with exes. Also improves debugging!
+    #
+    target.path = $${PREFIX}/bin
+
 }
 
-LIBS += $$EXTRALIBS 
 
-include ( ../libs-targetfix.pro )

mythtv/libs/libmythmetadata/libmythmetadata.pro

@@ -50,7 +50,6 @@ LIBS += -L../libmythbluray        -lmythbluray-$${LIBVERSION}
 LIBS += -L../../external/FFmpeg/libswscale -lmythswscale
 using_mheg:LIBS += -L../libmythfreemheg        -lmythfreemheg-$${LIBVERSION}
 using_live:LIBS += -L../libmythlivemedia        -lmythlivemedia-$${LIBVERSION}
-using_hdhomerun:LIBS += -L../libmythhdhomerun        -lmythhdhomerun-$${LIBVERSION}
 
 mingw {
 

mythtv/libs/libmythprotoserver/libmythprotoserver.pro

@@ -44,7 +44,6 @@ LIBS += -lmythavutil -lmythavcodec -lmythavformat -lmythswscale
 LIBS += $$EXTRA_LIBS $$LATE_LIBS $$QMAKE_LIBS_DYNLOAD
 using_mheg:LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION
 using_live:LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION
-using_hdhomerun:LIBS += -L../libmythhdhomerun -lmythhdhomerun-$$LIBVERSION
 
 inc.path = $${PREFIX}/include/mythtv/protoserver
 

mythtv/libs/libmythtv/libmythtv.pro

@@ -21,7 +21,7 @@ contains(INCLUDEPATH, /usr/local/include) {
 
 DEPENDPATH  += .
 DEPENDPATH  += ../libmyth ../libmyth/audio
-DEPENDPATH  += ../libmythbase ../libmythhdhomerun
+DEPENDPATH  += ../libmythbase
 DEPENDPATH  += ../libmythdvdnav/
 DEPENDPATH  += ../libmythbluray/
 DEPENDPATH  += ./mpeg ./channelscan ./visualisations
@@ -637,6 +637,9 @@ using_backend {
     # Support for HDHomeRun box
     using_hdhomerun {
         # MythTV HDHomeRun glue
+        INCLUDEPATH += ../../external/libhdhomerun
+        DEPENDPATH += ../../external/libhdhomerun
+
         HEADERS += recorders/hdhrsignalmonitor.h
         HEADERS += recorders/hdhrchannel.h
         HEADERS += recorders/hdhrrecorder.h
@@ -772,7 +775,7 @@ LIBS += -lmythbase-$$LIBVERSION
 LIBS += -lmythservicecontracts-$$LIBVERSION
 using_mheg: LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION
 using_live: LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION
-using_hdhomerun: LIBS += -L../libmythhdhomerun -lmythhdhomerun-$$LIBVERSION
+using_hdhomerun: LIBS += -L../../external/libhdhomerun -lmythhdhomerun
 using_backend: LIBS += -lmp3lame
 LIBS += $$EXTRA_LIBS $$QMAKE_LIBS_DYNLOAD
 
@@ -783,7 +786,7 @@ POST_TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat)
 POST_TARGETDEPS += ../../external/FFmpeg/libswscale/$$avLibName(swscale)
 using_mheg: POST_TARGETDEPS += ../libmythfreemheg/libmythfreemheg-$${MYTH_SHLIB_EXT}
 using_live: POST_TARGETDEPS += ../libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
-using_hdhomerun: POST_TARGETDEPS += ../libmythhdhomerun/libmythhdhomerun-$${MYTH_SHLIB_EXT}
+using_hdhomerun: POST_TARGETDEPS += ../../external/libhdhomerun/libmythhdhomerun.$${QMAKE_EXTENSION_SHLIB}
 
 include ( ../libs-targetfix.pro )
 

mythtv/libs/libs.pro

@@ -9,7 +9,6 @@ SUBDIRS += libmythbluray libmythfreesurround libmythbase
 SUBDIRS += libmythservicecontracts
 
 using_mheg:SUBDIRS += libmythfreemheg
-using_hdhomerun:SUBDIRS += libmythhdhomerun
 using_x11:SUBDIRS += libmythnvctrl
 !contains( CONFIG_LIBMPEG2EXTERNAL, yes):SUBDIRS += libmythmpeg2
 

mythtv/programs/programs-libs.pro

@@ -1,7 +1,7 @@
 INCLUDEPATH += ../.. ../../libs/ ../../libs/libmyth ../../libs/libmyth/audio
 INCLUDEPATH +=  ../../libs/libmythtv ../../external/FFmpeg
 INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui ../../libs/libmythmetadata
-INCLUDEPATH += ../../libs/libmythlivemedia ../../libs/libmythbase ../../libs/libmythhdhomerun
+INCLUDEPATH += ../../libs/libmythlivemedia ../../libs/libmythbase
 INCLUDEPATH += ../../libs/libmythdvdnav ../../libs/libmythbluray ../../libs/libmythsamplerate
 INCLUDEPATH += ../../libs/libmythtv/mpeg
 INCLUDEPATH += ../../libs/libmythtv/vbitext
@@ -35,7 +35,7 @@ LIBS += -lmythprotoserver-$$LIBVERSION
 
 using_live:LIBS += -L../../libs/libmythlivemedia -lmythlivemedia-$$LIBVERSION
 using_mheg:LIBS += -L../../libs/libmythfreemheg -lmythfreemheg-$$LIBVERSION
-using_hdhomerun:LIBS += -L../../libs/libmythhdhomerun -lmythhdhomerun-$$LIBVERSION
+using_hdhomerun:LIBS += -L../../external/libhdhomerun -lmythhdhomerun
 
 mingw {
     CONFIG += console
@@ -53,14 +53,14 @@ POST_TARGETDEPS += ../../libs/libmythbase/libmythbase-$${MYTH_SHLIB_EXT}
 POST_TARGETDEPS += ../../libs/libmythservicecontracts/libmythservicecontracts-$${MYTH_SHLIB_EXT}
 POST_TARGETDEPS += ../../libs/libmythprotoserver/libmythprotoserver-$${MYTH_SHLIB_EXT}
 using_live: POST_TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
-using_hdhomerun: POST_TARGETDEPS += ../../libs/libmythhdhomerun/libmythhdhomerun-$${MYTH_SHLIB_EXT}
+using_hdhomerun: POST_TARGETDEPS += ../../external/libhdhomerun/libmythhdhomerun.$${QMAKE_EXTENSION_SHLIB}
 
 DEPENDPATH += ../.. ../../libs ../../libs/libmyth ../../libs/libmyth/audio
 DEPENDPATH += ../../libs/libmythtv
 DEPENDPATH += ../../libs/libmythtv/mpeg ../../libs/libmythtv/vbitext
 DEPENDPATH += ../../external/FFmpeg
 DEPENDPATH += ../../libs/libmythupnp ../../libs/libmythui
-DEPENDPATH += ../../libs/libmythlivemedia ../../libmythbase ../../libmythhdhomerun
+DEPENDPATH += ../../libs/libmythlivemedia ../../libmythbase
 DEPENDPATH +=../../libs/libmythservicecontracts ../../libs/libmythprotoserver
 
 using_opengl:CONFIG += opengl