8 files changed, 188 insertions, 15 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index c67ec810224b..cce5100b15f6 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 542941ddc5bb..151538708221 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,5 +1,7 @@
 AUX ffmpeg5.patch 3209 BLAKE2B fdf3f68d7cc292c37ca7b8cbc023de80b696c3b01b9326d6cde609b8cf6909e51a9356fa2a96294bb5ee8844c1673049e0165521ad158298acc1897d31c8a62d SHA512 a47b6335905fa0c6fd38e6156c8a974f896062dcb2c0a7fee9ff2d3013b4a1f8c34081d292602e1dcdae1fe28482643d204c1a79d3caad6467d014ab3eb8a6b5
 AUX wx30.patch 624 BLAKE2B fa464a7e39d721e52eec106794ecee23e802e7b57d2448d2d95c5cb932864615cf6e969d7a31ee3c1154265aeb1725c8fd65bd30271085bb782adf351df8d7f8 SHA512 aa2404bcca318e5fc5adea98bf1efa4a91128a3067e0ed1a4313f61ac55c17b4b9524655221c7d3107f1264a7ed5dcde33bc8c9bc63ff5a5bb3006a2e9cabfa0
+AUX wx32.patch 424 BLAKE2B 68eb622d8417f4b01391dd1aad10cc0e2575434149bbde54803e97010a2b367014225b17761f34a5b5a52356eb4aef4bc4bb0037cc6efe988918476bff8e5b11 SHA512 7d97ac865b7efb883d054f01a0702e4867a9da132cc1ab7fc2c1cc74d8ee252ce07e9b4a2f1e197ca6dd50d5923cf84c20e6d5908799d7bc214cf9e496221e51
 DIST DVDStyler-3.2.1.tar.bz2 9040634 BLAKE2B f6c3ec5d6595b650ead167ae6532a0849cc6545e1531f10483a7dd2f9962ea6cd4494b7eb8224bbc6e70588b1054fc13a13a5e2f5d977b5b80692c7cc2553d53 SHA512 09124a6c8db2b8d8072bfe2f7de98474d736a36a66d5124eab1b925da9ca830901f554ca80d9a4403365616001d869237002a2cb467cf3cc11b37aea12ff9d90
+EBUILD dvdstyler-3.2.1-r1.ebuild 1731 BLAKE2B 50c12d24a3385a76a972803922d417a971b1d0c7be644b3910811e2d4bc15da8ffb77b6c35391158a973b3155f2c5092b0df4c19e3d2cccfaafb551613e544a8 SHA512 d6ec2f627b370e8ce68cdd62d6c3d41f433f9a4dba6540cab3a79644d19ef61408614f6fae7c516687336ffb1ff77697622ef66f344209e3b76a583a8511823c
 EBUILD dvdstyler-3.2.1.ebuild 1700 BLAKE2B fd7b1098fd40cc042d74ecf4b4eabd7b53d76edfb5f9e253c9a174725f53c2e066e68cbce80466ddce7b12bae819b4d7de6d74449dcdd9879bf57c6afa584f13 SHA512 a6f7b9f2d4bf629f89d9f65b3b95e5a46d677f93fa375186e4c8f7d27698545214179ba904b0447623038f895c44fc45b73f9be8ee755efabc337602c5c37c2b
 MISC metadata.xml 303 BLAKE2B 968311b2bad01107bc5da7eb9357989f0d9030ee07696d1ba676a4d5cc59773b8b474bae5167f0cdf1b39e5e182f41aec3b64dd7ac0df04302024ae75481c551 SHA512 8cb99add5aa709b0f9b14bc8c5fab09c958fa0b04f20bf4657e7a125761bec3e59fa6893a4b4633b8dc1d84c598ba518f757adef2ab1a5866a45f8c7cd59cf61
diff --git a/media-video/dvdstyler/dvdstyler-3.2.1-r1.ebuild b/media-video/dvdstyler/dvdstyler-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..d8a814c94575
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-3.2.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.2-gtk3
+
+inherit wxwidgets
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="https://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +udev"
+
+DEPEND="
+	app-cdr/cdrtools
+	>=app-cdr/dvd+rw-tools-7.1
+	media-libs/libexif:=
+	>=media-libs/wxsvg-1.5.23:=
+	>=media-video/dvdauthor-0.7.1
+	>=media-video/ffmpeg-2.6:0=[encode]
+	>=media-video/xine-ui-0.99.7
+	virtual/jpeg:0
+	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
+	sys-apps/dbus
+	udev? ( >=virtual/libudev-215:= )
+"
+RDEPEND="${DEPEND}
+	>=app-cdr/dvdisaster-0.72.4
+	media-video/mjpegtools
+"
+BDEPEND="
+	app-arch/zip
+	app-text/xmlto
+	sys-devel/gettext
+	app-alternatives/yacc
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/ffmpeg5.patch
+	"${FILESDIR}"/wx30.patch
+	"${FILESDIR}"/wx32.patch
+)
+
+src_prepare() {
+	default
+
+	# disable obsolete GNOME 2.x libraries wrt #508854
+	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+	# rmdir: failed to remove `tempfoobar': Directory not empty
+	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+	# fix underlinking wrt #367863
+	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+	# silence desktop-file-validate QA check
+	sed -i \
+		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+		data/dvdstyler.desktop || die
+}
+
+src_configure() {
+	setup-wxwidgets unicode
+	econf \
+		$(use_enable debug) \
+		--with-wx-config="${WX_CONFIG}"
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} || die
+}
diff --git a/media-video/dvdstyler/files/wx32.patch b/media-video/dvdstyler/files/wx32.patch
new file mode 100644
index 000000000000..1391fb3c1a83
--- /dev/null
+++ b/media-video/dvdstyler/files/wx32.patch
@@ -0,0 +1,12 @@
+Index: b/wxVillaLib/PropDlg.cpp
+===================================================================
+--- a/wxVillaLib/PropDlg.cpp	2021-11-07 10:42:36.000000000 +0200
++++ b/wxVillaLib/PropDlg.cpp	2022-08-01 09:06:10.548828062 +0200
+@@ -12,7 +12,6 @@
+ #include "utils.h"
+ #include <wx/fontdlg.h>
+ #include <wx/colordlg.h>
+-#include <wx/generic/colrdlgg.h>
+ #include <wx/filedlg.h>
+ #include <wx/dirdlg.h>
+ #include <wx/grid.h>
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index c8db12d16f58..917e23bfb372 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,7 +1,9 @@
 DIST mediainfo_22.09.tar.xz 2016868 BLAKE2B c4b1766c4d49be6e90d11c736e4572e24299ae96efdfbf92ef9d32a418d7777cad2ae60ac7e6234cfa7c3a11996e46fb178996c536b9ce13dd19a0449ae8bf86 SHA512 acdeef13153fd74c29d54b9bdf4e983dd81525ace47550977d99cb5950ab72579cbbfc1ae39d81d89e03c491ea559177a16853d9db20d83a995eff300b864d4d
 DIST mediainfo_23.03.tar.xz 2027676 BLAKE2B 2da17afaccb3a8b4a1e19012cb3bb29284856f9d16e27026701b1c78add444e83c5fbb3e22ff39955ffa1c0b6f62e87224c0b35a0ff007296c4c065f58f83c87 SHA512 5082826a315fefaa48ea65a09a538225f1311cfb48285c939bb7ce2ebc38a2d444e6974ecb8062e02b60fbde27759b5828fc97dd7f9229e0066e9d193137fb5c
 DIST mediainfo_23.04.tar.xz 2022444 BLAKE2B 4e5c1c09b670ee20839c49365f0973d783ec7ed4bd336bed7574b6369f356f8f11fe63fe99dd80a28b2677b3c872bc45941b89c307190fe0b8ab867f66ab7755 SHA512 768ac916da81ea10323be2957a87058ba863015f26a337ba3b3db15e40e52c7cd7b24f2ca2508334e35cdae6476d147ed4c81eeabfe801fa9dc5ca68ceb1e7af
+DIST mediainfo_23.10.tar.xz 2025172 BLAKE2B 91816fa74e4f9949e73072bb25748ca350178c4e0bfc33cf5ff8ed5171dbc2d8266e418bfe83ed382f5de3b1e9d7d95e38188082ac2b2e5c8df34324407db184 SHA512 bf5864e5aafd38f64dbdf2ac47b19543ed24ab69d27180606ad49e587e6964e83995dcceffa441fabf0b0aa3c032c9450ad8738d28663a1b4180a9f651f4ba08
 EBUILD mediainfo-22.09.ebuild 1780 BLAKE2B fc5c58923404c035c2bf3f30310a20d9c04c55a4107908d6922d0a84458b3061bb305847371a27d21179fb38566365e2e90ef777b1e32c8e98fba697032bff50 SHA512 493a741ef961dd8871e79bfd5f1e521cabccc434077e49ff58822edd999ac1ffce2a39b7480ef58b4bcf58af025f3629937ecfeecf91856ad22ca620991ef514
 EBUILD mediainfo-23.03.ebuild 1845 BLAKE2B 646434c342e19b3da44642cf5bc58d5a28582d598faa87164d69cb329f6a6cdcada3a57cf9bedec85cbc4a41078d77f3efedfc028a5054ff904657611aa0e7fb SHA512 158d6c501626faf9b87df87cc7afab394157ba3c906cdc48817b1792ebfbe2fb1a79acc3773d13f202fc2b61d7de33d8e92f9bdb91a4a9e2cdd9c54b684d5a5e
 EBUILD mediainfo-23.04.ebuild 1845 BLAKE2B 646434c342e19b3da44642cf5bc58d5a28582d598faa87164d69cb329f6a6cdcada3a57cf9bedec85cbc4a41078d77f3efedfc028a5054ff904657611aa0e7fb SHA512 158d6c501626faf9b87df87cc7afab394157ba3c906cdc48817b1792ebfbe2fb1a79acc3773d13f202fc2b61d7de33d8e92f9bdb91a4a9e2cdd9c54b684d5a5e
+EBUILD mediainfo-23.10.ebuild 1851 BLAKE2B c194ac5d89bac261c19e5c48238f31fc3697102f180798990ff6475cd20bc0aa407722d25e6912e4e959dd1e3a4e11a7369bdb6eb7304dab92b8ee76623abb85 SHA512 b54983ea241ba0cbc302d29ba75048e67d2cb1591f3259a339c4a240a0377be857069951868656be9d322cb12cdd5bcb37f0205e1f798183a2ffcb6bc2d63b03
 MISC metadata.xml 344 BLAKE2B c70240ab3644a4c1d2367d1eb094a01b60198549456dfae21604c03bb30298f0abde2afda7dfdcf16425ca90856e98f57869481b85358e1724595454c8fdb308 SHA512 cdf31d4cd6185e0fdf604b611ee54b0bb90ffd369119cfd0bcc759e1e3d63a0d5ce673f508d3963b06c0c6152cdc1ef7d369ad2e84327ebd91c1e4a196e75d2e
diff --git a/media-video/mediainfo/mediainfo-23.10.ebuild b/media-video/mediainfo/mediainfo-23.10.ebuild
new file mode 100644
index 000000000000..3443f9271677
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-23.10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# - media-libs/libzen (if a release is available)
+# - media-libs/libmediainfo
+# - media-video/mediainfo
+
+WX_GTK_VER="3.2-gtk3"
+inherit xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/en/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}/MediaInfo"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="curl mms wxwidgets"
+
+# The libzen dep usually needs to be bumped for each release!
+RDEPEND="
+	~media-libs/libmediainfo-${PV}[curl=,mms=]
+	>=media-libs/libzen-0.4.41
+	sys-libs/zlib
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	TARGETS="CLI"
+
+	if use wxwidgets; then
+		TARGETS+=" GUI"
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	default
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		sed -i -e "s:-O2::" configure.ac || die
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+	done
+}
+
+src_install() {
+	local target
+
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+		dodoc "${S}"/History_${target}.txt
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 1e1c8187800d..845fac24db5a 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,5 +1,5 @@
 AUX xine-ui-0.99.10-desktop.patch 852 BLAKE2B 6341545955de64e3fc30a89c30b102b2bad33915f03a435786c18addc6d329ed65988b5ac6394039550136e3705c6cf03d9b34145d248671d3a98fe0d6f08bd8 SHA512 f901219cfe75fc4b4e9e25074a12e14366dae4c412866ff75c95f28ddb972a1237d8d33cd622deb812ec240bcd9d05bf6ec0c2cdec7d18de7ad88f2f93b77bc0
 AUX xine-ui-0.99.13-build.patch 1293 BLAKE2B 1bc2176ea28ce2b52efbd57b3e796470c489df1b6ec29fc76eaa1eae0b12032be3b12147b5de58858f6478c6546ecfad745317646ad0611363adce72585fad1d SHA512 e4d9d16b888021c5ceb754990c944efa8346ea648d1c3d1b1adf302963825dd84dd3f62d19c7f72fecd7d4e14823fe6fb0d28439bb7c2a27ead94b47852bc2d4
 DIST xine-ui-0.99.13.tar.xz 2156892 BLAKE2B edb4cb082faeba5f9f64ea06f6561d471fddfc7672dd92ec1a0a99b5c8eb10f46c15df2044fa2a4eaafdeab1fa56d990afa443f912602fdc676d1e34e3cf6c84 SHA512 a0802d767a805c462f7ae05fa5c4860af5c281ffa74c70a6c2c8a3ecbf8060e6f3f40fed215e27a823985c7d5c3484715cbbe5e4bf43655353f59fa2230b41e7
-EBUILD xine-ui-0.99.13.ebuild 2036 BLAKE2B 982dad398ed1da33c1c9e51e397a90f636e477a6a4795006c46378e8ae5e540ddc59617fff75bd4299b450a60ef8aed26f7f5dbe07d420c3f7a7d4a088ece5b4 SHA512 d5c75337e92011695499aaa22e7429e5c4ef5955c946f79f937c2947ba7e403ec1e8a84bfc97f17c42d867934aa4aa56ea904b9b347df62488c7d4be53d715f6
+EBUILD xine-ui-0.99.13.ebuild 1822 BLAKE2B 4cc346cad1be1588499973c6135c64e0a7563706a24415b77d1edc429e0ed577fcd9a74310247c5722bc43d877b58ac54a2f9eaba2c7688bc4665c00425d1726 SHA512 d4c20c2415293a30f0ad16136bf4c85d6b921b19511a9dae94fdd7c79d00fa925a17e79c7f4b9b903cdda081056614305cfa3d28f91d77b1d2637bc0663d01ba
 MISC metadata.xml 387 BLAKE2B c8fa662bcdb54c05bd2360ee28622b8f41636ee93ac77d9db6f5a0a6fc68e0b0aa46b1bd8953243242fcd414088351a71331eaaf8838055d3c87c4120a45827e SHA512 de41930ed1d1133841980eec98872a74b05ad97196f01aa1c121806c2d726567327de3baaf5726b32e427efda38744ecbd16b5ab3568575844fe7e07f70a6621
diff --git a/media-video/xine-ui/xine-ui-0.99.13.ebuild b/media-video/xine-ui/xine-ui-0.99.13.ebuild
index 07439be71c4e..7ba60714ee22 100644
--- a/media-video/xine-ui/xine-ui-0.99.13.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.13.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools xdg-utils
+inherit autotools xdg
 
 DESCRIPTION="Xine movie player"
 HOMEPAGE="https://xine-project.org/home"
@@ -87,15 +87,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}