From 305095bda340a5e15d7c02687e42787dc3e733c1 Mon Sep 17 00:00:00 2001 From: ZoomTen Date: Mon, 8 Apr 2019 21:36:01 +0700 Subject: [PATCH 1/6] add olive_id to cmake list --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfb27145f..049bb19f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -423,6 +423,7 @@ qt5_add_translation(OLIVE_QM_FILES ts/olive_it.ts ts/olive_ru.ts ts/olive_sr.ts + ts/olive_id.ts ) set(OLIVE_TARGET "olive-editor") From 5e7192d1d7ad40131893f50fa9d6abe4fdab3536 Mon Sep 17 00:00:00 2001 From: ZoomTen Date: Mon, 8 Apr 2019 21:52:44 +0700 Subject: [PATCH 2/6] add id translation to linux dist files --- packaging/linux/org.olivevideoeditor.Olive.appdata.xml | 2 ++ packaging/linux/org.olivevideoeditor.Olive.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/packaging/linux/org.olivevideoeditor.Olive.appdata.xml b/packaging/linux/org.olivevideoeditor.Olive.appdata.xml index 317f873b8..e8a508b2d 100644 --- a/packaging/linux/org.olivevideoeditor.Olive.appdata.xml +++ b/packaging/linux/org.olivevideoeditor.Olive.appdata.xml @@ -13,6 +13,7 @@ Нелинейный видеоредактор Нелінійний відеоредактор Нелінійний відеоредактор + Aplikasi edit video non-linier

Olive is a free non-linear video editor aiming to provide a fully-featured alternative to high-end professional video editing software.

 Olive ist ein freies nicht-lineares Videoschnittprogramm, welches eine vollwertige Alternative zu High-End Videoschnittprogrammen darstellen soll.

Olive é um editor de vídeo não-linear com o objetivo de fornecer uma alternativa completa para softwares profissionais de edição de vídeo.

 @@ -21,6 +22,7 @@

Olive — свободный нелинейный видеоредактор, задуманный как полноценная замена закрытым коммерческим продуктам.

Olive — вільний нелінійний відеоредактор, задуманий як повноцінна заміна закритим комерційним продуктам.

Olive — вільний нелінійний відеоредактор, задуманий як повноцінна заміна закритим комерційним продуктам.

 +

Olive adalah aplikasi edit video bersifat non-linier yang bebas dan gratis, bertujuan untuk memberikan alternatif yang lengkap untuk aplikasi edit video profesional.

 https://www.olivevideoeditor.org https://www.patreon.com/olivevideoeditor https://github.com/olive-editor/olive/issues diff --git a/packaging/linux/org.olivevideoeditor.Olive.desktop b/packaging/linux/org.olivevideoeditor.Olive.desktop index 613de4845..4ada20d93 100644 --- a/packaging/linux/org.olivevideoeditor.Olive.desktop +++ b/packaging/linux/org.olivevideoeditor.Olive.desktop @@ -2,6 +2,7 @@ Name=Olive Comment=Professional open-source non-linear video editor Comment[it]=Programma di montaggio video professionale open-source +Comment[id]=Aplikasi edit video yang non-linier, profesional serta sumbernya terbuka. Exec=olive-editor Icon=org.olivevideoeditor.Olive Terminal=false From b4e5dab12061c04c8e1c9bfab6c6593450c1280d Mon Sep 17 00:00:00 2001 From: ZoomTen Date: Mon, 8 Apr 2019 22:09:20 +0700 Subject: [PATCH 3/6] fix really awkward wording --- ts/olive_id.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/olive_id.ts b/ts/olive_id.ts index f50b98ca3..358132bbf 100644 --- a/ts/olive_id.ts +++ b/ts/olive_id.ts @@ -2604,12 +2604,12 @@ Tampilkan frame dengan cepat (dapat menampilkan frame yang salah ketika menggese Replace clips using "%1" - Ganti klip dengan "%1" + Ganti klip yang menggunakan "%1" Select which media you want to replace this media's clips with: - Pilih media pengganti media dari klip: + Pilih media pengganti: @@ -2891,7 +2891,7 @@ Tampilkan frame dengan cepat (dapat menampilkan frame yang salah ketika menggese Replace Clips Using This Media - Ganti Klip dengan Media Ini + Ganti Semua Klip yang Menggunakan Media Ini From 6ce78ce37c5cb39dab0266ab3f694145962615e3 Mon Sep 17 00:00:00 2001 From: eszlari Date: Tue, 16 Apr 2019 12:48:30 +0200 Subject: [PATCH 4/6] cmake: set OpenGL_GL_PREFERENCE fallback to LEGACY --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 049bb19f1..e94f1872c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ set(OLIVE_DEFINITIONS -DQT_DEPRECATED_WARNINGS) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") if(UNIX AND NOT APPLE AND NOT DEFINED OpenGL_GL_PREFERENCE) - set(OpenGL_GL_PREFERENCE GLVND) + set(OpenGL_GL_PREFERENCE LEGACY) endif() find_package(OpenGL REQUIRED) From 56680ff4d6bca2d0e22ff2cbe1f146cd1ce329c7 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 17 Apr 2019 09:27:49 +1000 Subject: [PATCH 5/6] minor build fixes --- .travis/install.sh | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index bc4662f01..55b8a68ff 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -8,11 +8,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [ "$ARCH" == "x86_64" ]; then - sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse curl + sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev fuse curl fi if [ "$ARCH" == "i386" ]; then - sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 qt59svg:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386 curl + sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 qt59svg:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386 curl fi source /opt/qt*/bin/qt*-env.sh diff --git a/debian/control b/debian/control index 092cc89ab..1467703b3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: olive-editor Section: video Priority: optional Maintainer: Olive Team -Build-Depends: debhelper (>=9), build-essential, qt5-default, qtmultimedia5-dev, libqt5opengl5-dev, libqt5svg5-dev, libqt5multimedia5-plugins, libavformat-dev, libavcodec-dev, libavutil-dev, libswscale-dev, libswresample-dev, libavfilter-dev, libpostproc-dev, git, frei0r-plugins-dev, qttools5-dev-tools +Build-Depends: debhelper (>=9), build-essential, qt5-default, qtmultimedia5-dev, libqt5opengl5-dev, libqt5svg5-dev, libqt5multimedia5-plugins, libavformat-dev, libavcodec-dev, libavutil-dev, libswscale-dev, libswresample-dev, libavfilter-dev, libpostproc-dev, git, frei0r-plugins-dev, qttools5-dev-tools, cmake Standards-Version: 3.9.6 Homepage: https://olivevideoeditor.org/ From 61fdb11cbc1e66138f095f8545d827a49d472310 Mon Sep 17 00:00:00 2001 From: eszlari Date: Wed, 17 Apr 2019 13:11:15 +0200 Subject: [PATCH 6/6] cmake: try to fix PPA build (#818) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 049bb19f1..ac8fab803 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,8 +64,8 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git") elseif(UNIX AND NOT APPLE) # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo) # (see https://answers.launchpad.net/launchpad/+question/678556) - execute_process(COMMAND sh debian/gitfromlog.sh debian/changelog - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + execute_process(COMMAND sh -c "grep -Po '(?<=-)(([a-z0-9])\\w+)(?=\\+)' -m 1 changelog" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debian OUTPUT_VARIABLE GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE )