From d7b14e6b696f1b58e2c2d50044b39831b646a876 Mon Sep 17 00:00:00 2001 From: Brian Callahan Date: Sat, 3 Aug 2019 18:33:59 -0400 Subject: [PATCH 1/4] Don't use GNU grep for OpenBSD package builds Hi -- The -P flag is only available on GNU grep, not BSD grep. This causes package builds on OpenBSD to needlessly fail when running cmake. We will only ever package tagged versions of Olive, so we'll all know what version of Olive we're using. If a user wants to build from the tip of the tree, then they'll have a .git directory and the fallback won't even happen. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28acf2879..f23b8eed6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git") OUTPUT_STRIP_TRAILING_WHITESPACE ) endif() -elseif(UNIX AND NOT APPLE) +elseif(UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") # 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 -c "grep -Po '(?<=-)(([a-z0-9])\\w+)(?=\\+)' -m 1 changelog" From c19cd20c7c04ed680b35c470fb1beeb3ce9eb129 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Thu, 22 Aug 2019 12:39:31 +1000 Subject: [PATCH 2/4] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7e10917f7..8fd45236e 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ Please consider supporting Olive: [![Become a Patron](https://olivevideoeditor.org/img/become_a_patron_button.png)](https://www.patreon.com/olivevideoeditor) +**NOTE: It is strongly discouraged to use or compile the `master` branch in its current state as it's under heavy restructuring. Please use the 0.1.x code from the "Releases" tab instead.** + Compiling instructions for Windows, macOS, and Linux can be found [on the main site](https://olivevideoeditor.org/compile.php). Olive has Doxygen-compatible documentation hosted at http://olivevideoeditor.org/doxygen/. You can also run `doxygen` in the source root directory to generate a local copy. From 22bd4ed4a97040512771cde291dcfacdec76fd8d Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sat, 24 Aug 2019 08:47:59 +0200 Subject: [PATCH 3/4] Adds French to the menu item --- app/packaging/linux/org.olivevideoeditor.Olive.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/app/packaging/linux/org.olivevideoeditor.Olive.desktop b/app/packaging/linux/org.olivevideoeditor.Olive.desktop index 4ada20d93..ec5fa2edd 100644 --- a/app/packaging/linux/org.olivevideoeditor.Olive.desktop +++ b/app/packaging/linux/org.olivevideoeditor.Olive.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Olive Comment=Professional open-source non-linear video editor +Comment[fr]=Éditeur vidéo non-linéaire open-source professionnel Comment[it]=Programma di montaggio video professionale open-source Comment[id]=Aplikasi edit video yang non-linier, profesional serta sumbernya terbuka. Exec=olive-editor From 21397d39c6884351b89bbf34ed06e463cd11e931 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sat, 24 Aug 2019 08:54:12 +0200 Subject: [PATCH 4/4] Update org.olivevideoeditor.Olive.appdata.xml.in --- app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in b/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in index b09bfdd2f..0d7a2d8e8 100644 --- a/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in +++ b/app/packaging/linux/org.olivevideoeditor.Olive.appdata.xml.in @@ -14,6 +14,7 @@ Нелінійний відеоредактор Нелінійний відеоредактор Aplikasi edit video non-linier + Éditeur vidéo non-linéaire

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.

 @@ -23,6 +24,7 @@

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.

 +

Olive est un éditeur vidéo non linéaire libre visant à fournir une alternative complète aux logiciels de montage vidéo professionnels haut de gamme.

 https://www.olivevideoeditor.org https://www.patreon.com/olivevideoeditor https://github.com/olive-editor/olive/issues