* [gentoo-commits] repo/gentoo:master commit in: games-simulation/crrcsim/files/, games-simulation/crrcsim/
@ 2017-01-28 0:03 Michael Weber
0 siblings, 0 replies; 4+ messages in thread
From: Michael Weber @ 2017-01-28 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 5a523ff90c15898ff2ed1778701414a86e2fbd14
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 00:02:27 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 00:02:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a523ff9
games-simulation/crrcsim: Version bump (bug 601238, thanks Grant Edwards).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/crrcsim/Manifest | 1 +
games-simulation/crrcsim/crrcsim-0.9.13.ebuild | 60 +++++++++++++++++++++
.../crrcsim/files/crrcsim-0.9.13-buildsystem.patch | 62 ++++++++++++++++++++++
3 files changed, 123 insertions(+)
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index 0a90e22..d55ace0 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -1 +1,2 @@
DIST crrcsim-0.9.12.tar.gz 7355827 SHA256 2d166aec9ff4394a0252368d4cfcac5ba4ab8a29f58f99cd1649721a8f65a3fb SHA512 53c4a530922d58ca0211a5a3171d927c9c9161139c63e73d8dbc602e0aa1c259ef0f3ba712b30a71dc357889bbf59fa76888315bdcd264e0d29307e66b70b00a WHIRLPOOL 3f177ae208e0f70b0ebdc9aa4e1e200ff73bdf656fecb67c6ffe7a8e303bae4ce8caab4c4e01e52371c42ae389574e9c821dcb5c4afb4dc32b94661add18b7ee
+DIST crrcsim-0.9.13.tar.gz 8337392 SHA256 abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698 SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab WHIRLPOOL 2af5b8aa79f8e1edead4ff982392314d659e6f5fbb31f0a4438ecc986898c6026e05d9dc417c6ff88a7a3bba9d10b122e3bf09b8bb274354fe4e531bd86f7b2f
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
new file mode 100644
index 00000000..579b6a8
--- /dev/null
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WANT_AUTOMAKE="1.10"
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="model-airplane flight simulation program"
+HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portaudio"
+
+RDEPEND="media-libs/libsdl[X,sound,joystick,opengl,video]
+ media-libs/plib
+ sci-mathematics/cgal
+ portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
+
+src_prepare() {
+ default
+
+ if has_version "sci-mathematics/cgal[gmp(+)]" ; then
+ eapply "${FILESDIR}"/${PN}-cgal_gmp.patch
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --datadir="/usr/share" \
+ --datarootdir="${EPREFIX%/}/usr/share" \
+ --docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+ $(use_with portaudio)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS HISTORY NEWS README
+ doicon -s 32 packages/icons/${PN}.png
+ make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
new file mode 100644
index 00000000..396fd57
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
@@ -0,0 +1,62 @@
+--- crrcsim-0.9.11/configure.ac
++++ crrcsim-0.9.11/configure.ac
+@@ -79,8 +79,12 @@
+ dnl Default is: no portaudio present
+ portaudio=0
+
++AC_ARG_WITH([portaudio], AS_HELP_STRING([--without-portaudio], [Build without portaudio library (default: test)]))
++
++AS_IF([test "x$with_portaudio" != "xno"], [
+ dnl Check for the Portaudio header file
+ AC_CHECK_HEADER([portaudio.h])
++])
+
+ if (test "x$ac_cv_header_portaudio_h" = "xyes"); then
+ dnl Check for Portaudio 18
+--- crrcsim-0.9.13/src/mod_misc/filesystools.cpp
++++ crrcsim-0.9.13/src/mod_misc/filesystools.cpp
+@@ -113,8 +113,8 @@
+ // $USERPROFILE/.crrcsim (WIN32)
+ // $HOME/.crrcsim (LINUX)
+ // CRRC_DATA_PATH (LINUX)
+- // /usr/local/share/games/crrcsim (LINUX)
+- // /usr/share/games/crrcsim (LINUX)
++ // /usr/local/share/crrcsim (LINUX)
++ // /usr/share/crrcsim (LINUX)
+
+ // cwd
+ if (dirname != "")
+@@ -154,13 +154,13 @@
+ s.append(dirname);
+ pathlist.push_back(s);
+ #endif
+- s = "/usr/local/share/games/" + appname + "/";
++ s = "/usr/local/share/" + appname + "/";
+ if (s != data_path) // avoid adding this path twice
+ {
+ s.append(dirname);
+ pathlist.push_back(s);
+ }
+- s = "/usr/share/games/" + appname + "/";
++ s = "/usr/share/" + appname + "/";
+ if (s != data_path) // avoid adding this path twice
+ {
+ s.append(dirname);
+@@ -172,13 +172,13 @@
+ #ifdef CRRC_DATA_PATH
+ pathlist.push_back(data_path);
+ #endif
+- if (data_path != "/usr/local/share/games/" + appname) // avoid adding this path twice
++ if (data_path != "/usr/local/share/" + appname) // avoid adding this path twice
+ {
+- pathlist.push_back("/usr/local/share/games/" + appname);
++ pathlist.push_back("/usr/local/share/" + appname);
+ }
+- if (data_path != "/usr/share/games/" + appname) // avoid adding this path twice
++ if (data_path != "/usr/share/" + appname) // avoid adding this path twice
+ {
+- pathlist.push_back("/usr/share/games/" + appname);
++ pathlist.push_back("/usr/share/" + appname);
+ }
+ }
+ #endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/crrcsim/files/, games-simulation/crrcsim/
@ 2017-01-28 0:03 Michael Weber
0 siblings, 0 replies; 4+ messages in thread
From: Michael Weber @ 2017-01-28 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 0461da6f251ffac1ec0a91e117508324c3d0a4e3
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 00:03:04 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 00:03:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0461da6f
games-simulation/crrcsim: Drop old versions.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
games-simulation/crrcsim/Manifest | 1 -
games-simulation/crrcsim/crrcsim-0.9.12-r1.ebuild | 60 ---------------------
games-simulation/crrcsim/crrcsim-0.9.12-r2.ebuild | 63 ----------------------
.../crrcsim/files/crrcsim-buildsystem.patch | 25 ---------
4 files changed, 149 deletions(-)
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index d55ace0..2a090cd 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -1,2 +1 @@
-DIST crrcsim-0.9.12.tar.gz 7355827 SHA256 2d166aec9ff4394a0252368d4cfcac5ba4ab8a29f58f99cd1649721a8f65a3fb SHA512 53c4a530922d58ca0211a5a3171d927c9c9161139c63e73d8dbc602e0aa1c259ef0f3ba712b30a71dc357889bbf59fa76888315bdcd264e0d29307e66b70b00a WHIRLPOOL 3f177ae208e0f70b0ebdc9aa4e1e200ff73bdf656fecb67c6ffe7a8e303bae4ce8caab4c4e01e52371c42ae389574e9c821dcb5c4afb4dc32b94661add18b7ee
DIST crrcsim-0.9.13.tar.gz 8337392 SHA256 abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698 SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab WHIRLPOOL 2af5b8aa79f8e1edead4ff982392314d659e6f5fbb31f0a4438ecc986898c6026e05d9dc417c6ff88a7a3bba9d10b122e3bf09b8bb274354fe4e531bd86f7b2f
diff --git a/games-simulation/crrcsim/crrcsim-0.9.12-r1.ebuild b/games-simulation/crrcsim/crrcsim-0.9.12-r1.ebuild
deleted file mode 100644
index ab3711e..00000000
--- a/games-simulation/crrcsim/crrcsim-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOMAKE="1.10"
-inherit autotools eutils gnome2-utils games
-
-DESCRIPTION="model-airplane flight simulation program"
-HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
-
-RDEPEND="sci-mathematics/cgal
- media-libs/plib
- media-libs/libsdl[X,sound,joystick,opengl,video]
- portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-buildsystem.patch
- if has_version "sci-mathematics/cgal[gmp(+)]" ; then
- epatch "${FILESDIR}"/${PN}-cgal_gmp.patch
- fi
- eautoreconf
-}
-
-src_configure() {
- egamesconf \
- --datarootdir="${EPREFIX%/}/usr/share" \
- --datadir="${GAMES_DATADIR}" \
- --docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
- $(use_with portaudio)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS HISTORY NEWS README
- doicon -s 32 packages/icons/${PN}.png
- make_desktop_entry ${PN}
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-simulation/crrcsim/crrcsim-0.9.12-r2.ebuild b/games-simulation/crrcsim/crrcsim-0.9.12-r2.ebuild
deleted file mode 100644
index 6bd7440..00000000
--- a/games-simulation/crrcsim/crrcsim-0.9.12-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-WANT_AUTOMAKE="1.10"
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="model-airplane flight simulation program"
-HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
-
-RDEPEND="
- media-libs/libsdl[X,sound,joystick,opengl,video]
- media-libs/plib
- sci-mathematics/cgal
- portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-buildsystem.patch
-)
-
-src_prepare() {
- default
-
- if has_version "sci-mathematics/cgal[gmp(+)]" ; then
- eapply "${FILESDIR}"/${PN}-cgal_gmp.patch
- fi
- eautoreconf
-}
-
-src_configure() {
- econf \
- --datadir="/usr/share" \
- --datarootdir="${EPREFIX%/}/usr/share" \
- --docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
- $(use_with portaudio)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS HISTORY NEWS README
- doicon -s 32 packages/icons/${PN}.png
- make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-simulation/crrcsim/files/crrcsim-buildsystem.patch b/games-simulation/crrcsim/files/crrcsim-buildsystem.patch
deleted file mode 100644
index 3bc784d..00000000
--- a/games-simulation/crrcsim/files/crrcsim-buildsystem.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -79,8 +79,12 @@
- dnl Default is: no portaudio present
- portaudio=0
-
-+AC_ARG_WITH([portaudio], AS_HELP_STRING([--without-portaudio], [Build without portaudio library (default: test)]))
-+
-+AS_IF([test "x$with_portaudio" != "xno"], [
- dnl Check for the Portaudio header file
- AC_CHECK_HEADER([portaudio.h])
-+])
-
- if (test "x$ac_cv_header_portaudio_h" = "xyes"); then
- dnl Check for Portaudio 18
---- crrcsim-0.9.12/locale/Makefile.am
-+++ crrcsim-0.9.12/locale/Makefile.am
-@@ -1,7 +1,5 @@
- # Makefile.am for "/locale"
-
--localedir = $(datadir)/locale
--
- nobase_locale_DATA = fr/LC_MESSAGES/crrcsim.mo \
- de/LC_MESSAGES/crrcsim.mo \
- it/LC_MESSAGES/crrcsim.mo
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/crrcsim/files/, games-simulation/crrcsim/
@ 2021-08-17 12:02 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-08-17 12:02 UTC (permalink / raw
To: gentoo-commits
commit: acb696a00ddd3cd3758507da9a860885ecd74a02
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 11:56:17 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 12:01:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb696a0
games-simulation/crrcsim: remove overlink for boost-1.77.0
Merged CGAL fix in the same patch being related (since it
adds -lboost_thread-mt to LIBS it wasn't easily fixable
without a patch)
Closes: https://bugs.gentoo.org/808727
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild | 13 ++++++++-----
.../crrcsim/files/crrcsim-0.9.13-overlink.patch | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
index f32c81a4c52..2885d6f78f0 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit desktop
+inherit autotools desktop
DESCRIPTION="Model-airplane flight simulation program"
HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
@@ -28,16 +28,19 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-overlink.patch
)
DOCS=( AUTHORS HISTORY )
-src_configure() {
- econf ac_cv_header_portaudio_h=$(usex portaudio)
+src_prepare() {
+ default
+
+ eautoreconf
}
-src_compile() {
- emake CGAL_LIBS=
+src_configure() {
+ econf ac_cv_header_portaudio_h=$(usex portaudio)
}
src_install() {
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-overlink.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-overlink.patch
new file mode 100644
index 00000000000..42bcc6e3d99
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-overlink.patch
@@ -0,0 +1,20 @@
+With CGAL now being header-only and boost-1.77.0 dropping thread-mt (not
+actually linking with it), these link attempts just cause unnecessary issues.
+
+https://bugs.gentoo.org/790779
+https://bugs.gentoo.org/808727
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,5 +227,4 @@
+ has_CGAL="yes (found CGAL > v3)"
+ AC_CHECK_LIB(gmp,__gmpq_init,,AC_MSG_ERROR([gmp library not found. Please install it.]))
+- AC_CHECK_LIB(boost_thread-mt,main,,AC_MSG_ERROR([boost_thread-mt library not found. Please install it.]))
+ else
+ AC_DEFINE([CGAL_VERSION3], [1], [CGAL_VERSION3 compatibility])
+@@ -233,5 +232,5 @@
+ fi
+ CGAL_CFLAGS=-frounding-math
+- CGAL_LIBS=-lCGAL
++ CGAL_LIBS=
+ AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable])
+ else
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/crrcsim/files/, games-simulation/crrcsim/
@ 2022-01-04 8:30 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2022-01-04 8:30 UTC (permalink / raw
To: gentoo-commits
commit: daae655c343abfc4e6da6c786fe2fa09804efd20
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 08:28:17 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 08:28:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daae655c
games-simulation/crrcsim: fix build with clang
Closes: https://bugs.gentoo.org/830572
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild | 3 ++-
games-simulation/crrcsim/files/crrcsim-0.9.13-clang.patch | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
index 2885d6f78f0c..3acdebc8c4e8 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -29,6 +29,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-overlink.patch
+ "${FILESDIR}"/${P}-clang.patch
)
DOCS=( AUTHORS HISTORY )
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-clang.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-clang.patch
new file mode 100644
index 000000000000..967d51d7239d
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-clang.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/830572
+--- a/src/mod_fdm_config.h
++++ b/src/mod_fdm_config.h
+@@ -36,5 +36,5 @@
+ #define MOD_FDM_USE_MCOPTER01 1
+
+-#define MOD_FDM_INFOSTR "CRRCSim "PACKAGE_VERSION
++#define MOD_FDM_INFOSTR "CRRCSim " PACKAGE_VERSION
+
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-04 8:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-04 8:30 [gentoo-commits] repo/gentoo:master commit in: games-simulation/crrcsim/files/, games-simulation/crrcsim/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2021-08-17 12:02 Ionen Wolkens
2017-01-28 0:03 Michael Weber
2017-01-28 0:03 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox