* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fotoxx/, media-gfx/fotoxx/files/
@ 2021-02-11 10:12 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2021-02-11 10:12 UTC (permalink / raw
To: gentoo-commits
commit: 20a697ec94dd5f167b50a970bba0bffccbd70775
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 10:12:31 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 10:12:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a697ec
media-gfx/fotoxx: tweak for gcc-11
Reported-by: Kobboi
Closes: https://bugs.gentoo.org/768207
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
...otoxx-15.05.patch => fotoxx-15.05-docdir.patch} | 1 -
media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch | 31 ++++++++++++++++++++++
media-gfx/fotoxx/fotoxx-15.05.ebuild | 7 +++--
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
similarity index 85%
rename from media-gfx/fotoxx/files/fotoxx-15.05.patch
rename to media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
index 15fdaa9abac..8cab49ff51e 100644
--- a/media-gfx/fotoxx/files/fotoxx-15.05.patch
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
@@ -1,4 +1,3 @@
-diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile
--- fotoxx-14.10.2.orig/Makefile 2014-10-09 15:17:09.000000000 +0700
+++ fotoxx-14.10.2/Makefile 2014-10-13 20:44:55.061728475 +0700
@@ -16,3 +16,3 @@
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
new file mode 100644
index 00000000000..5d84e687d39
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
@@ -0,0 +1,31 @@
+Fix 'smart_erase_blur' declaration and definition mismatch.
+
+https://bugs.gentoo.org/768207
+--- a/f.repair.cc
++++ b/f.repair.cc
+@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode)
+
+ // add blur to the erased area to help mask the side-effects
+
+-int smart_erase_blur(float radius)
++void smart_erase_blur(float radius)
+ {
+ int ii, px, py, dx, dy, adx, ady;
+ float blur_weight[12][12]; // up to blur radius = 10
+@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius)
+ float red, green, blue;
+ float *pix9, *pix3, *pixN;
+
+- if (sa_stat != 3) return 0;
++ if (sa_stat != 3) return;
+
+ rad = radius - 0.2;
+ rad2 = rad * rad;
+@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius)
+ CEF->Fmods++;
+ CEF->Fsaved = 0;
+ Fpaint2(); // update window
+- return 0;
+ }
+
+
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index b0b0b1e0275..b15710b3982 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,10 @@ RDEPEND="${DEPEND}
media-libs/exiftool
x11-misc/xdg-utils"
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-docdir.patch
+ "${FILESDIR}"/${P}-gcc-11.patch
+)
src_compile() {
tc-export CXX
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fotoxx/, media-gfx/fotoxx/files/
@ 2021-05-18 11:56 Ben Kohler
0 siblings, 0 replies; 3+ messages in thread
From: Ben Kohler @ 2021-05-18 11:56 UTC (permalink / raw
To: gentoo-commits
commit: f51fda0dd556447833d47d0e8f6fd743ec23c610
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 11:37:30 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue May 18 11:56:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51fda0d
media-gfx/fotoxx: drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
media-gfx/fotoxx/Manifest | 1 -
media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch | 12 ------
media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch | 31 -------------
media-gfx/fotoxx/fotoxx-15.05.ebuild | 55 ------------------------
4 files changed, 99 deletions(-)
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index a100150b595..ff429acc628 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,2 +1 @@
-DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
DIST fotoxx-21.40.tar.gz 8583921 BLAKE2B 63e49768c6d5941fe4259f83aef4ce8d0e19498c1090e4eb5017337f184edb0c60939323cc6481efcf72d0544347e046c94e37619e1f466b6dde0ab0919c3792 SHA512 05db14fafd8187bcb1de1576ca445fe525e895089fe670a80f890b2c525f5424fabd751ea422a5cc266cc7e8175ecaf7800b97a5ad686ea3e4e482de78190f3b
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
deleted file mode 100644
index 8cab49ff51e..00000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- fotoxx-14.10.2.orig/Makefile 2014-10-09 15:17:09.000000000 +0700
-+++ fotoxx-14.10.2/Makefile 2014-10-13 20:44:55.061728475 +0700
-@@ -16,3 +16,3 @@
- LOCALESDIR = $(SHAREDIR)/locales
--DOCDIR = $(PREFIX)/share/doc/fotoxx
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -90,4 +90,2 @@
- rm -f fotoxx.1.gz
-- # menu (desktop) file
-- cp -f desktop $(DESTDIR)$(MENUFILE)
-
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
deleted file mode 100644
index 5d84e687d39..00000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix 'smart_erase_blur' declaration and definition mismatch.
-
-https://bugs.gentoo.org/768207
---- a/f.repair.cc
-+++ b/f.repair.cc
-@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode)
-
- // add blur to the erased area to help mask the side-effects
-
--int smart_erase_blur(float radius)
-+void smart_erase_blur(float radius)
- {
- int ii, px, py, dx, dy, adx, ady;
- float blur_weight[12][12]; // up to blur radius = 10
-@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius)
- float red, green, blue;
- float *pix9, *pix3, *pixN;
-
-- if (sa_stat != 3) return 0;
-+ if (sa_stat != 3) return;
-
- rad = radius - 0.2;
- rad2 = rad * rad;
-@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius)
- CEF->Fmods++;
- CEF->Fsaved = 0;
- Fpaint2(); // update window
-- return 0;
- }
-
-
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
deleted file mode 100644
index b15710b3982..00000000000
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://www.kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
- media-libs/libpng
- media-libs/tiff
- media-libs/lcms:2
- x11-libs/gtk+:3"
-RDEPEND="${DEPEND}
- media-gfx/ufraw[gtk]
- media-gfx/dcraw
- media-libs/exiftool
- x11-misc/xdg-utils"
-
-PATCHES=(
- "${FILESDIR}"/${P}-docdir.patch
- "${FILESDIR}"/${P}-gcc-11.patch
-)
-
-src_compile() {
- tc-export CXX
- emake
-}
-
-src_install() {
- # For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
- # and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed
- emake DESTDIR="${D}" install
- newmenu desktop ${PN}.desktop
- rm -f "${D}"/usr/share/doc/${PF}/*.man || die
- docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fotoxx/, media-gfx/fotoxx/files/
@ 2022-06-07 19:17 Ben Kohler
0 siblings, 0 replies; 3+ messages in thread
From: Ben Kohler @ 2022-06-07 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 187c43aa529acc46b7e642cf6bb8b7caf11de722
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 19:16:51 2022 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 19:17:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187c43aa
media-gfx/fotoxx: add 22.18
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
media-gfx/fotoxx/Manifest | 1 +
.../fotoxx/files/fotoxx-22.18-documentation.patch | 23 +++++++
media-gfx/fotoxx/fotoxx-22.18.ebuild | 80 ++++++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index bd98aa400f43..4866c95b2bdb 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,2 +1,3 @@
DIST fotoxx-21.60.tar.gz 8679841 BLAKE2B ec3dcbd0b937d730692e225fec7530ac46390328ae960e8960df7d252bc0cd8630de84bf47dfaf74c1e07855b4b0959e596e5e515ea00a6c430872359b2b4576 SHA512 ac999fcc70acd92c54e85ad276112aaa7f1b7606ea70381d6f833d829fd92c14aacad7a967838e5d28fce80cfa6da8ef05e0ee49b463210cb66a3f8ffc3d22e7
DIST fotoxx-22.16.tar.gz 8984376 BLAKE2B 4a5665313133405b4a53d7e40986e37601b5c9552f20c07d5f0889f3dacbabce1b4a712fcb216fe3358e7ad1de12da608961a996b081e4b3d644c5581ebcc6ee SHA512 ff78b0d7bbde0de5d98ac42d63c36f4bdcd425ae210dfcda6f64f4307be02dfca2966475df3f962751f73afc8e9442d2eb975725db31745109e174fe1665f804
+DIST fotoxx-22.18.tar.gz 8917288 BLAKE2B 252e0e4a812e1f510da29f844f1f854f779c44f49d864952a5fb151f27bbac8af207308352f20ed976986cff8a6ce0a78f8d57b874d630d32a4d928f06dc820e SHA512 385a01201d18f75f5b2f6d2f3609c90fae7ba016279c42f3b0aaee65c0c28c71eae6d589ace71a9714629838d2de57ac93cb24c05339aadb6a3751e3081af795
diff --git a/media-gfx/fotoxx/files/fotoxx-22.18-documentation.patch b/media-gfx/fotoxx/files/fotoxx-22.18-documentation.patch
new file mode 100644
index 000000000000..23d9509458d9
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-22.18-documentation.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -122,8 +123,7 @@
+ cp -f -R data/* $(DESTDIR)$(DATADIR)
+ cp -f -R images/* $(DESTDIR)$(IMAGEDIR)
+ # man page
+- gzip -fk -9 man/fotoxx.man
+- mv -f man/fotoxx.man.gz $(DESTDIR)$(MANDIR)/fotoxx.1.gz
++ cp man/fotoxx.man $(DESTDIR)$(MANDIR)/fotoxx.1
+ # desktop file and icon
+ cp -f fotoxx.desktop $(DESTDIR)$(MENUDIR)
+ cp -f fotoxx.png $(DESTDIR)$(ICONDIR)
+--- a/zfuncs.cc
++++ b/zfuncs.cc
+@@ -6106,7 +6106,7 @@
+
+ strncatv(zdatadir,199,zprefix,"/share/",zappname,"/data",null); // /prefix/share/appname/data
+ strncatv(zimagedir,199,zprefix,"/share/",zappname,"/images",null); // /prefix/share/appname/images
+- strncatv(zdocdir,199,zprefix,"/share/doc/",zappname,null); // /prefix/share/doc/appname
++ strncatv(zdocdir,199,zprefix,"/share/doc/",zappvers,null); // /prefix/share/doc/appname
+
+ ch_time = zstrdup(build_date_time,"zinitapp");
+ if (ch_time[4] == ' ') ch_time[4] = '0'; // replace month day ' d' with '0d'
diff --git a/media-gfx/fotoxx/fotoxx-22.18.ebuild b/media-gfx/fotoxx/fotoxx-22.18.ebuild
new file mode 100644
index 000000000000..5819421d21bf
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-22.18.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+ media-libs/clutter
+ media-libs/clutter-gtk
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:0
+ media-libs/tiff:0
+ media-libs/libchamplain[gtk]
+ x11-libs/gtk+:3"
+RDEPEND="
+ ${DEPEND}
+ media-gfx/dcraw
+ media-libs/exiftool
+ x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-22.18-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+ sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+ default
+}
+
+src_install() {
+ # For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+ # and README, changelog, copyright, license, etc. must not be compressed.
+ emake DESTDIR="${D}" install
+ rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+ docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+ optfeature "HEIC file support" media-libs/libheif
+ optfeature "additional RAW file support" media-gfx/rawtherapee
+ optfeature "additional RAW file support" media-gfx/darktable
+ optfeature "video thumbnails & playback" media-video/ffmpeg
+ optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+ optfeature "WEBP file support" media-libs/libwebp
+
+ elog
+ elog "Please read the Help > User Guide for details. The source location is"
+ elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
+ elog "be placed at /home/<user>/.fotoxx/userguide."
+ elog
+ elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+ elog
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-07 19:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-18 11:56 [gentoo-commits] repo/gentoo:master commit in: media-gfx/fotoxx/, media-gfx/fotoxx/files/ Ben Kohler
-- strict thread matches above, loose matches on Subject: below --
2022-06-07 19:17 Ben Kohler
2021-02-11 10:12 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox