From nobody Fri May 31 10:24:31 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrK3z4crkz5MdFW; Fri, 31 May 2024 10:24:31 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrK3z47TGz4bNY; Fri, 31 May 2024 10:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717151071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OaZ3pzCN1MmgBIkWg6rFsXgoygFKfeDTsVW1S6+eCc0=; b=utbSZQSHdqyxd19UX8bH0V2LkW8YjJ+vYJcTDo4bW+9q+9e3WA1V5E00VKvtjMC249jBSV 9GfRfeFYjLmsWfgB6CCnm+jASbrgNX7Or7qXicuu2GE2pxmWeQdXpSIJXWCUVym5l/wMLQ 4mX/Mc+JofZ4pBrcSuj1Ft0MedJVgGWkUqWNOr7RquhBnaFC/NyvrCetZKqD5Dy3cwhCgR FbsPepYDq9KRpZN4qrsAqgRKBGzkvcqXm+pz0zru9WojMA8mT8wSF71QsnpEAoVUbbyzuY frCnUp0szyX77JPktZ4J+qbm7sxZ7TxwQ48yy7dXbGCYXx3ZJcXga8Bj3Lww5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717151071; a=rsa-sha256; cv=none; b=NaXgMna4tOgDy7c5L+fL0iiiGs4wotfAFCUDxmlmRhobztOkpJMJmKn+4Y8ZgZSs2EKTsv neuMWANk7HKL207i0EiYFYB6SfIUlLGbRk28qGXYzgDlhyNiYF6Yz/f2Rld4CoYVfXdNpP 07CEj6Ypwlgsk7J2Oc3ZYckt1GSQXb/bE2jvHU0pd3qiTzxBp2cYE52kBJslLqXf5c93Qx km49trZ7UycAPgD3fIxq1u6uIvfJjmgAYUP6ps3yet5bT7nwAdvgzJRZCBBqU+mG63nxh0 /BYsohJgVHM++l+/aiFHcouaQfUpXdNgT5IUA8LjerRWdFhdgoyOw07a3ibU2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717151071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OaZ3pzCN1MmgBIkWg6rFsXgoygFKfeDTsVW1S6+eCc0=; b=b4NOwgZn1KQqQ/Lyx5o+2gH9VKHhmAsY3jAObieWP8VNCx93SFObpIg3rgBM3l+rfqBk7H FtBESHlNlY/CERtUtcTYEPn/GWthYW3YlsPxgrU6OE2aDY58nIXN8/9ZtYFHtYdAioNVVK IVO5ujNiEokBVkzSWkGtljqDzxAecr1HLKjNLJ0VkFYHSH6EJFkirIkCYFDZLpgy9HlKf9 Vg0AbjR+WQ17KQSi8JZGjlBt5zH9/Mk9AQypp/+rL1m5hfbEkGdIMmprwsgIm9+93CMJuW 281SbazOro0NA8taXaJCLyZzOq33SODCdUq0SnRCnVbkPj/YQ92AdUb5hBcfSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrK3z3kftzKq5; Fri, 31 May 2024 10:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VAOVLQ039004; Fri, 31 May 2024 10:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VAOVOI039001; Fri, 31 May 2024 10:24:31 GMT (envelope-from git) Date: Fri, 31 May 2024 10:24:31 GMT Message-Id: <202405311024.44VAOVOI039001@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 8a4631667cd6 - main - multimedia/dvdstyler: update to 3.3b4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a4631667cd60e3f76c6a5e81ffa13eb362a7a5a Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a4631667cd60e3f76c6a5e81ffa13eb362a7a5a commit 8a4631667cd60e3f76c6a5e81ffa13eb362a7a5a Author: Alan Hicks AuthorDate: 2024-05-31 10:14:39 +0000 Commit: Vladimir Druzenko CommitDate: 2024-05-31 10:14:39 +0000 multimedia/dvdstyler: update to 3.3b4 This is a minor upgrade incorporating this ports patches so they are no longer required. Version 3.3 beta 4 <2024-05-26> * updated ffmpeg to version 7.0 Changelog: https://sourceforge.net/projects/dvdstyler/files/dvdstyler-devel/3.3b4/ PR: 279407 --- multimedia/dvdstyler/Makefile | 6 ++---- multimedia/dvdstyler/distinfo | 6 +++--- multimedia/dvdstyler/files/patch-docs-Makefile.in | 11 ----------- multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp | 12 ------------ .../dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp | 11 ----------- multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp | 10 ---------- multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp | 11 ----------- multimedia/dvdstyler/pkg-plist | 1 + 8 files changed, 6 insertions(+), 62 deletions(-) diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index 3bc29682ac4e..a09c50b3c71c 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -1,6 +1,5 @@ PORTNAME= dvdstyler -DISTVERSION= 3.3b3 -PORTREVISION= 6 +DISTVERSION= 3.3b4 PORTEPOCH= 2 CATEGORIES= multimedia #MASTER_SITES= SF @@ -34,14 +33,13 @@ RUN_DEPENDS= zip:archivers/zip \ mkisofs:sysutils/cdrtools \ growisofs:sysutils/dvd+rw-tools -USES= autoreconf compiler:c++11-lib gettext gmake jpeg \ +USES= autoreconf compiler:c++11-lib gettext-tools gmake jpeg \ localbase:ldflags pkgconfig tar:bzip2 USE_CXXSTD= c++14 USE_WX= 3.2+ WX_CONF_ARGS= absolute GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}" CFLAGS+= -std=c17 diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo index c3c191dac576..bdb981315150 100644 --- a/multimedia/dvdstyler/distinfo +++ b/multimedia/dvdstyler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678827360 -SHA256 (DVDStyler-3.3b3.tar.bz2) = 7e37417f464640dfeecffb5fd4ed212999845b1c43955b203f3d691e782fe52b -SIZE (DVDStyler-3.3b3.tar.bz2) = 9899576 +TIMESTAMP = 1716996185 +SHA256 (DVDStyler-3.3b4.tar.bz2) = 24268a704ee3913c53e7b28a78fb3c82681079da0e70fe4d110d85c080d2d87a +SIZE (DVDStyler-3.3b4.tar.bz2) = 9901696 diff --git a/multimedia/dvdstyler/files/patch-docs-Makefile.in b/multimedia/dvdstyler/files/patch-docs-Makefile.in deleted file mode 100644 index 6f58626e46f3..000000000000 --- a/multimedia/dvdstyler/files/patch-docs-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/Makefile.in.orig 2015-02-17 21:35:57 UTC -+++ docs/Makefile.in -@@ -551,7 +551,7 @@ uninstall-man: uninstall-man1 - - help_%.zip: DVDStylerGuide_%.xml - t=`mktemp -d tempXXXXXXX`; \ -- (cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide_$*.xml && rm -f *.hh* && $(ZIP) ../help_$*.zip *.html); \ -+ (cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide_$*.xml && rm -f *.hh* *.proc && $(ZIP) ../help_$*.zip *.html); \ - rm -f "$$t"/*.html; \ - rm -f "$$t"/*.proc; \ - if [ -d "images/$*" ]; then \ diff --git a/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp b/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp deleted file mode 100644 index c43c9d1ea648..000000000000 --- a/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/mediaenc_ffmpeg.cpp.orig 2022-10-03 20:02:59 UTC -+++ src/mediaenc_ffmpeg.cpp -@@ -330,7 +330,9 @@ bool wxFfmpegMediaEncoder::addAudioStream(int codecId) - return false; - for (int i = 0; i < c->channels; i++) { - uint16_t *samples = (uint16_t*)m_audioFrame->data[i]; -+ if (samples) { - memset(samples, 0, c->frame_size * av_get_bytes_per_sample(c->sample_fmt)); -+ } - } - - return true; diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp deleted file mode 100644 index d1b28b3d4159..000000000000 --- a/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- wxVillaLib/ThumbnailFactory.cpp 2023-07-24 10:21:13.152544000 +0100 -+++ wxVillaLib/ThumbnailFactory.cpp 2023-07-24 10:18:45.440168000 +0100 -@@ -363,7 +363,7 @@ - img = decoder.GetNextFrame(); - } - if (img.Ok() && decoder.GetFrameAspectRatio() > 0 -- && labs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) { -+ && std::abs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) { - if (lround(img.GetWidth() / decoder.GetFrameAspectRatio()) > img.GetHeight()) - img.Rescale(img.GetWidth(), lround(img.GetWidth() / decoder.GetFrameAspectRatio())); - else diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp deleted file mode 100644 index feb4c16aa200..000000000000 --- a/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- wxVillaLib/imagjpg.cpp 2023-07-24 10:38:58.609790000 +0100 -+++ wxVillaLib/imagjpg.cpp 2023-07-24 10:41:28.358164000 +0100 -@@ -1,7 +1,3 @@ --#ifdef __GNUG__ --#pragma implementation "imagjpg.h" --#endif -- - // For compilers that support precompilation, includes "wx.h". - #include "wx/wxprec.h" - diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp deleted file mode 100644 index 6b18f2f1c11a..000000000000 --- a/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- wxVillaLib/thumb_md5.cpp 2023-07-24 10:20:48.138290000 +0100 -+++ wxVillaLib/thumb_md5.cpp 2023-07-24 10:02:20.011636000 +0100 -@@ -199,7 +199,7 @@ - static void - thumb_md5_transform (wxUint32 buf[4], wxUint32 const in[16]) - { -- register wxUint32 a, b, c, d; -+ wxUint32 a, b, c, d; - - a = buf[0]; - b = buf[1]; diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist index 49fe29314a11..9fc0e0dcbea3 100644 --- a/multimedia/dvdstyler/pkg-plist +++ b/multimedia/dvdstyler/pkg-plist @@ -116,6 +116,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/buttons/pill3.xml %%DATADIR%%/buttons/settings.xml %%DATADIR%%/buttons/star-frame.xml +%%DATADIR%%/buttons/star.xml %%DATADIR%%/buttons/sticky_note.xml %%DATADIR%%/buttons/stone.xml %%DATADIR%%/buttons/text-circle-v2.xml