1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

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
This commit is contained in:
Alan Hicks 2024-05-31 13:14:39 +03:00 committed by Vladimir Druzenko
parent bde5982e36
commit 8a4631667c
8 changed files with 6 additions and 62 deletions

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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;

View File

@ -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

View File

@ -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"

View File

@ -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];

View File

@ -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