Attachment 251106 Details for Bug 279407 – Updated patch to 3.3b4

[patch] Updated patch to 3.3b4

dvdstyler.patch (text/plain), 5.18 KB, created by Alan Hicks on 2024-05-31 05:32:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Hicks

Created: 2024-05-31 05:32:13 UTC

Size: 5.18 KB

patch

obsolete

>diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
>index 3bc29682ac4..1e4b503ef22 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,7 +33,7 @@ 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+
>diff --git a/multimedia/dvdstyler/distinfo b/multimedia/dvdstyler/distinfo
>index c3c191dac57..bdb98131515 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 6f58626e46f..00000000000
>--- 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 c43c9d1ea64..00000000000
>--- 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 d1b28b3d415..00000000000
>--- 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 feb4c16aa20..00000000000
>--- 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 6b18f2f1c11..00000000000
>--- 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 49fe29314a1..9fc0e0dcbea 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

Flags:

ahicks: maintainer-approval+

Actions: View | Diff

Attachments on bug 279407: 251096 | 251097 | 251106 | 251107