commit: eefddc92a4e972321eefd80796fd4cfdd6ca9b67 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Sat Nov 4 12:43:04 2023 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Sat Nov 4 12:43:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eefddc92
media-gfx/dcraw: fix build for glibc-2.38 Bug: https://bugs.gentoo.org/911753 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> media-gfx/dcraw/dcraw-9.28.0-r4.ebuild | 130 +++++++++++++++++++++ .../dcraw/files/dcraw-9.28.0-glibc-2.38.patch | 24 ++++ 2 files changed, 154 insertions(+) diff --git a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild new file mode 100644 index 000000000000..17e7705d0caf --- /dev/null +++ b/media-gfx/dcraw/dcraw-9.28.0-r4.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}-glibc-2.38.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-glibc-2.38.patch b/media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch new file mode 100644 index 000000000000..6ef89c2f5eec --- /dev/null +++ b/media-gfx/dcraw/files/dcraw-9.28.0-glibc-2.38.patch @@ -0,0 +1,24 @@ +Index: dcraw/parse.c +=================================================================== +--- dcraw.orig/parse.c ++++ dcraw/parse.c +@@ -1213,7 +1213,7 @@ void parse_qt (int level, int end) + } + } + +-char *memmem (char *haystack, size_t haystacklen, ++static void *my_memmem (char *haystack, size_t haystacklen, + char *needle, size_t needlelen) + { + char *c; +@@ -1239,8 +1239,8 @@ void identify() + tread (head, 1, 32, ifp); + tseek (ifp, 0, SEEK_END); + fsize = ftell(ifp); +- if ((cp = memmem (head, 32, "MMMM", 4)) || +- (cp = memmem (head, 32, "IIII", 4))) { ++ if ((cp = my_memmem (head, 32, "MMMM", 4)) || ++ (cp = my_memmem (head, 32, "IIII", 4))) { + parse_phase_one (cp-head); + if (cp-head) parse_tiff (0,0); + } else if (order == 0x4949 || order == 0x4d4d) {
