From owner-svn-ports-all@freebsd.org Sun Sep 13 07:14:24 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31AB33EF4F3; Sun, 13 Sep 2020 07:14:24 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bq12S0d8jz3Yxf; Sun, 13 Sep 2020 07:14:24 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDFD82252F; Sun, 13 Sep 2020 07:14:23 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D7ENx7022334; Sun, 13 Sep 2020 07:14:23 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D7EMww022328; Sun, 13 Sep 2020 07:14:22 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009130714.08D7EMww022328@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 Sep 2020 07:14:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548459 - in head/multimedia/libopenshot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/multimedia/libopenshot: . files X-SVN-Commit-Revision: 548459 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2020 07:14:24 -0000 Author: lwhsu Date: Sun Sep 13 07:14:22 2020 New Revision: 548459 URL: https://svnweb.freebsd.org/changeset/ports/548459 Log: multimedia/libopenshot: Update to 0.2.5.172 PR: 249271 Submitted by: Tatsuki Makino (maintainer) Modified: head/multimedia/libopenshot/Makefile head/multimedia/libopenshot/distinfo head/multimedia/libopenshot/files/patch-src_CMakeLists.txt head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp head/multimedia/libopenshot/pkg-plist Modified: head/multimedia/libopenshot/Makefile ============================================================================== --- head/multimedia/libopenshot/Makefile Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/Makefile Sun Sep 13 07:14:22 2020 (r548459) @@ -2,9 +2,8 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.5-106 -DISTVERSIONSUFFIX= -g517f289 -PORTREVISION= 1 +DISTVERSION= 0.2.5-172 +DISTVERSIONSUFFIX= -gac8966a CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/multimedia/libopenshot/distinfo ============================================================================== --- head/multimedia/libopenshot/distinfo Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/distinfo Sun Sep 13 07:14:22 2020 (r548459) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592888400 -SHA256 (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = e8cce2ce90a16798519522cb0bca21a8b1367bca3608694552d951bf03350aaa -SIZE (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = 10303100 +TIMESTAMP = 1599886800 +SHA256 (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = d90d146d167108eab98dbf1aadce564267c2f6741e2836501e25f3037f4b3b9c +SIZE (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = 10305575 Modified: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt ============================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Sep 13 07:14:22 2020 (r548459) @@ -1,7 +1,7 @@ ---- src/CMakeLists.txt.orig 2020-06-18 10:04:32 UTC +--- src/CMakeLists.txt.orig 2020-09-11 02:37:02 UTC +++ src/CMakeLists.txt -@@ -361,7 +361,13 @@ if (TARGET RESVG::resvg) - set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") +@@ -384,7 +384,13 @@ if (TARGET RESVG::resvg) + endif() +find_library(EXECINFO_LIBRARY NAMES execinfo) @@ -13,4 +13,4 @@ + # Link remaining dependency libraries target_link_libraries(openshot PUBLIC - ${LIBOPENSHOT_AUDIO_LIBRARIES} + ${LIBOPENSHOT_AUDIO_LIBRARIES} Modified: head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp ============================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Sun Sep 13 07:14:22 2020 (r548459) @@ -1,6 +1,6 @@ ---- src/FFmpegReader.cpp.orig 2020-02-10 17:52:00 UTC +--- src/FFmpegReader.cpp.orig 2020-09-11 02:37:02 UTC +++ src/FFmpegReader.cpp -@@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon +@@ -165,7 +165,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { switch (*p) { @@ -9,7 +9,7 @@ // Linux pix formats case AV_PIX_FMT_VAAPI: hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI; -@@ -318,7 +318,7 @@ void FFmpegReader::Open() { +@@ -321,7 +321,7 @@ void FFmpegReader::Open() { pCodecCtx->get_format = get_hw_dec_format; if (adapter_num < 3 && adapter_num >=0) { @@ -18,7 +18,7 @@ snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); adapter_ptr = adapter; i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER; -@@ -381,11 +381,13 @@ void FFmpegReader::Open() { +@@ -384,11 +384,13 @@ void FFmpegReader::Open() { } // Check if it is there and writable Modified: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp ============================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Sep 13 07:14:22 2020 (r548459) @@ -1,4 +1,4 @@ ---- src/FFmpegWriter.cpp.orig 2020-06-18 10:04:32 UTC +--- src/FFmpegWriter.cpp.orig 2020-09-11 02:37:02 UTC +++ src/FFmpegWriter.cpp @@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std AVCodec *new_codec; @@ -21,7 +21,7 @@ #else // not ffmpeg 3 new_codec = avcodec_find_encoder_by_name(codec.c_str()); #endif // HAVE_HW_ACCEL -@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s +@@ -556,6 +556,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s else { av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0); } @@ -29,7 +29,7 @@ case AV_CODEC_ID_HEVC : c->bit_rate = 0; if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) { -@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s +@@ -564,6 +565,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s av_opt_set_int(c->priv_data, "forced-idr",1,0); } break; @@ -38,7 +38,7 @@ } #endif } else { -@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1456,7 +1459,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET; fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num); if (adapter_num < 3 && adapter_num >=0) { @@ -47,7 +47,7 @@ snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); // Maybe 127 is better because the first card would be 1?! adapter_ptr = adapter; -@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1464,17 +1467,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_ptr = NULL; #elif defined(__APPLE__) adapter_ptr = NULL; Modified: head/multimedia/libopenshot/pkg-plist ============================================================================== --- head/multimedia/libopenshot/pkg-plist Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/pkg-plist Sun Sep 13 07:14:22 2020 (r548459) @@ -51,6 +51,7 @@ include/libopenshot/QtHtmlReader.h include/libopenshot/QtImageReader.h include/libopenshot/QtPlayer.h include/libopenshot/QtTextReader.h +include/libopenshot/QtUtilities.h include/libopenshot/ReaderBase.h include/libopenshot/RendererBase.h include/libopenshot/Settings.h