gentoo auto-resync : 31:10:2023 - 21:49:19

4 files changed, 167 insertions, 0 deletions

diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index fe39964ac828..e43d7807f4fc 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,8 +1,11 @@
 AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9
+AUX dcraw-9.28.0-fix-LC_CTYPE-undeclared.patch 377 BLAKE2B 91587f7f388b490cd4a9df193ce7602bf8dd6e60068c93f8e372cacd4c234ec905a02036a3942057dcca3f91efb7cb3c095449b34a4e48997874fff7d86fcfd3 SHA512 278fd2fc0d526dfe6f7b23f367dd398cf44c990266722f2878b3f86af7ef175b078df8217574b5bc718d381fff83550cab66d9d9684e19da5692e4ff5742057b
+AUX dcraw-9.28.0-fix-memmem-wrong-return-type.patch 373 BLAKE2B 767ebce05bff02c33a23ae4fc3ead18bf6be03c144a52688d31974cfd915a77833842f0d6e9c88a33ba51c60bb4d6acd0ded008bddd81dd79311ec69b0193728 SHA512 76c0ffbb94596d12afdb9400c52919d002464882389d49bff72266a19fefc030304b0a6eb377e93742b346e47a2f263a0badca61f0315ca74e168f65a5fe4f21
 AUX dcraw-9.28.0-gimp-2.10.patch 1182 BLAKE2B 25a71d36fe20ea97b17f13a65e09fbbe786bffb4c57ea398adc83933bb8cdae27a5db8f0b12cc1e51671aa70e2da14755e5aefa2f035060d08da99c7d51e23bf SHA512 e237cf9e917f451bb141dc86dd80c4a78eeb7b42ccda28eabb94b2516dff4ef7148b97a34b61ab27fb9743b3a40f81ab2e416ff0950ffdffdae3a98925896c0c
 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
 EBUILD dcraw-9.28.0-r2.ebuild 2962 BLAKE2B 90a57136615f9b9b6345174a51f0beed8105afca5e1ce4bbcc321fb6e4b7ff87432e59401f3b75f49ce7e6614aec77530ea77bbe24a8477ffa570502c9b8651e SHA512 c7b51592fb736d9e3e76ee0a420ea99db898fca7c1c1efc06bd67bfa7709c0c60df9c84bfa85f47ae15d39ee2bd50b9efe8dbe21d87cf1fad18337edb595678f
+EBUILD dcraw-9.28.0-r3.ebuild 3515 BLAKE2B 19940b4dcccf16588dc487bfd97314c052b543c579c505f2da139b77326323d19b68f090ebc39774a57a834b4304363dc52211e5f22cda1040146034e44287fa SHA512 cc33a1af42dca687c86daae3269c8ac9d57c9808ec901733d4a6b429cf264fa31d0e64c885850facf65ee355f8ae7a334690918fde5d1badc498635e6ce961fd
 MISC metadata.xml 610 BLAKE2B 1546712a5da3c3f29a1f1e632a8f3c7d600ce72d90fc05bfd54e5921d6047e60561cde7be1b110f0151c05220b3b1b8f2287e8330c0a65f523c5ce8d8fd00036 SHA512 a175c151e37ff8eaf827e0ecdf41a35761c44ed816f17b37f40bc0b3fefc9bbaf41bab44da907c4eecf512b55cf86792f8610bbfe2a54130c44c2d85c8b0c090
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild
new file mode 100644
index 000000000000..a56277206cec
--- /dev/null
+++ b/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Command-line decoder for raw digital photos"
+HOMEPAGE="https://www.dechifro.org/dcraw/"
+SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
+	mirror://gentoo/parse-1.73.tar.bz2
+	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
+IUSE="nls gimp jpeg lcms"
+
+COMMON_DEPEND="
+	jpeg? ( media-libs/libjpeg-turbo:0 )
+	lcms? ( media-libs/lcms:2 )
+	gimp? (
+		  dev-libs/atk
+		  media-gfx/gimp:0/2
+		  media-libs/harfbuzz
+		  x11-libs/cairo
+		  x11-libs/gdk-pixbuf:2
+		  x11-libs/gtk+:2
+		  x11-libs/pango
+)
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	gimp? ( virtual/pkgconfig )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/netpbm
+"
+
+S="${WORKDIR}/dcraw"
+
+DOC_CONTENTS="
+	See conversion-examples.txt.gz on how to convert
+	the PPM files produced by dcraw to other image formats.\n
+
+	\nThe functionality of the external program 'fujiturn' was
+	incorporated into dcraw and is automatically used now.\n
+
+	\nThere's an example wrapper script included called 'dcwrap'.
+	This package also includes 'dcparse', which extracts
+	thumbnail images (preferably JPEGs) from any raw digital
+	camera formats that have them, and shows table contents.
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-memmem-wrong-return-type.patch"
+		  "${FILESDIR}/${P}-fix-LC_CTYPE-undeclared.patch"
+)
+
+run_build() {
+	einfo "${@}"
+	${@} || die
+}
+
+src_prepare() {
+	default
+
+	# Support gimp-2.10, bug #655390
+	use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch
+
+	rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename"
+}
+
+src_compile() {
+	local ECFLAGS="-O2 -DNO_JASPER=yes " # Without optimisation build fails
+	local ELIBS="-lm"
+	local RP_ECFLAGS="-I/usr/include/gtk-2.0/ -I/usr/include/glib-2.0/ \
+	  -I/usr/$(get_libdir)/glib-2.0/include -I/usr/include/cairo \
+	  -I/usr/include/pango-1.0 -I/usr/include/harfbuzz \
+	  -I/usr/lib64/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 \
+	  -I/usr/include/atk-1.0"
+
+	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
+	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
+	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
+
+	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}
+
+	run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c
+
+	# rawphoto gimp plugin
+	if use gimp; then
+		run_build $(tc-getCC) ${RP_ECFLAGS} ${CFLAGS} ${LDFLAGS} \
+			$($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \
+			$($(tc-getPKG_CONFIG) --libs gimpui-2.0)
+	fi
+
+	if use nls; then
+		for lang in ${LANGS}; do
+			has ${lang} ${LINGUAS-${lang}} \
+				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
+		done
+	fi
+}
+
+src_install() {
+	dobin dcraw dcparse
+	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap}
+
+	# rawphoto gimp plugin
+	if use gimp; then
+		insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins"
+		insopts -m0755
+		doins rawphoto
+	fi
+
+	doman dcraw.1
+
+	if use nls; then
+		for lang in ${LANGS}; do
+			if has ${lang} ${LINGUAS-${lang}}; then
+				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
+				insinto /usr/share/locale/${lang}/LC_MESSAGES
+				newins dcraw_${lang}.mo dcraw.mo
+			fi
+		done
+	fi
+
+	readme.gentoo_create_doc
+}
diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-fix-LC_CTYPE-undeclared.patch b/media-gfx/dcraw/files/dcraw-9.28.0-fix-LC_CTYPE-undeclared.patch
new file mode 100644
index 000000000000..eb41892dee11
--- /dev/null
+++ b/media-gfx/dcraw/files/dcraw-9.28.0-fix-LC_CTYPE-undeclared.patch
@@ -0,0 +1,17 @@
+In musl this is not pulled in automatically
+
+Bug: https://bugs.gentoo.org/713220
+Bug: https://bugs.gentoo.org/896204
+
+#  Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-22)
+
+--- a/dcraw.c
++++ b/dcraw.c
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <sys/types.h>
++#include <locale.h>
+ 
+ #if defined(DJGPP) || defined(__MINGW32__)
+ #define fseeko fseek
diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch b/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch
new file mode 100644
index 000000000000..93f299e4d2aa
--- /dev/null
+++ b/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch
@@ -0,0 +1,17 @@
+Memmem returns void*
+
+#  Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-22)
+
+Bug: https://bugs.gentoo.org/911753
+
+--- a/parse.c
++++ b/parse.c
+@@ -965,7 +965,7 @@ void parse_phase_one (int base)
+   }
+ }
+ 
+-char *memmem (char *haystack, size_t haystacklen,
++void *memmem (char *haystack, size_t haystacklen,
+               char *needle, size_t needlelen)
+ {
+   char *c;