diff options
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/coverity-scan.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-bionic-5.9.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-eoan-5.12.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-groovy-5.14.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-tumbleweed-qt-latest.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/mac.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/scripts/linux-in-container-build.sh | 2 | ||||
| -rw-r--r-- | INSTALL | 12 |
9 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0e55e9030..45e530d82 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -47,7 +47,7 @@ jobs: qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev xvfb libbluetooth-dev + qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 085d04805..d3055e847 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -25,7 +25,7 @@ jobs: qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev wget curl libbluetooth-dev + qtquickcontrols2-5-dev wget curl libbluetooth-dev libmtp-dev - name: Download Coverity Build Tool run: | diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml index fe17c47a3..8aaf42932 100644 --- a/.github/workflows/linux-bionic-5.9.yml +++ b/.github/workflows/linux-bionic-5.9.yml @@ -29,7 +29,7 @@ jobs: qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev xvfb libbluetooth-dev + qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev - name: build Subsurface run: | diff --git a/.github/workflows/linux-eoan-5.12.yml b/.github/workflows/linux-eoan-5.12.yml index be60de01e..fe502fea5 100644 --- a/.github/workflows/linux-eoan-5.12.yml +++ b/.github/workflows/linux-eoan-5.12.yml @@ -33,7 +33,7 @@ jobs: qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev xvfb libbluetooth-dev + qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev - name: build Subsurface-mobile run: | diff --git a/.github/workflows/linux-groovy-5.14.yml b/.github/workflows/linux-groovy-5.14.yml index 29da8bb17..51f9c5d06 100644 --- a/.github/workflows/linux-groovy-5.14.yml +++ b/.github/workflows/linux-groovy-5.14.yml @@ -33,7 +33,7 @@ jobs: qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev xvfb libbluetooth-dev + qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev - name: build Subsurface-mobile run: | diff --git a/.github/workflows/linux-tumbleweed-qt-latest.yml b/.github/workflows/linux-tumbleweed-qt-latest.yml index 05dfbdbb4..23d842183 100644 --- a/.github/workflows/linux-tumbleweed-qt-latest.yml +++ b/.github/workflows/linux-tumbleweed-qt-latest.yml @@ -28,7 +28,7 @@ jobs: libqt5-qtscript-devel libqt5-qtdeclarative-devel \ libqt5-qtconnectivity-devel libqt5-qtlocation-devel libcurl-devel \ libQt5QuickControls2-devel bluez-devel \ - which libgit2-devel libssh2-devel + which libgit2-devel libssh2-devel libmtp-devel # if we want to run the tests below, add xvfb-run diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 2a330c6d0..7904471ec 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -14,7 +14,7 @@ jobs: - name: checkout sources uses: actions/checkout@v1 - name: setup Homebrew - run: brew install autoconf automake libtool xz hidapi libusb libxml2 libxslt libzip openssl pkg-config libgit2 libssh2 libjpg libpng + run: brew install autoconf automake libtool xz hidapi libusb libxml2 libxslt libzip openssl pkg-config libgit2 libssh2 libjpg libpng libmtp - name: set our Qt build run: | mkdir -p Qt/5.13.0 diff --git a/.github/workflows/scripts/linux-in-container-build.sh b/.github/workflows/scripts/linux-in-container-build.sh index ae09dc90c..e2c4a3373 100644 --- a/.github/workflows/scripts/linux-in-container-build.sh +++ b/.github/workflows/scripts/linux-in-container-build.sh @@ -11,7 +11,7 @@ export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake echo "--------------------------------------------------------------" echo "install missing packages" -apt install -y libbluetooth-dev +apt install -y libbluetooth-dev libmtp-dev # the container currently has things under / that need to be under /__w/subsurface/subsurface instead cp -a /appdir /__w/subsurface/ @@ -144,7 +144,7 @@ sudo dnf install autoconf automake bluez-libs-devel cmake gcc-c++ git \ qt5-qtbase-devel qt5-qtconnectivity-devel qt5-qtdeclarative-devel \ qt5-qtlocation-devel qt5-qtscript-devel qt5-qtsvg-devel \ qt5-qttools-devel qt5-qtwebkit-devel redhat-rpm-config \ - bluez-libs-devel libgit2-devel libzip-devel + bluez-libs-devel libgit2-devel libzip-devel libmtp-devel Package names are sadly different on OpenSUSE @@ -155,7 +155,7 @@ sudo zypper install git gcc-c++ make autoconf automake libtool cmake libzip-deve libqt5-qtbase-devel libQt5WebKit5-devel libqt5-qtsvg-devel \ libqt5-qtscript-devel libqt5-qtdeclarative-devel \ libqt5-qtconnectivity-devel libqt5-qtlocation-devel libcurl-devel \ - bluez-devel libgit2-devel + bluez-devel libgit2-devel libmtp-devel On Debian Buster this seems to work @@ -167,7 +167,7 @@ sudo apt install \ qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick2 \ qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \ qtdeclarative5-private-dev qtlocation5-dev qtpositioning5-dev \ - qtscript5-dev qttools5-dev qttools5-dev-tools + qtscript5-dev qttools5-dev qttools5-dev-tools libmtp-dev In order to build and run mobile-on-desktop, you also need @@ -187,7 +187,7 @@ sudo apt install \ qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick2 \ qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \ qtdeclarative5-private-dev qtlocation5-dev qtpositioning5-dev \ - qtscript5-dev qttools5-dev qttools5-dev-tools + qtscript5-dev qttools5-dev qttools5-dev-tools libmtp-dev In order to build and run mobile-on-desktop, you also need @@ -207,7 +207,7 @@ sudo apt install \ qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick2 \ qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \ qtdeclarative5-private-dev qtlocation5-dev qtpositioning5-dev \ - qtscript5-dev qttools5-dev qttools5-dev-tools + qtscript5-dev qttools5-dev qttools5-dev-tools libmtp-dev In order to build and run mobile-on-desktop, you also need @@ -281,7 +281,7 @@ what else you have installed on your mac. homebrew option: -1) brew install libzip cmake libusb pkg-config automake libtool hidapi curl libssh2 +1) brew install autoconf automake libtool hidapi libusb libxml2 libxslt libzip openssl pkg-config libgit2 libssh2 libjpg libpng libmtp 2) cd <repo>/..; bash <repo>/scripts/build.sh |