mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-03 15:43:09 +00:00
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>
This commit is contained in:
parent
4b24730ee6
commit
0b13cbd81b
9 changed files with 14 additions and 14 deletions
2
.github/workflows/codeql-analysis.yml
vendored
2
.github/workflows/codeql-analysis.yml
vendored
|
@ -47,7 +47,7 @@ jobs:
|
||||||
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
||||||
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
||||||
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
|
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.
|
# Initializes the CodeQL tools for scanning.
|
||||||
|
|
2
.github/workflows/coverity-scan.yml
vendored
2
.github/workflows/coverity-scan.yml
vendored
|
@ -25,7 +25,7 @@ jobs:
|
||||||
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
||||||
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
||||||
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
|
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
|
- name: Download Coverity Build Tool
|
||||||
run: |
|
run: |
|
||||||
|
|
2
.github/workflows/linux-bionic-5.9.yml
vendored
2
.github/workflows/linux-bionic-5.9.yml
vendored
|
@ -29,7 +29,7 @@ jobs:
|
||||||
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
||||||
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
||||||
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
|
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
|
- name: build Subsurface
|
||||||
run: |
|
run: |
|
||||||
|
|
2
.github/workflows/linux-eoan-5.12.yml
vendored
2
.github/workflows/linux-eoan-5.12.yml
vendored
|
@ -33,7 +33,7 @@ jobs:
|
||||||
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
||||||
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
||||||
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
|
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
|
- name: build Subsurface-mobile
|
||||||
run: |
|
run: |
|
||||||
|
|
2
.github/workflows/linux-groovy-5.14.yml
vendored
2
.github/workflows/linux-groovy-5.14.yml
vendored
|
@ -33,7 +33,7 @@ jobs:
|
||||||
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
|
||||||
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
|
||||||
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
|
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
|
- name: build Subsurface-mobile
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -28,7 +28,7 @@ jobs:
|
||||||
libqt5-qtscript-devel libqt5-qtdeclarative-devel \
|
libqt5-qtscript-devel libqt5-qtdeclarative-devel \
|
||||||
libqt5-qtconnectivity-devel libqt5-qtlocation-devel libcurl-devel \
|
libqt5-qtconnectivity-devel libqt5-qtlocation-devel libcurl-devel \
|
||||||
libQt5QuickControls2-devel bluez-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
|
# if we want to run the tests below, add xvfb-run
|
||||||
|
|
||||||
|
|
2
.github/workflows/mac.yml
vendored
2
.github/workflows/mac.yml
vendored
|
@ -14,7 +14,7 @@ jobs:
|
||||||
- name: checkout sources
|
- name: checkout sources
|
||||||
uses: actions/checkout@v1
|
uses: actions/checkout@v1
|
||||||
- name: setup Homebrew
|
- 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
|
- name: set our Qt build
|
||||||
run: |
|
run: |
|
||||||
mkdir -p Qt/5.13.0
|
mkdir -p Qt/5.13.0
|
||||||
|
|
|
@ -11,7 +11,7 @@ export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
|
||||||
|
|
||||||
echo "--------------------------------------------------------------"
|
echo "--------------------------------------------------------------"
|
||||||
echo "install missing packages"
|
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
|
# the container currently has things under / that need to be under /__w/subsurface/subsurface instead
|
||||||
cp -a /appdir /__w/subsurface/
|
cp -a /appdir /__w/subsurface/
|
||||||
|
|
12
INSTALL
12
INSTALL
|
@ -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-qtbase-devel qt5-qtconnectivity-devel qt5-qtdeclarative-devel \
|
||||||
qt5-qtlocation-devel qt5-qtscript-devel qt5-qtsvg-devel \
|
qt5-qtlocation-devel qt5-qtscript-devel qt5-qtsvg-devel \
|
||||||
qt5-qttools-devel qt5-qtwebkit-devel redhat-rpm-config \
|
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
|
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-qtbase-devel libQt5WebKit5-devel libqt5-qtsvg-devel \
|
||||||
libqt5-qtscript-devel libqt5-qtdeclarative-devel \
|
libqt5-qtscript-devel libqt5-qtdeclarative-devel \
|
||||||
libqt5-qtconnectivity-devel libqt5-qtlocation-devel libcurl-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
|
On Debian Buster this seems to work
|
||||||
|
|
||||||
|
@ -167,7 +167,7 @@ sudo apt install \
|
||||||
qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick2 \
|
qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick2 \
|
||||||
qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \
|
qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \
|
||||||
qtdeclarative5-private-dev qtlocation5-dev qtpositioning5-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
|
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 \
|
qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick2 \
|
||||||
qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \
|
qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \
|
||||||
qtdeclarative5-private-dev qtlocation5-dev qtpositioning5-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
|
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 \
|
qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick2 \
|
||||||
qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \
|
qt5-default qt5-qmake qtchooser qtconnectivity5-dev qtdeclarative5-dev \
|
||||||
qtdeclarative5-private-dev qtlocation5-dev qtpositioning5-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
|
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:
|
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
|
2) cd <repo>/..; bash <repo>/scripts/build.sh
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue