openshot, libopenshot, libopenshot-audio: rebuild for imagemagick
This commit is contained in:
suvari
@@ -52,6 +52,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="2">
|
||||
<Date>2022-07-05</Date>
|
||||
<Version>0.2.2</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvari@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2021-12-07</Date>
|
||||
<Version>0.2.2</Version>
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<Email>suvari@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPL</License>
|
||||
<Icon>libopenshot</Icon>
|
||||
<IsA>library</IsA>
|
||||
<Summary>A free, open-source C++ library dedicated to delivering high quality video editing, animation, and playback solutions to the world.</Summary>
|
||||
<Description>OpenShot Video Library (libopenshot) is a free, open-source C++ library dedicated to delivering high quality video editing, animation, and playback solutions to the world.</Description>
|
||||
@@ -46,9 +47,11 @@
|
||||
<Dependency>ffmpeg</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>zeromq</Dependency>
|
||||
<Dependency>opencv</Dependency>
|
||||
<Dependency>jsoncpp</Dependency>
|
||||
<Dependency>libgomp</Dependency>
|
||||
<Dependency>python3</Dependency>
|
||||
<Dependency>protobuf</Dependency>
|
||||
<Dependency>qt5-base</Dependency>
|
||||
<Dependency>imagemagick</Dependency>
|
||||
<Dependency>libopenshot-audio</Dependency>
|
||||
@@ -75,6 +78,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2022-07-05</Date>
|
||||
<Version>0.2.7</Version>
|
||||
<Comment>Rebuild for imagemagick</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvari@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2021-12-09</Date>
|
||||
<Version>0.2.7</Version>
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
From 9748a13268d66a5949aebc970637b5903756d018 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Thomas <jonathan@openshot.org>
|
||||
Date: Thu, 7 Oct 2021 13:53:09 -0500
|
||||
Subject: [PATCH] Support for previewing anamorphic video profiles, including a
|
||||
few code clean-ups.
|
||||
|
||||
---
|
||||
src/windows/video_widget.py | 22 +++++++---------------
|
||||
1 file changed, 7 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/windows/video_widget.py b/src/windows/video_widget.py
|
||||
index 7326598d34..842deb3ba0 100644
|
||||
--- a/src/windows/video_widget.py
|
||||
+++ b/src/windows/video_widget.py
|
||||
@@ -77,28 +77,20 @@ def changed(self, action):
|
||||
if action.type == "load" and action.values.get("pixel_ratio"):
|
||||
pixel_ratio_changed = True
|
||||
self.pixel_ratio = openshot.Fraction(
|
||||
- action.values.get("pixel_ratio").get("num", 16),
|
||||
- action.values.get("pixel_ratio").get("den", 9))
|
||||
+ action.values.get("pixel_ratio").get("num", 1),
|
||||
+ action.values.get("pixel_ratio").get("den", 1))
|
||||
log.info(
|
||||
"Set video widget pixel aspect ratio to: %s",
|
||||
self.pixel_ratio.ToFloat())
|
||||
elif action.key and action.key[0] == "pixel_ratio":
|
||||
pixel_ratio_changed = True
|
||||
self.pixel_ratio = openshot.Fraction(
|
||||
- action.values.get("num", 16),
|
||||
- action.values.get("den", 9))
|
||||
+ action.values.get("num", 1),
|
||||
+ action.values.get("den", 1))
|
||||
log.info(
|
||||
"Update: Set video widget pixel aspect ratio to: %s",
|
||||
self.pixel_ratio.ToFloat())
|
||||
|
||||
- # Update max size (to size of video preview viewport)
|
||||
- if display_ratio_changed or pixel_ratio_changed:
|
||||
- timeline = get_app().window.timeline_sync.timeline
|
||||
- timeline.SetMaxSize(
|
||||
- round(self.width() * self.pixel_ratio.ToFloat()),
|
||||
- round(self.height() * self.pixel_ratio.ToFloat())
|
||||
- )
|
||||
-
|
||||
|
||||
def drawTransformHandler(self, painter, sx, sy, source_width, source_height, origin_x, origin_y,
|
||||
x1=None, y1=None, x2=None, y2=None, rotation = None):
|
||||
@@ -236,7 +228,7 @@ def paintEvent(self, event, *args):
|
||||
# Determine original size of clip's reader
|
||||
source_width = self.transforming_clip.data['reader']['width']
|
||||
source_height = self.transforming_clip.data['reader']['height']
|
||||
- source_size = QSize(source_width, source_height)
|
||||
+ source_size = QSize(source_width, source_height * self.pixel_ratio.Reciprocal().ToDouble())
|
||||
|
||||
# Determine scale of clip
|
||||
scale = self.transforming_clip.data['scale']
|
||||
@@ -405,7 +397,7 @@ def paintEvent(self, event, *args):
|
||||
self.mutex.unlock()
|
||||
|
||||
def centeredViewport(self, width, height):
|
||||
- """ Calculate size of viewport to maintain apsect ratio """
|
||||
+ """ Calculate size of viewport to maintain aspect ratio """
|
||||
|
||||
# Calculate padding
|
||||
top_padding = (height - (height * self.zoom)) / 2.0
|
||||
@@ -416,7 +408,7 @@ def centeredViewport(self, width, height):
|
||||
height = height * self.zoom
|
||||
|
||||
# Calculate which direction to scale (for perfect centering)
|
||||
- aspectRatio = self.aspect_ratio.ToFloat() * self.pixel_ratio.ToFloat()
|
||||
+ aspectRatio = self.aspect_ratio.ToFloat()
|
||||
heightFromWidth = width / aspectRatio
|
||||
widthFromHeight = height * aspectRatio
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
<Archive sha1sum="ccc397a488253e3cdd26bd8ff59ad050bfe57323" type="targz">https://github.com/OpenShot/openshot-qt/archive/refs/tags/v2.6.1.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>faac-devel</Dependency>
|
||||
<Dependency>ffmpeg-devel</Dependency>
|
||||
<Dependency>python3-devel</Dependency>
|
||||
<Dependency>python3-pyzmq</Dependency>
|
||||
@@ -26,8 +27,10 @@
|
||||
<Dependency>python3-qt5-devel</Dependency>
|
||||
<Dependency>python3-setuptools</Dependency>
|
||||
<Dependency>libopenshot-audio-devel</Dependency>
|
||||
<Dependency>python3-importlib_metadata</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>video_widget.patch</Patch>
|
||||
<Patch>openshot-2.6.1-no_metric_default.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
@@ -35,6 +38,7 @@
|
||||
<Package>
|
||||
<Name>openshot</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>faac</Dependency>
|
||||
<Dependency>ffmpeg</Dependency>
|
||||
<Dependency>python3</Dependency>
|
||||
<Dependency>qt5-base</Dependency>
|
||||
@@ -44,6 +48,7 @@
|
||||
<Dependency>python3-qt5</Dependency>
|
||||
<Dependency>python3-pyzmq</Dependency>
|
||||
<Dependency>libopenshot-audio</Dependency>
|
||||
<Dependency>python3-importlib_metadata</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
@@ -60,6 +65,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="2">
|
||||
<Date>2022-07-05</Date>
|
||||
<Version>2.6.1</Version>
|
||||
<Comment>Rebuild for imagemagick</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvari@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2021-12-07</Date>
|
||||
<Version>2.6.1</Version>
|
||||
|
||||
Reference in New Issue
Block a user