From 070cb3d3d0b19ec498d8053cb89abd34c3887582 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sun, 5 Apr 2020 21:39:45 +0200 Subject: [PATCH 1/3] openshot: update to 2.5.1 --- .../disable-google-analytics-by-default.patch | 18 ------------------ srcpkgs/openshot/template | 7 +++---- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/openshot/patches/disable-google-analytics-by-default.patch diff --git a/srcpkgs/openshot/patches/disable-google-analytics-by-default.patch b/srcpkgs/openshot/patches/disable-google-analytics-by-default.patch deleted file mode 100644 index 62db4f3dc92..00000000000 --- a/srcpkgs/openshot/patches/disable-google-analytics-by-default.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/settings/_default.settings.orig 2016-09-04 08:57:45.591685817 +0200 -+++ src/settings/_default.settings 2016-09-04 08:57:59.528686536 +0200 -@@ -232,7 +232,7 @@ - "restart": true - }, - { -- "value": true, -+ "value": false, - "title": "Send Anonymous Metrics and Errors", - "type": "bool", - "category": "Debug", -@@ -628,4 +628,4 @@ - "value": "Ctrl+I", - "type": "text" - } --] -\ No newline at end of file -+] diff --git a/srcpkgs/openshot/template b/srcpkgs/openshot/template index d71b4d09fae..3ee73061f83 100644 --- a/srcpkgs/openshot/template +++ b/srcpkgs/openshot/template @@ -1,11 +1,10 @@ # Template file for 'openshot' pkgname=openshot -version=2.4.4 -revision=2 +version=2.5.1 +revision=1 archs="i686 x86_64 ppc64le" wrksrc="${pkgname}-qt-${version}" build_style=python3-module -pycompile_module="openshot_qt" hostmakedepends="python3" makedepends="ffmpeg-devel python3-PyQt5 python3-setuptools" depends="ImageMagick libopenshot mlt python3-PyQt5-svg @@ -15,4 +14,4 @@ maintainer="Spencer Hill " license="GPL-3.0-or-later" homepage="https://www.openshot.org" distfiles="https://github.com/OpenShot/openshot-qt/archive/v${version}.tar.gz" -checksum=8197923b3fff2010ee69c75469818543674a12fcb8fcb08944471e4ead3426be +checksum=4c25eb9a5de42e749de4c6ca2f7a313c60e1283fe52d70c121629dbb8bb2df7b From 6af3fc00b4959ae40f4c91ca0537ec15493079f2 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sun, 5 Apr 2020 21:38:04 +0200 Subject: [PATCH 2/3] libopenshot-audio: update to 0.2.0 --- common/shlibs | 3 +- .../patches/fix-std_isfinite.patch | 23 --- srcpkgs/libopenshot-audio/patches/gcc9.patch | 136 ------------------ srcpkgs/libopenshot-audio/template | 11 +- 4 files changed, 10 insertions(+), 163 deletions(-) delete mode 100644 srcpkgs/libopenshot-audio/patches/fix-std_isfinite.patch delete mode 100644 srcpkgs/libopenshot-audio/patches/gcc9.patch diff --git a/common/shlibs b/common/shlibs index 477ce5f2d3f..60d17fe9478 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2496,7 +2496,8 @@ libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 libykneomgr.so.0 libykneomgr-0.1.8_1 libopenshot.so.17 libopenshot-0.2.3_1 -libopenshot-audio.so.6 libopenshot-audio-0.1.5_1 +libopenshot-audio.so.7 libopenshot-audio-0.2.0_1 +libopenshot.so.19 libopenshot-0.2.5_3 libpqxx-6.3.so libpqxx-6.3.3_1 libndpi.so.1 ndpi-1.6_1 liblog.so android-studio-3.0.1_1 diff --git a/srcpkgs/libopenshot-audio/patches/fix-std_isfinite.patch b/srcpkgs/libopenshot-audio/patches/fix-std_isfinite.patch deleted file mode 100644 index 231f183d5a7..00000000000 --- a/srcpkgs/libopenshot-audio/patches/fix-std_isfinite.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix for gcc6 which does not have std::isfinite() but suggests -to use std::finite() instead. - ---- JuceLibraryCode/modules/juce_core/maths/juce_MathsFunctions.h 2016-08-30 06:24:27.000000000 +0200 -+++ JuceLibraryCode/modules/juce_core/maths/juce_MathsFunctions.h 2016-12-12 14:33:29.170005576 +0100 -@@ -381,7 +381,7 @@ - #if JUCE_WINDOWS && !JUCE_MINGW - return _finite (value) != 0; - #else -- return std::isfinite (value); -+ return finite (value); - #endif - } - -@@ -391,7 +391,7 @@ - #if JUCE_WINDOWS && !JUCE_MINGW - return _finite (value) != 0; - #else -- return std::isfinite (value); -+ return finite (value); - #endif - } - diff --git a/srcpkgs/libopenshot-audio/patches/gcc9.patch b/srcpkgs/libopenshot-audio/patches/gcc9.patch deleted file mode 100644 index d2acbd292c8..00000000000 --- a/srcpkgs/libopenshot-audio/patches/gcc9.patch +++ /dev/null @@ -1,136 +0,0 @@ -commit fa0e4ef1c4969ac1f6c54d306e66b27a31da5b87 -Author: q66 -Date: Mon Dec 23 18:23:28 2019 +0100 - - fix build with gcc9 - - Adapted from upstream. - -diff --git JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h -index 0df5987..ea2e990 100644 ---- JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h -+++ JuceLibraryCode/modules/juce_graphics/colour/juce_PixelFormats.h -@@ -108,19 +108,6 @@ public: - forcedinline uint8 getGreen() const noexcept { return components.g; } - forcedinline uint8 getBlue() const noexcept { return components.b; } - -- #if JUCE_GCC && ! JUCE_CLANG -- // NB these are here as a workaround because GCC refuses to bind to packed values. -- forcedinline uint8& getAlpha() noexcept { return comps [indexA]; } -- forcedinline uint8& getRed() noexcept { return comps [indexR]; } -- forcedinline uint8& getGreen() noexcept { return comps [indexG]; } -- forcedinline uint8& getBlue() noexcept { return comps [indexB]; } -- #else -- forcedinline uint8& getAlpha() noexcept { return components.a; } -- forcedinline uint8& getRed() noexcept { return components.r; } -- forcedinline uint8& getGreen() noexcept { return components.g; } -- forcedinline uint8& getBlue() noexcept { return components.b; } -- #endif -- - //============================================================================== - /** Copies another pixel colour over this one. - -@@ -339,9 +326,6 @@ private: - { - uint32 internal; - Components components; -- #if JUCE_GCC -- uint8 comps[4]; // helper struct needed because gcc does not allow references to packed union members -- #endif - }; - } - #ifndef DOXYGEN -@@ -428,10 +412,6 @@ public: - forcedinline uint8 getGreen() const noexcept { return g; } - forcedinline uint8 getBlue() const noexcept { return b; } - -- forcedinline uint8& getRed() noexcept { return r; } -- forcedinline uint8& getGreen() noexcept { return g; } -- forcedinline uint8& getBlue() noexcept { return b; } -- - //============================================================================== - /** Copies another pixel colour over this one. - -@@ -645,7 +625,6 @@ public: - - //============================================================================== - forcedinline uint8 getAlpha() const noexcept { return a; } -- forcedinline uint8& getAlpha() noexcept { return a; } - - forcedinline uint8 getRed() const noexcept { return 0; } - forcedinline uint8 getGreen() const noexcept { return 0; } -diff --git JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h -index cd8cd36..87bf33e 100644 ---- JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h -+++ JuceLibraryCode/modules/juce_graphics/native/juce_RenderingHelpers.h -@@ -583,10 +583,6 @@ namespace EdgeTableFillers - { - areRGBComponentsEqual = sourceColour.getRed() == sourceColour.getGreen() - && sourceColour.getGreen() == sourceColour.getBlue(); -- filler[0].set (sourceColour); -- filler[1].set (sourceColour); -- filler[2].set (sourceColour); -- filler[3].set (sourceColour); - } - else - { -@@ -642,7 +638,6 @@ namespace EdgeTableFillers - const Image::BitmapData& destData; - PixelType* linePixels; - PixelARGB sourceColour; -- PixelRGB filler [4]; - bool areRGBComponentsEqual; - - forcedinline PixelType* getPixel (const int x) const noexcept -@@ -657,47 +652,10 @@ namespace EdgeTableFillers - - forcedinline void replaceLine (PixelRGB* dest, const PixelARGB colour, int width) const noexcept - { -- if (destData.pixelStride == sizeof (*dest)) -- { -- if (areRGBComponentsEqual) // if all the component values are the same, we can cheat.. -- { -- memset (dest, colour.getRed(), (size_t) width * 3); -- } -- else -- { -- if (width >> 5) -- { -- const int* const intFiller = reinterpret_cast (filler); -- -- while (width > 8 && (((pointer_sized_int) dest) & 7) != 0) -- { -- dest->set (colour); -- ++dest; -- --width; -- } -- -- while (width > 4) -- { -- int* d = reinterpret_cast (dest); -- *d++ = intFiller[0]; -- *d++ = intFiller[1]; -- *d++ = intFiller[2]; -- dest = reinterpret_cast (d); -- width -= 4; -- } -- } -- -- while (--width >= 0) -- { -- dest->set (colour); -- ++dest; -- } -- } -- } -- else -- { -- JUCE_PERFORM_PIXEL_OP_LOOP (set (colour)) -- } -+ if ((size_t) destData.pixelStride == sizeof (*dest) && areRGBComponentsEqual) -+ memset ((void*) dest, colour.getRed(), (size_t) width * 3); // if all the component values are the same, we can cheat.. -+ else -+ JUCE_PERFORM_PIXEL_OP_LOOP (set (colour)); - } - - forcedinline void replaceLine (PixelAlpha* dest, const PixelARGB colour, int width) const noexcept diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template index 7975050fc49..d9a6a719734 100644 --- a/srcpkgs/libopenshot-audio/template +++ b/srcpkgs/libopenshot-audio/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot-audio' pkgname=libopenshot-audio -version=0.1.8 -revision=3 +version=0.2.0 +revision=1 build_style=cmake hostmakedepends="doxygen" makedepends="alsa-lib-devel libXcursor-devel libXinerama-devel libXrandr-devel @@ -11,10 +11,15 @@ maintainer="Spencer Hill " license="GPL-3.0-or-later" homepage="https://github.com/OpenShot/libopenshot-audio" distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz" -checksum=384d0ef39c78f16d77048de3c96152321724084f978dc622675dd6bb16e15e19 +checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + CXXFLAGS+=" -latomic " +fi + libopenshot-audio-devel_package() { short_desc+=" - development files" depends+=" ${sourcepkg}>=${version}_${revision}" From 8d1af42a599212169a4cd504cb58bf0aff634e22 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Sun, 5 Apr 2020 21:38:34 +0200 Subject: [PATCH 3/3] libopenshot: update to 0.2.5 --- common/shlibs | 1 - .../libopenshot/patches/imagemagick7.patch | 417 ------------------ srcpkgs/libopenshot/template | 11 +- 3 files changed, 3 insertions(+), 426 deletions(-) delete mode 100644 srcpkgs/libopenshot/patches/imagemagick7.patch diff --git a/common/shlibs b/common/shlibs index 60d17fe9478..774b3869df8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2495,7 +2495,6 @@ libax25io.so.0 libax25-0.0.12rc4_1 libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 libykneomgr.so.0 libykneomgr-0.1.8_1 -libopenshot.so.17 libopenshot-0.2.3_1 libopenshot-audio.so.7 libopenshot-audio-0.2.0_1 libopenshot.so.19 libopenshot-0.2.5_3 libpqxx-6.3.so libpqxx-6.3.3_1 diff --git a/srcpkgs/libopenshot/patches/imagemagick7.patch b/srcpkgs/libopenshot/patches/imagemagick7.patch deleted file mode 100644 index 62c9965ea2d..00000000000 --- a/srcpkgs/libopenshot/patches/imagemagick7.patch +++ /dev/null @@ -1,417 +0,0 @@ -From b0b6e43d8ff977e4853fe494a8ed4f10dc25e571 Mon Sep 17 00:00:00 2001 -From: "FeRD (Frank Dana)" -Date: Thu, 13 Jun 2019 03:10:16 -0400 -Subject: [PATCH 1/2] Add ImageMagick 7 compatibility -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A new header, `imclude/MagickUtilities.h`, is created to hold the -compatibility `#define`s. - -The image-conversion code in `src/Frame.cpp` received the only -major changes — instead of doing the export by hand (and having -to account for changes in the underlying API), it uses the -`MagickCore::ExportImagePixels()` function which does basically -the same work, but accounts for all of the API changes for us. -The API of that function is _unchanged_ from IM6 to IM7. - -TODO: `MagickCore::ExportImagePixels()` will return an `exception` -struct if it encounters any problems. Currently the code ignores -that, which it should not. ---- - include/Frame.h | 4 +-- - include/ImageReader.h | 8 +++-- - include/ImageWriter.h | 9 +++--- - include/MagickUtilities.h | 61 +++++++++++++++++++++++++++++++++++++++ - include/TextReader.h | 10 +++++-- - include/effects/Mask.h | 7 +++-- - src/Frame.cpp | 22 +++++--------- - src/ImageReader.cpp | 9 ++++-- - src/ImageWriter.cpp | 6 +++- - src/TextReader.cpp | 5 ++++ - src/effects/Mask.cpp | 9 +++--- - 11 files changed, 112 insertions(+), 38 deletions(-) - create mode 100644 include/MagickUtilities.h - -diff --git a/include/Frame.h b/include/Frame.h -index 6b682edb..eef750ff 100644 ---- a/include/Frame.h -+++ b/include/Frame.h -@@ -53,14 +53,12 @@ - #include - #include - #include "ZmqLogger.h" --#ifdef USE_IMAGEMAGICK -- #include "Magick++.h" --#endif - #include "JuceLibraryCode/JuceHeader.h" - #include "ChannelLayouts.h" - #include "AudioBufferSource.h" - #include "AudioResampler.h" - #include "Fraction.h" -+#include "MagickUtilities.h" - - #pragma SWIG nowarn=362 - using namespace std; -diff --git a/include/ImageReader.h b/include/ImageReader.h -index e698e0c1..7ad23173 100644 ---- a/include/ImageReader.h -+++ b/include/ImageReader.h -@@ -28,6 +28,9 @@ - #ifndef OPENSHOT_IMAGE_READER_H - #define OPENSHOT_IMAGE_READER_H - -+// Require ImageMagick support -+#ifdef USE_IMAGEMAGICK -+ - #include "ReaderBase.h" - - #include -@@ -36,9 +39,9 @@ - #include - #include - #include --#include "Magick++.h" - #include "CacheMemory.h" - #include "Exceptions.h" -+#include "MagickUtilities.h" - - using namespace std; - -@@ -113,4 +116,5 @@ namespace openshot - - } - --#endif -+#endif //USE_IMAGEMAGICK -+#endif //OPENSHOT_IMAGE_READER_H -diff --git a/include/ImageWriter.h b/include/ImageWriter.h -index 25177134..b7dd7dc2 100644 ---- a/include/ImageWriter.h -+++ b/include/ImageWriter.h -@@ -32,10 +32,11 @@ - * along with OpenShot Library. If not, see . - */ - -- - #ifndef OPENSHOT_IMAGE_WRITER_H - #define OPENSHOT_IMAGE_WRITER_H - -+#ifdef USE_IMAGEMAGICK -+ - #include "ReaderBase.h" - #include "WriterBase.h" - -@@ -44,11 +45,10 @@ - #include - #include - #include --#include "Magick++.h" - #include "CacheMemory.h" - #include "Exceptions.h" - #include "OpenMPUtilities.h" -- -+#include "MagickUtilities.h" - - using namespace std; - -@@ -145,4 +145,5 @@ namespace openshot - - } - --#endif -+#endif //USE_IMAGEMAGICK -+#endif //OPENSHOT_IMAGE_WRITER_H -diff --git a/include/MagickUtilities.h b/include/MagickUtilities.h -new file mode 100644 -index 00000000..f3b7ea12 ---- /dev/null -+++ b/include/MagickUtilities.h -@@ -0,0 +1,61 @@ -+/** -+ * @file -+ * @brief Header file for MagickUtilities (IM6/IM7 compatibility overlay) -+ * @author Jonathan Thomas -+ * @author FeRD (Frank Dana) -+ */ -+ -+/* LICENSE -+ * -+ * Copyright (c) 2008-2019 OpenShot Studios, LLC -+ * . This file is part of -+ * OpenShot Library (libopenshot), an open-source project dedicated to -+ * delivering high quality video editing and animation solutions to the -+ * world. For more information visit . -+ * -+ * OpenShot Library (libopenshot) is free software: you can redistribute it -+ * and/or modify it under the terms of the GNU Lesser General Public License -+ * as published by the Free Software Foundation, either version 3 of the -+ * License, or (at your option) any later version. -+ * -+ * OpenShot Library (libopenshot) is distributed in the hope that it will be -+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with OpenShot Library. If not, see . -+ */ -+ -+#ifndef OPENSHOT_MAGICK_UTILITIES_H -+#define OPENSHOT_MAGICK_UTILITIES_H -+ -+#ifdef USE_IMAGEMAGICK -+ -+ #include "Magick++.h" -+ -+ // Determine ImageMagick version, as IM7 isn't fully -+ // backwards compatible -+ #ifndef NEW_MAGICK -+ #define NEW_MAGICK (MagickLibVersion >= 0x700) -+ #endif -+ -+ // IM7: ->alpha(bool) -+ // IM6: ->matte(bool) -+ #if NEW_MAGICK -+ #define MAGICK_IMAGE_ALPHA(im, a) im->alpha((a)) -+ #else -+ #define MAGICK_IMAGE_ALPHA(im, a) im->matte((a)) -+ #endif -+ -+ // IM7: vector -+ // IM6: list -+ // (both have the push_back() method which is all we use) -+ #if NEW_MAGICK -+ #define MAGICK_DRAWABLE vector -+ #else -+ #define MAGICK_DRAWABLE list -+ #endif -+ -+#endif -+#endif -diff --git a/include/TextReader.h b/include/TextReader.h -index d7d653d2..bb4bdc22 100644 ---- a/include/TextReader.h -+++ b/include/TextReader.h -@@ -28,6 +28,9 @@ - #ifndef OPENSHOT_TEXT_READER_H - #define OPENSHOT_TEXT_READER_H - -+// Require ImageMagick support -+#ifdef USE_IMAGEMAGICK -+ - #include "ReaderBase.h" - - #include -@@ -36,10 +39,10 @@ - #include - #include - #include --#include "Magick++.h" - #include "CacheMemory.h" - #include "Enums.h" - #include "Exceptions.h" -+#include "MagickUtilities.h" - - using namespace std; - -@@ -91,7 +94,7 @@ namespace openshot - string text_color; - string background_color; - std::shared_ptr image; -- list lines; -+ MAGICK_DRAWABLE lines; - bool is_open; - GravityType gravity; - -@@ -144,4 +147,5 @@ namespace openshot - - } - --#endif -+#endif //USE_IMAGEMAGICK -+#endif //OPENSHOT_TEXT_READER_H -diff --git a/include/effects/Mask.h b/include/effects/Mask.h -index ef707f5f..e5b8f649 100644 ---- a/include/effects/Mask.h -+++ b/include/effects/Mask.h -@@ -25,8 +25,8 @@ - * along with OpenShot Library. If not, see . - */ - --#ifndef OPENSHOT_WIPE_EFFECT_H --#define OPENSHOT_WIPE_EFFECT_H -+#ifndef OPENSHOT_MASK_EFFECT_H -+#define OPENSHOT_MASK_EFFECT_H - - #include "../EffectBase.h" - -@@ -45,6 +45,7 @@ - #include "../QtImageReader.h" - #include "../ChunkReader.h" - #ifdef USE_IMAGEMAGICK -+ #include "../MagickUtilities.h" - #include "../ImageReader.h" - #endif - -@@ -54,7 +55,7 @@ namespace openshot - { - - /** -- * @brief This class uses the ImageMagick++ libraries, to apply alpha (or transparency) masks -+ * @brief This class uses the image libraries to apply alpha (or transparency) masks - * to any frame. It can also be animated, and used as a powerful Wipe transition. - * - * These masks / wipes can also be combined, such as a transparency mask on top of a clip, which -diff --git a/src/Frame.cpp b/src/Frame.cpp -index aa7c0d87..5e06e61e 100644 ---- a/src/Frame.cpp -+++ b/src/Frame.cpp -@@ -926,7 +926,7 @@ std::shared_ptr Frame::GetMagickImage() - // Give image a transparent background color - magick_image->backgroundColor(Magick::Color("none")); - magick_image->virtualPixelMethod(Magick::TransparentVirtualPixelMethod); -- magick_image->matte(true); -+ MAGICK_IMAGE_ALPHA(magick_image, true); - - return magick_image; - } -@@ -945,20 +945,12 @@ void Frame::AddMagickImage(std::shared_ptr new_image) - qbuffer = new unsigned char[bufferSize](); - unsigned char *buffer = (unsigned char*)qbuffer; - -- // Iterate through the pixel packets, and load our own buffer -- // Each color needs to be scaled to 8 bit (using the ImageMagick built-in ScaleQuantumToChar function) -- int numcopied = 0; -- Magick::PixelPacket *pixels = new_image->getPixels(0,0, new_image->columns(), new_image->rows()); -- for (int n = 0, i = 0; n < new_image->columns() * new_image->rows(); n += 1, i += 4) { -- buffer[i+0] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].red); -- buffer[i+1] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].green); -- buffer[i+2] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].blue); -- buffer[i+3] = 255 - MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].opacity); -- numcopied+=4; -- } -- -- // Create QImage of frame data -- image = std::shared_ptr(new QImage(qbuffer, width, height, width * BPP, QImage::Format_RGBA8888, (QImageCleanupFunction) &cleanUpBuffer, (void*) qbuffer)); -+ MagickCore::ExceptionInfo exception; -+ // TODO: Actually do something, if we get an exception here -+ MagickCore::ExportImagePixels(new_image->constImage(), 0, 0, new_image->columns(), new_image->rows(), "RGBA", Magick::CharPixel, buffer, &exception); -+ -+ // Create QImage of frame data -+ image = std::shared_ptr(new QImage(qbuffer, width, height, width * BPP, QImage::Format_RGBA8888, (QImageCleanupFunction) &cleanUpBuffer, (void*) qbuffer)); - - // Update height and width - width = image->width(); -diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp -index f535666a..cc2005a4 100644 ---- a/src/ImageReader.cpp -+++ b/src/ImageReader.cpp -@@ -25,6 +25,9 @@ - * along with OpenShot Library. If not, see . - */ - -+// Require ImageMagick support -+#ifdef USE_IMAGEMAGICK -+ - #include "../include/ImageReader.h" - - using namespace openshot; -@@ -59,7 +62,7 @@ void ImageReader::Open() - - // Give image a transparent background color - image->backgroundColor(Magick::Color("none")); -- image->matte(true); -+ MAGICK_IMAGE_ALPHA(image, true); - } - catch (Magick::Exception e) { - // raise exception -@@ -106,7 +109,7 @@ void ImageReader::Close() - { - // Mark as "closed" - is_open = false; -- -+ - // Delete the image - image.reset(); - } -@@ -188,3 +191,5 @@ void ImageReader::SetJsonValue(Json::Value root) { - Open(); - } - } -+ -+#endif //USE_IMAGEMAGICK -diff --git a/src/ImageWriter.cpp b/src/ImageWriter.cpp -index 41626b09..5bc0367a 100644 ---- a/src/ImageWriter.cpp -+++ b/src/ImageWriter.cpp -@@ -28,6 +28,9 @@ - * along with OpenShot Library. If not, see . - */ - -+//Require ImageMagick support -+#ifdef USE_IMAGEMAGICK -+ - #include "../include/ImageWriter.h" - - using namespace openshot; -@@ -97,7 +100,7 @@ void ImageWriter::WriteFrame(std::shared_ptr frame) - std::shared_ptr frame_image = frame->GetMagickImage(); - frame_image->magick( info.vcodec ); - frame_image->backgroundColor(Magick::Color("none")); -- frame_image->matte(true); -+ MAGICK_IMAGE_ALPHA(frame_image, true); - frame_image->quality(image_quality); - frame_image->animationDelay(info.video_timebase.ToFloat() * 100); - frame_image->animationIterations(number_of_loops); -@@ -153,3 +156,4 @@ void ImageWriter::Close() - ZmqLogger::Instance()->AppendDebugMethod("ImageWriter::Close", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1); - } - -+#endif //USE_IMAGEMAGICK -diff --git a/src/TextReader.cpp b/src/TextReader.cpp -index 8234aa5d..b3faecf3 100644 ---- a/src/TextReader.cpp -+++ b/src/TextReader.cpp -@@ -25,6 +25,9 @@ - * along with OpenShot Library. If not, see . - */ - -+// Require ImageMagick support -+#ifdef USE_IMAGEMAGICK -+ - #include "../include/TextReader.h" - - using namespace openshot; -@@ -254,3 +257,5 @@ void TextReader::SetJsonValue(Json::Value root) { - Open(); - } - } -+ -+#endif //USE_IMAGEMAGICK -diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp -index f8f34ac6..ab634654 100644 ---- a/src/effects/Mask.cpp -+++ b/src/effects/Mask.cpp -@@ -234,11 +234,11 @@ void Mask::SetJsonValue(Json::Value root) { - reader->SetJsonValue(root["reader"]); - - #ifdef USE_IMAGEMAGICK -- } else if (type == "ImageReader") { -+ } else if (type == "ImageReader") { - -- // Create new reader -- reader = new ImageReader(root["reader"]["path"].asString()); -- reader->SetJsonValue(root["reader"]); -+ // Create new reader -+ reader = new ImageReader(root["reader"]["path"].asString()); -+ reader->SetJsonValue(root["reader"]); - #endif - - } else if (type == "QtImageReader") { -@@ -290,4 +290,3 @@ string Mask::PropertiesJSON(int64_t requested_frame) { - // Return formatted string - return root.toStyledString(); - } -- diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 0701bed0dbf..57b3edcf7e3 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot -version=0.2.3 -revision=3 +version=0.2.5 +revision=1 archs="i686 x86_64 ppc64le" build_style=cmake configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1 @@ -15,14 +15,9 @@ maintainer="Spencer Hill " license="LGPL-3.0-or-later" homepage="https://github.com/OpenShot/libopenshot" distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz" -checksum=8536b0a790b0d98ed4c3b10e11d1b34ae68ccbc710887e3703a5143d95598746 +checksum=8ae7d226fbd2efbc84da4f7d9d8c7f3cc9616e4de46e1233e3b0a84ac0a429bc patch_args="-Np1" -pre_configure() { - # vendored python cmake module does not find python 3.8 - rm cmake/Modules/FindPythonLibs.cmake -} - libopenshot-devel_package() { short_desc+=" - development files" pkg_install() {