* [gentoo-commits] repo/gentoo:master commit in: media-gfx/dcraw/files/, media-gfx/dcraw/
@ 2024-09-13 7:59 Petr Vaněk
0 siblings, 0 replies; only message in thread
From: Petr Vaněk @ 2024-09-13 7:59 UTC (permalink / raw
To: gentoo-commits
commit: 65b050ed9b2254043d7b4bb4f83b9cdee50ecc3f
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 07:52:16 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 07:58:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b050ed
media-gfx/dcraw: drop 9.28.0-r2, 9.28.0-r3
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
media-gfx/dcraw/dcraw-9.28.0-r2.ebuild | 113 ------------------
media-gfx/dcraw/dcraw-9.28.0-r3.ebuild | 130 ---------------------
...dcraw-9.28.0-fix-memmem-wrong-return-type.patch | 17 ---
3 files changed, 260 deletions(-)
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
deleted file mode 100644
index f6f07264dba9..000000000000
--- a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Command-line decoder for raw digital photos"
-HOMEPAGE="https://www.cybercom.net/~dcoffin/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 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? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- gimp? ( media-gfx/gimp:0/2 )
-"
-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.
-"
-
-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"
-
- 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) ${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/dcraw-9.28.0-r3.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild
deleted file mode 100644
index bf11dc222d4b..000000000000
--- a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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 ~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-memmem-wrong-return-type.patch b/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch
deleted file mode 100644
index 93f299e4d2aa..000000000000
--- a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-09-13 7:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-13 7:59 [gentoo-commits] repo/gentoo:master commit in: media-gfx/dcraw/files/, media-gfx/dcraw/ Petr Vaněk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox