* [gentoo-commits] repo/gentoo:master commit in: media-gfx/sfftobmp/files/, media-gfx/sfftobmp/
@ 2021-10-16 13:59 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-10-16 13:59 UTC (permalink / raw
To: gentoo-commits
commit: c671b43a3b97bfaf4bd06df7406f815a3c33695b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 13:58:40 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 13:58:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c671b43a
media-gfx/sfftobmp: port to EAPI 8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../sfftobmp-3.1.1-gcc44-and-boost-1_37.patch | 17 ++++--------
.../sfftobmp/files/sfftobmp-3.1.2-Wformat.patch | 11 ++++++++
.../sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch | 4 +--
media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild | 32 ++++++++++++++--------
4 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
index 3ba832afaed..226b717431d 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
@@ -1,8 +1,5 @@
-Only in sfftobmp3_1_1: Makefile.am.orig
-Only in sfftobmp3_1_1: Makefile.am.rej
-diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
---- sfftobmp3_1_1.orig/src/cmdline.cpp 2007-10-07 22:01:21.000000000 +0300
-+++ sfftobmp3_1_1/src/cmdline.cpp 2009-05-09 00:33:06.000000000 +0300
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
@@ -35,6 +35,7 @@
---RCS-Info--------------------------------------------------*/
@@ -11,9 +8,8 @@ diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
#include <vector>
#include <cassert>
#include <iostream>
-diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
---- sfftobmp3_1_1.orig/src/common.cpp 2007-10-07 22:01:20.000000000 +0300
-+++ sfftobmp3_1_1/src/common.cpp 2009-05-09 00:28:37.000000000 +0300
+--- a/src/common.cpp
++++ b/src/common.cpp
@@ -49,6 +49,7 @@
#include <sys/utime.h>
#endif
@@ -22,9 +18,8 @@ diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
#include <cassert>
#include <iostream>
-diff -ur sfftobmp3_1_1.orig/src/Makefile.am sfftobmp3_1_1/src/Makefile.am
---- sfftobmp3_1_1.orig/src/Makefile.am 2006-10-24 23:14:19.000000000 +0300
-+++ sfftobmp3_1_1/src/Makefile.am 2009-05-09 00:27:42.000000000 +0300
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -3,4 +3,4 @@
INCLUDES = -I$(top_builddir) -I$(top_srcdir)
bin_PROGRAMS = sfftobmp
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
new file mode 100644
index 00000000000..a7ab1c18575
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -163,7 +163,7 @@
+ m_pFile->Write(acBuf, strlen(acBuf));
+ sprintf(acBuf, "%s", "# generated with SffToBmp\n");
+ m_pFile->Write(acBuf, strlen(acBuf));
+- sprintf(acBuf, "%ld %ld\n", aWidth, aHeight);
++ sprintf(acBuf, "%u %u\n", aWidth, aHeight);
+ m_pFile->Write(acBuf, strlen(acBuf));
+ }
+
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
index f39d157e197..7ae13855def 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/425364
---- src/cmdline.cpp
-+++ src/cmdline.cpp
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
@@ -264,14 +264,14 @@
}
do {
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
index 4f2ebeb017f..1bc93102d37 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
@@ -1,37 +1,45 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit autotools epatch flag-o-matic
+EAPI=8
+
+inherit autotools flag-o-matic
MY_P=${PN}${PV//./_}
DESCRIPTION="sff to bmp converter"
HOMEPAGE="http://sfftools.sourceforge.net/"
SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
+S="${WORKDIR}/${MY_P}"
LICENSE="HPND MIT"
SLOT="0"
KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
-RDEPEND=">=dev-libs/boost-1.49
+RDEPEND="
+ dev-libs/boost:=
media-libs/tiff:0
virtual/jpeg:0"
-DEPEND="${RDEPEND}
- app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch
+ "${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
+ "${FILESDIR}"/${PN}-3.1.2-Wformat.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch \
- "${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
- append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+ default
eautoreconf
}
+src_configure() {
+ append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+ default
+}
+
src_install() {
- emake DESTDIR="${D}" install
+ default
dodoc doc/{changes,credits,readme}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/sfftobmp/files/, media-gfx/sfftobmp/
@ 2024-07-12 20:24 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-07-12 20:24 UTC (permalink / raw
To: gentoo-commits
commit: c15580624df737dd8363b38ed59ac9018aa3def7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 20:23:06 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 20:23:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1558062
media-gfx/sfftobmp: fix build w/ boost-1.85
Closes: https://bugs.gentoo.org/932281
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch | 63 ++++++++++++++++++++++
media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild | 11 ++--
2 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch
new file mode 100644
index 000000000000..9fac13880922
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch
@@ -0,0 +1,63 @@
+https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
+@@ -41,7 +41,6 @@
+ #include <iostream>
+
+ #include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/convenience.hpp>
+
+ #include <tiff.h>
+
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -41,7 +41,6 @@
+
+ #include <boost/filesystem/path.hpp>
+ #include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/convenience.hpp>
+
+ extern "C"
+ {
+@@ -172,10 +171,10 @@ int main( int argc, char *argv[] )
+ if (pathOutFileName.string().length()) {
+ // A fixed name was given, so use it as a base name
+ outPath = pathOutFileName;
+- std::string orgExt = fs::extension(outPath);
++ std::string orgExt = outPath.extension().string();
+ if (nFileCountOut > 1) {
+ sprintf(acNumber, "_%03d", nPage+1);
+- outPath = fs::change_extension(outPath, acNumber);
++ outPath.replace_extension(acNumber);
+ if (orgExt.length()) {
+ std::string strTemp = outPath.string();
+ strTemp += orgExt;
+@@ -184,15 +183,15 @@ int main( int argc, char *argv[] )
+ }
+ } else {
+ // Otherwise construct output filename from input filename
+- outPath = pathOutDirectory / pathInFileName.leaf();
++ outPath = pathOutDirectory / pathInFileName.filename();
+ if (nFileCountOut > 1) {
+ sprintf(acNumber, "_%03d", nPage+1);
+- outPath = fs::change_extension(outPath, acNumber);
++ outPath.replace_extension(acNumber);
+ std::string strTemp = outPath.string();
+ strTemp += pOut->GetExtension();
+ outPath = fs::path(strTemp);
+ } else {
+- outPath = fs::change_extension(outPath, pOut->GetExtension());
++ outPath.replace_extension(pOut->GetExtension());
+ }
+ }
+ if (!proc.doOverwrite() && !((nPage > 0) && (nFileCountOut == 1)) && fs::exists(outPath)) {
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -42,7 +42,6 @@
+ #include <iostream>
+
+ #include <boost/filesystem/path.hpp>
+-#include <boost/filesystem/convenience.hpp>
+
+ #ifdef WIN32
+ #include <io.h>
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
index 236b6a7b496a..6b9a92e6cfc2 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools flag-o-matic
+inherit autotools
MY_P=${PN}${PV//./_}
@@ -19,7 +19,8 @@ KEYWORDS="amd64 ~hppa ppc x86"
RDEPEND="
dev-libs/boost:=
media-libs/libjpeg-turbo:=
- media-libs/tiff:="
+ media-libs/tiff:=
+"
DEPEND="${RDEPEND}"
BDEPEND="app-arch/unzip"
@@ -27,6 +28,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch
"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
"${FILESDIR}"/${PN}-3.1.2-Wformat.patch
+ "${FILESDIR}"/${PN}-3.1.2-boost-1.85.patch
)
src_prepare() {
@@ -34,11 +36,6 @@ src_prepare() {
eautoreconf
}
-src_configure() {
- append-cppflags -DBOOST_FILESYSTEM_VERSION=3
- default
-}
-
src_install() {
default
dodoc doc/{changes,credits,readme}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-12 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 20:24 [gentoo-commits] repo/gentoo:master commit in: media-gfx/sfftobmp/files/, media-gfx/sfftobmp/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-10-16 13:59 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox