* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/grafx2/
@ 2020-12-06 10:29 Theo Anderson
0 siblings, 0 replies; 6+ messages in thread
From: Theo Anderson @ 2020-12-06 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 04ea2029ece0d3e96e5e82b143c7ed2f2a254274
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sun Dec 6 10:29:42 2020 +0000
Commit: Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sun Dec 6 10:29:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=04ea2029
media-gfx/grafx2-*-r100: fix REQUIRED_USE
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
index eb9f7ac9..a75f2620 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="lua ttf"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
# Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
RESTRICT="test"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/grafx2/
@ 2020-12-23 23:59 Theo Anderson
0 siblings, 0 replies; 6+ messages in thread
From: Theo Anderson @ 2020-12-23 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 3f834b13f73a8d173bf5ce83ba39061b2f2c7c39
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Wed Dec 23 23:58:47 2020 +0000
Commit: Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Wed Dec 23 23:58:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3f834b13
media-gfx/grafx2: depend media-libs/sdl-image[tiff]
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild | 2 +-
media-gfx/grafx2/grafx2-2.7.2978.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
index a75f2620..32440b6e 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
DEPEND="
media-libs/libsdl
- media-libs/sdl-image
+ media-libs/sdl-image[tiff]
media-libs/freetype
media-libs/libpng
ttf? ( media-libs/sdl-ttf )
diff --git a/media-gfx/grafx2/grafx2-2.7.2978.ebuild b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
index ac53ecd1..574d98c6 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
@@ -23,7 +23,7 @@ PATCHES=(
DEPEND="
media-libs/libsdl
- media-libs/sdl-image
+ media-libs/sdl-image[tiff]
media-libs/freetype
media-libs/libpng
ttf? ( media-libs/sdl-ttf )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/grafx2/
@ 2021-04-27 20:20 Marco Scardovi
0 siblings, 0 replies; 6+ messages in thread
From: Marco Scardovi @ 2021-04-27 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 5b3e3ac052dd9fb24c85703b63548b00072449f8
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Tue Apr 27 20:20:06 2021 +0000
Commit: Marco Scardovi <marco <AT> scardovi <DOT> com>
CommitDate: Tue Apr 27 20:20:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b3e3ac0
media-gfx/grafx2: fix build
Closes: https://bugs.gentoo.org/259896
^ this bug is really old and grafx2 is in GURU now
Closes: https://bugs.gentoo.org/784419
^ sed is not required
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
index 32440b6e0..2e5d34f33 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,6 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="lua ttf"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
# Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
RESTRICT="test"
@@ -34,16 +35,15 @@ PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" )
src_prepare() {
pushd ../ && default && popd
- sed -i s/lua5\.1/lua/g Makefile || die "sed failed"
}
src_compile() {
use ttf || MYCNF="NOTTF=1"
use lua || MYCNF="${MYCNF} NOLUA=1"
- emake ${MYCNF} || die "emake failed"
+ emake ${MYCNF}
}
src_install() {
- emake ${MYCNF} DESTDIR="${D}" PREFIX="/usr" install || die "Install failed"
+ emake ${MYCNF} DESTDIR="${ED}" PREFIX="/usr" install
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/grafx2/
@ 2024-11-18 7:40 Golubev Alexander
0 siblings, 0 replies; 6+ messages in thread
From: Golubev Alexander @ 2024-11-18 7:40 UTC (permalink / raw
To: gentoo-commits
commit: cddb1c00a71d7ece644a6083eb90ec5d9faa543a
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Mon Nov 18 05:53:09 2024 +0000
Commit: Golubev Alexander <fatzer2 <AT> gmail <DOT> com>
CommitDate: Mon Nov 18 07:40:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cddb1c00
media-gfx/grafx2: add missing RDEPEND
Closes: https://bugs.gentoo.org/860060
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild | 3 ++-
media-gfx/grafx2/grafx2-2.7.2978.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
index 044d12b6d..64555df70 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
# Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
RESTRICT="test"
-DEPEND="
+RDEPEND="
media-libs/libsdl
media-libs/sdl-image[tiff]
media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
ttf? ( media-libs/sdl-ttf )
lua? ( ${LUA_DEPS} )
"
+DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" )
diff --git a/media-gfx/grafx2/grafx2-2.7.2978.ebuild b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
index 4517af4d3..21cebe5d7 100644
--- a/media-gfx/grafx2/grafx2-2.7.2978.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
@@ -23,7 +23,7 @@ PATCHES=(
"${FILESDIR}/${PN}-desktop-file.patch"
)
-DEPEND="
+RDEPEND="
media-libs/libsdl
media-libs/sdl-image[tiff]
media-libs/freetype
@@ -31,6 +31,7 @@ DEPEND="
ttf? ( media-libs/sdl-ttf )
lua? ( >=dev-lang/lua-5.1.0 )
"
+DEPEND="${RDEPEND}"
src_prepare() {
pushd ../
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/grafx2/
@ 2024-11-18 7:40 Golubev Alexander
0 siblings, 0 replies; 6+ messages in thread
From: Golubev Alexander @ 2024-11-18 7:40 UTC (permalink / raw
To: gentoo-commits
commit: 06b7a3ee184fc85d87cc0590fd7f065f8e99af38
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Mon Nov 18 07:39:32 2024 +0000
Commit: Golubev Alexander <fatzer2 <AT> gmail <DOT> com>
CommitDate: Mon Nov 18 07:40:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=06b7a3ee
media-gfx/grafx2: add 2.9.3219
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
media-gfx/grafx2/Manifest | 2 +
media-gfx/grafx2/grafx2-2.9.3219.ebuild | 112 ++++++++++++++++++++++++++++++++
media-gfx/grafx2/metadata.xml | 4 +-
3 files changed, 117 insertions(+), 1 deletion(-)
diff --git a/media-gfx/grafx2/Manifest b/media-gfx/grafx2/Manifest
index 39b36d2b3..c42dcbbd3 100644
--- a/media-gfx/grafx2/Manifest
+++ b/media-gfx/grafx2/Manifest
@@ -1 +1,3 @@
DIST grafx2-2.7.2978-src.tgz 1104727 BLAKE2B 7ae308ea7ce3dd10966e85353111c890931a56c9bc496c4d956d89db9609e4e472280df1202e85494929979ee080a7c5daf07b629ed7002291448c87a7547cf6 SHA512 ed8d92b51cf71ee139b7c21206a088ba056642debcbbc6e650bdab9547b53159251d842eb4c5ea46b18859c0f333bad66ed60e4b91d58bacd7f02022ead7a61e
+DIST grafx2-testdata-20201222.tar.bz2 36853538 BLAKE2B 506db79030f33e5308ac9f4cbed7891c836cde9c8795eb867b7df2c80bd3b3825af93099f3def6f3a0e55b8628a4139e9b1c689d317daec189037d50a9e2da93 SHA512 3be28934b8d7b945fcc21bd9e1d500dd4dfca2bb371b801ef7dbe4670529d054fb19f10fdeeb2fec9096c611c31adfcf238c4b3035b2891db4fc6e9968978c4e
+DIST grafx2-v2.9.3219.tar.gz 2631545 BLAKE2B 76c67986f45f21c11d7df7f628c689f2e08d24ec54e14ed2d2d25729e471b4b045cc4d70e5c4c20ee9e6e4950439d1747b3e67308d2dacd706be762c693391d6 SHA512 db6a6092c899dbc313e4a680654d128e77b0db8af64032f412dc788b0d9fa9070847cfdb6ec8af4a4dbb35568dc992bce2ebf8f3852ecba1a12608f0a454cd74
diff --git a/media-gfx/grafx2/grafx2-2.9.3219.ebuild b/media-gfx/grafx2/grafx2-2.9.3219.ebuild
new file mode 100644
index 000000000..b873337c8
--- /dev/null
+++ b/media-gfx/grafx2/grafx2-2.9.3219.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit lua-single toolchain-funcs xdg
+
+pic_samples_commit=40738b358a5a5cb33d54897b008cbccad98e63d6
+pic_samples_date=20201222
+
+DESCRIPTION="A pixelart-oriented painting program"
+HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2
+ https://grafx2.eu/
+"
+SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${PN}-v${PV}.tar.gz
+ test? (
+ https://gitlab.com/GrafX2/pic-samples/-/archive/${pic_samples_commit}/pic-samples-${pic_samples_commit}.tar.bz2
+ -> ${PN}-testdata-${pic_samples_date}.tar.bz2
+ )
+"
+S="${WORKDIR}/${PN}-v$(ver_cut 1-2)/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc lua +sdl sdl2 ttf test"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+ ?? ( sdl sdl2 )
+ ttf? ( ^^ ( sdl sdl2 ) )
+"
+RESTRICT="!test? ( test )"
+
+SDL_DEPS="
+ media-libs/libsdl!VER!
+ media-libs/sdl!VER!-image[tiff]
+ ttf? ( media-libs/sdl!VER!-ttf )
+"
+
+RDEPEND="
+ media-libs/libpng
+ lua? ( ${LUA_DEPS} )
+ sdl? ( ${SDL_DEPS//!VER!/} )
+ sdl2? ( ${SDL_DEPS//!VER!/2} )
+ !sdl? ( !sdl2? ( x11-libs/libX11 ) )
+ ttf? ( media-libs/freetype )
+"
+DEPEND="$RDEPEND"
+
+src_prepare() {
+ pushd .. || die
+ default
+
+ if use test; then
+ rmdir tests/pic-samples || die
+ mv "${WORKDIR}/pic-samples-${pic_samples_commit}" tests/pic-samples || die
+ fi
+
+ popd || die
+
+ # Remove optimisation and debug info from CFLAGS
+ sed -r -i '/^\s*COPT\s*\+?=/s!\s*(-g(|gdb|stabs)|-O\$\(OPTIM\))(\s|$)!\3!g' Makefile
+}
+
+src_configure() {
+ my_makeargs=(
+ V=1
+ PREFIX="${EPREFIX}/usr"
+ )
+ use sdl && my_makeargs+=( API=sdl )
+ use sdl2 && my_makeargs+=( API=sdl2 )
+ use sdl || use sdl2 || my_makeargs+=( API=x11 )
+
+ use ttf || my_makeargs+=( NOTTF=1 )
+ use lua || my_makeargs+=( NOLUA=1 SCRIPT_FILES="" )
+
+ tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+ emake "${my_makeargs[@]}"
+}
+
+src_test() {
+ emake "${my_makeargs[@]}" check
+}
+
+src_install() {
+ emake "${my_makeargs[@]}" DESTDIR="${D}" install
+
+ # install documentation
+ cd ../doc || die
+ dodoc README.txt COMPILING.txt
+
+ if use doc; then
+ dodoc -r original_docs
+
+ insinto "/usr/share/doc/${P}"
+ doins quickstart.rtf
+ fi
+
+ # grafx2 binary usually has name grafx2-sdl or grafx2-x11 but desktop file
+ # references it as just grafx2, so let's create symlink to mitigate it.
+ local bin="$(basename "$(ls "${ED}"/usr/bin/grafx2*)" )"
+ [[ -z "$bin" ]] && die "failed to find installed binary"
+ if [[ "$bin" != "grafx2" ]]; then
+ echo "$bin"
+ dosym "$bin" "/usr/bin/grafx2" || die;
+ fi
+}
diff --git a/media-gfx/grafx2/metadata.xml b/media-gfx/grafx2/metadata.xml
index d36ec0dfb..3ca1b8e83 100644
--- a/media-gfx/grafx2/metadata.xml
+++ b/media-gfx/grafx2/metadata.xml
@@ -4,6 +4,8 @@
<pkgmetadata>
<!-- maintainer-needed -->
<use>
- <flag name="ttf">Install TTF Fonts</flag>
+ <flag name="ttf">Add support for TTF fonts</flag>
+ <flag name="sdl">Use <pkg>media-libs/libsdl</pkg> as a rendering backend</flag>
+ <flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> as a rendering backend</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/grafx2/
@ 2024-11-21 2:26 Golubev Alexander
0 siblings, 0 replies; 6+ messages in thread
From: Golubev Alexander @ 2024-11-21 2:26 UTC (permalink / raw
To: gentoo-commits
commit: e201c26971e7fdd984b8067d934b8f045051b700
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Thu Nov 21 02:26:24 2024 +0000
Commit: Golubev Alexander <fatzer2 <AT> gmail <DOT> com>
CommitDate: Thu Nov 21 02:26:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e201c269
media-gfx/grafx2: add gitlab upstream metadata
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
media-gfx/grafx2/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/media-gfx/grafx2/metadata.xml b/media-gfx/grafx2/metadata.xml
index 3ca1b8e83..85d29dacd 100644
--- a/media-gfx/grafx2/metadata.xml
+++ b/media-gfx/grafx2/metadata.xml
@@ -3,6 +3,9 @@
<pkgmetadata>
<!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="gitlab">GrafX2/grafX2</remote-id>
+ </upstream>
<use>
<flag name="ttf">Add support for TTF fonts</flag>
<flag name="sdl">Use <pkg>media-libs/libsdl</pkg> as a rendering backend</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-11-21 2:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-23 23:59 [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/grafx2/ Theo Anderson
-- strict thread matches above, loose matches on Subject: below --
2024-11-21 2:26 Golubev Alexander
2024-11-18 7:40 Golubev Alexander
2024-11-18 7:40 Golubev Alexander
2021-04-27 20:20 Marco Scardovi
2020-12-06 10:29 Theo Anderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox