6 files changed, 130 insertions, 0 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 131dc02878d6..64dbb8106ed9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 2011aa445b95..26ee43a9995a 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,3 +1,5 @@
+AUX libraw-0.21.1-CVE-2023-1729.patch 810 BLAKE2B 23388d0f1fe99d6d7641a6d871da5165118260107d70dd34dee691704f626e6bd12f9763b4076d0f790f21fccb590d95bdaa26329edb864ac0338b9535c23572 SHA512 c0e77285f9de35bd5511b1f07317facb63393135e5615fc6b44ad9b396d4486b7e95cbee5acef8ba82afd296d95d17fd10ead47686d07919a625b301f72de040
 DIST LibRaw-0.21.1.tar.gz 1638461 BLAKE2B 5db9a02f6854b90acf5e22419e2bc5470118140173be38cb520cc03553a328cad86d97ebda62c149622e045325ce82dcc34df40b5f700c319929c10fc43fdc9e SHA512 8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d
+EBUILD libraw-0.21.1-r1.ebuild 1604 BLAKE2B 112bd29003dfba67de8df1d608fcb21236461707dafeac4eef55afb6221d4ef59b4f1ae9afe3cc5a8e292e1e4cef7f3bbb8f2b8fdb4f9328cce616fbc5efa677 SHA512 db6a052f4d039ded18a029970deef33553933864de3284f43c5eb102d169f473c4797b3c300fd7cf4d87473c659a6927a15718d132e91500f36b0ed077c6525a
 EBUILD libraw-0.21.1.ebuild 1545 BLAKE2B 6c064249c7ae9c3e1dd1119de71d463313b9a43c333167a373aec29a4434aed6e6b96345a79d0dad09017754b72234e30eda17c69854c0caaa6225a68ba82491 SHA512 4737b259683ca8557f5fa3ae58d10c3025dc63774bb8fb4a184012acc94a96267ebef5536dab3c6a6635d6580cb71c1f8758936c2954162d8d9a9b9ccdc3981c
 MISC metadata.xml 277 BLAKE2B 173d0b654a315fbeb39d77d02381d4acddceb0ea54baf2cdd2026b6cf5665299dc2944e68ae103181620df1e27a53cf82279e54b7e5f497ee1fd1e06db4e4556 SHA512 e2e9247845f55db13088ad027b4c056c7a070e1ab9a7bb74faed666347d646ba28ad121bfb38e3995844518f0a2583e1a51f6b3ca49295639157f98728444fda
diff --git a/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch b/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
new file mode 100644
index 000000000000..427b3c852c16
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
@@ -0,0 +1,22 @@
+From 9ab70f6dca19229cb5caad7cc31af4e7501bac93 Mon Sep 17 00:00:00 2001
+From: Alex Tutubalin <lexa@lexa.ru>
+Date: Sat, 14 Jan 2023 18:32:59 +0300
+Subject: [PATCH] do not set shrink flag for 3/4 component images
+
+---
+ src/preprocessing/raw2image.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp
+index e65e2ad7..702cf290 100644
+--- a/src/preprocessing/raw2image.cpp
++++ b/src/preprocessing/raw2image.cpp
+@@ -43,6 +43,8 @@ void LibRaw::raw2image_start()
+ 
+   // adjust for half mode!
+   IO.shrink =
++	  !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image &&
++	  !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image &&
+       P1.filters &&
+       (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1)));
+ 
diff --git a/media-libs/libraw/libraw-0.21.1-r1.ebuild b/media-libs/libraw/libraw-0.21.1-r1.ebuild
new file mode 100644
index 000000000000..98313a578726
--- /dev/null
+++ b/media-libs/libraw/libraw-0.21.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+# SONAME isn't exactly the same as PV but it does correspond and
+# libraw has unstable ABI across releases.
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples jpeg +lcms openmp zlib"
+
+RDEPEND="
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README.md )
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2023-1729.patch" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-jasper
+		$(multilib_native_use_enable examples)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable openmp)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 8b6a998e4bc8..8c734e1b7e26 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -12,6 +12,7 @@ AUX libsidplay-2.1.1-slibtool.patch 967 BLAKE2B ed31c7ac9c567fae2d802103d8f8f1f9
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r2.ebuild 766 BLAKE2B 33fb576676adfe11e1eb49fec9072fcbbb1200d6d1a084ce9332178529f798e74a37a16d2a47b15e18cb738af0d03830c865f00f7b583936357b8dbea92cd87a SHA512 54426f91c6bf5753f523e8a73154773396ddfb040315e91476e2dda2aa32641c1cf09258ed4777638f42779ac3e8732b8551e9ff9c582479201fa5e6a70885e9
+EBUILD libsidplay-1.36.59-r3.ebuild 990 BLAKE2B 21b76be9c543862a537baa4ba3bd91fab74514ab4682b82deb1f833e0517ddda09fd039d58a04e26705c72117f8187dcf51dc045c1217669ff13fe499e7b02ff SHA512 5c9b04b9e84e22d034f5ffec5613cd6823ef882a67ff407a032a1902ac21203de5c7e9bb582f0acdde54d84a5d6d66d06cd0c53c0ac517b24d4ef998577c512c
 EBUILD libsidplay-2.1.1-r6.ebuild 1526 BLAKE2B 8915ac65a033fe9d6715577b0184a6f1729139c03815dd97ab2af1a0873fc3c3b98fb1ae61ab59b9123069781b41143bfa47b625d4cd9c6c3b5b55f10651cffd SHA512 57a84d4cc19ea0b5638cff0fbfb2554eeaab37a25759e4849e07eeafc3e2c55220c44cb158e23b64aeff44d6ca49e31ec994943eb5898a570c5d0da5574b1a84
 EBUILD libsidplay-2.1.1-r7.ebuild 1565 BLAKE2B cc39c028473b376fa1ac1915238c95f286fcaec2f8d988ca75b3524fdaded303ea406fd33d6c14ef6ba9a6abf06dc3eb4cf0f6f44014e80556a1ba0993476222 SHA512 fc8c4fc2b02affd068ce32dc3e4436d7a59c84c0d07c4ab5fa45d16e9f754e95a1ed8d6f25c73980bd23e689eb0fbda66e5abd5d28270c40772550ec88dd8c28
 MISC metadata.xml 246 BLAKE2B 5791eec1fea2211cdfa2d13a89732df17195754dddcb9122157536f9f398f783de194f304cc545db22ae0506f69cb13cb1b9e03449959edc96097b2f0eac2d13 SHA512 8f5558a12be53599ddda50ec08e80a33b37ee1f4c73048b4a02983121e22c149dca53abda7985c840aedc506a9945a66ef94e034f168d868b9933b8c5c2c9fdb
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r3.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r3.ebuild
new file mode 100644
index 000000000000..6321b7f58428
--- /dev/null
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="C64 SID player library"
+HOMEPAGE="http://critical.ch/distfiles/"
+SRC_URI="http://critical.ch/distfiles/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+DOCS=( AUTHORS DEVELOPER )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+)
+
+src_prepare() {
+	default
+
+	# Ships with a autoconf-2.59 generated ./configure, which misdetects strnicmp, bug #859919
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Uses register storage class specifier and it is an ancient version that may have
+	# other problems with newer C++, bug #896252
+	append-cxxflags -std=gnu++14
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}