Date: Saturday, May 1, 2021 @ 21:30:58
Author: bgyorgy
Revision: 926053
archrelease: copy trunk to community-x86_64
Added:
ciano/repos/community-x86_64/0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
(from rev 926052,
ciano/trunk/0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch)
ciano/repos/community-x86_64/0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
(from rev 926052,
ciano/trunk/0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch)
ciano/repos/community-x86_64/0001-Create-output-directory-if-not-exist.patch
(from rev 926052,
ciano/trunk/0001-Create-output-directory-if-not-exist.patch)
ciano/repos/community-x86_64/0001-Handle-GIF-with-ImageMagick.patch
(from rev 926052, ciano/trunk/0001-Handle-GIF-with-ImageMagick.patch)
ciano/repos/community-x86_64/0001-Use-standard-icon-names.patch
(from rev 926052, ciano/trunk/0001-Use-standard-icon-names.patch)
ciano/repos/community-x86_64/PKGBUILD
(from rev 926052, ciano/trunk/PKGBUILD)
Deleted:
ciano/repos/community-x86_64/0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
ciano/repos/community-x86_64/0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
ciano/repos/community-x86_64/0001-Create-output-directory-if-not-exist.patch
ciano/repos/community-x86_64/0001-Handle-GIF-with-ImageMagick.patch
ciano/repos/community-x86_64/0001-Use-standard-icon-names.patch
ciano/repos/community-x86_64/PKGBUILD
-----------------------------------------------------------------+
0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch | 178
+++++-----
0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch | 152 ++++----
0001-Create-output-directory-if-not-exist.patch | 52 +-
0001-Handle-GIF-with-ImageMagick.patch | 152 ++++----
0001-Use-standard-icon-names.patch | 100 ++---
PKGBUILD | 107 +++---
6 files changed, 371 insertions(+), 370 deletions(-)
Deleted: 0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
===================================================================
--- 0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
2021-05-01 21:30:43 UTC (rev 926052)
+++ 0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
2021-05-01 21:30:58 UTC (rev 926053)
@@ -1,89 +0,0 @@
-From 0e4808a1513ea9f7a7d7c24911ec7dd0e7ccc02f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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 <robertsanser...@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;
- }
-
-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
-
Copied:
ciano/repos/community-x86_64/0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
(from rev 926052,
ciano/trunk/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
2021-05-01 21:30:58 UTC (rev 926053)
@@ -0,0 +1,89 @@
+From 0e4808a1513ea9f7a7d7c24911ec7dd0e7ccc02f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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 <robertsanser...@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;
+ }
+
+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
+
Deleted: 0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
===================================================================
--- 0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
2021-05-01 21:30:43 UTC (rev 926052)
+++ 0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
2021-05-01 21:30:58 UTC (rev 926053)
@@ -1,76 +0,0 @@
-From 62a8a740f0843822b2e39db3dd8c1ff68a785a3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Wed, 8 Jul 2020 17:54:05 +0200
-Subject: [PATCH] Add support for conversion and selection of WEBP images
-
----
- src/Configs/Constants.vala | 3 ++-
- src/Controllers/ConverterController.vala | 10 +++++++++-
- src/Widgets/SourceListSidebar.vala | 4 +++-
- 3 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/Configs/Constants.vala b/src/Configs/Constants.vala
-index 64143c9..e583155 100644
---- a/src/Configs/Constants.vala
-+++ b/src/Configs/Constants.vala
-@@ -73,7 +73,8 @@ namespace Ciano.Configs {
- public abstract const string TEXT_OGV =
"OGV";
- public abstract const string TEXT_WEBM =
"WEBM";
- public abstract const string TEXT_AT9 =
"AT9";
-+ public abstract const string TEXT_WEBP =
"WEBP";
- public abstract const string [] ABOUT_AUTHORS =
{ "Robert San <robertsanser...@gmail.com>" };
- public abstract const Gtk.License ABOUT_LICENSE_TYPE =
Gtk.License.GPL_3_0;
- }
- }
-diff --git a/src/Controllers/ConverterController.vala
b/src/Controllers/ConverterController.vala
-index b639d11..696f2bd 100644
---- a/src/Controllers/ConverterController.vala
-+++ b/src/Controllers/ConverterController.vala
-@@ -746,6 +746,9 @@ namespace Ciano.Controllers {
- case Constants.TEXT_TGA:
- formats = get_array_formats_image (Constants.TEXT_TGA);
- break;
-+ case Constants.TEXT_WEBP:
-+ formats = get_array_formats_image (Constants.TEXT_WEBP);
-+ break;
- }
-
- return formats.data;
-@@ -948,7 +951,12 @@ namespace Ciano.Controllers {
- array.add (Constants.TEXT_TGA.up());
- }
-
-+ if(format_image != Constants.TEXT_WEBP) {
-+ array.add (Constants.TEXT_WEBP);
-+ array.add (Constants.TEXT_WEBP.up());
-+ }
-+
- return array;
- }
- }
- }
-diff --git a/src/Widgets/SourceListSidebar.vala
b/src/Widgets/SourceListSidebar.vala
-index eeaba78..81cb7e8 100644
---- a/src/Widgets/SourceListSidebar.vala
-+++ b/src/Widgets/SourceListSidebar.vala
-@@ -150,6 +150,7 @@ namespace Ciano.Widgets {
- var tif_item = new SourceList.Item (Constants.TEXT_TIF);
- var gif_item = new SourceList.Item (Constants.TEXT_GIF);
- var tga_item = new SourceList.Item (Constants.TEXT_TGA);
-+ var webp_item = new SourceList.Item (Constants.TEXT_WEBP);
-
- image_list.add (jpg_item);
- image_list.add (bmp_item);
-@@ -157,8 +158,9 @@ namespace Ciano.Widgets {
- image_list.add (tif_item);
- image_list.add (gif_item);
- image_list.add (tga_item);
-+ image_list.add (webp_item);
-
- this.type_list.add (image_list);
- }
- }
- }
---
-2.27.0
-
Copied:
ciano/repos/community-x86_64/0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
(from rev 926052,
ciano/trunk/0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch)
===================================================================
--- 0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
(rev 0)
+++ 0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
2021-05-01 21:30:58 UTC (rev 926053)
@@ -0,0 +1,76 @@
+From 62a8a740f0843822b2e39db3dd8c1ff68a785a3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Wed, 8 Jul 2020 17:54:05 +0200
+Subject: [PATCH] Add support for conversion and selection of WEBP images
+
+---
+ src/Configs/Constants.vala | 3 ++-
+ src/Controllers/ConverterController.vala | 10 +++++++++-
+ src/Widgets/SourceListSidebar.vala | 4 +++-
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/Configs/Constants.vala b/src/Configs/Constants.vala
+index 64143c9..e583155 100644
+--- a/src/Configs/Constants.vala
++++ b/src/Configs/Constants.vala
+@@ -73,7 +73,8 @@ namespace Ciano.Configs {
+ public abstract const string TEXT_OGV =
"OGV";
+ public abstract const string TEXT_WEBM =
"WEBM";
+ public abstract const string TEXT_AT9 =
"AT9";
++ public abstract const string TEXT_WEBP =
"WEBP";
+ public abstract const string [] ABOUT_AUTHORS =
{ "Robert San <robertsanser...@gmail.com>" };
+ public abstract const Gtk.License ABOUT_LICENSE_TYPE =
Gtk.License.GPL_3_0;
+ }
+ }
+diff --git a/src/Controllers/ConverterController.vala
b/src/Controllers/ConverterController.vala
+index b639d11..696f2bd 100644
+--- a/src/Controllers/ConverterController.vala
++++ b/src/Controllers/ConverterController.vala
+@@ -746,6 +746,9 @@ namespace Ciano.Controllers {
+ case Constants.TEXT_TGA:
+ formats = get_array_formats_image (Constants.TEXT_TGA);
+ break;
++ case Constants.TEXT_WEBP:
++ formats = get_array_formats_image (Constants.TEXT_WEBP);
++ break;
+ }
+
+ return formats.data;
+@@ -948,7 +951,12 @@ namespace Ciano.Controllers {
+ array.add (Constants.TEXT_TGA.up());
+ }
+
++ if(format_image != Constants.TEXT_WEBP) {
++ array.add (Constants.TEXT_WEBP);
++ array.add (Constants.TEXT_WEBP.up());
++ }
++
+ return array;
+ }
+ }
+ }
+diff --git a/src/Widgets/SourceListSidebar.vala
b/src/Widgets/SourceListSidebar.vala
+index eeaba78..81cb7e8 100644
+--- a/src/Widgets/SourceListSidebar.vala
++++ b/src/Widgets/SourceListSidebar.vala
+@@ -150,6 +150,7 @@ namespace Ciano.Widgets {
+ var tif_item = new SourceList.Item (Constants.TEXT_TIF);
+ var gif_item = new SourceList.Item (Constants.TEXT_GIF);
+ var tga_item = new SourceList.Item (Constants.TEXT_TGA);
++ var webp_item = new SourceList.Item (Constants.TEXT_WEBP);
+
+ image_list.add (jpg_item);
+ image_list.add (bmp_item);
+@@ -157,8 +158,9 @@ namespace Ciano.Widgets {
+ image_list.add (tif_item);
+ image_list.add (gif_item);
+ image_list.add (tga_item);
++ image_list.add (webp_item);
+
+ this.type_list.add (image_list);
+ }
+ }
+ }
+--
+2.27.0
+
Deleted: 0001-Create-output-directory-if-not-exist.patch
===================================================================
--- 0001-Create-output-directory-if-not-exist.patch 2021-05-01 21:30:43 UTC
(rev 926052)
+++ 0001-Create-output-directory-if-not-exist.patch 2021-05-01 21:30:58 UTC
(rev 926053)
@@ -1,26 +0,0 @@
-From 162821952e14010531a89bc172fa00f95dcc2c79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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
-
Copied:
ciano/repos/community-x86_64/0001-Create-output-directory-if-not-exist.patch
(from rev 926052, ciano/trunk/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 2021-05-01 21:30:58 UTC
(rev 926053)
@@ -0,0 +1,26 @@
+From 162821952e14010531a89bc172fa00f95dcc2c79 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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
+
Deleted: 0001-Handle-GIF-with-ImageMagick.patch
===================================================================
--- 0001-Handle-GIF-with-ImageMagick.patch 2021-05-01 21:30:43 UTC (rev
926052)
+++ 0001-Handle-GIF-with-ImageMagick.patch 2021-05-01 21:30:58 UTC (rev
926053)
@@ -1,76 +0,0 @@
-From 6444a3328b9ea85481b156ce2a8098c7b7847659 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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
-
Copied: ciano/repos/community-x86_64/0001-Handle-GIF-with-ImageMagick.patch
(from rev 926052, ciano/trunk/0001-Handle-GIF-with-ImageMagick.patch)
===================================================================
--- 0001-Handle-GIF-with-ImageMagick.patch (rev 0)
+++ 0001-Handle-GIF-with-ImageMagick.patch 2021-05-01 21:30:58 UTC (rev
926053)
@@ -0,0 +1,76 @@
+From 6444a3328b9ea85481b156ce2a8098c7b7847659 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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
+
Deleted: 0001-Use-standard-icon-names.patch
===================================================================
--- 0001-Use-standard-icon-names.patch 2021-05-01 21:30:43 UTC (rev 926052)
+++ 0001-Use-standard-icon-names.patch 2021-05-01 21:30:58 UTC (rev 926053)
@@ -1,50 +0,0 @@
-From ce29381d7e4be91ddd341a04f6619a6a71bd4278 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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
-
Copied: ciano/repos/community-x86_64/0001-Use-standard-icon-names.patch (from
rev 926052, ciano/trunk/0001-Use-standard-icon-names.patch)
===================================================================
--- 0001-Use-standard-icon-names.patch (rev 0)
+++ 0001-Use-standard-icon-names.patch 2021-05-01 21:30:58 UTC (rev 926053)
@@ -0,0 +1,50 @@
+From ce29381d7e4be91ddd341a04f6619a6a71bd4278 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-01 21:30:43 UTC (rev 926052)
+++ PKGBUILD 2021-05-01 21:30:58 UTC (rev 926053)
@@ -1,53 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ciano
-pkgver=0.2.4
-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=(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"
- "0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch")
-sha256sums=('cdb7f77f10e4b7a64520d618472de97955ce897d26468055666291672db58754'
- '8b44b7df58f82d0ff38572b773724b6f42e085fc1a1aa098776c794eb117b49d'
- 'f682329bc9cbed2d0605b31e1cc4915c9a7e188bb398fed88001e892f44c50bb'
- 'fb99403b4f6707454eef3f8552cded3e48e230dd4a118c7ada6e78e1a52fa3a4'
- '6b24642ba9fb78256eb2e25185ad33db1e175abeff766bf425a3d505d9d7257b'
- '792c95739e89a6db241934230ecf6692dab8811da37439256321924793a2b732')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # 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
- patch -Np1 -i ../0001-Use-standard-icon-names.patch
-
- # Add support for more formats
- patch -Np1 -i
../0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
- patch -Np1 -i
../0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
-}
-
-build() {
- arch-meson $pkgname-$pkgver build
- ninja -C build
-}
-
-check() {
- meson test -C build
-}
-
-package() {
- DESTDIR="$pkgdir" meson install -C build
-}
Copied: ciano/repos/community-x86_64/PKGBUILD (from rev 926052,
ciano/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-01 21:30:58 UTC (rev 926053)
@@ -0,0 +1,54 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=ciano
+_id=com.github.robertsanseries.ciano
+pkgver=0.2.4
+pkgrel=3
+pkgdesc='Multimedia file converter focused on simplicity'
+arch=('x86_64')
+url='https://robertsanseries.github.io/ciano/'
+license=('GPL3')
+depends=('ffmpeg' 'granite' 'imagemagick')
+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'
+ '0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch')
+sha256sums=('cdb7f77f10e4b7a64520d618472de97955ce897d26468055666291672db58754'
+ '8b44b7df58f82d0ff38572b773724b6f42e085fc1a1aa098776c794eb117b49d'
+ 'f682329bc9cbed2d0605b31e1cc4915c9a7e188bb398fed88001e892f44c50bb'
+ 'fb99403b4f6707454eef3f8552cded3e48e230dd4a118c7ada6e78e1a52fa3a4'
+ '6b24642ba9fb78256eb2e25185ad33db1e175abeff766bf425a3d505d9d7257b'
+ '792c95739e89a6db241934230ecf6692dab8811da37439256321924793a2b732')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # 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
+ patch -Np1 -i ../0001-Use-standard-icon-names.patch
+
+ # Add support for more formats
+ patch -Np1 -i
../0001-Add-support-for-conversion-and-selection-of-OPUS-aud.patch
+ patch -Np1 -i
../0001-Add-support-for-conversion-and-selection-of-WEBP-ima.patch
+
+ # Fix metainfo file
+ sed -i "/<id>/a <launchable type=\"desktop-id\">$_id.desktop</launchable>"
data/$_id.appdata.xml.in
+}
+
+build() {
+ arch-meson $pkgname-$pkgver build
+ meson compile -C build
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+ ln -s $_id "$pkgdir/usr/bin/$pkgname"
+}
