git: 0104b89d1361 - main - multimedia/openshot: Update 3.2.1 → 3.3.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 10 Feb 2025 13:11:46 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0104b89d13613704b93380ec604f1553e5420dd3

commit 0104b89d13613704b93380ec604f1553e5420dd3
Author:     Tatsuki Makino <tatsuki_makino@hotmail.com>
AuthorDate: 2025-02-10 13:09:54 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-02-10 13:09:54 +0000

    multimedia/openshot: Update 3.2.1 → 3.3.0
    
    News:
    https://www.openshot.org/blog/2024/12/22/new_openshot_release_330/
    
    Changelog:
    https://github.com/OpenShot/openshot-qt/releases/tag/v3.3.0
    
    PR:     284374
---
 multimedia/openshot/Makefile                       |  6 +-
 multimedia/openshot/distinfo                       |  6 +-
 multimedia/openshot/files/patch-MANIFEST.in        | 23 ++++--
 multimedia/openshot/files/patch-doc_conf.py        | 10 +++
 multimedia/openshot/files/patch-setup.py           | 81 ++++++++++++++++++++--
 .../files/patch-src_settings___default.settings    |  6 +-
 .../files/patch-src_windows_preferences.py         |  4 +-
 multimedia/openshot/pkg-plist                      | 17 +++++
 8 files changed, 132 insertions(+), 21 deletions(-)

diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index cb46b4e46375..c8cf522228a5 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openshot
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.1
+DISTVERSION=	3.3.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	tatsuki_makino@hotmail.com
@@ -36,10 +36,6 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLA
 DOCS_BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 DOCS_PORTDOCS=	*
 
-post-patch:
-	${GREP} -r -m 1 -l -e '\blibx264\b' ${WRKSRC}/src/presets ${WRKSRC}/src/windows |\
-		${XARGS} ${REINPLACE_CMD} -e 's,[[:<:]]libx264[[:>:]],&rgb,g;' --
-
 do-build-DOCS-on:
 	@(cd ${BUILD_WRKSRC}/doc; if ! ${DO_MAKE_BUILD} html; then \
 		(${ECHO_CMD} "===> ${.TARGET} failed unexpectedly.") | ${FMT_80} ; \
diff --git a/multimedia/openshot/distinfo b/multimedia/openshot/distinfo
index cb7a168f5f98..73bf38a38a22 100644
--- a/multimedia/openshot/distinfo
+++ b/multimedia/openshot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720918447
-SHA256 (OpenShot-openshot-qt-v3.2.1_GH0.tar.gz) = a177e6380ac655c158480b90201bde10b093018f210e1f7b81bb70b1a488bc7d
-SIZE (OpenShot-openshot-qt-v3.2.1_GH0.tar.gz) = 96525680
+TIMESTAMP = 1737806577
+SHA256 (OpenShot-openshot-qt-v3.3.0_GH0.tar.gz) = f5471eec94d59830ea58351b93e69d4c56b42874d927fbd6482f83b9bb545d4f
+SIZE (OpenShot-openshot-qt-v3.3.0_GH0.tar.gz) = 98508240
diff --git a/multimedia/openshot/files/patch-MANIFEST.in b/multimedia/openshot/files/patch-MANIFEST.in
index 2a4d6210320f..1d6f99cd27e9 100644
--- a/multimedia/openshot/files/patch-MANIFEST.in
+++ b/multimedia/openshot/files/patch-MANIFEST.in
@@ -1,11 +1,26 @@
---- MANIFEST.in.orig	2024-03-27 20:05:10 UTC
+--- MANIFEST.in.orig	2024-12-22 02:37:46 UTC
 +++ MANIFEST.in
-@@ -9,4 +9,6 @@ recursive-include xdg *
+@@ -1,12 +1,14 @@
+-include AUTHORS
+-include COPYING
+-include README
+-recursive-include bin *
+-recursive-include doc *
+-recursive-include openshot_qt *
+-recursive-include xdg *
++#include AUTHORS
++#include COPYING
++#include README
++#recursive-include bin *
++#recursive-include doc *
++#recursive-include openshot_qt *
++graft openshot_qt/*
++#recursive-include xdg *
+ 
  global-exclude *__pycache__*
  global-exclude *pyc
  global-exclude .idea
 -global-exclude .git
 \ No newline at end of file
 +global-exclude .git
-+global-exclude *.bak
-+global-exclude *.orig
++global-exclude *.bak *.orig
diff --git a/multimedia/openshot/files/patch-doc_conf.py b/multimedia/openshot/files/patch-doc_conf.py
new file mode 100644
index 000000000000..b1ed2cc09507
--- /dev/null
+++ b/multimedia/openshot/files/patch-doc_conf.py
@@ -0,0 +1,10 @@
+--- doc/conf.py.orig	2024-12-22 02:37:46 UTC
++++ doc/conf.py
+@@ -19,6 +19,7 @@
+ #
+ import os
+ import sys
++sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath('.')), "openshot_qt"))
+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath('.')), "src"))
+ 
+ from classes import info
diff --git a/multimedia/openshot/files/patch-setup.py b/multimedia/openshot/files/patch-setup.py
index 3c42686cf9cf..9d462f576f35 100644
--- a/multimedia/openshot/files/patch-setup.py
+++ b/multimedia/openshot/files/patch-setup.py
@@ -1,6 +1,33 @@
---- setup.py.orig	2023-04-01 07:04:04 UTC
+--- setup.py.orig	2024-12-22 02:37:46 UTC
 +++ setup.py
-@@ -68,7 +68,7 @@ os_files = [
+@@ -29,8 +29,8 @@ import os
+ import sys
+ import fnmatch
+ import subprocess
+-from setuptools import setup
+-from shutil import copytree, rmtree, copy
++from setuptools import setup, find_namespace_packages
++from shutil import copytree, rmtree, copy, move
+ 
+ 
+ # Determine absolute PATH of OpenShot folder
+@@ -38,9 +38,12 @@ PATH = os.path.dirname(os.path.realpath(__file__))  # 
+ 
+ # Make a copy of the src tree (temporary for naming reasons only)
+ if os.path.exists(os.path.join(PATH, "src")):
+-    print("Copying modules to openshot_qt directory: %s" % os.path.join(PATH, "openshot_qt"))
+-    # Only make a copy if the SRC directory is present (otherwise ignore this)
+-    copytree(os.path.join(PATH, "src"), os.path.join(PATH, "openshot_qt"))
++#    print("Copying modules to openshot_qt directory: %s" % os.path.join(PATH, "openshot_qt"))
++#    # Only make a copy if the SRC directory is present (otherwise ignore this)
++#    copytree(os.path.join(PATH, "src"), os.path.join(PATH, "openshot_qt"))
++	print("Move for switching to flat-layout: %s -> %s" %
++		(os.path.join(PATH, "src"), os.path.join(PATH, "openshot_qt")))
++	move(os.path.join(PATH, "src"), os.path.join(PATH, "openshot_qt"))
+ 
+ if os.path.exists(os.path.join(PATH, "openshot_qt")):
+     # Append path to system path
+@@ -68,7 +71,7 @@ os_files = [
      # AppStream metadata
      ('share/metainfo', ['xdg/org.openshot.OpenShot.appdata.xml']),
      # Debian menu system application icon
@@ -9,7 +36,7 @@
      # XDG Freedesktop icon paths
      ('share/icons/hicolor/scalable/apps', ['xdg/openshot-qt.svg']),
      ('share/icons/hicolor/scalable/mimetypes', ['xdg/openshot-qt-doc.svg']),
-@@ -79,7 +79,7 @@ os_files = [
+@@ -79,7 +82,7 @@ os_files = [
      # XDG desktop mime types cache
      ('share/mime/packages', ['xdg/org.openshot.OpenShot.xml']),
      # launcher (mime.types)
@@ -18,7 +45,53 @@
  ]
  
  # Find files matching patterns
-@@ -122,22 +122,28 @@ FAILED = 'Failed to update.\n'
+@@ -97,20 +100,35 @@ def find_files(directory, patterns):
+ package_data = {}
+ 
+ # Find all project files
+-src_files = []
+-for filename in find_files(os.path.join(PATH, "openshot_qt"), ["*"]):
+-    src_files.append(filename.replace(os.path.join(PATH, "openshot_qt"), ""))
+-package_data["openshot_qt"] = src_files
++#src_files = []
++#for filename in find_files(os.path.join(PATH, "openshot_qt"), ["*"]):
++#    src_files.append(filename.replace(os.path.join(PATH, "openshot_qt"), ""))
++#package_data["openshot_qt"] = src_files
+ 
+ # Call the main Distutils setup command
+ # -------------------------------------
++#dist = setup(
++#    packages=[('openshot_qt')],
++#    package_data=package_data,
++#    data_files=os_files,
++#    include_package_data=True,
++#    **info.SETUP
++#)
+ dist = setup(
+-    packages=[('openshot_qt')],
+-    package_data=package_data,
+-    data_files=os_files,
+-    include_package_data=True,
+-    **info.SETUP
+-)
++	packages=find_namespace_packages(
++		where=".",	# default
++		exclude=[
++			"build", "build.*",
++			"doc", "doc.*",
++			"images", "images.*",
++			"installer", "installer.*",
++			"src", "src.*",
++			"xdg", "xdg.*",
++			],	# for flat-layout
++		),
++	data_files=os_files,
++	include_package_data=True,
++	**info.SETUP)
+ # -------------------------------------
+ 
+ # Remove temporary folder (if SRC folder present)
+@@ -122,22 +140,28 @@ FAILED = 'Failed to update.\n'
  if ROOT and dist != None:
      # update the XDG Shared MIME-Info database cache
      try:
diff --git a/multimedia/openshot/files/patch-src_settings___default.settings b/multimedia/openshot/files/patch-src_settings___default.settings
index 07602333d2f8..ae7c3f7a6db0 100644
--- a/multimedia/openshot/files/patch-src_settings___default.settings
+++ b/multimedia/openshot/files/patch-src_settings___default.settings
@@ -1,6 +1,6 @@
---- src/settings/_default.settings.orig	2024-06-24 20:49:58 UTC
+--- src/settings/_default.settings.orig	2024-12-22 02:37:46 UTC
 +++ src/settings/_default.settings
-@@ -445,7 +445,7 @@
+@@ -472,7 +472,7 @@
      "min": 0,
      "setting": "graca_number_de",
      "type": "dropdown",
@@ -9,7 +9,7 @@
      "translate_values": true,
      "values": [],
      "restart": true
-@@ -457,7 +457,7 @@
+@@ -484,7 +484,7 @@
      "min": 0,
      "setting": "graca_number_en",
      "type": "dropdown",
diff --git a/multimedia/openshot/files/patch-src_windows_preferences.py b/multimedia/openshot/files/patch-src_windows_preferences.py
index f26971428109..0a078a7cf054 100644
--- a/multimedia/openshot/files/patch-src_windows_preferences.py
+++ b/multimedia/openshot/files/patch-src_windows_preferences.py
@@ -1,6 +1,6 @@
---- src/windows/preferences.py.orig	2024-06-24 20:49:58 UTC
+--- src/windows/preferences.py.orig	2024-12-22 02:37:46 UTC
 +++ src/windows/preferences.py
-@@ -335,7 +335,7 @@ class Preferences(QDialog):
+@@ -358,7 +358,7 @@ class Preferences(QDialog):
                                  value_list.remove(value_item)
                              elif os_platform == "Windows" and v not in ("0", "3", "4"):
                                  value_list.remove(value_item)
diff --git a/multimedia/openshot/pkg-plist b/multimedia/openshot/pkg-plist
index 3ff1af6f7b9e..e09e496b6755 100644
--- a/multimedia/openshot/pkg-plist
+++ b/multimedia/openshot/pkg-plist
@@ -98,8 +98,12 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/app%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/assets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/assets%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/clipboard%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/clipboard%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/conversion%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/conversion%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/convert_framerate%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/convert_framerate%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/effect_init%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/effect_init%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -140,6 +144,8 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/time_parts%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/timeline%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/timeline%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/title_bar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/title_bar%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/ui_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/ui_util%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/updates%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -150,7 +156,9 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/waveform%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/app.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/assets.py
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/clipboard.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/conversion.py
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/convert_framerate.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/effect_init.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/exceptions.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/exporters/__init__.py
@@ -228,6 +236,7 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/thumbnail.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/time_parts.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/timeline.py
+%%PYTHON_SITELIBDIR%%/openshot_qt/classes/title_bar.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/ui_util.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/updates.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/classes/version.py
@@ -5776,6 +5785,7 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/cosmic/__pycache__/theme%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/cosmic/images/dock-close.svg
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/cosmic/images/dock-float.svg
+%%PYTHON_SITELIBDIR%%/openshot_qt/themes/cosmic/images/dock-move.svg
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/cosmic/images/dropdown-arrow.svg
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/cosmic/images/dropdown-tick.svg
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/cosmic/images/keyframe-bezier.svg
@@ -5813,6 +5823,9 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/__pycache__/theme%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/__pycache__/theme%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/images/dock-close.svg
+%%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/images/dock-float.svg
+%%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/images/dock-move.svg
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/images/keyframe-bezier.svg
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/images/keyframe-constant.svg
 %%PYTHON_SITELIBDIR%%/openshot_qt/themes/humanity/images/keyframe-linear.svg
@@ -6351,6 +6364,8 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/preview_thread%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/process_effect%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/process_effect%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/profile_edit%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/profile_edit%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/profile%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/profile%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/__pycache__/region%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -6408,6 +6423,7 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/preferences.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/preview_thread.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/process_effect.py
+%%PYTHON_SITELIBDIR%%/openshot_qt/windows/profile_edit.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/profile.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/region.py
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/title_editor.py
@@ -6425,6 +6441,7 @@ bin/openshot-qt
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/ui/main-window.ui
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/ui/preferences.ui
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/ui/process-effect.ui
+%%PYTHON_SITELIBDIR%%/openshot_qt/windows/ui/profile-edit.ui
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/ui/profile.ui
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/ui/region.ui
 %%PYTHON_SITELIBDIR%%/openshot_qt/windows/ui/title-editor.ui