Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Carla Support to AppImage #4026

Merged
merged 6 commits into from
Dec 1, 2017
Merged

Add Carla Support to AppImage #4026

merged 6 commits into from
Dec 1, 2017
+37 −16

Conversation

tresf
Copy link
Member

@tresf tresf commented Nov 30, 2017 •
edited
Loading

This adds the following functionality to the AppImage:

  • If Carla IS found, uses the system provided version (e.g. /usr/share/carla/resources/carla-plugin)
  • If Carla is NOT found, notifies the user via console that Carla won't be available, removes it from the plugin listing. Some console warnings appear, these are safe to ignore.

Download:
You can get it here... #3688

Note: This PR also disables HiDPI in the AppImage due to some issues found during testing. It can be re-enabled via export QT_AUTO_SCREEN_SCALE_FACTOR=1.

Closes #3976, #2429
Supersedes #2643

@tresf tresf changed the base branch from master to stable-1.2 November 30, 2017 07:31
@tresf tresf mentioned this pull request Nov 30, 2017
Closed
falkTX
falkTX reviewed Nov 30, 2017
View reviewed changes
cmake/linux/package_linux.sh.in Outdated
CARLABIN="/usr/share/carla/resources"
if [ -d "${CARLABIN}" ]; then
rm -f "${APPDIR}/usr/lib/libcarla*.so"
mkdir -p "${APPDIR}${CARLABIN}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think these are needed (copying carla-plugin startup scripts).
The carla backend will start them using the resource dir, which comes from the system-installed carla.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. Once I got the bundled libraries removed and LD_LIBRARY_PATH set to /usr/lib/carla, it worked out. Removed via 31402e3.

falkTX
falkTX reviewed Nov 30, 2017
View reviewed changes
.travis/linux..install.sh Outdated
# can simply be added to $PACKAGES
sudo apt-get install -y apt-transport-https software-properties-common wget
wget https://launchpad.net/~kxstudio-debian/+archive/kxstudio/+files/kxstudio-repos_9.4.6~kxstudio1_all.deb
sudo dpkg -i kxstudio-repos_9.4.6~kxstudio1_all.deb
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sudo apt-get update is missing here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also these steps will break as soon as I update that deb file.

Try this instead:

sudo add-apt-repository -y kxstudio-debian/gcc5
sudo add-apt-repository -y kxstudio-debian/gcc5-deps
sudo apt-get update

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@falkTX Thanks, but this isn't working on my machine. how should I go about adding kxstudio-debian/gcc5[...] on Ubuntu 14.04?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah no, those are for 16.04.
I thought the AppImages was using that.

So use this:

sudo add-apt-repository -y kxstudio-debian/libs
sudo add-apt-repository -y kxstudio-debian/apps
sudo apt-get update

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, I think it was just missing ppa: before the repository name.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, carla-git isn't showing up for ppa:kxstudio-debian/gcc5. Did you mean to say ppa:kxstudio-debian/kxstudio ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got your messages late. Trying that now, thanks.

@tresf
Copy link
Member Author

tresf commented Nov 30, 2017

@falkTX opinions welcome here: 5ea683d, attempts to address the following error from Travis-CI:

/home/travis/build/LMMS/lmms/plugins/carlabase/carla.cpp: In member function ‘intptr_t CarlaInstrument::handleDispatcher(NativeHostDispatcherOpcode, int32_t, intptr_t, void*, float)’:
/home/travis/build/LMMS/lmms/plugins/carlabase/carla.cpp:261:12: error: enumeration value ‘NATIVE_HOST_OPCODE_INTERNAL_PLUGIN’ not handled in switch [-Werror=switch]
     switch (opcode)
            ^
cc1plus: all warnings being treated as errors

tresf
tresf commented Dec 1, 2017
View reviewed changes
cmake/linux/package_linux.sh.in Outdated Show resolved Hide resolved
falkTX
falkTX reviewed Dec 1, 2017
View reviewed changes
.travis/linux..install.sh Outdated Show resolved Hide resolved
falkTX
falkTX reviewed Dec 1, 2017
View reviewed changes
plugins/carlabase/carla.cpp Outdated Show resolved Hide resolved
@tresf
Various fixes
4fb162b 
Make QString use implicit initializer
Detect carla prefix in AppRun
Fix ppa comment/wording
@tresf
Copy link
Member Author

tresf commented Dec 1, 2017

@falkTX all conversation points addressed via 4fb162b.

tresf referenced this pull request Dec 1, 2017
@tresf
Add support for HiDPI screens
8bc9e9d 
Per #3814
@tresf tresf merged commit d711b8b into LMMS:stable-1.2 Dec 1, 2017
@tresf tresf mentioned this pull request Dec 5, 2017
Closed
7 tasks
PhysSong added a commit to PhysSong/lmms that referenced this pull request Dec 20, 2017
@PhysSong
Travis: install jack2 in Linux build
eb9b460 
Per LMMS#4026: Installing Carla will remove jack1 if it's installed, since Carla requires jack2.
@tresf tresf deleted the carla branch December 23, 2017 07:30
@tresf tresf mentioned this pull request Jan 16, 2018
Closed
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@tresf
Add Carla Support to AppImage (LMMS#4026)
5485249 
Build AppImage with Carla support
* Disables HiDPI support in the AppImages
* Ignores deprecated jack usage
* Fix Carla compilation warnings
* Detects carla prefix in AppRun
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@PhysSong
Travis: install jack2 in Linux build
80c443e 
Per LMMS#4026: Installing Carla will remove jack1 if it's installed, since Carla requires jack2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@falkTX falkTX falkTX left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tresf @falkTX