aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-27 16:07:19 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-30 12:24:36 -0700
commit0b13cbd81b8d55ef041bf92d1855e2b1497eb170 (patch)
treeba53030373e88a3baee759e9f7148f0072ac871a /.github
parent4b24730ee668d3940d40a7779d1965827f9448ce (diff)
downloadsubsurface-0b13cbd81b8d55ef041bf92d1855e2b1497eb170.tar.gz
build-system: add libmtp for Linux and macOS
Since MXE doesn't offer libmtp I'll need to add code to manually build libmtp there. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/codeql-analysis.yml2
-rw-r--r--.github/workflows/coverity-scan.yml2
-rw-r--r--.github/workflows/linux-bionic-5.9.yml2
-rw-r--r--.github/workflows/linux-eoan-5.12.yml2
-rw-r--r--.github/workflows/linux-groovy-5.14.yml2
-rw-r--r--.github/workflows/linux-tumbleweed-qt-latest.yml2
-rw-r--r--.github/workflows/mac.yml2
-rw-r--r--.github/workflows/scripts/linux-in-container-build.sh2
8 files changed, 8 insertions, 8 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/