From 0500071cc57165c76d0178052c7220cd07325542 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 15 Jul 2024 15:07:55 +0100
Subject: [PATCH] dvdstyler: 3.2.1 -> 3.3b4

Includes fixes for FFmpeg 7 and the patch we were shipping for
wxGTK 3.2.
---
 pkgs/applications/video/dvdstyler/default.nix   | 15 +++++----------
 pkgs/applications/video/dvdstyler/wxgtk32.patch | 12 ------------
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/applications/video/dvdstyler/wxgtk32.patch

diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index ec15a47090fd..7ec4658aee32 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -7,7 +7,7 @@
 , docbook-xsl-nons
 , dvdauthor
 , dvdplusrwtools
-, ffmpeg_4
+, ffmpeg_7
 , flex
 , fontconfig
 , gettext
@@ -32,18 +32,13 @@ let
   inherit (lib) optionals makeBinPath;
 in stdenv.mkDerivation rec {
   pname = "dvdstyler";
-  version = "3.2.1";
+  version = "3.3b4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2";
-    sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg=";
+    url = "mirror://sourceforge/project/dvdstyler/dvdstyler-devel/${version}/DVDStyler-${version}.tar.bz2";
+    hash = "sha256-JCaKcE7jkTxT57KKePs8gmgQedoOcP5NEQ2FwIDS2Ho=";
   };
 
-  patches = [
-    # https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/
-    ./wxgtk32.patch
-  ];
-
   nativeBuildInputs = [
     bison
     docbook_xml_dtd_412
@@ -60,7 +55,7 @@ in stdenv.mkDerivation rec {
     cdrtools
     dvdauthor
     dvdplusrwtools
-    ffmpeg_4
+    ffmpeg_7
     fontconfig
     glib
     libexif
diff --git a/pkgs/applications/video/dvdstyler/wxgtk32.patch b/pkgs/applications/video/dvdstyler/wxgtk32.patch
deleted file mode 100644
index 92b3c3fbe3ba..000000000000
--- a/pkgs/applications/video/dvdstyler/wxgtk32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/wxVillaLib/PropDlg.cpp
-+++ b/wxVillaLib/PropDlg.cpp
-@@ -12,7 +12,9 @@
- #include "utils.h"
- #include <wx/fontdlg.h>
- #include <wx/colordlg.h>
-+#ifdef __WXMSW__
- #include <wx/generic/colrdlgg.h>
-+#endif
- #include <wx/filedlg.h>
- #include <wx/dirdlg.h>
- #include <wx/grid.h>