View | Details | Raw Unified | Return to bug 279407 | Differences between
and this patch

Collapse All | Expand All

(-)b/multimedia/dvdstyler/Makefile (-2 / +1 lines)
Lines 1-6 Link Here
1 
PORTNAME=	dvdstyler
 1 
PORTNAME=	dvdstyler
2 
DISTVERSION=	3.3b3
 2 
DISTVERSION=	3.3b4
3 
PORTREVISION=	6
4 
PORTEPOCH=	2
 3 
PORTEPOCH=	2
5 
CATEGORIES=	multimedia
 4 
CATEGORIES=	multimedia
6 
#MASTER_SITES=	SF
 5 
#MASTER_SITES=	SF
(-)b/multimedia/dvdstyler/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1 
TIMESTAMP = 1678827360
 1 
TIMESTAMP = 1716996185
2 
SHA256 (DVDStyler-3.3b3.tar.bz2) = 7e37417f464640dfeecffb5fd4ed212999845b1c43955b203f3d691e782fe52b
 2 
SHA256 (DVDStyler-3.3b4.tar.bz2) = 24268a704ee3913c53e7b28a78fb3c82681079da0e70fe4d110d85c080d2d87a
3 
SIZE (DVDStyler-3.3b3.tar.bz2) = 9899576
 3 
SIZE (DVDStyler-3.3b4.tar.bz2) = 9901696
(-)a/multimedia/dvdstyler/files/patch-docs-Makefile.in (-11 lines)
Removed Link Here
1 
--- docs/Makefile.in.orig	2015-02-17 21:35:57 UTC
2 
+++ docs/Makefile.in
3 
@@ -551,7 +551,7 @@ uninstall-man: uninstall-man1
4
5 
 help_%.zip: DVDStylerGuide_%.xml
6 
 	t=`mktemp -d tempXXXXXXX`; \
7 
-	(cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide_$*.xml && rm -f *.hh* && $(ZIP) ../help_$*.zip *.html); \
8 
+	(cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide_$*.xml && rm -f *.hh* *.proc && $(ZIP) ../help_$*.zip *.html); \
9 
 	rm -f "$$t"/*.html; \
10 
 	rm -f "$$t"/*.proc; \
11 
 	if [ -d "images/$*" ]; then \
(-)a/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp (-12 lines)
Removed Link Here
1 
--- src/mediaenc_ffmpeg.cpp.orig	2022-10-03 20:02:59 UTC
2 
+++ src/mediaenc_ffmpeg.cpp
3 
@@ -330,7 +330,9 @@ bool wxFfmpegMediaEncoder::addAudioStream(int codecId)
4 
 		return false;
5 
 	for (int i = 0; i < c->channels; i++) {
6 
 		uint16_t *samples = (uint16_t*)m_audioFrame->data[i];
7 
+		if (samples) {
8 
 		memset(samples, 0, c->frame_size * av_get_bytes_per_sample(c->sample_fmt));
9 
+		}
10 
 	}
11
12 
 	return true;
(-)a/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp (-11 lines)
Removed Link Here
1 
--- wxVillaLib/ThumbnailFactory.cpp	2023-07-24 10:21:13.152544000 +0100
2 
+++ wxVillaLib/ThumbnailFactory.cpp	2023-07-24 10:18:45.440168000 +0100
3 
@@ -363,7 +363,7 @@
4 
 				img = decoder.GetNextFrame();
5 
 		}
6 
 		if (img.Ok() && decoder.GetFrameAspectRatio() > 0
7 
-				&& labs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) {
8 
+				&& std::abs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) {
9 
 			if (lround(img.GetWidth() / decoder.GetFrameAspectRatio()) > img.GetHeight())
10 
 				img.Rescale(img.GetWidth(), lround(img.GetWidth() / decoder.GetFrameAspectRatio()));
11 
 			else
(-)a/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp (-10 lines)
Removed Link Here
1 
--- wxVillaLib/imagjpg.cpp	2023-07-24 10:38:58.609790000 +0100
2 
+++ wxVillaLib/imagjpg.cpp	2023-07-24 10:41:28.358164000 +0100
3 
@@ -1,7 +1,3 @@
4 
-#ifdef __GNUG__
5 
-#pragma implementation "imagjpg.h"
6 
-#endif
7 
-
8 
 // For compilers that support precompilation, includes "wx.h".
9 
 #include "wx/wxprec.h"
10
(-)a/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp (-11 lines)
Removed Link Here
1 
--- wxVillaLib/thumb_md5.cpp	2023-07-24 10:20:48.138290000 +0100
2 
+++ wxVillaLib/thumb_md5.cpp	2023-07-24 10:02:20.011636000 +0100
3 
@@ -199,7 +199,7 @@
4 
 static void
5 
 thumb_md5_transform (wxUint32 buf[4], wxUint32 const in[16])
6 
 {
7 
-    register wxUint32 a, b, c, d;
8 
+    wxUint32 a, b, c, d;
9
10 
     a = buf[0];
11 
     b = buf[1];

Return to bug 279407