From f82bef4195b2f4fbec53d9e5ad09eee87561403d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rcio=20Martins?= Date: Thu, 12 Dec 2019 03:12:28 -0300 Subject: [PATCH 1/3] Fix Travis script "install.sh" - execution hangs on osx "if" condition. --- .travis/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 350e7ab81..5dec1c211 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - - #export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH" - -elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then +if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt510base qt510multimedia qt510svg qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev libopenexr-dev source /opt/qt*/bin/qt*-env.sh +#elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + + #export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH" + fi From 92ef984184e63a42f56d27d3bff50ec298a62917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rcio=20Martins?= Date: Sat, 26 Feb 2022 15:04:09 -0300 Subject: [PATCH 2/3] Revert "Fix Travis script "install.sh" - execution hangs on osx "if" condition." This reverts commit f82bef4195b2f4fbec53d9e5ad09eee87561403d. --- .travis/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 5dec1c211..350e7ab81 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then +if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + + #export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH" + +elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt510base qt510multimedia qt510svg qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev libopenexr-dev source /opt/qt*/bin/qt*-env.sh -#elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - - #export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH" - fi From 027f789a623e39a85318b73b31281d52ec1a21d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rcio=20Martins?= Date: Sat, 26 Feb 2022 16:07:02 -0300 Subject: [PATCH 3/3] =?UTF-8?q?Fix=20the=20error=20"=E2=80=98AV=5FCH=5FLAY?= =?UTF-8?q?OUT=5FSTEREO=E2=80=99=20was=20not=20declared=20in=20this=20scop?= =?UTF-8?q?e"=20during=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build of Olive under Arch Linux (package "olive-git") crashes in the file "app/dialog/sequence/sequencedialogpresettab.cpp". GCC tries to look for the directive "AV_CH_LAYOUT_STEREO", but cannot find it, because the source code has no reference to the header "render/audioparams.h". The following link contains more details about the error: https://aur.archlinux.org/packages/olive-git#comment-852760 --- app/dialog/sequence/sequencedialogpresettab.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp index a52258fa0..c3e471b9c 100644 --- a/app/dialog/sequence/sequencedialogpresettab.cpp +++ b/app/dialog/sequence/sequencedialogpresettab.cpp @@ -31,6 +31,7 @@ #include "common/filefunctions.h" #include "config/config.h" +#include "render/audioparams.h" #include "render/videoparams.h" #include "ui/icons/icons.h" #include "widget/menu/menu.h"