Browse Source

Run strict build on code that uses juce; Strict build 32bit bridge

Signed-off-by: falkTX <falktx@gmail.com>
tags/v2.1-alpha2
falkTX 5 years ago
parent
commit
c6d5ece01b
9 changed files with 81 additions and 9 deletions
  1. +6
    -0
      .travis.yml
  2. +1
    -1
      .travis/before_install.sh
  3. +20
    -0
      .travis/install.sh
  4. +36
    -0
      .travis/script-linux-juce-strict.sh
  5. +4
    -1
      .travis/script-linux-strict.sh
  6. +1
    -1
      source/backend/plugin/CarlaPluginVST2.cpp
  7. +1
    -1
      source/includes/lv2/atom-forge.h
  8. +11
    -4
      source/jackbridge/JackBridge1.cpp
  9. +1
    -1
      source/jackbridge/JackBridge2.cpp

+ 6
- 0
.travis.yml View File

@@ -36,6 +36,12 @@ matrix:
env:
- TARGET="linux-strict"

# linux with gcc 8, strict build, using juce
- os: linux
compiler: gcc
env:
- TARGET="linux-juce-strict"

before_install:
- sh ${TRAVIS_BUILD_DIR}/.travis/before_install.sh



+ 1
- 1
.travis/before_install.sh View File

@@ -6,7 +6,7 @@ sudo add-apt-repository -y ppa:kxstudio-debian/kxstudio
sudo add-apt-repository -y ppa:kxstudio-debian/mingw
sudo add-apt-repository -y ppa:kxstudio-debian/toolchain

if [ "${TARGET}" = "linux-strict" ]; then
if [ "${TARGET}" = "linux-strict" ] || [ "${TARGET}" = "linux-juce-strict" ]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
fi



+ 20
- 0
.travis/install.sh View File

@@ -50,6 +50,26 @@ elif [ "${TARGET}" = "linux-strict" ]; then
liblo-static \
fluidsynth-static

elif [ "${TARGET}" = "linux-juce-strict" ]; then
sudo apt-get install -y \
g++-8 \
pkg-config \
pyqt5-dev-tools \
python3-pyqt5.qtsvg \
python3-rdflib \
libgtk2.0-dev \
libgtk-3-dev \
libqt4-dev \
qtbase5-dev \
libasound2-dev \
libfreetype6-dev \
libmagic-dev \
libgl1-mesa-dev \
libx11-dev \
libxext-dev \
liblo-static \
fluidsynth-static

elif [ "${TARGET}" = "macos" ]; then
sudo apt-get install -y \
pkg-config \


+ 36
- 0
.travis/script-linux-juce-strict.sh View File

@@ -0,0 +1,36 @@
#!/bin/bash

set -e

# Preparation
export CC=gcc-8
export CXX=g++-8
export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:${PKG_CONFIG_PATH}
unset CFLAGS
unset CXXFLAGS
unset LDFLAGS

# Start clean
make distclean >/dev/null

# Print available features
make features

# Build things that we skip strict tests for
make -C source/modules/audio_decoder
make -C source/modules/dgl
make -C source/modules/hylia
make -C source/modules/juce_audio_basics
make -C source/modules/juce_audio_devices
make -C source/modules/juce_audio_processors
make -C source/modules/juce_core
make -C source/modules/juce_data_structures
make -C source/modules/juce_events
make -C source/modules/juce_graphics
make -C source/modules/juce_gui_basics
make -C source/modules/sfzero
make -C source/modules/water
make -C source/theme all qt4 qt5

# Build native stuff
make TESTBUILD=true USING_JUCE=true

+ 4
- 1
.travis/script-linux-strict.sh View File

@@ -23,8 +23,11 @@ make -C source/modules/hylia
make -C source/modules/rtaudio
make -C source/modules/rtmidi
make -C source/modules/sfzero
make -C source/modules/water
make -C source/modules/water all posix32
make -C source/theme all qt4 qt5

# Build native stuff
make TESTBUILD=true

# Build 32bit bridges
make TESTBUILD=true posix32

+ 1
- 1
source/backend/plugin/CarlaPluginVST2.cpp View File

@@ -2279,7 +2279,7 @@ public:
// ---------------------------------------------------------------
// initialize plugin (part 1)

sCurrentUniqueId = uniqueId;
sCurrentUniqueId = static_cast<intptr_t>(uniqueId);
sLastCarlaPluginVST2 = this;

try {


+ 1
- 1
source/includes/lv2/atom-forge.h View File

@@ -296,7 +296,7 @@ lv2_atom_forge_raw(LV2_Atom_Forge* forge, const void* data, uint32_t size)
if (forge->sink) {
out = forge->sink(forge->handle, data, size);
} else {
out = (LV2_Atom_Forge_Ref)forge->buf + forge->offset;
out = (LV2_Atom_Forge_Ref)((uint32_t)forge->buf + forge->offset);
uint8_t* mem = forge->buf + forge->offset;
if (forge->offset + size > forge->size) {
return 0;


+ 11
- 4
source/jackbridge/JackBridge1.cpp View File

@@ -1273,7 +1273,9 @@ jack_port_t* jackbridge_port_register(jack_client_t* client, const char* port_na
return jack_port_register(client, port_name, port_type, flags, buffer_size);
#else
if (getBridgeInstance().port_register_ptr != nullptr)
return getBridgeInstance().port_register_ptr(client, port_name, port_type, flags, buffer_size);
return getBridgeInstance().port_register_ptr(client, port_name, port_type,
static_cast<ulong>(flags),
static_cast<ulong>(buffer_size));
#endif
return nullptr;
}
@@ -1613,7 +1615,9 @@ void jackbridge_port_get_latency_range(jack_port_t* port, uint32_t mode, jack_la
return jack_port_get_latency_range(port, static_cast<jack_latency_callback_mode_t>(mode), range);
#else
if (getBridgeInstance().port_get_latency_range_ptr != nullptr)
return getBridgeInstance().port_get_latency_range_ptr(port, static_cast<jack_latency_callback_mode_t>(mode), range);
return getBridgeInstance().port_get_latency_range_ptr(port,
static_cast<jack_latency_callback_mode_t>(mode),
range);
#endif
range->min = 0;
range->max = 0;
@@ -1626,7 +1630,9 @@ void jackbridge_port_set_latency_range(jack_port_t* port, uint32_t mode, jack_la
jack_port_set_latency_range(port, static_cast<jack_latency_callback_mode_t>(mode), range);
#else
if (getBridgeInstance().port_set_latency_range_ptr != nullptr)
getBridgeInstance().port_set_latency_range_ptr(port, static_cast<jack_latency_callback_mode_t>(mode), range);
getBridgeInstance().port_set_latency_range_ptr(port,
static_cast<jack_latency_callback_mode_t>(mode),
range);
#endif
}

@@ -1651,7 +1657,8 @@ const char** jackbridge_get_ports(jack_client_t* client, const char* port_name_p
return jack_get_ports(client, port_name_pattern, type_name_pattern, flags);
#else
if (getBridgeInstance().get_ports_ptr != nullptr)
return getBridgeInstance().get_ports_ptr(client, port_name_pattern, type_name_pattern, flags);
return getBridgeInstance().get_ports_ptr(client, port_name_pattern, type_name_pattern,
static_cast<ulong>(flags));
#endif
return nullptr;
}


+ 1
- 1
source/jackbridge/JackBridge2.cpp View File

@@ -121,7 +121,7 @@ void* jackbridge_shm_map(void* shm, uint64_t size) noexcept
#ifdef JACKBRIDGE_DUMMY
return nullptr;
#else
return carla_shm_map(*(carla_shm_t*)shm, size);
return carla_shm_map(*(carla_shm_t*)shm, static_cast<std::size_t>(size));
#endif
}



Loading…
Cancel
Save