diff options
Diffstat (limited to 'games-sports')
75 files changed, 1589 insertions, 1181 deletions
diff --git a/games-sports/billardgl/billardgl-1.75-r2.ebuild b/games-sports/billardgl/billardgl-1.75-r2.ebuild index 83ccabcbf9f2..5c1bcd616075 100644 --- a/games-sports/billardgl/billardgl-1.75-r2.ebuild +++ b/games-sports/billardgl/billardgl-1.75-r2.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=7 -DESCRIPTION="an OpenGL billards game" +inherit desktop + +DESCRIPTION="An OpenGL billards game" HOMEPAGE="https://sourceforge.net/projects/billardgl/" SRC_URI="mirror://sourceforge/${PN}/BillardGL-${PV}.tar.gz mirror://gentoo/${PN}.png" +S="${WORKDIR}"/BillardGL-${PV}/src LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=" media-libs/freeglut @@ -22,34 +23,34 @@ DEPEND=" virtual/glu" RDEPEND="${DEPEND}" -S=${WORKDIR}/BillardGL-${PV}/src - src_prepare() { default + sed -i \ -e "s:/usr/share/BillardGL/:/usr/share/${PN}/:" \ - Namen.h \ - || die "sed Namen.h failed" + Namen.h || die "sed Namen.h failed" + sed -i \ -e '/^LINK/s:g++:$(CXX):' \ -e '/^CXX[[:space:]]/d' \ -e '/^CC[[:space:]]/d' \ -e '/^CXXFLAGS/s:=.*\(-D.*\)-.*:+=\1:' \ -e "/^LFLAGS/s:=:=${LDFLAGS}:" \ - Makefile \ - || die "sed Makefile failed" + Makefile || die "sed Makefile failed" + sed -i \ -e 's:<iostream.h>:<iostream>:' \ -e 's:<fstream.h>:<fstream>\nusing namespace std;:' \ - bmp.cpp \ - || die "sed bmp.cpp failed" + bmp.cpp || die "sed bmp.cpp failed" } src_install() { newbin BillardGL ${PN} + insinto /usr/share/${PN} doins -r lang Texturen dodoc README doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} BillardGL } diff --git a/games-sports/billardgl/metadata.xml b/games-sports/billardgl/metadata.xml index d755f0671516..1ebae65dac87 100644 --- a/games-sports/billardgl/metadata.xml +++ b/games-sports/billardgl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild b/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild deleted file mode 100644 index ea344fe4a073..000000000000 --- a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils - -DESCRIPTION="GTK+2 Soccer Management Game" -HOMEPAGE="http://bygfoot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - app-arch/zip - media-libs/freetype:2 - x11-libs/gtk+:2 - virtual/libintl" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - default - - sed -i \ - -e 's:$(gnulocaledir):/usr/share/locale:' \ - -e '/PACKAGE_LOCALE_DIR/s:\$(prefix)/\$(DATADIRNAME):/usr/share:' \ - -e '/bygfoot_LDADD/s/$/ -lm/' \ - po/Makefile.in.in src/Makefile.in || die -} - -src_configure() { - econf --disable-gstreamer -} - -src_install() { - emake DESTDIR="${D}" install - esvn_clean "${D}" - dodoc AUTHORS ChangeLog README TODO UPDATE - newicon support_files/pixmaps/bygfoot_icon.png ${PN}.png - make_desktop_entry ${PN} Bygfoot -} diff --git a/games-sports/bygfoot/bygfoot-2.3.2-r2.ebuild b/games-sports/bygfoot/bygfoot-2.3.2-r2.ebuild new file mode 100644 index 000000000000..2e4aaaa572f5 --- /dev/null +++ b/games-sports/bygfoot/bygfoot-2.3.2-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic vcs-clean + +DESCRIPTION="GTK+2 Soccer Management Game" +HOMEPAGE="https://bygfoot.sourceforge.io/new/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + app-arch/zip + media-libs/freetype:2 + x11-libs/gtk+:2 + virtual/libintl" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/859232 + # + # Upstream sourceforge is inactive since 2021, and even that was a java port. + # The gtk / C project was last touched in 2014. Even if upstream was still + # around, it does not seem worth discussing the production C version. + filter-lto + + econf --disable-gstreamer +} + +src_install() { + default + dodoc UPDATE + + esvn_clean "${D}" + + newicon support_files/pixmaps/bygfoot_icon.png ${PN}.png + make_desktop_entry ${PN} Bygfoot +} diff --git a/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch b/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch new file mode 100644 index 000000000000..306428a50055 --- /dev/null +++ b/games-sports/bygfoot/files/bygfoot-2.3.2-Makefile.patch @@ -0,0 +1,57 @@ +--- a/po/Makefile.in.in ++++ b/po/Makefile.in.in +@@ -28,7 +28,7 @@ + datarootdir = @datarootdir@ + datadir = @datadir@ + libdir = @libdir@ +-localedir = $(libdir)/locale ++localedir = @localedir@ + gnulocaledir = $(datadir)/locale + gettextsrcdir = $(datadir)/glib-2.0/gettext/po + subdir = po +@@ -129,7 +129,6 @@ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ +- *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ +@@ -183,8 +182,6 @@ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ +- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ +- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + done + if test "$(PACKAGE)" = "glib"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -206,7 +206,7 @@ + AM_CFLAGS = -Wall #-fprofile-arcs -ftest-coverage -pg + INCLUDES = \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ +- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ++ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ + @PACKAGE_CFLAGS@ @GST_CFLAGS@ + + bygfoot_SOURCES = \ +@@ -289,7 +289,7 @@ + xml_team.c file.h free.h main.h misc.h option.h player.h team.h variables.h xml_team.h \ + youth_academy.c free.h maths.h name.h option.h player.h team.h user.h youth_academy.h + +-bygfoot_LDADD = @PACKAGE_LIBS@ @GST_LIBS@ $(INTLLIBS) ++bygfoot_LDADD = @PACKAGE_LIBS@ @GST_LIBS@ $(INTLLIBS) -lm + all: all-am + + .SUFFIXES: +@@ -348,7 +348,7 @@ + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + bygfoot$(EXEEXT): $(bygfoot_OBJECTS) $(bygfoot_DEPENDENCIES) + @rm -f bygfoot$(EXEEXT) +- $(LINK) $(bygfoot_OBJECTS) $(bygfoot_LDADD) $(LIBS) ++ $(LINK) $(bygfoot_OBJECTS) $(bygfoot_LDADD) $(LIBS) -lm + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/games-sports/bygfoot/files/bygfoot-2.3.2-fno-common.patch b/games-sports/bygfoot/files/bygfoot-2.3.2-fno-common.patch new file mode 100644 index 000000000000..931b7a01f7f9 --- /dev/null +++ b/games-sports/bygfoot/files/bygfoot-2.3.2-fno-common.patch @@ -0,0 +1,496 @@ +--- a/src/main.c ++++ b/src/main.c +@@ -61,6 +61,42 @@ + #include "window.h" + #include "xml_strategy.h" + ++// Global vars (-fno-common) ++Country country; ++GArray *users; ++gint season, week, week_round; ++OptionList options; ++OptionList constants; ++OptionList constants_app; ++OptionList settings; ++OptionList tokens; ++GArray *lg_commentary[LIVE_GAME_EVENT_END]; ++GArray *news[NEWS_ARTICLE_TYPE_END]; ++NewsPaper newspaper; ++GArray *transfer_list; ++GArray *season_stats; ++GArray *strategies; ++GArray *bets[2]; ++gfloat current_interest; ++GArray *jobs, *job_teams; ++gint counters[COUNT_END]; ++gint status[6]; ++gpointer statp; ++gint selected_row; ++GArray *name_lists; ++Windows window; ++GArray *live_games; ++gint cur_user; ++gint timeout_id; ++GRand *rand_generator; ++gint debug_level, debug_output; ++GList *support_directories; ++GList *root_definitions_directories; ++GList *definitions_directories; ++gchar *save_file; ++gboolean os_is_unix; ++OptionList hints; ++ + #define DEBUG_LEVEL_DEFAULT 0 + + #if defined(MAC_BUILD) || defined(G_OS_WIN32) +--- a/src/variables.h ++++ b/src/variables.h +@@ -33,89 +33,89 @@ + * The main variable of the game. + * @see Country + */ +-Country country; ++extern Country country; + + /** The array of human players. @see #User */ +-GArray *users; ++extern GArray *users; + + /** The season, week and week round numbers. + We keep track of the time in the game with these variables. */ +-gint season, week, week_round; ++extern gint season, week, week_round; + + /** Array of options that get read from + bygfoot.conf. */ +-OptionList options; ++extern OptionList options; + /** Array of constants that get read from the constants + file specified in bygfoot.conf. */ +-OptionList constants; ++extern OptionList constants; + /** Array of constants affecting game appearance rather than + behaviour. */ +-OptionList constants_app; ++extern OptionList constants_app; + /** Array with internal settings. */ +-OptionList settings; ++extern OptionList settings; + /* Array holding string replacement tokens. */ +-OptionList tokens; ++extern OptionList tokens; + + /** The array containing the live game commentary strings. */ +-GArray *lg_commentary[LIVE_GAME_EVENT_END]; ++extern GArray *lg_commentary[LIVE_GAME_EVENT_END]; + + /** The array containing the news article strings. */ +-GArray *news[NEWS_ARTICLE_TYPE_END]; ++extern GArray *news[NEWS_ARTICLE_TYPE_END]; + + /** Newspaper containing the news articles. */ +-NewsPaper newspaper; ++extern NewsPaper newspaper; + + /** The array containing players to be transfered. + @see TransferPlayer */ +-GArray *transfer_list; ++extern GArray *transfer_list; + + /** Array with season statistics (updated at the + end of each season. */ +-GArray *season_stats; ++extern GArray *season_stats; + + /** Array of available CPU strategies. */ +-GArray *strategies; ++extern GArray *strategies; + + /** Array of current and recent bets. */ +-GArray *bets[2]; ++extern GArray *bets[2]; + + /** Loan interest for the current week. */ +-gfloat current_interest; ++extern gfloat current_interest; + + /** Array of jobs in the job exchange and + teams going with the international jobs. */ +-GArray *jobs, *job_teams; ++extern GArray *jobs, *job_teams; + + /** Some counters we use. */ +-gint counters[COUNT_END]; ++extern gint counters[COUNT_END]; + + /** These help us keep track of what's happening. */ +-gint status[6]; ++extern gint status[6]; + + /** A pointer we store temporary stuff in. */ +-gpointer statp; ++extern gpointer statp; + + /** The currently selected row in the treeview. */ +-gint selected_row; ++extern gint selected_row; + + /** An array of name lists. */ +-GArray *name_lists; ++extern GArray *name_lists; + + /** The struct containing the window pointers. */ +-Windows window; ++extern Windows window; + + /** The variables for non-user live games (which aren't shown). */ +-GArray *live_games; ++extern GArray *live_games; + + /** The index of the current user in the #users array. */ +-gint cur_user; ++extern gint cur_user; + +-gint timeout_id; ++extern gint timeout_id; + +-GRand *rand_generator; ++extern GRand *rand_generator; + + /** Debug information. */ +-gint debug_level, debug_output; ++extern gint debug_level, debug_output; + + /** + The list of directories the file_find_support_file() function +@@ -123,24 +123,24 @@ + @see file_find_support_file() + @see file_add_support_directory_recursive() + */ +-GList *support_directories; ++extern GList *support_directories; + + /** + * The list of root defintions directories found (ending in definitions) + */ +-GList *root_definitions_directories; ++extern GList *root_definitions_directories; + + /** + * The list of defintions directories found + */ +-GList *definitions_directories; ++extern GList *definitions_directories; + + /** The name of the current save file (gets updated when a game is + saved or loaded). */ +-gchar *save_file; ++extern gchar *save_file; + + /** Whether we are using a Unix system or Windows. */ +-gboolean os_is_unix; ++extern gboolean os_is_unix; + + /** The hints displayed in the splash screen. */ +-OptionList hints; ++extern OptionList hints; +--- a/src/xml_country.c ++++ b/src/xml_country.c +@@ -65,7 +65,7 @@ + /** + * The state variable used in the XML parsing functions. + */ +-gint state; ++extern gint state; + Country *cntry; + + /** +--- a/src/xml_cup.c ++++ b/src/xml_cup.c +@@ -129,7 +129,7 @@ + /** + * The state variable used in the XML parsing functions. + */ +-gint state; ++extern gint state; + + /** The variable we will fill and append to an array. */ + Cup new_cup; +--- a/src/xml_league.c ++++ b/src/xml_league.c +@@ -123,7 +123,7 @@ + /** + * The state variable used in the XML parsing functions. + */ +-gint state; ++extern gint state; + + /** The new league we create and append to an array. */ + League new_league; +--- a/src/xml_lg_commentary.c ++++ b/src/xml_lg_commentary.c +@@ -80,7 +80,8 @@ + STATE_END + }; + +-gint state, commentary_idx, priority; ++extern gint state; ++gint commentary_idx, priority; + gchar *condition; + + /** Return the appropriate enum integer going with the event string. */ +--- a/src/xml_loadsave_cup.c ++++ b/src/xml_loadsave_cup.c +@@ -80,13 +80,13 @@ + TAG_END + }; + +-gint state; +-Cup *new_cup; +-CupChooseTeam new_choose_team; +-CupRound new_round; +-gchar *dirname; +-WeekBreak new_week_break; +-CupRoundWait new_wait; ++extern gint state; ++extern Cup *new_cup; ++extern CupChooseTeam new_choose_team; ++extern CupRound new_round; ++extern gchar *dirname; ++extern WeekBreak new_week_break; ++extern CupRoundWait new_wait; + + void + xml_loadsave_cup_start_element (GMarkupParseContext *context, +--- a/src/xml_loadsave_fixtures.c ++++ b/src/xml_loadsave_fixtures.c +@@ -47,7 +47,8 @@ + TAG_END + }; + +-gint state, residx1, residx2, teamidx, nameidx; ++extern gint state; ++gint residx1, residx2, teamidx, nameidx; + Fixture new_fixture; + GArray *fixtures_array; + +--- a/src/xml_loadsave_jobs.c ++++ b/src/xml_loadsave_jobs.c +@@ -48,7 +48,7 @@ + TAG_END + }; + +-gint state; ++extern gint state; + Job new_job; + + void +--- a/src/xml_loadsave_league.c ++++ b/src/xml_loadsave_league.c +@@ -67,12 +67,13 @@ + TAG_END + }; + +-gint promrankidx, state; ++gint promrankidx; ++extern gint state; + PromRelElement new_element; + PromGames new_prom_games; +-WeekBreak new_week_break; +-League *new_league; +-gchar *dirname; ++extern WeekBreak new_week_break; ++extern League *new_league; ++extern gchar *dirname; + + void + xml_loadsave_league_start_element (GMarkupParseContext *context, +--- a/src/xml_loadsave_leagues_cups.c ++++ b/src/xml_loadsave_leagues_cups.c +@@ -44,7 +44,7 @@ + TAG_END + }; + +-gint state; ++extern gint state; + const gchar *dir; + + void +--- a/src/xml_loadsave_league_stat.c ++++ b/src/xml_loadsave_league_stat.c +@@ -46,7 +46,8 @@ + TAG_END + }; + +-gint state, in_state, valueidx; ++extern gint state; ++gint in_state, valueidx; + Stat new_stat; + LeagueStat *lig_stat; + +--- a/src/xml_loadsave_live_game.c ++++ b/src/xml_loadsave_live_game.c +@@ -63,7 +63,8 @@ + TAG_END + }; + +-gint state, unitidx, ++extern gint state; ++gint unitidx, + statvalidx, statvalidx2, statplidx, statplidx2, + team_name_idx; + LiveGameUnit new_unit; +--- a/src/xml_loadsave_misc.c ++++ b/src/xml_loadsave_misc.c +@@ -53,8 +53,9 @@ + TAG_END + }; + +-gint state, countidx, oddidx, betidx; +-BetMatch new_bet; ++extern gint state; ++gint countidx, oddidx, betidx; ++extern BetMatch new_bet; + + void + xml_loadsave_misc_start_element (GMarkupParseContext *context, +--- a/src/xml_loadsave_newspaper.c ++++ b/src/xml_loadsave_newspaper.c +@@ -49,8 +49,8 @@ + TAG_END + }; + +-gint state; +-NewsPaperArticle new_article; ++extern gint state; ++extern NewsPaperArticle new_article; + + void + xml_loadsave_newspaper_start_element (GMarkupParseContext *context, +--- a/src/xml_loadsave_players.c ++++ b/src/xml_loadsave_players.c +@@ -69,8 +69,9 @@ + TAG_END + }; + +-gint state, etalidx, careeridx; +-Player new_player; ++extern gint state; ++gint etalidx, careeridx; ++extern Player new_player; + PlayerGamesGoals new_games_goals; + PlayerCard new_card; + +--- a/src/xml_loadsave_season_stats.c ++++ b/src/xml_loadsave_season_stats.c +@@ -46,7 +46,7 @@ + TAG_END + }; + +-gint state, in_state; ++extern gint state, in_state; + ChampStat new_champ_stat; + SeasonStat new_season_stat; + const gchar *dirname2; +--- a/src/xml_loadsave_table.c ++++ b/src/xml_loadsave_table.c +@@ -38,8 +38,8 @@ + TAG_END + }; + +-gint state, valueidx; +-TableElement new_element; ++extern gint state, valueidx; ++extern TableElement new_element; + Table *new_table; + + void +--- a/src/xml_loadsave_teams.c ++++ b/src/xml_loadsave_teams.c +@@ -53,12 +53,9 @@ + TAG_END + }; + +-gint state, etalidx, careeridx; ++extern gint state; + GArray *teams_array; + Team new_team; +-Player new_player; +-PlayerGamesGoals new_games_goals; +-PlayerCard new_card; + + void + xml_loadsave_teams_start_element (GMarkupParseContext *context, +--- a/src/xml_loadsave_transfers.c ++++ b/src/xml_loadsave_transfers.c +@@ -46,7 +46,8 @@ + TAG_END + }; + +-gint state, feeidx, wageidx; ++extern gint state; ++gint feeidx, wageidx; + Transfer new_transfer; + TransferOffer new_offer; + +--- a/src/xml_loadsave_users.c ++++ b/src/xml_loadsave_users.c +@@ -79,7 +79,8 @@ + TAG_END + }; + +-gint state, idx_mon_in, idx_mon_out, idx, ++extern gint state; ++gint idx_mon_in, idx_mon_out, idx, + idx_bet, idx_cnt; + User new_user; + UserHistory new_history; +--- a/src/xml_mmatches.c ++++ b/src/xml_mmatches.c +@@ -47,7 +47,7 @@ + /** + * The state variable used in the XML parsing functions. + */ +-gint state; ++extern gint state; + MemMatch new_match; + gchar *dirname; + GArray *mm_array; +--- a/src/xml_news.c ++++ b/src/xml_news.c +@@ -59,8 +59,9 @@ + STATE_END + }; + +-gint state, article_idx, priority; +-gchar *condition; ++extern gint state, priority; ++gint article_idx; ++extern gchar *condition; + NewsArticle new_article; + NewsText new_title, new_subtitle; + +--- a/src/xml_strategy.c ++++ b/src/xml_strategy.c +@@ -91,7 +91,8 @@ + STATE_STRATEGY_MATCH_ACTION_SUB_OUT_POS, + }; + +-gint state, action_id; ++extern gint state; ++gint action_id; + + #define curstrat g_array_index(strategies, Strategy, strategies->len - 1) + #define curprematch g_array_index(curstrat.prematch, StrategyPrematch, curstrat.prematch->len - 1) +--- a/src/xml_team.c ++++ b/src/xml_team.c +@@ -70,7 +70,8 @@ + STATE_END + }; + +-gint state, birth_year; ++extern gint state; ++gint birth_year; + Player new_player; + Team *team; + const gchar *d_file; diff --git a/games-sports/bygfoot/metadata.xml b/games-sports/bygfoot/metadata.xml index bd5aa766b504..e77ff0f288c1 100644 --- a/games-sports/bygfoot/metadata.xml +++ b/games-sports/bygfoot/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/dustrac/Manifest b/games-sports/dustrac/Manifest index 7e7ab1ee713c..4acfc195402b 100644 --- a/games-sports/dustrac/Manifest +++ b/games-sports/dustrac/Manifest @@ -1 +1 @@ -DIST dustrac-1.11.0.tar.gz 27505282 BLAKE2B a42de406e388e13f1829e10248899f47cf98333a972eb4ce978116a706d9786840c4c6ec9107403aad25bd538453a7595c35cab33b0643968133710db2a3c66c SHA512 af67b76a815543d41cf8e5681ede11bfd63a2d6be7e4a21986d495d77b2673f5a145bb1c9cd5237d2caf64a4e77f221ae48b97a38a883dcd4e5bb0ef8c55f839 +DIST dustrac-1.13.0.tar.gz 18466297 BLAKE2B 694b879755125f273864f16ebb889d39d1dc690aa0f79e6cc3f8b5e64eec64209f32065dd2c88eb7b82e246837a0217ee284fb529b9e1e3149f2adeb5e54d2d1 SHA512 afb7a361771e5c19ef6ef26dd273a4b5df2b0ae7d7dd8292d2c875ac6a3109d2ff50f37f83006505c68486c50b4f6b371ba1f76cdedbe99652637508d86d7b49 diff --git a/games-sports/dustrac/dustrac-1.11.0-r1.ebuild b/games-sports/dustrac/dustrac-1.11.0-r1.ebuild deleted file mode 100644 index 550cbced1e66..000000000000 --- a/games-sports/dustrac/dustrac-1.11.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils gnome2-utils cmake-utils - -DESCRIPTION="Tile-based, cross-platform 2D racing game" -HOMEPAGE="http://dustrac.sourceforge.net/" -SRC_URI="mirror://sourceforge/dustrac/${P}.tar.gz" - -LICENSE="GPL-3+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtxml:5 - media-libs/libvorbis - media-libs/openal - virtual/opengl" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-cmake.patch -) - -src_configure() { - # -DGLES=ON didn't build for me but maybe just need use flags on some QT package? - # Maybe add a local gles use flag - local mycmakeargs=( - -DReleaseBuild=ON - -DDATA_PATH="/usr/share/${PN}" - -DBIN_PATH="/usr/bin" - -DDOC_PATH=/usr/share/doc/${PF} - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - # FIXME: where should these come from? - dosym /usr/share/fonts/ubuntu-font-family/UbuntuMono-B.ttf "/usr/share/${PN}/fonts/UbuntuMono-B.ttf" - dosym /usr/share/fonts/ubuntu-font-family/UbuntuMono-R.ttf "/usr/share/${PN}/fonts/UbuntuMono-R.ttf" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-sports/dustrac/dustrac-1.13.0.ebuild b/games-sports/dustrac/dustrac-1.13.0.ebuild new file mode 100644 index 000000000000..93e1bcf4e61a --- /dev/null +++ b/games-sports/dustrac/dustrac-1.13.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils virtualx + +DESCRIPTION="Tile-based, cross-platform 2D racing game" +HOMEPAGE="https://juzzlin.github.io/DustRacing2D/" +SRC_URI="https://github.com/juzzlin/DustRacing2D/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/DustRacing2D-${PV}" + +LICENSE="GPL-3+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtxml:5 + media-fonts/ubuntu-font-family + media-libs/libvorbis + media-libs/openal + virtual/opengl +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( + # upstream backports + "${FILESDIR}"/${P}-gcc10.patch # bug 722524 + "${FILESDIR}"/${P}-opengl.patch + "${FILESDIR}"/${P}-appdata.patch + # downstream patches + "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${P}-cmake-add_library-static.patch +) + +src_configure() { + # -DGLES=ON didn't build for me but maybe just need use flags on some Qt package? + # Maybe add a local gles use flag + local mycmakeargs=( + -DReleaseBuild=ON + -DOpenGL_GL_PREFERENCE=GLVND + -DDATA_PATH=/usr/share/${PN} + -DBIN_PATH=/usr/bin + -DDOC_PATH=/usr/share/doc/${PF} + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + dosym ../../fonts/ubuntu-font-family/UbuntuMono-B.ttf /usr/share/${PN}/fonts/UbuntuMono-B.ttf + dosym ../../fonts/ubuntu-font-family/UbuntuMono-R.ttf /usr/share/${PN}/fonts/UbuntuMono-R.ttf +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch b/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch deleted file mode 100644 index 6f497e4969ef..000000000000 --- a/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- dustrac-1.11.0.orig/CMakeLists.txt -+++ dustrac-1.11.0/CMakeLists.txt -@@ -68,8 +68,7 @@ - endif() - - if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- add_compile_options(-std=c++11 -W -Wall -O3 -pedantic) -- add_compile_options(-fomit-frame-pointer -finline-functions -ffast-math) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -fomit-frame-pointer -finline-functions") - elseif(MSVC) - add_definitions(-DNOMINMAX) - endif() ---- dustrac-1.11.0.orig/InstallLinux.cmake -+++ dustrac-1.11.0/InstallLinux.cmake -@@ -58,7 +58,7 @@ - install(FILES data/fonts.conf DESTINATION ${DATA_PATH}) - install(FILES data/meshes.conf DESTINATION ${DATA_PATH}) - install(FILES data/surfaces.conf DESTINATION ${DATA_PATH}) -- install(FILES AUTHORS CHANGELOG COPYING README DESTINATION ${DOC_PATH}) -+ install(FILES AUTHORS CHANGELOG README DESTINATION ${DOC_PATH}) - install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg") - install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png") - install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk") diff --git a/games-sports/dustrac/files/dustrac-1.13.0-appdata.patch b/games-sports/dustrac/files/dustrac-1.13.0-appdata.patch new file mode 100644 index 000000000000..e932a411fd62 --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-appdata.patch @@ -0,0 +1,27 @@ +From 5c5c437c2634572da21a22e1f64fac1dc1b296ea Mon Sep 17 00:00:00 2001 +From: Pino Toscano <toscano.pino@tiscali.it> +Date: Sun, 24 Sep 2017 16:19:51 +0200 +Subject: [PATCH] Install AppData file to the right location + +According to the specs [1], the location is now /usr/share/metainfo, +with appdata left as legacy directory. Hence, install the AppData file +to the non-legacy directory. + +[1] https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html +--- + InstallLinux.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/InstallLinux.cmake b/InstallLinux.cmake +index 15e69855..3e0443d1 100644 +--- a/InstallLinux.cmake ++++ b/InstallLinux.cmake +@@ -74,7 +74,7 @@ function(setup_install_targets BIN_PATH DATA_PATH DOC_PATH) + install(FILES ${CMAKE_BINARY_DIR}/dustrac-editor.desktop DESTINATION share/applications) + + # Install app store meta data +- install(FILES src/dustrac.appdata.xml DESTINATION share/appdata) ++ install(FILES src/dustrac.appdata.xml DESTINATION share/metainfo) + + # Install icons + install(FILES data/icons/dustrac-game.png DESTINATION share/pixmaps) diff --git a/games-sports/dustrac/files/dustrac-1.13.0-cmake-add_library-static.patch b/games-sports/dustrac/files/dustrac-1.13.0-cmake-add_library-static.patch new file mode 100644 index 000000000000..f6b2cc612cc1 --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-cmake-add_library-static.patch @@ -0,0 +1,31 @@ +Fix linking with BUILD_SHARED_LIBS=ON default in EAPI-7. + +--- a/src/game/STFH/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/STFH/CMakeLists.txt 2021-02-27 20:58:35.523503983 +0100 +@@ -10,5 +10,5 @@ + source.cpp + ) + +-add_library(STFH ${STFHSRC}) ++add_library(STFH STATIC ${STFHSRC}) + +--- a/src/game/MTFH/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/MTFH/CMakeLists.txt 2021-02-27 20:58:48.451565823 +0100 +@@ -9,5 +9,5 @@ + menumanager.cpp + menuitemview.cpp) + +-add_library(MTFH ${MTFHSRC}) ++add_library(MTFH STATIC ${MTFHSRC}) + +--- a/src/game/MiniCore/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/MiniCore/CMakeLists.txt 2021-02-27 20:59:01.267627130 +0100 +@@ -82,7 +82,7 @@ + set(MiniCoreSRC ${MiniCoreSRC} Graphics/contrib/glew/glew.c) + endif() + +-add_library(MiniCore ${MiniCoreSRC}) ++add_library(MiniCore STATIC ${MiniCoreSRC}) + + target_link_libraries(MiniCore Qt5::Core Qt5::OpenGL Qt5::Xml OpenGL::GL) + diff --git a/games-sports/dustrac/files/dustrac-1.13.0-cmake.patch b/games-sports/dustrac/files/dustrac-1.13.0-cmake.patch new file mode 100644 index 000000000000..57a00c0068fa --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-cmake.patch @@ -0,0 +1,69 @@ +Rebase CFLAGS and COPYING removal patch onto 1.13.0 +Use CTest module for standard BUILD_TESTING switch and make Qt5Test optional + +--- a/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/CMakeLists.txt 2021-02-27 19:21:04.090117623 +0100 +@@ -57,6 +57,9 @@ + add_definitions(-DGLEW_STATIC) + add_definitions(-DGLEW_NO_GLU) + ++# Enable CMake's unit test framework ++include(CTest) ++ + if(UNIX) + include("InstallLinux.cmake") + elseif(WIN32) +@@ -64,8 +67,7 @@ + endif() + + if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") +- add_compile_options(-std=c++11 -W -Wall -O3 -pedantic) +- add_compile_options(-fomit-frame-pointer -finline-functions -ffast-math) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -fomit-frame-pointer -finline-functions") + elseif(MSVC) + add_definitions(-DNOMINMAX) + endif() +@@ -83,7 +85,10 @@ + find_package(Qt5Xml ${QT_MIN_VER} REQUIRED) + find_package(Qt5Widgets ${QT_MIN_VER} REQUIRED) + find_package(Qt5LinguistTools ${QT_MIN_VER} REQUIRED) +-find_package(Qt5Test ${QT_MIN_VER} REQUIRED) ++ ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VER} REQUIRED) ++endif() + + # Find OpenGL + find_package(OpenGL REQUIRED) +@@ -109,9 +114,6 @@ + pkg_check_modules(VORBISFILE REQUIRED vorbisfile) + endif() + +-# Enable CMake's unit test framework +-enable_testing() +- + # Install paths depend on the build type and target platform + resolve_install_paths() + +--- a/InstallLinux.cmake 2017-08-28 21:43:54.000000000 +0200 ++++ b/InstallLinux.cmake 2021-02-27 19:21:23.760211724 +0100 +@@ -58,7 +58,7 @@ + install(FILES data/fonts.conf DESTINATION ${DATA_PATH}) + install(FILES data/meshes.conf DESTINATION ${DATA_PATH}) + install(FILES data/surfaces.conf DESTINATION ${DATA_PATH}) +- install(FILES AUTHORS CHANGELOG COPYING README.md DESTINATION ${DOC_PATH}) ++ install(FILES AUTHORS CHANGELOG README.md DESTINATION ${DOC_PATH}) + install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg") + install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png") + install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk") +--- a/src/game/MiniCore/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/MiniCore/CMakeLists.txt 2021-02-27 19:17:29.616848751 +0100 +@@ -86,5 +86,7 @@ + + target_link_libraries(MiniCore Qt5::OpenGL Qt5::Xml) + +-add_subdirectory(UnitTests) ++if(BUILD_TESTING) ++ add_subdirectory(UnitTests) ++endif() + diff --git a/games-sports/dustrac/files/dustrac-1.13.0-gcc10.patch b/games-sports/dustrac/files/dustrac-1.13.0-gcc10.patch new file mode 100644 index 000000000000..1a3f51896bdb --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-gcc10.patch @@ -0,0 +1,48 @@ +From d41a46ac32038055bfc9fe9a907e199ed74e371c Mon Sep 17 00:00:00 2001 +From: Pino Toscano <toscano.pino@tiscali.it> +Date: Fri, 17 Apr 2020 13:25:12 +0200 +Subject: [PATCH] Include <stdexcept> for std::runtime_error + +It was implicitly pulled before, and in GCC 10 it will not be anymore. +--- + src/game/openaloggdata.cpp | 1 + + src/game/openalsource.cpp | 1 + + src/game/openalwavdata.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/game/openaloggdata.cpp b/src/game/openaloggdata.cpp +index 56634c20..4a2ab882 100644 +--- a/src/game/openaloggdata.cpp ++++ b/src/game/openaloggdata.cpp +@@ -19,6 +19,7 @@ + + #include <vector> + #include <cstdio> ++#include <stdexcept> + + #include <vorbis/vorbisfile.h> + +diff --git a/src/game/openalsource.cpp b/src/game/openalsource.cpp +index 9d2bb7f5..37a4272a 100644 +--- a/src/game/openalsource.cpp ++++ b/src/game/openalsource.cpp +@@ -19,6 +19,7 @@ + #include <AL/alc.h> + + #include <memory> ++#include <stdexcept> + + static bool checkError() + { +diff --git a/src/game/openalwavdata.cpp b/src/game/openalwavdata.cpp +index 3a9fc20a..015a11d3 100644 +--- a/src/game/openalwavdata.cpp ++++ b/src/game/openalwavdata.cpp +@@ -25,6 +25,7 @@ + + #include <cstdio> + #include <AL/alc.h> ++#include <stdexcept> + + static bool checkError() + { diff --git a/games-sports/dustrac/files/dustrac-1.13.0-opengl.patch b/games-sports/dustrac/files/dustrac-1.13.0-opengl.patch new file mode 100644 index 000000000000..5251169b46ef --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-opengl.patch @@ -0,0 +1,91 @@ +From acde4499b4a4d014d95668269797a272fd53bf86 Mon Sep 17 00:00:00 2001 +From: Jussi Lind <jussi.lind@iki.fi> +Date: Thu, 15 Nov 2018 01:35:58 +0200 +Subject: [PATCH] CMake: Default to GLVND, use the recommended way to link to + GL + +--- + CMakeLists.txt | 7 +++++++ + src/game/CMakeLists.txt | 2 +- + src/game/MiniCore/src/CMakeLists.txt | 2 +- + 3 files changed, 9 insertions(+), 2 deletions(-) + +From 7d6d2213d10ea96d25b5b9f18b42cace5bf0fbfd Mon Sep 17 00:00:00 2001 +From: Jussi Lind <jussi.lind@iki.fi> +Date: Sun, 18 Nov 2018 21:12:20 +0200 +Subject: [PATCH] Fix linking to OpenGL libs on CMake < 3.11.0 + +--- + CMakeLists.txt | 5 +++++ + src/game/CMakeLists.txt | 4 +--- + src/game/MiniCore/CMakeLists.txt | 5 +++++ + src/game/MiniCore/src/CMakeLists.txt | 2 +- + 4 files changed, 12 insertions(+), 4 deletions(-) + +From edc1825110f80377af51226a686731bf17d1de52 Mon Sep 17 00:00:00 2001 +From: Jussi Lind <jussi.lind@iki.fi> +Date: Tue, 30 Jul 2019 23:14:20 +0300 +Subject: [PATCH] Use OpenGL::GL instead of OpenGL::OpenGL + +- For more info: https://cmake.org/cmake/help/v3.10/module/FindOpenGL.html +--- + CMakeLists.txt | 2 +- + src/game/MiniCore/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff -u a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,8 @@ + cmake_minimum_required(VERSION 2.8.12) + cmake_policy(VERSION 2.8.12) + ++# Use cmake --help-policy [POLICY] for more information about these: ++ + if(POLICY CMP0005) + cmake_policy(SET CMP0005 NEW) + endif() +@@ -11,6 +13,11 @@ + cmake_policy(SET CMP0020 NEW) + endif() + ++# Default to GLVND ++if(POLICY CMP0072) ++ cmake_policy(SET CMP0072 OLD) ++endif() ++ + # Global game version + set(VERSION_MAJOR "2") + set(VERSION_MINOR "0") +diff -u a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt +--- a/src/game/CMakeLists.txt ++++ b/src/game/CMakeLists.txt +@@ -157,15 +157,13 @@ + MiniCore + MTFH + STFH +- ${OPENGL_gl_LIBRARY} +- ${OPENGL_glu_LIBRARY} + ${OPENAL_LIBRARY} + ${VORBISFILE_LIBRARIES} + ${VORBISFILE_LIB} # Valid only with MSVC + ${VORBIS_LIB} # Valid only with MSVC + ${OGG_LIB}) # Valid only with MSVC + +-target_link_libraries(${GAME_BINARY_NAME} ${COMMON_LIBS} Qt5::OpenGL Qt5::Xml) ++target_link_libraries(${GAME_BINARY_NAME} ${COMMON_LIBS} Qt5::OpenGL Qt5::Xml OpenGL::GL) + + foreach(TS_FILE ${TS}) + # Make targets to copy generated qm files to data dir. This is done the hard +diff -u a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt +--- a/src/game/MiniCore/CMakeLists.txt ++++ b/src/game/MiniCore/CMakeLists.txt +@@ -88,7 +88,7 @@ + + add_library(MiniCore ${MiniCoreSRC}) + +-target_link_libraries(MiniCore Qt5::OpenGL Qt5::Xml) ++target_link_libraries(MiniCore Qt5::Core Qt5::OpenGL Qt5::Xml OpenGL::GL) + + if(BUILD_TESTING) + add_subdirectory(UnitTests) diff --git a/games-sports/dustrac/metadata.xml b/games-sports/dustrac/metadata.xml index 065d1cf194d5..8a5f457eb00a 100644 --- a/games-sports/dustrac/metadata.xml +++ b/games-sports/dustrac/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch index 272f9c711778..cb3f4236b719 100644 --- a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch +++ b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch @@ -1,10 +1,10 @@ ---- foobillard-3.0a.old/src/Makefile.am 2004-02-25 07:23:56.000000000 +0100 -+++ foobillard-3.0a/src/Makefile.am 2008-12-06 21:57:03.000000000 +0100 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -83,6 +83,5 @@ AM_CFLAGS = -Wall `freetype-config --cfl #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz --AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} +-AM_LDFLAGS = ${all_libraries} `${PKG_CONFIG} --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse -LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -+LIBS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz ++LIBS = ${all_libraries} `${PKG_CONFIG} --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz diff --git a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch index 3b7fc953a4de..08fa262f415f 100644 --- a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch +++ b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch @@ -1,7 +1,5 @@ -Index: foobillard-3.0a/configure.in -=================================================================== ---- foobillard-3.0a.orig/configure.in -+++ foobillard-3.0a/configure.in +--- a/configure.in ++++ b/configure.in @@ -13,7 +13,7 @@ dnl Checks for libraries. dnl Checks for header files. @@ -11,10 +9,8 @@ Index: foobillard-3.0a/configure.in dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -Index: foobillard-3.0a/src/billard3d.c -=================================================================== ---- foobillard-3.0a.orig/src/billard3d.c -+++ foobillard-3.0a/src/billard3d.c +--- a/src/billard3d.c ++++ b/src/billard3d.c @@ -24,7 +24,11 @@ #include <string.h> #include <math.h> diff --git a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch index b01c53ecbc8b..2fc284580aad 100644 --- a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch +++ b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch @@ -1,5 +1,5 @@ ---- foobillard-3.0a/configure.in -+++ foobillard-3.0a/configure.in +--- a/configure.in ++++ b/configure.in @@ -13,7 +13,7 @@ dnl Checks for header files. @@ -9,14 +9,14 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST ---- foobillard-3.0a/src/Makefile.am -+++ foobillard-3.0a/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -50,7 +50,7 @@ #CC = gcc #CXXFLAGS = -O6 -s #CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR) -#CFLAGS = -Wall -O3 -I$(INCDIR) `freetype-config --cflags` -+#CFLAGS = -Wall -O3 -I$(INCDIR) `pkg-config --cflags freetype2` ++#CFLAGS = -Wall -O3 -I$(INCDIR) `${PKG_CONFIG} --cflags freetype2` if USE_SDL SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL SDL_LIBS = `sdl-config --libs` @@ -25,11 +25,11 @@ endif -AM_CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS} -+AM_CFLAGS = -Wall `pkg-config --cflags freetype2` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS} ++AM_CFLAGS = -Wall `${PKG_CONFIG} --cflags freetype2` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS} #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz -AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS} -+AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} ++AM_LDFLAGS = ${all_libraries} `${PKG_CONFIG} --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz diff --git a/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch b/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch index 972d14cabb0a..3d185e8d2776 100644 --- a/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch +++ b/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch @@ -1,6 +1,5 @@ -diff -ur foobillard-3.0a/src/table.c foobillard-3.0a-glclamp/src/table.c ---- foobillard-3.0a/src/table.c 2004-01-11 21:53:02.000000000 +0000 -+++ foobillard-3.0a-glclamp/src/table.c 2011-02-21 09:14:36.000000000 +0000 +--- a/src/table.c ++++ b/src/table.c @@ -1214,8 +1214,8 @@ GL_UNSIGNED_BYTE, tabletexdata); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, options_tex_min_filter); diff --git a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch index 8a9a33c43ea4..82e80cef0b7f 100644 --- a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch +++ b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch @@ -1,5 +1,5 @@ ---- a/src/ball.c.orig 2004-06-02 07:00:57.000000000 -0400 -+++ b/src/ball.c 2004-06-02 07:03:52.000000000 -0400 +--- a/src/ball.c ++++ b/src/ball.c @@ -1821,6 +1821,7 @@ } else if( options_cuberef && cuberef_binds!=0 ){ glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]); diff --git a/games-sports/foobillard/foobillard-3.0a-r1.ebuild b/games-sports/foobillard/foobillard-3.0a-r1.ebuild index 4847f1d1ffcd..3cb4c991c6c5 100644 --- a/games-sports/foobillard/foobillard-3.0a-r1.ebuild +++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools desktop flag-o-matic toolchain-funcs DESCRIPTION="8ball, 9ball, snooker and carambol game" -HOMEPAGE="http://foobillard.sourceforge.net/" +HOMEPAGE="https://foobillard.sourceforge.net/" SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="sdl video_cards_nvidia" RDEPEND="x11-libs/libXaw @@ -22,24 +23,35 @@ RDEPEND="x11-libs/libXaw sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut ) " -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-no_nvidia.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch + "${FILESDIR}"/${P}-fbsd.patch + "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-gl-clamp.patch +) src_prepare() { default - eapply \ - "${FILESDIR}"/${P}-no_nvidia.patch \ - "${FILESDIR}"/${P}-freetype_pkgconfig.patch \ - "${FILESDIR}"/${P}-fbsd.patch \ - "${FILESDIR}"/${P}-as-needed.patch \ - "${FILESDIR}"/${P}-gl-clamp.patch + mv configure.{in,ac} || die rm aclocal.m4 + tc-export PKG_CONFIG + eautoreconf } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/859235 + # + # Upstream is sourceforge, and dead since 2010. Not reported upstream. + filter-lto + use video_cards_nvidia && append-ldflags -L/usr/$(get_libdir)/opengl/nvidia/lib econf \ --enable-sound \ diff --git a/games-sports/foobillard/metadata.xml b/games-sports/foobillard/metadata.xml index 9a3afbb16c8e..a62a396413a8 100644 --- a/games-sports/foobillard/metadata.xml +++ b/games-sports/foobillard/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/gracer/files/gracer-0.1.5-gcc10.patch b/games-sports/gracer/files/gracer-0.1.5-gcc10.patch new file mode 100644 index 000000000000..a7539248e50d --- /dev/null +++ b/games-sports/gracer/files/gracer-0.1.5-gcc10.patch @@ -0,0 +1,14 @@ +Fix -fno-common + +diff -r c259e312716e vehicle.h +--- a/src/vehicle.h Sat Oct 03 12:42:08 2020 +0000 ++++ b/src/vehicle.h Sat Oct 03 12:44:13 2020 +0000 +@@ -70,7 +70,7 @@ + + /* constants */ + float mu[128]; /* friction factor */ +-} GrBreak; ++}; + + struct _GrTireData { + GrRef ref; diff --git a/games-sports/gracer/gracer-0.1.5-r1.ebuild b/games-sports/gracer/gracer-0.1.5-r2.ebuild index c604168f2c6c..6138404cd11e 100644 --- a/games-sports/gracer/gracer-0.1.5-r1.ebuild +++ b/games-sports/gracer/gracer-0.1.5-r2.ebuild @@ -1,30 +1,31 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="3D motor sports simulator" -HOMEPAGE="http://gracer.sourceforge.net/" +HOMEPAGE="https://gracer.sourceforge.net/" SRC_URI="mirror://sourceforge/gracer/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="joystick" DEPEND=" - dev-lang/tcl:0 + dev-lang/tcl:0= media-libs/freeglut - media-libs/giflib - media-libs/libpng:0 + media-libs/giflib:= + media-libs/libpng:0= media-libs/plib - x11-libs/libXi - x11-libs/libXmu virtual/glu virtual/jpeg:0 - virtual/opengl" + virtual/opengl + x11-libs/libXi + x11-libs/libXmu +" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PV}-gldefs.patch @@ -35,6 +36,7 @@ PATCHES=( "${FILESDIR}"/${P}-png15.patch "${FILESDIR}"/${P}-giflib.patch "${FILESDIR}"/${P}-warnings.patch + "${FILESDIR}"/${P}-gcc10.patch ) src_configure() { diff --git a/games-sports/gracer/metadata.xml b/games-sports/gracer/metadata.xml index f8270e9a0c3b..725c864613e9 100644 --- a/games-sports/gracer/metadata.xml +++ b/games-sports/gracer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/metadata.xml b/games-sports/metadata.xml index 370d356069e1..0acdd29a25f6 100644 --- a/games-sports/metadata.xml +++ b/games-sports/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The games-sports category contains sports games. @@ -29,4 +29,3 @@ Kategoria games-sports zawiera gry sportowe. </longdescription> </catmetadata> - diff --git a/games-sports/skatebird/Manifest b/games-sports/skatebird/Manifest new file mode 100644 index 000000000000..2de91d3fa2da --- /dev/null +++ b/games-sports/skatebird/Manifest @@ -0,0 +1 @@ +DIST skatebird-linux.zip 1701252738 BLAKE2B b28081b528167f09376053600b96de2007c44c0ba8f43485a8e20ca7dc09f635c21ebd32ef69de7d1c3975c0b5ded3ae8aaa427b5c5dbcccdab924f4ce6fbc33 SHA512 0bb7a9b4d215bd7c29ed43cfe7c50d5782961acee1392688d449b38ec9c4e3c74a6509b99ea9d5597d72e27ba09c43e0f6583f2b4673abc37ff7b6000990a29b diff --git a/games-sports/torcs/metadata.xml b/games-sports/skatebird/metadata.xml index dd8247bbc427..7c730d47817a 100644 --- a/games-sports/torcs/metadata.xml +++ b/games-sports/skatebird/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> </maintainer> - <upstream> - <remote-id type="sourceforge">torcs</remote-id> - </upstream> </pkgmetadata> diff --git a/games-sports/skatebird/skatebird-14.ebuild b/games-sports/skatebird/skatebird-14.ebuild new file mode 100644 index 000000000000..fa99f085ac4a --- /dev/null +++ b/games-sports/skatebird/skatebird-14.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CHECKREQS_DISK_BUILD="3G" +inherit check-reqs desktop wrapper xdg + +MY_PN="SkateBIRD" +DESCRIPTION="Skateboarding game where you play as a bird" +HOMEPAGE="https://glassbottommeg.itch.io/skatebird" +SRC_URI="skatebird-linux.zip" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64" +RESTRICT="bindist fetch splitdebug" + +BDEPEND=" + app-arch/unzip +" + +S="${WORKDIR}" +DIR="/opt/${PN}" +QA_PREBUILT="${DIR#/}/*" + +pkg_nofetch() { + einfo "Please buy and download ${SRC_URI} from:" + einfo " ${HOMEPAGE}" + einfo "and move it to your distfiles directory." +} + +src_prepare() { + default + + # Avoid error trying to create unity.lock. + sed -i "/^single-instance=/d" ${MY_PN}_Data/boot.config || die +} + +src_install() { + exeinto "${DIR}" + newexe ${MY_PN}.x86_64 ${MY_PN} + doexe UnityPlayer.so + + insinto "${DIR}" + doins -r ${MY_PN}_Data/ + + newicon -s 128 ${MY_PN}_Data/Resources/UnityPlayer.png ${PN}.png + make_wrapper ${PN} "${DIR}"/${MY_PN} + make_desktop_entry ${PN} ${MY_PN} +} diff --git a/games-sports/ski/Manifest b/games-sports/ski/Manifest deleted file mode 100644 index ffc26f2beabf..000000000000 --- a/games-sports/ski/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ski-6.9.tar.gz 17543 BLAKE2B aedc697ba636f12a3e180d351d2e0c409debcca2aba1eaa8bd5ecf93503b3903845424f9ed99ea83e26b311841b8287702a3c71730c60dbb3fa8e47eea05ead4 SHA512 bdcd9a267153b23bc1e4b99f0073d9d26ff8a8d670d70ec06cc27b91cd4a3bdaf821507671d73a359b3447261d52e596c61cbf9596eead7191102d1a089178b6 diff --git a/games-sports/ski/metadata.xml b/games-sports/ski/metadata.xml deleted file mode 100644 index 78274e0fa550..000000000000 --- a/games-sports/ski/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> -</maintainer> -</pkgmetadata> diff --git a/games-sports/ski/ski-6.9-r1.ebuild b/games-sports/ski/ski-6.9-r1.ebuild deleted file mode 100644 index e817d5cc3607..000000000000 --- a/games-sports/ski/ski-6.9-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 - -DESCRIPTION="A simple text-mode skiing game" -HOMEPAGE="http://www.catb.org/~esr/ski/" -SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND}" - -src_install() { - dobin ski - dodoc NEWS README - doman ski.6 - domenu ski.desktop - doicon ski.png - python_fix_shebang "${ED}/usr/bin" -} diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest index 5bd75a5398a7..3a2f5e6253d5 100644 --- a/games-sports/speed-dreams/Manifest +++ b/games-sports/speed-dreams/Manifest @@ -1 +1,8 @@ -DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 BLAKE2B 17455c6fc6bbe0cb4b5e00d4217eb49e0f6e39a8aa389f304771e32429c48e2e6bc834d8d0c7a01927376c5b37ae8e7b27399da88784b5f46b9549d46d01222f SHA512 6ae88691f52480351825c20c8bfb3ff54783b84bfbbc385ae2c0578991fa9025b16dcdc4ce136b85246a2a479452f2b209ecbec2be0a7ae85818929ea5fa1195 +DIST speed-dreams-src-base-2.2.3-r7616.tar.xz 238067340 BLAKE2B 5250a295fd077ab5c773bfb066416a2b0abfbd667e99c5c7a360898121af9dc757cf6afd003e220b9e76e687040d80687f8f78d445d6b98064efa396f5b1b4b7 SHA512 a98913625a78a67f7428649c6f3c426d32537b5f1b9331540bb32926568d281e1ec0e80bf45e5d847f43ee00b2d0c5945be96d86ac36d840b79dd3da82920960 +DIST speed-dreams-src-base-2.3.0-r8786.tar.xz 250870100 BLAKE2B a64f52a2a7f01124e524e4f375941d6538b3756fad1bc802d7d791d6904cd121bae96ca4856440333009d7f53f5ff47183b718932d36c8da3b817cfe467469f7 SHA512 b678a722a1f9fd62779ab776d5f5777d6fc68ecbb29991bd315319218c1d7e6554ad489c44076b1f0699e9ff72c298373315f1d7c63c87c566a009cae85fad39 +DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-r7616.tar.xz 578705056 BLAKE2B 8b354211686ca6183ada892c844fa0345f2b751b786194d2d52e37a25c8dcf048e91862f2964c337e02765fba4e7bafa81539355a2b00af68476704ddc85c817 SHA512 4a488daeb1161dbc61ca95c5152d38864f759bbc2d0d8cc4d4c4a258aa143dedab55f16ba3343657b2fe8544e1f33ee0bc82e2cdeda7a7087a283e2513a8b6c6 +DIST speed-dreams-src-hq-cars-and-tracks-2.3.0-r8786.tar.xz 698564396 BLAKE2B 30ab454a109ebe2a0922b0e9bcc2d3a02e84f7c4a5591c235a144e79d96153c67846781ee8e23028457c6e59d49a8bc62f54c5c022f1180e5e10b7303342f4b8 SHA512 4f67539bb7e9b126500426d2323035053d6a9f1bf7b6947fc9fc39fee53551ba652d93c95337d2cd74280455f25d55e2a922bc64380bba5b8ea40163ad9ab7cf +DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-r7616.tar.xz 668751780 BLAKE2B f4c528eebdecc337394a08100e45eb66a8ad5e85164813a27a406d6b54089cd640874d37680588bfffcf3f1fdc274fd2329defb9d052ef2833c86dec8be21c9d SHA512 e8256c28697dd78794c41f2dc659d7aa455f0e5967b3178fbe17eb4adf6ef93ed719621f38afd78c8d0a548bcb7b61bb0859755b4867fee21096fe0925acfd89 +DIST speed-dreams-src-more-hq-cars-and-tracks-2.3.0-r8786.tar.xz 795460296 BLAKE2B 70ea28aa6f6f5ec57f673ade55e526cd20dfb47964aaed044086557dcefc2b7b246c90ae55350ef6d911c11af5592d6ae5d7b3847ab4819b1b073104fef7ce86 SHA512 8eb252fe38d74dbd8b5a39d027b739484520ac21be928c1c4fb00a3b845ca51b63d2d59d11119c26c998fb859dba0ab711e8da1ea83430f771e1903411eb44c4 +DIST speed-dreams-src-wip-cars-and-tracks-2.2.3-r7616.tar.xz 409517248 BLAKE2B 5dc7af87df13f87e3561dbc139366a1b7041130812d02316c103707102b352de9c3dd111411576f168b813d4c735656a098e681e70e274593762e552aabb517c SHA512 693ebd5f1f81629fe62c7c086de8a924833b3ee1b4a25f803b7214b58f8520b16f4d45cdd96e941f1f884afa3f53afd66ef9a500fda42b928c7124ae9205060a +DIST speed-dreams-src-wip-cars-and-tracks-2.3.0-r8786.tar.xz 414204048 BLAKE2B 4588cae0e8db0a7c2764168b6745e83d36bb1ed7a9a70008a07661249eeb163cedbf9fd85c1961bd929043f68098ce5ee218c2374c81fdbde048b24cd07b1acd SHA512 64651237115149ec063fcb11faf64b62005ee590526c5101a5a6a632aeb130b691b2651299eaf4190ddf1fd00ae33007d6f1d62441c672b4808ef33201ef1dbf diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch deleted file mode 100644 index 779119d995b1..000000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -123,8 +123,7 @@ - AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"])) - AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/])) - AC_CHECK_LIB(alut, alutLoadWAVFile, -- LDFLAGS="$LDFLAGS -lalut", -- LDFLAGS="$LDFLAGS") -+ LIBS="$LIBS -lalut", ) - - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"])) -@@ -141,7 +140,7 @@ - AC_CHECK_LIB(glut, glutSwapBuffers,,AC_MSG_ERROR([Can't find libglut. freeglut can be found on http://freeglut.sourceforge.net/])) - - dnl Checks for plib libraries. --LDFLAGS="$LDFLAGS -lplibjs" -+AC_CHECK_LIB(plibjs, main,,AC_MSG_ERROR([Can't find libplibjs. PLIB can be found on http://plib.sourceforge.net/])) - AC_CHECK_LIB(plibul, main,,AC_MSG_ERROR([Can't find libplibul. PLIB can be found on http://plib.sourceforge.net/])) - AC_CHECK_LIB(plibsg, main,,AC_MSG_ERROR([Can't find libplibsg. PLIB can be found on http://plib.sourceforge.net/])) - AC_CHECK_LIB(plibsl, main,,AC_MSG_ERROR([Can't find libplibsl. PLIB can be found on http://plib.sourceforge.net/])) ---- a/Make-default.mk -+++ b/Make-default.mk -@@ -402,7 +402,7 @@ - ifdef PROGRAM - - ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@ -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - installprogram: ${PROGRAM} - @ createdir="${INSTLIBBASE}" ; \ -@@ -420,14 +420,14 @@ - ifdef LOCALTOOLS - - ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - endif - - ifdef TOOLS - - ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - installtools: ${TOOLS} - @createdir="${INSTBINBASE}/${TOOLSDIR}" ; \ -@@ -478,7 +478,7 @@ - ifdef SOLIBRARY - - ${SOLIBRARY}: ${OBJECTS} -- ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS} -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - @D=`pwd` ; \ - createdir="${EXPORTBASE}/lib" ; \ - $(mkinstalldirs) $$createdir ; \ -@@ -509,7 +509,7 @@ - ifdef MODULE - - ${MODULE}: ${OBJECTS} -- ${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - @D=`pwd` ; \ - createdir="${EXPORTBASE}/${MODULEDIR}" ; \ - $(mkinstalldirs) $$createdir ; \ ---- a/src/libs/client/Makefile -+++ b/src/libs/client/Makefile -@@ -23,6 +23,8 @@ - SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \ - optionmenu.cpp - -+SOLIBS = -lconfscreens -lraceengine -+ - LIBS = -lplibssg -lplibsg -lplibul - - EXPDIR = include ---- a/src/libs/Makefile -+++ b/src/libs/Makefile -@@ -23,7 +23,7 @@ - - TOOLSUBDIRS = txml - --SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \ -+SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \ - portability math - - PKGSUBDIRS = $(SUBDIRS) ---- a/src/libs/raceengineclient/Makefile -+++ b/src/libs/raceengineclient/Makefile -@@ -23,6 +23,8 @@ - SOURCES = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \ - raceengine.cpp raceresults.cpp - -+SOLIBS = -lconfscreens -lrobottools -lracescreens -+ - EXPDIR = include - - EXPORTS = singleplayer.h raceinit.h ---- a/src/libs/tgf/Makefile -+++ b/src/libs/tgf/Makefile -@@ -29,6 +29,7 @@ - profiler.cpp \ - hash.cpp - -+SOLIBS = -ltxml - - EXPDIR = include - diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch deleted file mode 100644 index 72c755af9ebd..000000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/configure.in 2012-03-13 08:15:34.891163505 +0100 -+++ b/configure.in 2012-03-13 08:18:40.154092687 +0100 -@@ -14,9 +14,10 @@ - # - ############################################################################## - --AC_INIT(Make-config.in) -+AC_INIT([speed-dreams], [1.4.0-r2307]) -+AC_CONFIG_SRCDIR([Make-config.in]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE(speed-dreams, 1.4.0-r2307) -+AC_DEFINE(VERSION, ["1.4.0-r2307"], [Version]) - - dnl Checks for programs. - AC_PROG_CC ---- a/Makefile 2012-03-13 10:43:30.563720337 +0100 -+++ b/Makefile 2012-03-13 10:44:26.339794119 +0100 -@@ -88,17 +88,7 @@ - -include ${MAKE_DEFAULT} - - Make-config: configure Make-config.in -- rm -f config.status config.log config.cache - ./configure -- rm -f config.status config.log config.cache -- --configure: configure.in config.h.in aclocal.m4 -- rm -f config.status config.log config.cache -- autoheader -- autoconf -- --aclocal.m4: acinclude.m4 -- aclocal - - distclean: clean - rm -f config.status config.log config.cache diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch deleted file mode 100644 index 6b09ce2a41c8..000000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/libs/tgfclient/img.cpp -+++ b/src/libs/tgfclient/img.cpp -@@ -98,7 +98,7 @@ - return (unsigned char *)NULL; - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); -@@ -229,7 +229,7 @@ - return -1; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(fp); - return -1; diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch deleted file mode 100644 index 32b4f85a2000..000000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://sourceforge.net/p/speed-dreams/tickets/952/ -https://bugs.gentoo.org/580054 - ---- a/src/modules/simu/simuv2/simu.cpp -+++ b/src/modules/simu/simuv2/simu.cpp -@@ -61,7 +61,7 @@ - if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; - if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0; - if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0; -- if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0; -+ if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0; - #else - if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0; - if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; ---- a/src/modules/simu/simuv3/simu.cpp -+++ b/src/modules/simu/simuv3/simu.cpp -@@ -61,7 +61,7 @@ - if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; - if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0; - if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0; -- if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0; -+ if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0; - #else - if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0; - if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; diff --git a/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch b/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch new file mode 100644 index 000000000000..784a35f9826a --- /dev/null +++ b/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch @@ -0,0 +1,11 @@ +Building with install rpath makes things simpler, but this is an issue +for used-only-at-build-time xmlversion. Suboptimal fix given all these +are built for CHOST. +--- a/src/tools/xmlversion/CMakeLists.txt ++++ b/src/tools/xmlversion/CMakeLists.txt +@@ -2,4 +2,5 @@ + PROJECT(xmlversion) + ++SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + SET(XMLVERSION_SOURCES main.cpp) + diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml index 7585d6ad4181..c268c1c9f99e 100644 --- a/games-sports/speed-dreams/metadata.xml +++ b/games-sports/speed-dreams/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <use> - <flag name="xrandr">Enable support for the X xrandr extension</flag> - </use> - <upstream> - <remote-id type="sourceforge">speed-dreams</remote-id> - </upstream> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <use> + <flag name="osggraph">Enable the new work-in-progress 3D engine using <pkg>dev-games/openscenegraph</pkg></flag> + <flag name="webstats">Enable support for sending racing statistics to a web server (experimental)</flag> + </use> + <upstream> + <remote-id type="sourceforge">speed-dreams</remote-id> + </upstream> </pkgmetadata> diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild deleted file mode 100644 index b8c182a4a903..000000000000 --- a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils versionator - -DESCRIPTION="A fork of the famous open racing car simulator TORCS" -HOMEPAGE="http://speed-dreams.sourceforge.net/" -SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="xrandr" - -RDEPEND="virtual/opengl - virtual/glu - media-libs/freealut - media-libs/freeglut - >=media-libs/libpng-1.2.40:0 - media-libs/openal - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXxf86vm - xrandr? ( x11-libs/libXrandr )" -DEPEND="${RDEPEND} - >=media-libs/plib-1.8.3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXi - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXrender - x11-base/xorg-proto" - -S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src - -PATCHES=( - "${FILESDIR}"/${P}-asneeded.patch - "${FILESDIR}"/${P}-automake.patch - "${FILESDIR}"/${P}-libpng15.patch - "${FILESDIR}"/${P}-math-hack.patch -) - -src_prepare() { - default - - # https://sourceforge.net/apps/trac/speed-dreams/ticket/111 - MAKEOPTS="${MAKEOPTS} -j1" - - sed -i \ - -e '/ADDCFLAGS/s: -O2::' \ - configure.in || die - sed -i \ - -e '/COPYING/s:=.*:= \\:' \ - Makefile || die - sed -i \ - -e '/LDFLAGS/s:-L/usr/lib::' \ - -e "/^datadir/s:=.*:= /usr/share/games/${PN}:" \ - Make-config.in || die - - eautoreconf -} - -src_configure() { - addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g') - [[ -e /dev/dsp ]] && addpredict /dev/dsp - econf \ - --prefix=/usr \ - --bindir=/usr/bin \ - $(use_enable xrandr) -} - -src_install() { - emake DESTDIR="${D}" install datainstall - - find "${D}" -name Makefile -exec rm -f {} + - - dodoc CHANGES README TODO - - newicon icon.svg ${PN}.svg - make_desktop_entry ${PN} "Speed Dreams" -} diff --git a/games-sports/speed-dreams/speed-dreams-2.2.3.ebuild b/games-sports/speed-dreams/speed-dreams-2.2.3.ebuild new file mode 100644 index 000000000000..514956352f07 --- /dev/null +++ b/games-sports/speed-dreams/speed-dreams-2.2.3.ebuild @@ -0,0 +1,85 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop flag-o-matic + +MY_PV="${PV}-r7616" + +DESCRIPTION="Fork of the famous open racing car simulator TORCS" +HOMEPAGE="http://www.speed-dreams.org/" +SRC_URI=" + mirror://sourceforge/speed-dreams/${PN}-src-base-${MY_PV}.tar.xz + mirror://sourceforge/speed-dreams/${PN}-src-hq-cars-and-tracks-${MY_PV}.tar.xz + mirror://sourceforge/speed-dreams/${PN}-src-more-hq-cars-and-tracks-${MY_PV}.tar.xz + mirror://sourceforge/speed-dreams/${PN}-src-wip-cars-and-tracks-${MY_PV}.tar.xz" +S="${WORKDIR}" + +LICENSE="GPL-2+ BitstreamVera CC0-1.0 Free-Art-1.2 OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug osggraph webstats" + +RDEPEND=" + dev-games/freesolid + dev-libs/expat + media-libs/libpng:= + media-libs/libsdl2[X,haptic,opengl,joystick,video] + media-libs/libvorbis + media-libs/openal + media-libs/plib + net-libs/enet:1.3 + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/opengl + osggraph? ( dev-games/openscenegraph:=[png] ) + webstats? ( net-misc/curl )" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.3_rc1-xmlversion-rpath.patch +) + +src_configure() { + append-cppflags -I. #806980 + + local mycmakeargs=( + -DCMAKE_BUILD_WITH_INSTALL_RPATH=yes # see xmlversion-rpath patch + -DOPTION_3RDPARTY_SOLID=yes + -DOPTION_HUDDEBUG=$(usex debug) + -DOPTION_OFFICIAL_ONLY=yes + -DOPTION_OSGGRAPH=$(usex osggraph) + -DOPTION_TRACE_LEVEL=$(usex debug 5 3) + -DOPTION_WEBSERVER=$(usex webstats) + -DOpenGL_GL_PREFERENCE=LEGACY # legacy needed for gl*ARB symbols + -DSD_BINDIR="${EPREFIX}"/usr/bin + -DSD_DATADIR="${EPREFIX}"/usr/share/${PN}-2 + -DSD_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}-2 + + # These features currently lack official support and portions + # of the required code is missing in release tarballs. + # Check if these directories exist on a version bump. + #-DOPTION_3RDPARTY_SQLITE3=yes # src/modules/simu/simureplay/ + #-DOPTION_CLIENT_SERVER=yes # src/modules/csnetworking/ + ) + + cmake_src_configure +} + +src_install() { + local HTML_DOCS=( doc/userman/. ) + cmake_src_install + + newicon data/data/icons/icon.png ${PN}-2.png + make_desktop_entry ${PN}-2 "Speed Dreams 2" ${PN}-2 +} + +pkg_postinst() { + # Issue reproduced in testing, warn in case it's widespread. + elog "If you experience freezes in menus, try to disable menu music in options." + elog "See: https://sourceforge.net/p/speed-dreams/tickets/973/" +} diff --git a/games-sports/speed-dreams/speed-dreams-2.3.0.ebuild b/games-sports/speed-dreams/speed-dreams-2.3.0.ebuild new file mode 100644 index 000000000000..ef52cadfa46f --- /dev/null +++ b/games-sports/speed-dreams/speed-dreams-2.3.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop flag-o-matic + +MY_PV="${PV}-r8786" + +DESCRIPTION="Fork of the famous open racing car simulator TORCS" +HOMEPAGE="http://www.speed-dreams.org/" +SRC_URI=" + mirror://sourceforge/speed-dreams/${PN}-src-base-${MY_PV}.tar.xz + mirror://sourceforge/speed-dreams/${PN}-src-hq-cars-and-tracks-${MY_PV}.tar.xz + mirror://sourceforge/speed-dreams/${PN}-src-more-hq-cars-and-tracks-${MY_PV}.tar.xz + mirror://sourceforge/speed-dreams/${PN}-src-wip-cars-and-tracks-${MY_PV}.tar.xz" + +LICENSE="GPL-2+ BitstreamVera CC0-1.0 Free-Art-1.2 OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug osggraph webstats" + +RDEPEND=" + dev-games/freesolid + dev-libs/expat + media-libs/libpng:= + media-libs/libsdl2[X,haptic,opengl,joystick,video] + media-libs/sdl2-mixer + media-libs/openal + media-libs/plib + net-libs/enet:1.3 + sys-libs/zlib:= + net-misc/curl + virtual/glu + virtual/jpeg + virtual/opengl + osggraph? ( dev-games/openscenegraph:=[png] ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.3_rc1-xmlversion-rpath.patch +) + +src_unpack() { + mkdir "${S}" || die + cd "${S}" + default +} + +src_configure() { + append-cppflags -I. #806980 + + local mycmakeargs=( + -DCMAKE_BUILD_WITH_INSTALL_RPATH=yes # see xmlversion-rpath patch + -DOPTION_3RDPARTY_SOLID=yes + -DOPTION_OFFICIAL_ONLY=yes + -DOPTION_OSGGRAPH=$(usex osggraph) + -DOPTION_TRACE_LEVEL=$(usex debug 5 3) + -DOPTION_WEBSERVER=$(usex webstats) + -DOpenGL_GL_PREFERENCE=LEGACY # legacy needed for gl*ARB symbols + -DSD_BINDIR="${EPREFIX}"/usr/bin + -DSD_DATADIR="${EPREFIX}"/usr/share/${PN}-2 + -DSD_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}-2 + + # These features currently lack official support and portions + # of the required code is missing in release tarballs. + # Check if these directories exist on a version bump. + #-DOPTION_3RDPARTY_SQLITE3=yes # src/modules/simu/simureplay/ + #-DOPTION_CLIENT_SERVER=yes # src/modules/csnetworking/ + ) + + cmake_src_configure +} + +src_install() { + local HTML_DOCS=( doc/userman/. ) + cmake_src_install + + newicon data/data/icons/icon.png ${PN}-2.png + make_desktop_entry ${PN}-2 "Speed Dreams 2" ${PN}-2 +} + +pkg_postinst() { + # Issue reproduced in testing, warn in case it's widespread. + elog "If you experience freezes in menus, try to disable menu music in options." + elog "See: https://sourceforge.net/p/speed-dreams/tickets/973/" +} diff --git a/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-clang.patch b/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-clang.patch new file mode 100644 index 000000000000..7ef2a8e69203 --- /dev/null +++ b/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-clang.patch @@ -0,0 +1,47 @@ +Fix build with clang +Bug: https://bugs.gentoo.org/739386 + +--- a/carpettrack.h ++++ b/carpettrack.h +@@ -15,7 +15,7 @@ class CarpetTrack + trackspace = dSimpleSpaceCreate(staticspace); + track = new StaticWorldObject(trackmodel, trackspace, initialpos); + sgVec3 sz = { 2.0, 1.2, 0.08 }; +- sgVec3 cpos = { initialpos[0]+5, initialpos[1], initialpos[2]+0.6 }; ++ sgVec3 cpos = { initialpos[0]+5, initialpos[1], initialpos[2]+0.6f }; + carpet = new DynamicBoxObject(carpetmodel, world, trackspace, cpos, sz); + carpet->name = "carpet"; + carpet->SetMass(1.0); +--- a/doorstand.h ++++ b/doorstand.h +@@ -63,7 +63,7 @@ class DoorStand : public WorldObject + + // Do the door + dReal sz[3] = { 0.1, 1.4, 1.6 }; +- dReal ps[3] = { initialpos[0], initialpos[1], initialpos[2]+0.85 }; ++ dReal ps[3] = { initialpos[0], initialpos[1], initialpos[2]+0.85f }; + door_body = dBodyCreate(world); + dBodySetAutoDisableFlag(door_body, false); + dBodySetPosition(door_body, ps[0], ps[1], ps[2]); +--- a/spikejump.h ++++ b/spikejump.h +@@ -17,7 +17,7 @@ class SpikeJump + spikespace = dSimpleSpaceCreate(staticspace); + spikegate = new StaticWorldObject(spikemodel, spikespace, initialpos); + sgVec3 sz = { 2.0, 1.2, 0.08 }; +- sgVec3 cpos = { initialpos[0], initialpos[1], initialpos[2]+0.6 }; ++ sgVec3 cpos = { initialpos[0], initialpos[1], initialpos[2]+0.6f }; + jumpboard = new DynamicBoxObject(boardmodel, world, spikespace, cpos, sz); + jumpboard->name = "jumpboard"; + jumpboard->SetMass(1.0); +--- a/ferriswheel.h ++++ b/ferriswheel.h +@@ -20,7 +20,7 @@ class FerrisWheelCart : public DynamicObject + dBodySetPosition (body,initialpos[0],initialpos[1],initialpos[2]-1.45); + + dReal sizes[2][3] = {{ 2.0, 2.9, 0.1 }, {0.2, 0.3, 1.5}}; +- dReal xlats[2][4] = {{initialpos[0], initialpos[1], initialpos[2]-1.45}, {0,0,0.70}}; ++ dReal xlats[2][4] = {{initialpos[0], initialpos[1], initialpos[2]-1.45f}, {0,0,0.70}}; + + dMass m; + dMassSetZero(&m); diff --git a/games-sports/stormbaancoureur/metadata.xml b/games-sports/stormbaancoureur/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-sports/stormbaancoureur/metadata.xml +++ b/games-sports/stormbaancoureur/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r1.ebuild b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r2.ebuild index fd84d6d9c602..51faa064e71e 100644 --- a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r1.ebuild +++ b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r2.ebuild @@ -1,31 +1,31 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=8 + +inherit desktop toolchain-funcs DESCRIPTION="Simulated obstacle course for automobiles" -HOMEPAGE="http://www.stolk.org/stormbaancoureur/" -SRC_URI="http://www.stolk.org/stormbaancoureur/download/${P}.tar.gz" +HOMEPAGE="https://www.stolk.org/stormbaancoureur/" +SRC_URI="https://www.stolk.org/stormbaancoureur/download/${P}.tar.gz" +S="${WORKDIR}/${P}/src-stormbaancoureur" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=" - >=dev-games/ode-0.8 + >=dev-games/ode-0.8[-double-precision] media-libs/alsa-lib media-libs/freeglut >=media-libs/plib-1.8.4 virtual/glu virtual/opengl" -RDEPEND=${DEPEND} - -S=${WORKDIR}/${P}/src-${PN} +RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-clang.patch ) src_prepare() { @@ -34,6 +34,11 @@ src_prepare() { sed -ie "s:GENTOODIR:/usr/share/${PN}:" main.cxx || die } +src_compile() { + tc-export CXX + emake LIBDIRNAME=$(get_libdir) +} + src_install() { dobin ${PN} insinto /usr/share/${PN} diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest deleted file mode 100644 index 0e8af9340f57..000000000000 --- a/games-sports/torcs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST torcs-1.3.6.tar.bz2 477954437 BLAKE2B 294e2775f9d7a88b1781139793fedf1f5e79238ed46ffcda22188bdf9f991180b161ab1057fcfe72205033db43b7a134b9568055e62f2152462de4436b454726 SHA512 4116c920b92ecbf5dcd3f14a137e86685651167f68725f2ad4549b2d3d20e3dc54569685925e08ffff6e7e19e532ecb1a95ec77dfe22a542a26c9e006b0c8c0d diff --git a/games-sports/torcs/files/torcs-1.3.6-as-needed.patch b/games-sports/torcs/files/torcs-1.3.6-as-needed.patch deleted file mode 100644 index d848538c07ea..000000000000 --- a/games-sports/torcs/files/torcs-1.3.6-as-needed.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- torcs-1.3.6.orig/Make-default.mk -+++ torcs-1.3.6/Make-default.mk -@@ -402,7 +402,7 @@ - ifdef PROGRAM - - ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@ -+ ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - installprogram: ${PROGRAM} - @ createdir="${INSTLIBBASE}" ; \ -@@ -420,14 +420,14 @@ - ifdef LOCALTOOLS - - ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ -+ ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - endif - - ifdef TOOLS - - ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) -- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ -+ ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - - installtools: ${TOOLS} - @createdir="${INSTBINBASE}/${TOOLSDIR}" ; \ -@@ -478,7 +478,7 @@ - ifdef SOLIBRARY - - ${SOLIBRARY}: ${OBJECTS} -- ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS} -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - @D=`pwd` ; \ - createdir="${EXPORTBASE}/lib" ; \ - $(mkinstalldirs) $$createdir ; \ -@@ -509,7 +509,7 @@ - ifdef MODULE - - ${MODULE}: ${OBJECTS} -- ${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} -+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} - @D=`pwd` ; \ - createdir="${EXPORTBASE}/${MODULEDIR}" ; \ - $(mkinstalldirs) $$createdir ; \ ---- torcs-1.3.6.orig/configure.in -+++ torcs-1.3.6/configure.in -@@ -123,11 +123,11 @@ - AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) --AC_CHECK_LIB(openal, alEnable, LDFLAGS="$LDFLAGS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/])) -+AC_CHECK_LIB(openal, alEnable, LIBS="$LIBS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/])) - AC_CHECK_LIB(alut, alutLoadWAVFile, -- LDFLAGS="$LDFLAGS -lalut", -- LDFLAGS="$LDFLAGS") --AC_CHECK_LIB(vorbisfile, ov_fopen, LDFLAGS="$LDFLAGS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.])) -+ LIBS="$LIBS -lalut", ) -+AC_CHECK_LIB(vorbisfile, ov_fopen, LIBS="$LIBS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.])) -+ - - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) ---- torcs-1.3.6.orig/src/libs/Makefile -+++ torcs-1.3.6/src/libs/Makefile -@@ -23,7 +23,7 @@ - - TOOLSUBDIRS = txml - --SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \ -+SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \ - portability math musicplayer - - PKGSUBDIRS = $(SUBDIRS) ---- torcs-1.3.6.orig/src/libs/client/Makefile -+++ torcs-1.3.6/src/libs/client/Makefile -@@ -23,6 +23,8 @@ - SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \ - optionmenu.cpp - -+SOLIBS = -lconfscreens -lraceengine -+ - LIBS = -lplibssg -lplibsg -lplibul - - EXPDIR = include ---- torcs-1.3.6.orig/src/libs/tgf/Makefile -+++ torcs-1.3.6/src/libs/tgf/Makefile -@@ -29,6 +29,7 @@ - profiler.cpp \ - hash.cpp - -+SOLIBS = -ltxml - - EXPDIR = include - diff --git a/games-sports/torcs/files/torcs-1.3.6-flags.patch b/games-sports/torcs/files/torcs-1.3.6-flags.patch deleted file mode 100644 index 5f11fd270ef1..000000000000 --- a/games-sports/torcs/files/torcs-1.3.6-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ -respect cflags - ---- torcs-1.3.6/configure.in -+++ torcs-1.3.6/configure.in -@@ -50,8 +50,7 @@ - ADDCFLAGS="-Wall -fPIC -fno-strict-aliasing" - AC_ARG_ENABLE(debug, - [ --enable-debug set the debug mode], -- ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT", -- ADDCFLAGS="$ADDCFLAGS -O2") -+ ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT") - - AC_ARG_ENABLE(xrandr, - [ --disable-xrandr reset the XRANDR mode], diff --git a/games-sports/torcs/files/torcs-1.3.6-format.patch b/games-sports/torcs/files/torcs-1.3.6-format.patch deleted file mode 100644 index da59c4da4fa0..000000000000 --- a/games-sports/torcs/files/torcs-1.3.6-format.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:24.874102363 +0100 -+++ b/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:55.071553325 +0100 -@@ -103,7 +103,7 @@ - { - int i, j; - -- printf(title); -+ printf("%s", title); - for (j = 0; j < 4; j ++){ - for (i = 0; i < 4; i ++) { - printf("%.6f ", m[i][j]); ---- a/src/tools/trackgen/objects.cpp 2015-12-23 20:59:49.671287196 +0100 -+++ b/src/tools/trackgen/objects.cpp 2015-12-23 21:02:21.639523189 +0100 -@@ -234,9 +234,9 @@ -
- ssgLeaf *vt = (ssgLeaf *)ent;
- if (vt->getCullFace() == TRUE) {
-- surf = "SURF 0x10\n";
-+ surf = "0x10";
- } else {
-- surf = "SURF 0x30\n";
-+ surf = "0x30";
- }
-
- int num_verts = vt->getNumVertices();
-@@ -304,7 +304,7 @@ - fprintf (save_fd, "numsurf %d\n", num_tris);
-
- for (i = 0; i < num_tris; i++) {
-- fprintf (save_fd, surf);
-+ fprintf (save_fd, "SURF %s\n", surf);
- fprintf (save_fd, "mat 0\n");
- fprintf (save_fd, "refs 3\n");
- fprintf (save_fd, "%d %g %g\n",
diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc6.patch b/games-sports/torcs/files/torcs-1.3.6-gcc6.patch deleted file mode 100644 index 6daf22a81b11..000000000000 --- a/games-sports/torcs/files/torcs-1.3.6-gcc6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/drivers/olethros/geometry.cpp -+++ b/src/drivers/olethros/geometry.cpp -@@ -27,6 +27,8 @@ - #ifdef WIN32 - #include <float.h> - #define isnan _isnan -+#elif __cplusplus >= 201103L -+using std::isnan; - #endif - - diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc7.patch b/games-sports/torcs/files/torcs-1.3.6-gcc7.patch deleted file mode 100644 index af139ad509de..000000000000 --- a/games-sports/torcs/files/torcs-1.3.6-gcc7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libs/musicplayer/OpenALMusicPlayer.cpp -+++ b/src/libs/musicplayer/OpenALMusicPlayer.cpp -@@ -161,7 +161,7 @@ - { - char pcm[BUFFERSIZE]; - int size = 0; -- const char* error = '\0'; -+ const char* error = ""; - - if (!stream->read(pcm, BUFFERSIZE, &size, &error)) { - GfError("OpenALMusicPlayer: Stream read error: %s\n", error); diff --git a/games-sports/torcs/files/torcs-1.3.6-no-automake.patch b/games-sports/torcs/files/torcs-1.3.6-no-automake.patch deleted file mode 100644 index 9b47bfb9a64c..000000000000 --- a/games-sports/torcs/files/torcs-1.3.6-no-automake.patch +++ /dev/null @@ -1,21 +0,0 @@ -torcs doesn't use automake, so it shouldn't be calling the macro - -http://bugs.gentoo.org/408473 - ---- torcs-1.3.6.orig/configure.in -+++ torcs-1.3.6/configure.in -@@ -15,9 +15,12 @@ - # - ############################################################################## - --AC_INIT(Make-config.in) -+AC_INIT(torcs, 1.3.6) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE(torcs, 1.3.6) -+dnl Workaround code using old VERSION instead of new PACKAGE_VERSION -+VERSION=$PACKAGE_VERSION -+AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround]) -+AC_SUBST(VERSION) - - dnl Checks for programs. - AC_PROG_CC diff --git a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch deleted file mode 100644 index f87fb750d199..000000000000 --- a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -116,12 +116,8 @@ - AC_CHECK_LIB(ICE, IceSetIOErrorHandler,,AC_MSG_ERROR([Can't find libICE. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - dnl Replace `main' with a function in -lSM: - AC_CHECK_LIB(SM, SmsSetErrorHandler,,AC_MSG_ERROR([Can't find libSM. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) --dnl Replace `main' with a function in -lXt: --AC_CHECK_LIB(Xt, XtDisplay,,AC_MSG_ERROR([Can't find libXt. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - dnl Replace `main' with a function in -lXi: - AC_CHECK_LIB(Xi, XOpenDevice,,AC_MSG_ERROR([Can't find libXi. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) --dnl Replace `main' with a function in -lXmu: --AC_CHECK_LIB(Xmu, XmuSimpleErrorHandler,,AC_MSG_ERROR([Can't find libXmu. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) - AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild b/games-sports/torcs/torcs-1.3.6-r1.ebuild deleted file mode 100644 index 77612fb8eaa9..000000000000 --- a/games-sports/torcs/torcs-1.3.6-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils multilib - -DESCRIPTION="The Open Racing Car Simulator" -HOMEPAGE="http://torcs.sourceforge.net/" -SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2" - -LICENSE="GPL-2 FreeArt" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/freealut - media-libs/freeglut - media-libs/libpng:0 - media-libs/libvorbis:= - media-libs/openal - >=media-libs/plib-1.8.5 - sys-libs/zlib:0= - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXrandr" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${P}-no-automake.patch - "${FILESDIR}"/${P}-as-needed.patch - "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${P}-format.patch - "${FILESDIR}"/${P}-noXmuXt.patch - "${FILESDIR}"/${P}-gcc6.patch - "${FILESDIR}"/${P}-gcc7.patch -) - -src_prepare() { - default - - eautoreconf - ecvs_clean -} - -src_configure() { - addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g') - [[ -e /dev/dsp ]] && addpredict /dev/dsp - econf \ - --datadir=/usr/share \ - --x-libraries=/usr/$(get_libdir) \ - --enable-xrandr -} - -src_compile() { - # So ugly... patches welcome. - emake -j1 -} - -src_install() { - emake -j1 DESTDIR="${D}" install datainstall - newicon Ticon.png ${PN}.png - make_desktop_entry ${PN} TORCS - dodoc README doc/history/history.txt - doman doc/man/*.6 - dodoc -r doc/faq/faq.html doc/tutorials doc/userman -} diff --git a/games-sports/trigger/metadata.xml b/games-sports/trigger/metadata.xml index c9f6b92e908a..3aeddc15105a 100644 --- a/games-sports/trigger/metadata.xml +++ b/games-sports/trigger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/trigger/trigger-0.6.1-r1.ebuild b/games-sports/trigger/trigger-0.6.1-r1.ebuild index 0b6083919971..4f792aba9d4f 100644 --- a/games-sports/trigger/trigger-0.6.1-r1.ebuild +++ b/games-sports/trigger/trigger-0.6.1-r1.ebuild @@ -1,57 +1,57 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=8 + +inherit desktop toolchain-funcs MY_PN=${PN}-rally MY_P=${MY_PN}-${PV} DESCRIPTION="Free OpenGL rally car racing game" -HOMEPAGE="http://trigger-rally.sourceforge.net/" +HOMEPAGE="https://trigger-rally.sourceforge.net/" SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" dev-games/physfs media-libs/freealut - media-libs/libsdl + media-libs/libsdl[joystick] media-libs/openal media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer virtual/glu virtual/opengl" -DEPEND="${RDEPEND} - dev-util/ftjam" - -S=${WORKDIR}/${MY_P} +DEPEND="${RDEPEND}" +BDEPEND="dev-util/ftjam" PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) -pkg_setup() { +src_configure() { # Otherwise build fails with: # ...skipped trigger for lack of libpengine.a... tc-export AR -} -src_configure() { econf --datadir=/usr/share/games/${PN} } src_compile() { AR="${AR} cru" jam -dx -qa || die - } src_install() { dobin ${PN} + insinto /usr/share/games/${PN} doins -r data/* + newicon data/textures/life_helmet.png ${PN}.png + make_desktop_entry ${PN} Trigger + dodoc doc/*.txt } diff --git a/games-sports/trophy/Manifest b/games-sports/trophy/Manifest index fc2bf005d059..eeb53c632273 100644 --- a/games-sports/trophy/Manifest +++ b/games-sports/trophy/Manifest @@ -1 +1,2 @@ -DIST trophy-2.0.3.tar.gz 14780127 BLAKE2B cb61ea3c5e264f8d0435e64a9076c403543dfec4c8e914d6192bbeef91d7db12e430e151df7ab10c367ddbac8f924da931376b1f06f70f55e222580301b28aa6 SHA512 40376c2a27f205421189d5fea3dc154492fae8977b62d1150c986be6fe823d0f718b61a51a2febad851fc96cf4e1b408ab9318ab32e32d685966228f51327b06 +DIST trophy-2.0.4.tar.gz 14797140 BLAKE2B da2bc4d2e03b88b64ca1f01298ac17c40e15f2aff15535a14c80083e5f5e1bbb74a08394d367cdda27ef01bd11047a8fb2ca912879ee59fdf8c180303404d378 SHA512 128128c8c133817eda4cf0e8a995d4c22d75cef1cec237873ba01f636cce69e966d0af803a2927f9cb77274807be6ecfd665910e8b605e940dd8ce913e65dfaa +DIST trophy.png 124829 BLAKE2B 508e1dc57d9e246ee1222991e88d15ecb0f308056ef7e4205415489f0fe8e23488285945306c19ee50a94e11f28aaaccf50fe0371366eb3b37545d4b6b9d2ef3 SHA512 5989388ffa4ec32379e27f6a579e5dff13c0c94a986726ace640b7b6e2357833e625b21c42ee2b692ddd6ec880ddbce30f5ae7bab84a9b4c0a9048224eb8584a diff --git a/games-sports/trophy/metadata.xml b/games-sports/trophy/metadata.xml index f3c03da7ef8e..845a090eeb45 100644 --- a/games-sports/trophy/metadata.xml +++ b/games-sports/trophy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/trophy/trophy-2.0.3-r1.ebuild b/games-sports/trophy/trophy-2.0.3-r1.ebuild deleted file mode 100644 index e038f16088bf..000000000000 --- a/games-sports/trophy/trophy-2.0.3-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils gnome2-utils - -DESCRIPTION="2D Racing Game" -HOMEPAGE="http://trophy.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-games/clanlib:0.8[opengl]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-sports/trophy/trophy-2.0.4-r1.ebuild b/games-sports/trophy/trophy-2.0.4-r1.ebuild new file mode 100644 index 000000000000..23bd48e035fb --- /dev/null +++ b/games-sports/trophy/trophy-2.0.4-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit desktop xdg + +DESCRIPTION="2D Racing Game" +HOMEPAGE="https://trophy.sourceforge.io/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + https://dev.gentoo.org/~pacho/${PN}/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-games/clanlib:0.8[opengl]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_install(){ + default + doicon -s 256 "${DISTDIR}/${PN}.png" +} diff --git a/games-sports/ultimatestunts/metadata.xml b/games-sports/ultimatestunts/metadata.xml index ad38b6a0fe1b..e1792c8b2bd5 100644 --- a/games-sports/ultimatestunts/metadata.xml +++ b/games-sports/ultimatestunts/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> diff --git a/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.7.7-r2.ebuild index 53a8f0c1a688..6a5ba8f9a23f 100644 --- a/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild +++ b/games-sports/ultimatestunts/ultimatestunts-0.7.7-r2.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic versionator +EAPI=8 + +inherit desktop flag-o-matic vcs-clean + +MY_P=${PN}-srcdata-$(ver_rs 1- '')1 -MY_P=${PN}-srcdata-$(replace_all_version_separators)1 DESCRIPTION="Remake of the famous Stunts game" HOMEPAGE="http://www.ultimatestunts.nl/" SRC_URI="mirror://sourceforge/ultimatestunts/${MY_P}.tar.gz" @@ -23,8 +25,8 @@ RDEPEND=" virtual/opengl virtual/glu nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - sys-devel/gettext" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" S=${WORKDIR}/${MY_P} @@ -41,6 +43,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/859241 + # Upstream sourceforge is inactive since 2017. No bug filed + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ --with-openal \ $(use_enable nls) diff --git a/games-sports/vdrift/Manifest b/games-sports/vdrift/Manifest deleted file mode 100644 index 7fc27d8f2fb8..000000000000 --- a/games-sports/vdrift/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST vdrift-2012-07-22.tar.bz2 589288618 BLAKE2B ccdd6358f7d753a87eb8d9d0603001ab3ca6f5c8572348c300a75961f58eb624f4cd7df18b6d892554e0f6e96982de5d5d8aca4f59d8db7e95926d772a6d963f SHA512 eb6f243fd28e5fe46e856c37cb528c8ec903bdec91b6aa86681add79a333077a3a8874f694255913ae8492b965884f02057a95a98e37027ff67c082a8ca5527e -DIST vdrift-2012-07-22c_patch.diff 21689 BLAKE2B de7575df09d434f41a4dd02554dd39f7b6ae13d676ae33c692c7aabc49764c25805efdf5cb89e0b5fb016e02b5e33b93977d588df87ff0923421b57cf2796026 SHA512 7b82ba53f3c19ccd01de9ea64e0b7e15224219c0c614a6505b2a3f552ce78565fdedf7781a198c58606d3e9b94e594dee79097d46687e7d4fc763868204b761d diff --git a/games-sports/vdrift/files/vdrift-20120722-build.patch b/games-sports/vdrift/files/vdrift-20120722-build.patch deleted file mode 100644 index 16b6fe4c9ba1..000000000000 --- a/games-sports/vdrift/files/vdrift-20120722-build.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- VDrift.orig/SConstruct -+++ VDrift/SConstruct -@@ -44,6 +44,7 @@ - LIBPATH = ['.', '#lib', LOCALBASE + '/lib'], - LINKFLAGS = ['-pthread','-lintl'], - options = opts) -+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) - check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h', 'bullet/btBulletCollisionCommon.h'] - check_libs = [] - if 'CC' in os.environ: -@@ -380,7 +381,7 @@ - if env['release']: - # release build, debugging off, optimizations on - if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8') and (sys.platform != 'freebsd9') and (sys.platform != 'win32') and (sys.platform != 'cygwin'): -- env.Append(CCFLAGS = ['-O1', '-pipe']) -+ env.Append(CCFLAGS = ['-pipe']) - else: - # debug build, lots of debugging, no optimizations - env.Append(CCFLAGS = ['-g3']) -@@ -399,7 +400,6 @@ - env.Append(CCFLAGS = ['-pg']) - env.Append(LINKFLAGS = ['-pg']) - env.Append(CCFLAGS = ['-g3']) -- env.Append(CCFLAGS = ['-O1']) - - #------------------------------------# - # compile-time efficiency assessment # - diff --git a/games-sports/vdrift/files/vdrift-20120722-bullet.patch b/games-sports/vdrift/files/vdrift-20120722-bullet.patch deleted file mode 100644 index 907433417ee6..000000000000 --- a/games-sports/vdrift/files/vdrift-20120722-bullet.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- src/cardynamics.cpp Mon Jan 19 23:26:36 1970
-+++ src/cardynamics.cpp Mon Jan 19 23:26:36 1970
-@@ -1791,23 +1791,29 @@
-
- bool CARDYNAMICS::WheelContactCallback(
- btManifoldPoint& cp,
-- const btCollisionObject* colObj0,
-- int partId0,
-+ const btCollisionObjectWrapper* col0,
-+ int part0,
- int index0,
-- const btCollisionObject* colObj1,
-- int partId1,
-+ const btCollisionObjectWrapper* col1,
-+ int part1,
- int index1)
- {
-- // cars are fracture bodies, wheel is a cylinder shape
-- const btCollisionShape* shape = colObj0->getCollisionShape();
-- if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) &&
-+#if (BT_BULLET_VERSION < 281)
-+ const btCollisionObject* obj = col0;
-+ const btCollisionShape* shape = obj->getCollisionShape();
-+ const btCollisionShape* rootshape = obj->getRootCollisionShape();
-+#else
-+ const btCollisionObject* obj = col0->getCollisionObject();
-+ const btCollisionShape* shape = col0->getCollisionShape();
-+ const btCollisionShape* rootshape = obj->getCollisionShape();
-+#endif
-+ if ((obj->getInternalType() & CO_FRACTURE_TYPE) &&
- (shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE))
- {
-- // is contact within contact patch?
-- const btCompoundShape* car = static_cast<const btCompoundShape*>(colObj0->getRootCollisionShape());
-- const btCylinderShapeX* wheel = static_cast<const btCylinderShapeX*>(shape);
-- btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin();
-- if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius())
-+ const btCompoundShape* carshape = static_cast<const btCompoundShape*>(rootshape);
-+ const btCylinderShapeX* wheelshape = static_cast<const btCylinderShapeX*>(shape);
-+ btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin();
-+ if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius())
- {
- // break contact (hack)
- cp.m_normalWorldOnB = btVector3(0, 0, 0);
---- src/cardynamics.h Mon Jan 19 23:26:36 1970
-+++ src/cardynamics.h Mon Jan 19 23:26:36 1970
-@@ -25,6 +25,12 @@
- class FractureBody;
- class PTree;
-
-+#if (BT_BULLET_VERSION < 281)
-+#define btCollisionObjectWrapper btCollisionObject
-+#else
-+struct btCollisionObjectWrapper;
-+#endif
-+
- class CARDYNAMICS : public btActionInterface
- {
- friend class PERFORMANCE_TESTING;
-@@ -151,11 +157,11 @@
-
- static bool WheelContactCallback(
- btManifoldPoint& cp,
-- const btCollisionObject* colObj0,
-- int partId0,
-+ const btCollisionObjectWrapper* col0,
-+ int part0,
- int index0,
-- const btCollisionObject* colObj1,
-- int partId1,
-+ const btCollisionObjectWrapper* col1,
-+ int part1,
- int index1);
-
- protected:
---- src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970
-+++ src/dynamicsworld.cpp Mon Jan 19 23:26:36 1970
-@@ -105,7 +105,7 @@
- int patch_id = -1;
- const BEZIER * b = 0;
- const TRACKSURFACE * s = TRACKSURFACE::None();
-- btCollisionObject * c = 0;
-+ const btCollisionObject * c = 0;
-
- MyRayResultCallback ray(origin, p, caster);
- rayTest(origin, p, ray);
-@@ -221,6 +221,7 @@
-
- void DynamicsWorld::fractureCallback()
- {
-+#if (BT_BULLET_VERSION < 281)
- m_activeConnections.resize(0);
-
- int numManifolds = getDispatcher()->getNumManifolds();
-@@ -268,4 +269,5 @@
- btRigidBody* child = body->updateConnection(con_id);
- if (child) addRigidBody(child);
- }
-+#endif
- }
\ No newline at end of file diff --git a/games-sports/vdrift/metadata.xml b/games-sports/vdrift/metadata.xml deleted file mode 100644 index 873fcd84214e..000000000000 --- a/games-sports/vdrift/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">vdrift</remote-id> - </upstream> -</pkgmetadata> diff --git a/games-sports/vdrift/vdrift-20120722.ebuild b/games-sports/vdrift/vdrift-20120722.ebuild deleted file mode 100644 index c863bdfbb2ca..000000000000 --- a/games-sports/vdrift/vdrift-20120722.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils scons-utils games - -MY_P=${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2} -DESCRIPTION="A driving simulation made with drift racing in mind" -HOMEPAGE="http://vdrift.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 - mirror://sourceforge/${PN}/${MY_P}c_patch.diff" - -LICENSE="GPL-3 ZLIB LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-arch/libarchive - media-libs/glew - media-libs/libsdl[opengl,video] - media-libs/sdl-gfx - media-libs/sdl-image[png] - media-libs/libvorbis - net-misc/curl - sci-physics/bullet[-double-precision] - virtual/opengl - virtual/glu" -DEPEND="${RDEPEND} - dev-cpp/asio - dev-libs/boost - virtual/pkgconfig" - -S=${WORKDIR}/VDrift - -src_unpack() { - unpack ${MY_P}.tar.bz2 -} - -src_prepare() { - epatch \ - "${DISTDIR}"/${MY_P}c_patch.diff \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-bullet.patch -} - -src_compile() { - escons \ - force_feedback=1 \ - destdir="${D}" \ - bindir="${GAMES_BINDIR}" \ - datadir="${GAMES_DATADIR}"/${PN} \ - prefix= \ - use_binreloc=0 \ - release=1 \ - os_cc=1 \ - os_cxx=1 \ - os_cxxflags=1 \ - || die -} - -src_install() { - dogamesbin build/vdrift - insinto "${GAMES_DATADIR}/${PN}" - doins -r data/* - newicon data/textures/icons/vdrift-64x64.png ${PN}.png - make_desktop_entry ${PN} VDrift - find "${D}" -name "SCon*" -exec rm \{\} + - keepdir "${GAMES_DATADIR}"/${PN}/{music,settings/replays,settings/screenshots} - prepgamesdirs -} diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest index d44948a241bf..f6cf3dd9ef23 100644 --- a/games-sports/xmoto/Manifest +++ b/games-sports/xmoto/Manifest @@ -1,3 +1 @@ -DIST inksmoto-0.7.0.tar.gz 2628941 BLAKE2B b8469739e6368f7b36b9a5b766522c295de43c001fba00975fb3c761ba6df34bf97e684ddf51aa83a6a41a1b800d64d6d6fe77358cf1244f193d3aad4746c6b5 SHA512 af0ae49ea160a2274f6835abd82ccaa00dc9ff81875b7d4ea29789388c131b519cb77e6da42efeaf51d52b97090c67320af38145204a1d5418781c99cb23a704 -DIST xmoto-0.5.11-src.tar.gz 40785573 BLAKE2B a1c19656ec5b206417ebdf5ac80e134ce7f29258d8a76f47bad4084ce4d2cdaeeecde1cf6cef1254a0832f21c50a49049947c1896681fe2dd8f3531ba22e7627 SHA512 7046745e8f7a045fa2ce1deb3fd75b73b233dc1092f5ecd6dd4e42938f70269a93a3a623a39a1f0520c90643a42dc1ce93c43ad07bf225ff6c50741cc02511f6 -DIST xmoto_0.5.11+dfsg-7.debian.tar.xz 25708 BLAKE2B e4029d9c66b176c6eebbf68c973cb726ef7b2522c6245ce626c7a61c13492f2e599c5a7deff4f2c853bc58d21afb4e53072a0ddc25a4e7bdb8b89b93fd44159a SHA512 d430fa37fdde90ac68e8ff4b7d2707ea5fc73fa8fab241f7a97b27e803a88321f0ea01b094a5f77ac7e43b2202113842b4f69a745e9212eead7ce4a0a5cd220c +DIST xmoto-0.6.1.tar.gz 41623870 BLAKE2B a26b89266b05513f2a48a2516ffdd39f05d584e70aa1fb18d463c754acd438cef0b0f1664cc577ebb89012f86dc37e2d52cd9d1310217941f16c9a4085dc3894 SHA512 809e5f149e5679adc2f82313afe654dbd027c0c10292c90e6c1982bdd3f7d0f1305e30b974bba94a92e18aeeff5faa6f0d24be225d4755ae73ad03274adaf60b diff --git a/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch b/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch new file mode 100644 index 000000000000..53a29161a141 --- /dev/null +++ b/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch @@ -0,0 +1,13 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -40,8 +40,8 @@ + endif() + find_package(PNG REQUIRED) + +-find_package(Lua) +-set(USE_SYSTEM_Lua $<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA51_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>) ++find_package(Lua ${LUA_VERSION} EXACT REQUIRED) ++set(USE_SYSTEM_Lua $<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>) + if (NOT LUA_VERSION_STRING VERSION_LESS 5.2 AND LUA_VERSION_STRING VERSION_LESS 5.3) + add_definitions("-DLUA_COMPAT_ALL") + elseif (LUA_VERSION_STRING VERSION_GREATER_EQUAL "5.3") diff --git a/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch b/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch new file mode 100644 index 000000000000..078fa91aaab8 --- /dev/null +++ b/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch @@ -0,0 +1,79 @@ +From fb004501a6387bb7ba5182b60ec305e9947dc545 Mon Sep 17 00:00:00 2001 +From: _yui <imbatman0xff@gmail.com> +Date: Tue, 7 Jul 2020 21:44:49 +0300 +Subject: [PATCH 1/2] Fix building with Lua with deprecated functions removed + +--- + src/CMakeLists.txt | 5 +++++ + src/xmoto/LuaLibBase.cpp | 6 ++++++ + 2 files changed, 11 insertions(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a3f328f9..3618360e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -461,6 +461,11 @@ check_prototype_definition(mkdir + ) + target_compile_definitions(xmoto PUBLIC MS_MKDIR=$<BOOL:${MS_MKDIR}>) + ++if(USE_SYSTEM_Lua) ++ check_symbol_exists(luaL_openlib lauxlib.h HAVE_LUAL_OPENLIB) ++ target_compile_definitions(xmoto PUBLIC HAVE_LUAL_OPENLIB=$<BOOL:${HAVE_LUAL_OPENLIB}>) ++endif() ++ + target_compile_definitions(xmoto PUBLIC USE_OPENGL=$<BOOL:${USE_OPENGL}>) + target_compile_definitions(xmoto PUBLIC USE_SDLGFX=$<BOOL:${USE_SDLGFX}>) + target_compile_definitions(xmoto PUBLIC USE_GETTEXT=$<BOOL:${USE_GETTEXT}>) +diff --git a/src/xmoto/LuaLibBase.cpp b/src/xmoto/LuaLibBase.cpp +index fed3c79e..62b690e1 100644 +--- a/src/xmoto/LuaLibBase.cpp ++++ b/src/xmoto/LuaLibBase.cpp +@@ -42,7 +42,13 @@ LuaLibBase::LuaLibBase(const std::string &i_libname, luaL_Reg i_reg[]) { + luaL_requiref(m_pL, LUA_TABLIBNAME, luaopen_table, 1); + #endif + ++#if HAVE_LUAL_OPENLIB + luaL_openlib(m_pL, i_libname.c_str(), i_reg, 0); ++#else ++ lua_newtable(m_pL); ++ luaL_register(m_pL, i_libname.c_str(), i_reg); ++ lua_setglobal(m_pL, i_libname.c_str()); ++#endif + } + + LuaLibBase::~LuaLibBase() { + +From 0a92ee4e8d6ffb88f137b74ba3e9a9b688ac50e6 Mon Sep 17 00:00:00 2001 +From: _yui <imbatman0xff@gmail.com> +Date: Tue, 7 Jul 2020 23:01:38 +0300 +Subject: [PATCH 2/2] Change luaL_register to luaL_setfuncs for lua 5.2 and + newer + +--- + src/xmoto/LuaLibBase.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/xmoto/LuaLibBase.cpp b/src/xmoto/LuaLibBase.cpp +index 62b690e1..911c5698 100644 +--- a/src/xmoto/LuaLibBase.cpp ++++ b/src/xmoto/LuaLibBase.cpp +@@ -44,11 +44,17 @@ LuaLibBase::LuaLibBase(const std::string &i_libname, luaL_Reg i_reg[]) { + + #if HAVE_LUAL_OPENLIB + luaL_openlib(m_pL, i_libname.c_str(), i_reg, 0); +-#else ++#else // HAVE_LUAL_OPENLIB + lua_newtable(m_pL); ++ ++#if LUA_VERSION_NUM >= 502 ++ luaL_setfuncs(m_pL, i_reg, 0); ++#else // LUA_VERSION_NUM >= 502 + luaL_register(m_pL, i_libname.c_str(), i_reg); ++#endif // LUA_VERSION_NUM >= 502 ++ + lua_setglobal(m_pL, i_libname.c_str()); +-#endif ++#endif // HAVE_LUAL_OPENLIB + } + + LuaLibBase::~LuaLibBase() { diff --git a/games-sports/xmoto/metadata.xml b/games-sports/xmoto/metadata.xml index 5b72e0102ede..bd68dad20a5d 100644 --- a/games-sports/xmoto/metadata.xml +++ b/games-sports/xmoto/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> @@ -7,6 +7,8 @@ </maintainer> <use> <flag name="double-precision">more precise calculations at the expense of speed</flag> - <flag name="editor">Depend on inkscape, scripts to convert svg to level (svg2lvl)</flag> </use> + <upstream> + <remote-id type="github">xmoto/xmoto</remote-id> + </upstream> </pkgmetadata> diff --git a/games-sports/xmoto/xmoto-0.5.11-r2.ebuild b/games-sports/xmoto/xmoto-0.5.11-r2.ebuild deleted file mode 100644 index 4b906f8726a4..000000000000 --- a/games-sports/xmoto/xmoto-0.5.11-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic - -LVL_PV="0.7.0" #they unfortunately don't release both at the same time, why ~ as separator :( -LVL="inksmoto-${LVL_PV}" -DEB_PV=7 -DESCRIPTION="A challenging 2D motocross platform game" -HOMEPAGE="http://xmoto.tuxfamily.org" -SRC_URI="http://download.tuxfamily.org/xmoto/xmoto/${PV}/${P}-src.tar.gz - mirror://debian/pool/main/x/${PN}/${PN}_${PV}+dfsg-${DEB_PV}.debian.tar.xz - editor? ( http://download.tuxfamily.org/xmoto/svg2lvl/${LVL_PV}/${LVL}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="double-precision editor nls" - -RDEPEND=" - app-arch/bzip2 - dev-db/sqlite:3 - dev-games/ode[double-precision=] - dev-lang/lua:0[deprecated] - dev-libs/libxdg-basedir - dev-libs/libxml2 - media-fonts/dejavu - media-libs/libpng:0 - media-libs/libsdl[joystick,opengl] - media-libs/sdl-mixer[vorbis] - media-libs/sdl-net - media-libs/sdl-ttf - net-misc/curl - virtual/jpeg:0 - virtual/opengl - virtual/glu - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - editor? ( media-gfx/inkscape )" - -src_prepare() { - default - - EPATCH_SOURCE="${WORKDIR}/debian/patches" \ - epatch $(cat ${WORKDIR}/debian/patches/series) - use editor && rm -vf "${WORKDIR}"/extensions/{bezmisc,inkex}.py - sed -i \ - -e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \ - po/Makefile.in.in || die - mv configure.{in,ac} || die - eautoreconf - - rm -r "${S}"/src/ode || die -} - -src_configure() { - # bug 653404 - # due to ICU 59 requiring C++11 now - append-cxxflags -std=c++11 - - econf \ - --enable-threads=posix \ - $(use_enable nls) \ - --localedir=/usr/share/locale \ - --with-localesdir=/usr/share/locale \ - --with-renderer-sdlGfx=0 \ - --with-renderer-openGl=1 -} - -src_install() { - default - - rm -f "${D}/usr/share/xmoto"/Textures/Fonts/DejaVu*.ttf - dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf - dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf - doicon extra/xmoto.xpm - make_desktop_entry xmoto Xmoto - - if use editor; then - insinto /usr/share/inkscape/ - doins -r "${WORKDIR}"/extensions/ - fi -} - -pkg_postinst() { - if use editor; then - elog "If you want to know how to create Xmoto levels" - elog "have a look at this Tutorial:" - elog " http://wiki.xmoto.tuxfamily.org/index.php?title=Inksmoto-${LVL_PV}" - elog "You can share your levels on the Xmoto homepage." - fi -} diff --git a/games-sports/xmoto/xmoto-0.6.1-r100.ebuild b/games-sports/xmoto/xmoto-0.6.1-r100.ebuild new file mode 100644 index 000000000000..aa6635754fc4 --- /dev/null +++ b/games-sports/xmoto/xmoto-0.6.1-r100.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} ) + +inherit cmake lua-single + +DESCRIPTION="A challenging 2D motocross platform game, where physics play an important role" +HOMEPAGE="https://xmoto.tuxfamily.org" +SRC_URI="https://github.com/xmoto/xmoto/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="double-precision +nls" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="app-arch/bzip2 + dev-db/sqlite:3 + dev-games/ode[double-precision=] + ${LUA_DEPS} + dev-libs/libxdg-basedir + dev-libs/libxml2 + media-fonts/dejavu + media-libs/libpng:0= + media-libs/libsdl[joystick,opengl] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-net + media-libs/sdl-ttf + net-misc/curl + sys-libs/zlib:= + virtual/jpeg:0 + virtual/glu + virtual/opengl + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/xz-utils + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}/${P}_lua_deprecated.patch" + "${FILESDIR}/${PN}-0.6.1_cmake_lua_version.patch" +) + +src_prepare() { + sed -e "/^Icon/s/.xpm//" -i extra/xmoto.desktop || die + sed -e "/add_subdirectory.*\(bzip2\|libccd\|lua\|ode\|xdgbasedir\)/d" -i src/CMakeLists.txt || die + rm -rf vendor/{bzip2,lua,ode,xdgbasedir} || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_GETTEXT=$(usex nls) + -DOpenGL_GL_PREFERENCE=GLVND + -DLUA_VERSION=$(lua_get_version) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -f "${ED}/usr/share/xmoto"/Textures/Fonts/DejaVuSans{Mono,}.ttf || die + dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf + dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf +} |