* [gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/
@ 2015-10-11 5:43 Michael Sterrett
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett @ 2015-10-11 5:43 UTC (permalink / raw
To: gentoo-commits
commit: 1b59cc3e262e449fa01587cb2b411a48cc14247b
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 05:43:31 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 05:43:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b59cc3e
tidy; keep up with freetype's shifting headers (bug #562734)
Package-Manager: portage-2.2.20.1
games-arcade/openmortal/files/openmortal-0.7-freetype.patch | 10 +++++-----
games-arcade/openmortal/files/openmortal-0.7-gcc41.patch | 4 ++--
games-arcade/openmortal/openmortal-0.7-r1.ebuild | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
index 4000ca3..3a342c8 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
@@ -1,5 +1,5 @@
---- openmortal-0.7/src/sge_tt_text.cpp.old 2014-04-04 21:35:37.275483286 +0300
-+++ openmortal-0.7/src/sge_tt_text.cpp 2014-04-04 21:36:08.065359870 +0300
+--- openmortal-0.7/src/sge_tt_text.cpp.old
++++ openmortal-0.7/src/sge_tt_text.cpp
@@ -37,9 +37,9 @@
#ifndef _SGE_NOTTF
@@ -7,9 +7,9 @@
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
-+#include <freetype.h>
-+#include <ftoutln.h>
-+#include <ttnameid.h>
++#include FT_FREETYPE_H
++#include FT_OUTLINE_H
++#include FT_TRUETYPE_IDS_H
/* The structure used to hold glyph information (cached) */
struct glyph {
diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
index fdba61c..1c10ce2 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
@@ -1,5 +1,5 @@
---- src/OnlineChat.cpp.old 2006-01-28 14:34:42.000000000 -0700
-+++ src/OnlineChat.cpp 2006-01-28 14:34:53.000000000 -0700
+--- src/OnlineChat.cpp.old
++++ src/OnlineChat.cpp
@@ -56,7 +56,7 @@
class CChallengeMenu: public Menu
{
diff --git a/games-arcade/openmortal/openmortal-0.7-r1.ebuild b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
index c24d9f4..9dcc163 100644
--- a/games-arcade/openmortal/openmortal-0.7-r1.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
@@ -21,20 +21,20 @@ DEPEND="media-libs/libsdl[video]
media-libs/sdl-net
>=media-libs/freetype-2.4.0
dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
src_prepare() {
epatch \
"${FILESDIR}/${P}"-gcc41.patch \
"${FILESDIR}/${P}"-freetype.patch
-
+ mv configure.{in,ac} || die
eautoreconf
}
src_install() {
- emake DESTDIR="${D}" install
+ DOCS="AUTHORS ChangeLog README TODO" \
+ default
newicon data/gfx/icon.png ${PN}.png
make_desktop_entry ${PN} OpenMortal
- dodoc AUTHORS ChangeLog README TODO
prepgamesdirs
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/
@ 2018-05-07 9:13 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2018-05-07 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 6bef3592397b1e52042ca088d0e15e8631a7ccbf
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 09:12:41 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 7 09:12:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bef3592
games-arcade/openmortal: Use pkg-config to find freetype
Closes: https://bugs.gentoo.org/655036
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../files/openmortal-0.7-freetype_pkgconfig.patch | 24 ++++++++++++++++++++++
games-arcade/openmortal/openmortal-0.7-r2.ebuild | 8 +++++---
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..fe683899f2e
--- /dev/null
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
@@ -0,0 +1,24 @@
+--- openmortal-0.7/configure.in
++++ openmortal-0.7/configure.in
+@@ -25,6 +25,7 @@
+ AC_C_CONST
+ AC_PROG_CXX
+
++PKG_PROG_PKG_CONFIG
+
+ dnl
+ dnl Switches
+@@ -122,11 +123,8 @@
+
+ dnl Check for Freetype 2 library
+
+-FT2_VERSION=2.1.0
+-AC_CHECK_FT2(
+- $FT2_VERSION,
+- :,
+- AC_MSG_ERROR([*** FreeType 2 version $FT2_VERSION not found!])
++PKG_CHECK_MODULES(FT2, freetype2,,
++ AC_MSG_ERROR([*** FreeType2 not found!])
+ )
+ CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
+ LIBS="$LIBS $FT2_LIBS"
diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
index 025e21b639f..0153c5d051a 100644
--- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="media-libs/libsdl[video]
+RDEPEND="media-libs/libsdl[video]
media-libs/sdl-image
media-libs/sdl-mixer
media-libs/sdl-ttf
@@ -21,13 +21,15 @@ DEPEND="media-libs/libsdl[video]
>=media-libs/freetype-2.4.0:2
dev-lang/perl
"
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
src_prepare() {
default
eapply \
"${FILESDIR}/${P}"-gcc41.patch \
- "${FILESDIR}/${P}"-freetype.patch
+ "${FILESDIR}/${P}"-freetype.patch \
+ "${FILESDIR}/${P}"-freetype_pkgconfig.patch
mv configure.{in,ac} || die
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/
@ 2021-08-19 0:39 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-08-19 0:39 UTC (permalink / raw
To: gentoo-commits
commit: 2cc8300fe0b1887194c6c4ce26d48f1fb3c5525a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 00:12:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 00:38:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc8300f
games-arcade/openmortal: update EAPI 6 -> 7, add libsdl2[joystick] dep
Closes: https://bugs.gentoo.org/742518
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openmortal/files/openmortal-0.7-freetype.patch | 4 ++--
.../files/openmortal-0.7-freetype_pkgconfig.patch | 4 ++--
.../openmortal/files/openmortal-0.7-gcc41.patch | 2 +-
games-arcade/openmortal/openmortal-0.7-r2.ebuild | 20 ++++++++++++--------
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
index 3a342c88979..2c545edc1d1 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
@@ -1,5 +1,5 @@
---- openmortal-0.7/src/sge_tt_text.cpp.old
-+++ openmortal-0.7/src/sge_tt_text.cpp
+--- a/src/sge_tt_text.cpp
++++ b/src/sge_tt_text.cpp
@@ -37,9 +37,9 @@
#ifndef _SGE_NOTTF
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
index fe683899f2e..cde67a66e10 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
@@ -1,5 +1,5 @@
---- openmortal-0.7/configure.in
-+++ openmortal-0.7/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -25,6 +25,7 @@
AC_C_CONST
AC_PROG_CXX
diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
index 2620c153e83..888a06868d0 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
@@ -1,4 +1,4 @@
---- a/src/OnlineChat.cpp.old
+--- a/src/OnlineChat.cpp
+++ b/src/OnlineChat.cpp
@@ -56,7 +56,7 @@
class CChallengeMenu: public Menu
diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
index 6e1e3a824af..1c6c8ce1d1b 100644
--- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit autotools desktop
DESCRIPTION="A spoof of the famous Mortal Kombat game"
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="media-libs/libsdl[video]
media-libs/sdl-image
@@ -21,21 +21,25 @@ RDEPEND="media-libs/libsdl[video]
>=media-libs/freetype-2.4.0:2
dev-lang/perl
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}"-gcc41.patch
+ "${FILESDIR}/${P}"-freetype.patch
+ "${FILESDIR}/${P}"-freetype_pkgconfig.patch
+)
src_prepare() {
default
- eapply \
- "${FILESDIR}/${P}"-gcc41.patch \
- "${FILESDIR}/${P}"-freetype.patch \
- "${FILESDIR}/${P}"-freetype_pkgconfig.patch
+
mv configure.{in,ac} || die
eautoreconf
}
src_install() {
default
+
newicon data/gfx/icon.png ${PN}.png
make_desktop_entry ${PN} OpenMortal
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-19 0:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-19 0:39 [gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-05-07 9:13 Lars Wendler
2015-10-11 5:43 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox