From 8c92f623c925ff0b5f027e17c0e0b96c8b2a3d24 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 13 Oct 2018 19:32:15 +0200 Subject: Revert "media-libs/libopenshot: Commit the patch, drop old" This reverts commit 9e4cf555ecf51c074d6d179897894413a8e9eb9a. Signed-off-by: Pacho Ramos Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- media-libs/libopenshot/Manifest | 2 + media-libs/libopenshot/libopenshot-0.1.3.ebuild | 84 ++++++++++++++++++++++ media-libs/libopenshot/libopenshot-0.1.7.ebuild | 83 +++++++++++++++++++++ .../libopenshot-0.2.2-imagemagick7.patch | 78 -------------------- 4 files changed, 169 insertions(+), 78 deletions(-) create mode 100644 media-libs/libopenshot/libopenshot-0.1.3.ebuild create mode 100644 media-libs/libopenshot/libopenshot-0.1.7.ebuild delete mode 100644 media-libs/libopenshot/libopenshot-0.2.2-imagemagick7.patch (limited to 'media-libs') diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest index d1299bd05fbc..be122d9c41a5 100644 --- a/media-libs/libopenshot/Manifest +++ b/media-libs/libopenshot/Manifest @@ -1,2 +1,4 @@ +DIST libopenshot-0.1.3.tar.gz 11019740 BLAKE2B a706889f709024300ef79518406da861111a8445b5ce23364b8492a72e74e7944c88ba9b4a29da356ca21500253d19e8c32abe7b5aaa0ac35bebec85e52ba970 SHA512 d59817505812868db408a88dc1d30b5b1833910f45dd0df03937110b7d4cbd85a270773008e75a1501f4b3b89a09ea798ed9b580755adf3ae79ac24d403f6982 +DIST libopenshot-0.1.7.tar.gz 11022594 BLAKE2B f3e0836ebb6dd89ce42085dc9d18dd3bce9ab3011550958bec41eead2c62b454459d219d2efeece1a43eb0536cb99866eaf9b478205d717da4c173e954772a46 SHA512 4c8871ff30c03a14766e35a64052695768311afd81ecc55598720ad146f53c122ef3b1293467670f7dd48da77bf6cb4f4f14a18c298a649b8827f901ed653709 DIST libopenshot-0.1.8.tar.gz 11019495 BLAKE2B a86994a09328e24705fe06ec3c47cbedb89815e6ec1440237dc58babfc066655f1c7dacc19257b02b645a9415c63cd4e0c1191fa452b7632cf531d98a1b073c3 SHA512 02630d7ce9fd378ad648d034622d4f971728a2074691d7facc8a36dcd52b87c1372dd5a9588c0ba852589105bdbf78941083fd6b1eb1bcc0a33d4ca49634162c DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553 diff --git a/media-libs/libopenshot/libopenshot-0.1.3.ebuild b/media-libs/libopenshot/libopenshot-0.1.3.ebuild new file mode 100644 index 000000000000..cc13df34d2a1 --- /dev/null +++ b/media-libs/libopenshot/libopenshot-0.1.3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5} ) + +inherit cmake-utils python-single-r1 toolchain-funcs versionator + +DESCRIPTION="Video editing library used by OpenShot" +HOMEPAGE="http://www.openshotvideo.com/" +SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+imagemagick libav +python test" +# https://github.com/OpenShot/libopenshot/issues/43 +RESTRICT="test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + net-libs/cppzmq + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + media-libs/libopenshot-audio + imagemagick? ( media-gfx/imagemagick:0=[cxx] ) + libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) + !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND=" + ${RDEPEND} + python? ( dev-lang/swig ) + test? ( dev-libs/unittest++ ) +" + +# https://github.com/OpenShot/libopenshot/pull/45 +PATCHES=( ${FILESDIR}/${P}-fix-tests.patch ) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then + eerror "${P} requires a compiler with OpenMP support. Your current" + eerror "compiler does not support it. If you use gcc, you can" + eerror "re-emerge it with the 'openmp' use flag enabled." + die "The current compiler does not support OpenMP" + fi +} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # https://github.com/OpenShot/libopenshot/issues/17 + use test || cmake_comment_add_subdirectory tests + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_RUBY=OFF # TODO: add ruby support + -DENABLE_PYTHON=$(usex python) + -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick) + ) + use python && mycmakeargs+=( + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + ) + cmake-utils_src_configure +} + +src_test() { + cd "${BUILD_DIR}" || die + emake test +} + +src_install() { + cmake-utils_src_install + python_optimize +} diff --git a/media-libs/libopenshot/libopenshot-0.1.7.ebuild b/media-libs/libopenshot/libopenshot-0.1.7.ebuild new file mode 100644 index 000000000000..4f9643afa9b0 --- /dev/null +++ b/media-libs/libopenshot/libopenshot-0.1.7.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit cmake-utils python-single-r1 toolchain-funcs versionator + +DESCRIPTION="Video editing library used by OpenShot" +HOMEPAGE="http://www.openshotvideo.com/" +SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+imagemagick libav +python test" +# https://github.com/OpenShot/libopenshot/issues/43 +RESTRICT="test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + net-libs/cppzmq + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + media-libs/libopenshot-audio + imagemagick? ( image; -- list lines; -+ vector lines; - bool is_open; - GravityType gravity; - -diff -Nru a/src/Frame.cpp b/src/Frame.cpp ---- a/src/Frame.cpp 2018-09-22 21:47:46.000000000 +0200 -+++ b/src/Frame.cpp 2018-09-23 16:21:44.921563711 +0200 -@@ -29,6 +29,9 @@ - - using namespace std; - using namespace openshot; -+#ifdef USE_IMAGEMAGICK -+using namespace Magick; -+#endif - - // Constructor - blank frame (300x200 blank image, 48kHz audio silence) - Frame::Frame() : number(1), pixel_ratio(1,1), channels(2), width(1), height(1), color("#000000"), -@@ -904,7 +907,7 @@ - // Give image a transparent background color - magick_image->backgroundColor(Magick::Color("none")); - magick_image->virtualPixelMethod(Magick::TransparentVirtualPixelMethod); -- magick_image->matte(true); -+ magick_image->alpha(true); - - return magick_image; - } -@@ -926,13 +929,14 @@ - // 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()); -+ const Quantum *pixels = new_image->getConstPixels(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); -+ buffer[i+0] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelRed(new_image->image(), pixels)); -+ buffer[i+1] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelGreen(new_image->image(), pixels)); -+ buffer[i+2] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelBlue(new_image->image(), pixels)); -+ buffer[i+3] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelAlpha(new_image->image(), pixels)); - numcopied+=4; -+ pixels += MagickCore::GetPixelChannels(new_image->image()); - } - - // Create QImage of frame data -diff -Nru a/src/ImageReader.cpp b/src/ImageReader.cpp ---- a/src/ImageReader.cpp 2018-09-22 21:47:46.000000000 +0200 -+++ b/src/ImageReader.cpp 2018-09-23 16:22:32.330865516 +0200 -@@ -59,7 +59,7 @@ - - // Give image a transparent background color - image->backgroundColor(Magick::Color("none")); -- image->matte(true); -+ image->alpha(true); - } - catch (Magick::Exception e) { - // raise exception -diff -Nru a/src/ImageWriter.cpp b/src/ImageWriter.cpp ---- a/src/ImageWriter.cpp 2018-09-22 21:47:46.000000000 +0200 -+++ b/src/ImageWriter.cpp 2018-09-23 16:22:58.380031419 +0200 -@@ -97,7 +97,7 @@ - std::shared_ptr frame_image = frame->GetMagickImage(); - frame_image->magick( info.vcodec ); - frame_image->backgroundColor(Magick::Color("none")); -- frame_image->matte(true); -+ frame_image->alpha(true); - frame_image->quality(image_quality); - frame_image->animationDelay(info.video_timebase.ToFloat() * 100); - frame_image->animationIterations(number_of_loops); -- cgit v1.2.3-18-g5258