commit 8696608356308a5ea3a163c44d15278f8c5663fcca1043b0e23fb9f1f470c6f1 Author: Martin Hauke Date: Sat Nov 2 21:44:31 2024 +0000 - Add patch: * vitetris-fix-gcc14.patch OBS-URL: https://build.opensuse.org/package/show/games/vitetris?expand=0&rev=12 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/vitetris-0.59.1.tar.gz b/vitetris-0.59.1.tar.gz new file mode 100644 index 0000000..17d927c --- /dev/null +++ b/vitetris-0.59.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:699443df03c8d4bf2051838c1015da72039bbbdd0ab0eede891c59c840bdf58d +size 97182 diff --git a/vitetris-fix-font-path.patch b/vitetris-fix-font-path.patch new file mode 100644 index 0000000..2404607 --- /dev/null +++ b/vitetris-fix-font-path.patch @@ -0,0 +1,30 @@ +diff --git a/configure b/configure +index 442b0d0..0b359f4 100755 +--- a/configure ++++ b/configure +@@ -742,8 +742,7 @@ echo "pixmapdir = $PIXMAPDIR" >> configmk.tmp + echo "desktopdir = $DESKTOPDIR" >> configmk.tmp + if [ $OS = unix ]; then + echo >> configmk.tmp +- echo 'datadir = $(datarootdir)/allegro' >> configmk.tmp +- echo '#datadir = $(datarootdir)/allegro/vitetris' >> configmk.tmp ++ echo 'datadir = $(datarootdir)/vitetris' >> configmk.tmp + else + echo 'datadir = $(prefix)' >> configmk.tmp + fi +diff --git a/src/textgfx/allegro.c b/src/textgfx/allegro.c +index 68066bc..9dd75ed 100644 +--- a/src/textgfx/allegro.c ++++ b/src/textgfx/allegro.c +@@ -105,10 +105,7 @@ static void load_pc8x16_font() + set_allegro_resource_path(5, fname); + } + #ifdef UNIX +- set_allegro_resource_path(4, "/usr/share/allegro/vitetris"); +- set_allegro_resource_path(3, "/usr/share/allegro"); +- set_allegro_resource_path(2, "/usr/local/share/allegro/vitetris"); +- set_allegro_resource_path(1, "/usr/local/share/allegro"); ++ set_allegro_resource_path(1, "/usr/share/vitetris"); + #endif + if (find_allegro_resource(fname, "pc8x16.fnt", 0,0,0,0,0, + sizeof(fname)) == 0) diff --git a/vitetris-fix-gcc14.patch b/vitetris-fix-gcc14.patch new file mode 100644 index 0000000..547f006 --- /dev/null +++ b/vitetris-fix-gcc14.patch @@ -0,0 +1,25 @@ +diff --git a/src/menu/netplay.c b/src/menu/netplay.c +index 0b03ec7..f181ebb 100644 +--- a/src/menu/netplay.c ++++ b/src/menu/netplay.c +@@ -17,7 +17,7 @@ static char name_str[18]; + + static int cursor = -1; + +-static init_field(char *str, const char *val, int maxlen) ++static void init_field(char *str, const char *val, int maxlen) + { + memset(str, ' ', maxlen+1); + if (val) { +diff --git a/src/netw/tty_socket.c b/src/netw/tty_socket.c +index c6858a4..1593498 100644 +--- a/src/netw/tty_socket.c ++++ b/src/netw/tty_socket.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include "sock.h" + #include "internal.h" + diff --git a/vitetris.6 b/vitetris.6 new file mode 100644 index 0000000..1c4c388 --- /dev/null +++ b/vitetris.6 @@ -0,0 +1,52 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH VITETRIS "6" "September 2018" "vitetris 0.57.2 (20180628)" "Vitetris Game Manual" +.SH NAME +vitetris \- The game of tetris +.SH DESCRIPTION +vitetris 0.57.2 (20180628) +.TP +\fB\-nomenu\fR +Skip menus. +.TP +\fB\-hiscores\fR +Print highscore list and exit. +.TP +\fB\-hiscores\fR FILE +Read and add highscore entries from FILE. +.TP +\fB\-js0\fR DEVNAME +Joystick device name (e.g. \fI\,/dev/js0\/\fP). +.TP +\fB\-js1\fR DEVNAME +Second joystick device name. +.TP +\fB\-listen\fR PORT +Listen for connections on port PORT. +.HP +\fB\-connect\fR HOSTNAME:PORT +.TP +Connect to HOSTNAME on PORT. +HOSTNAME may be an IP address. +.TP +\fB\-connect\fR PORT +Connect to localhost on PORT. +.TP +\fB\-name\fR NAME +Identify yourself as NAME when connecting to other players. +.TP +\fB\-help\fR +Print this help and exit. +.TP +\fB\-help\fR game +List game options and exit. +.TP +\fB\-help\fR term +List terminal options and exit. +.TP +\-?, \fB\-h\fR [ARG] +Same as \fB\-help\fR ARG (if ARG isn't a number). +.PP +Options may also be given as option=ARG, \fB\-\-option\fR=\fI\,ARG\/\fR etc. +.PP +Highscores are saved in /home/local/.vitetris, +and in \fI\,/var/games/vitetris\-hiscores\/\fP if it exists and is writable. diff --git a/vitetris.changes b/vitetris.changes new file mode 100644 index 0000000..b5ddb15 --- /dev/null +++ b/vitetris.changes @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Sat Nov 2 20:39:09 UTC 2024 - Martin Hauke + +- Add patch: + * vitetris-fix-gcc14.patch + +------------------------------------------------------------------- +Tue Feb 20 13:28:55 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN + +------------------------------------------------------------------- +Sun Dec 27 11:26:39 UTC 2020 - Martin Hauke + +- Update to version 0.59.1 + * Fix some options not taking effect (#20) + +------------------------------------------------------------------- +Sat Dec 12 22:13:10 UTC 2020 - Martin Hauke + +- Update to version 0.59 + * Highlight last high score + * Change qualification for high score when in B-type + * Enhance desktop entry file + * Remove explicit ownership for installed files + * Add runtime library search path +- Drop patch: + * vitetris-no-need-for-root-to-install.patch + +------------------------------------------------------------------- +Sun Mar 10 16:32:02 UTC 2019 - Martin Hauke + +- Update to version 0.58 + * bugfix release - no functional changes +- Remove patches (included upstream): + * 0001-fix-extraneous-licence.patch + * 0002-fix-insecure-printf.patch + * 0003-rename-program-to-vitetris.patch + * 0004-add-comment-desktop.patch + * 0005-fix-implicit-declaration.patch + +------------------------------------------------------------------- +Thu Jan 17 15:29:01 UTC 2019 - Jan Engelhardt + +- Trim filler wording from description. + +------------------------------------------------------------------- +Sun Jan 13 08:59:11 UTC 2019 - mardnh@gmx.de + +- Initial package, version 0.57.2 diff --git a/vitetris.spec b/vitetris.spec new file mode 100644 index 0000000..4c18f3c --- /dev/null +++ b/vitetris.spec @@ -0,0 +1,101 @@ +# +# spec file for package vitetris +# +# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2019-2024, Martin Hauke +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%bcond_without ncurses +# build with support for allegro - disabled by default +%bcond_with allegro +Name: vitetris +Version: 0.59.1 +Release: 0 +Summary: Terminal-based Tetris clone +License: BSD-2-Clause +Group: Amusements/Games/Action/Arcade +URL: http://victornils.net/tetris/ +#Git-Clone: https://github.com/vicgeralds/vitetris.git +Source: https://github.com/vicgeralds/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: vitetris.6 +Patch6: vitetris-fix-font-path.patch +Patch7: vitetris-fix-gcc14.patch +%if 0%{with allegro} +BuildRequires: liballeg-devel +%endif +%if 0%{with ncurses} +BuildRequires: ncurses-devel +%endif + +%description +Vitetris is a terminal-based Tetris game. It can be played by one or +two players, over the network or on the same keyboard. + +Vitetris comes with customizable appearance and netplay where both +players can choose difficulty (level and height). (No sound, though.) + +Rotation, scoring, levels and speed resembles the early Tetris +games by Nintendo, with the addition of a short lock delay which +makes it possible to play at higher levels. (It does not make it +possible to prevent the piece from ever locking by abusing lock delay +resets.) + +%prep +%autosetup -p1 + +sed -i 's|Exec=tetris|Exec=vitetris|' vitetris.desktop + +%build +./configure \ + --prefix=%{_prefix} \ + --datarootdir=%{_datadir} \ +%if 0%{with allegro} + --with-allegro \ +%else + --without-allegro \ +%endif +%if 0%{with ncurses} + --with-ncurses \ +%else + --without-ncurses \ +%endif + --with-2player \ + --with-network \ + --with-term_resizing \ + --with-menu \ + --with-blockstyles \ + --with-pctimer + +make CFLAGS='%{optflags} -Wno-return-type' %{?_smp_mflags} + +%install +%make_install +install -Dm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man6/vitetris.6 +mv %{buildroot}%{_bindir}/tetris %{buildroot}%{_bindir}/vitetris +rm -fR %{buildroot}%{_datadir}/doc/vitetris/ + +%files +%doc README changes.txt +%license licence.txt +%{_bindir}/vitetris +%{_mandir}/man6/%{name}.6%{?ext_man} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.xpm +%if 0%{with allegro} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/pc8x16.fnt +%endif + +%changelog