[arch-commits] Commit in ciano/trunk (5 files)
Balló György
bgyorgy at archlinux.org
Wed Jul 8 13:24:53 UTC 2020
Date: Wednesday, July 8, 2020 @ 13:24:52
Author: bgyorgy
Revision: 661735
upgpkg: ciano 0.2.2-2: Various fixes
Added:
ciano/trunk/0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
ciano/trunk/0001-Create-output-directory-if-not-exist.patch
ciano/trunk/0001-Handle-GIF-with-ImageMagick.patch
ciano/trunk/0001-Use-standard-icon-names.patch
Modified:
ciano/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch | 96 ++++++++++
0001-Create-output-directory-if-not-exist.patch | 26 ++
0001-Handle-GIF-with-ImageMagick.patch | 76 +++++++
0001-Use-standard-icon-names.patch | 50 +++++
PKGBUILD | 38 ++-
5 files changed, 273 insertions(+), 13 deletions(-)
Added: 0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
===================================================================
--- 0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch (rev 0)
+++ 0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch 2020-07-08 13:24:52 UTC (rev 661735)
@@ -0,0 +1,96 @@
+From 0e4808a1513ea9f7a7d7c24911ec7dd0e7ccc02f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Wed, 8 Jul 2020 11:34:01 +0200
+Subject: [PATCH] Add support for conversion and selection of OPUS audios. #65
+
+---
+ src/Configs/Constants.vala | 3 ++-
+ src/Controllers/ConverterController.vala | 13 ++++++++++++-
+ src/Widgets/SourceListSidebar.vala | 4 +++-
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/Configs/Constants.vala b/src/Configs/Constants.vala
+index 64143c9..f163ff5 100644
+--- a/src/Configs/Constants.vala
++++ b/src/Configs/Constants.vala
+@@ -61,6 +61,7 @@ namespace Ciano.Configs {
+ public abstract const string TEXT_AAC = "AAC";
+ public abstract const string TEXT_MMF = "MMF";
+ public abstract const string TEXT_M4A = "M4A";
++ public abstract const string TEXT_OPUS = "OPUS";
+ public abstract const string TEXT_WAV = "WAV";
+ public abstract const string TEXT_FLAC = "FLAC";
+ public abstract const string TEXT_AIFF = "AIFF";
+@@ -76,4 +77,4 @@ namespace Ciano.Configs {
+ public abstract const string [] ABOUT_AUTHORS = { "Robert San <robertsanseries at gmail.com>" };
+ public abstract const Gtk.License ABOUT_LICENSE_TYPE = Gtk.License.GPL_3_0;
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/src/Controllers/ConverterController.vala b/src/Controllers/ConverterController.vala
+index b639d11..756a7cb 100644
+--- a/src/Controllers/ConverterController.vala
++++ b/src/Controllers/ConverterController.vala
+@@ -721,6 +721,12 @@ namespace Ciano.Controllers {
+ get_array_formats_videos (StringUtil.EMPTY)
+ );
+ break;
++ case Constants.TEXT_OPUS:
++ formats = ArrayUtil.join_generic_string_arrays (
++ get_array_formats_music (Constants.TEXT_OPUS),
++ get_array_formats_videos (StringUtil.EMPTY)
++ );
++ break;
+
+ case Constants.TEXT_JPG:
+ formats = get_array_formats_image (Constants.TEXT_JPG);
+@@ -894,6 +900,11 @@ namespace Ciano.Controllers {
+ array.add (Constants.TEXT_M4A.up());
+ }
+
++ if(format_music != Constants.TEXT_OPUS) {
++ array.add (Constants.TEXT_OPUS);
++ array.add (Constants.TEXT_OPUS.up());
++ }
++
+ return array;
+ }
+
+@@ -951,4 +962,4 @@ namespace Ciano.Controllers {
+ return array;
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/src/Widgets/SourceListSidebar.vala b/src/Widgets/SourceListSidebar.vala
+index eeaba78..129d525 100644
+--- a/src/Widgets/SourceListSidebar.vala
++++ b/src/Widgets/SourceListSidebar.vala
+@@ -117,6 +117,7 @@ namespace Ciano.Widgets {
+ var aiff_item = new SourceList.Item (Constants.TEXT_AIFF);
+ var mmf_item = new SourceList.Item (Constants.TEXT_MMF);
+ var m4a_item = new SourceList.Item (Constants.TEXT_M4A);
++ var opus_item = new SourceList.Item (Constants.TEXT_OPUS);
+
+ music_list.add (mp3_item);
+ music_list.add (wma_item);
+@@ -127,6 +128,7 @@ namespace Ciano.Widgets {
+ music_list.add (aiff_item);
+ music_list.add (mmf_item);
+ music_list.add (m4a_item);
++ music_list.add (opus_item);
+
+ this.type_list.add (music_list);
+ }
+@@ -161,4 +163,4 @@ namespace Ciano.Widgets {
+ this.type_list.add (image_list);
+ }
+ }
+-}
+\ No newline at end of file
++}
+--
+2.27.0
+
Added: 0001-Create-output-directory-if-not-exist.patch
===================================================================
--- 0001-Create-output-directory-if-not-exist.patch (rev 0)
+++ 0001-Create-output-directory-if-not-exist.patch 2020-07-08 13:24:52 UTC (rev 661735)
@@ -0,0 +1,26 @@
+From 162821952e14010531a89bc172fa00f95dcc2c79 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Wed, 8 Jul 2020 10:46:34 +0200
+Subject: [PATCH] Create output directory if not exist
+
+Instead of trying to create the source directory, which must be already exist.
+---
+ src/Controllers/ConverterController.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Controllers/ConverterController.vala b/src/Controllers/ConverterController.vala
+index b639d11..d05681d 100644
+--- a/src/Controllers/ConverterController.vala
++++ b/src/Controllers/ConverterController.vala
+@@ -251,7 +251,7 @@ namespace Ciano.Controllers {
+ */
+ private void start_conversion_process (ItemConversion item, string name_format) {
+ try {
+- var directory = File.new_for_path (item.directory);
++ var directory = File.new_for_path (this.settings.output_folder);
+ if (!directory.query_exists ()) {
+ directory.make_directory_with_parents();
+ }
+--
+2.27.0
+
Added: 0001-Handle-GIF-with-ImageMagick.patch
===================================================================
--- 0001-Handle-GIF-with-ImageMagick.patch (rev 0)
+++ 0001-Handle-GIF-with-ImageMagick.patch 2020-07-08 13:24:52 UTC (rev 661735)
@@ -0,0 +1,76 @@
+From 6444a3328b9ea85481b156ce2a8098c7b7847659 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Wed, 8 Jul 2020 14:48:38 +0200
+Subject: [PATCH] Handle GIF with ImageMagick
+
+Using FFmpeg could lead to crash. This removes support converting videos to animated GIF. See: #110
+---
+ src/Controllers/ConverterController.vala | 33 +++++-------------------
+ 1 file changed, 6 insertions(+), 27 deletions(-)
+
+diff --git a/src/Controllers/ConverterController.vala b/src/Controllers/ConverterController.vala
+index b639d11..24402bb 100644
+--- a/src/Controllers/ConverterController.vala
++++ b/src/Controllers/ConverterController.vala
+@@ -370,7 +370,7 @@ namespace Ciano.Controllers {
+ break;
+ } else {
+ // there is no return on image conversion, if display is pq was generated some error.
+- if (item.type_item != TypeItemEnum.IMAGE || this.name_format_selected.down () == "gif") {
++ if (item.type_item != TypeItemEnum.IMAGE) {
+ process_line (str_return, row, ref total, error);
+
+ if (error > 0) {
+@@ -552,26 +552,8 @@ namespace Ciano.Controllers {
+ array.add ("-2");
+ array.add (new_file);
+ } else if (this.type_item == TypeItemEnum.IMAGE) {
+- if (this.name_format_selected.down () == "gif") {
+- array.add ("ffmpeg");
+- array.add ("-y");
+- array.add ("-i");
+- array.add (uri);
+-
+- if("webm" == FileUtil.get_file_extension_name(uri)) {
+- array.add ("-pix_fmt");
+- array.add ("rgb8");
+- } else {
+- array.add ("-ss");
+- array.add ("00:00:00.000");
+- array.add ("-vf");
+- array.add ("format=rgb8,format=rgb24");
+- }
+- } else {
+- array.add ("convert");
+- array.add (uri);
+- }
+-
++ array.add ("convert");
++ array.add (uri);
+ array.add (new_file);
+ }
+
+@@ -738,10 +720,7 @@ namespace Ciano.Controllers {
+ formats = get_array_formats_image (Constants.TEXT_ICO);
+ break;
+ case Constants.TEXT_GIF:
+- formats = ArrayUtil.join_generic_string_arrays (
+- get_array_formats_image (Constants.TEXT_GIF),
+- get_array_formats_videos (StringUtil.EMPTY)
+- );
++ formats = get_array_formats_image (Constants.TEXT_GIF);
+ break;
+ case Constants.TEXT_TGA:
+ formats = get_array_formats_image (Constants.TEXT_TGA);
+@@ -821,7 +800,7 @@ namespace Ciano.Controllers {
+ array.add (Constants.TEXT_OGV.up());
+ }
+
+- if(format_video != Constants.TEXT_WEBM && format_video != Constants.TEXT_GIF && this.type_item == TypeItemEnum.VIDEO) {
++ if(format_video != Constants.TEXT_WEBM) {
+ array.add (Constants.TEXT_WEBM);
+ array.add (Constants.TEXT_WEBM.up());
+ }
+--
+2.27.0
+
Added: 0001-Use-standard-icon-names.patch
===================================================================
--- 0001-Use-standard-icon-names.patch (rev 0)
+++ 0001-Use-standard-icon-names.patch 2020-07-08 13:24:52 UTC (rev 661735)
@@ -0,0 +1,50 @@
+From ce29381d7e4be91ddd341a04f6619a6a71bd4278 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Wed, 8 Jul 2020 11:13:12 +0200
+Subject: [PATCH] Use standard icon names
+
+---
+ src/Controllers/ConverterController.vala | 8 ++++----
+ src/Widgets/DialogConvertFile.vala | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Controllers/ConverterController.vala b/src/Controllers/ConverterController.vala
+index b639d11..9740fad 100644
+--- a/src/Controllers/ConverterController.vala
++++ b/src/Controllers/ConverterController.vala
+@@ -439,16 +439,16 @@ namespace Ciano.Controllers {
+
+ switch (item.type_item) {
+ case TypeItemEnum.VIDEO:
+- icon = "media-video";
++ icon = "video-x-generic";
+ break;
+ case TypeItemEnum.MUSIC:
+ icon = "audio-x-generic";
+ break;
+ case TypeItemEnum.IMAGE:
+- icon = "image";
++ icon = "image-x-generic";
+ break;
+ default:
+- icon = "file";
++ icon = "text-x-generic";
+ break;
+ }
+
+diff --git a/src/Widgets/DialogConvertFile.vala b/src/Widgets/DialogConvertFile.vala
+index 3f7d44c..ba1be41 100644
+--- a/src/Widgets/DialogConvertFile.vala
++++ b/src/Widgets/DialogConvertFile.vala
+@@ -175,7 +175,7 @@ namespace Ciano.Widgets {
+ toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+ toolbar.set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
+
+- var button_add_file = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("application-add-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
++ var button_add_file = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-add-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
+ button_add_file.tooltip_text = Properties.TEXT_ADD_FILE;
+ button_add_file.clicked.connect (() => {
+ this.converter_controller.on_activate_button_add_file (
+--
+2.27.0
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-08 12:45:47 UTC (rev 661734)
+++ PKGBUILD 2020-07-08 13:24:52 UTC (rev 661735)
@@ -2,30 +2,42 @@
pkgname=ciano
pkgver=0.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="Multimedia file converter focused on simplicity"
arch=(x86_64)
url="https://robertsanseries.github.io/ciano/"
license=(GPL3)
depends=(ffmpeg granite imagemagick)
-makedepends=(git meson vala)
-_commit=92f02c23f8809ec48e889cec42d3efd9617f7628 # tags/0.2.2
-source=("git+https://github.com/robertsanseries/ciano#commit=$_commit")
-sha256sums=('SKIP')
+makedepends=(meson vala)
+source=("https://github.com/robertsanseries/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+ "0001-Handle-GIF-with-ImageMagick.patch"
+ "0001-Create-output-directory-if-not-exist.patch"
+ "0001-Use-standard-icon-names.patch"
+ "0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch")
+sha256sums=('49e648ff0d6f122057e6f15f7d3a3a451b005e296781d4f4d9816c8f0fcaa387'
+ '8b44b7df58f82d0ff38572b773724b6f42e085fc1a1aa098776c794eb117b49d'
+ 'f682329bc9cbed2d0605b31e1cc4915c9a7e188bb398fed88001e892f44c50bb'
+ 'fb99403b4f6707454eef3f8552cded3e48e230dd4a118c7ada6e78e1a52fa3a4'
+ '0eb72a2e4ea2f83e25043396acdf5a090f554985ab4902e63363c0a1d30b4d36')
-pkgver() {
- cd ciano
- git describe --tags | sed 's/-/+/g'
-}
+prepare() {
+ cd $pkgname-$pkgver
-prepare() {
- cd ciano
+ # Handle GIF with ImageMagick
+ patch -Np1 -i ../0001-Handle-GIF-with-ImageMagick.patch
+
+ # Create output directory if not exist
+ patch -Np1 -i ../0001-Create-output-directory-if-not-exist.patch
+
# Use standard icon names
- sed -i 's/application-add-symbolic/list-add-symbolic/' src/Widgets/DialogConvertFile.vala
+ patch -Np1 -i ../0001-Use-standard-icon-names.patch
+
+ # Add support for conversion and selection of OPUS audios.
+ patch -Np1 -i ../0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
}
build() {
- arch-meson ciano build
+ arch-meson $pkgname-$pkgver build
ninja -C build
}
More information about the arch-commits
mailing list