From 675ae46d5d0b2ecf9416b46ba7bc5477edcb0ff3 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 15:28:56 +0100 Subject: [PATCH 1/3] mplayer: 1.5-unstable-2024-07-03 -> 1.5-unstable-2024-12-21 --- pkgs/applications/video/mplayer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f84c8e5c18eff..bf94c7c1d9f1c 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -120,12 +120,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "1.5-unstable-2024-07-03"; + version = "1.5-unstable-2024-12-21"; src = fetchsvn { url = "svn://svn.mplayerhq.hu/mplayer/trunk"; - rev = "38637"; - hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE="; + rev = "38668"; + hash = "sha256-ezWYBkhiSBgf/SeTrO6sKGbL/IrX+82KXCIlqYMEtgY="; }; prePatch = '' @@ -276,7 +276,8 @@ stdenv.mkDerivation rec { description = "Movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = licenses.gpl2Only; - maintainers = [ ]; + # Picking it up: no idea about the origin of some choices (but seems fine) + maintainers = [ maintainers.raskin ]; platforms = [ "i686-linux" "x86_64-linux" From 3a8ff68623f62859026343669e65a3002d22b6ba Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 14:31:32 +0100 Subject: [PATCH 2/3] xpilot-ng: fix build --- pkgs/games/xpilot/default.nix | 3 + pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch | 168 +++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index bdc41a27de8a3..8e011af62f299 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { zlib libXxf86misc ]; + + patches = [ ./xpilot-ng-gcc-14-fix.patch ]; + meta = with lib; { description = "Multiplayer X11 space combat game"; homepage = "http://xpilot.sf.net/"; diff --git a/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch new file mode 100644 index 0000000000000..e66ed96971fe4 --- /dev/null +++ b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch @@ -0,0 +1,168 @@ +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/proto.h xpilot-ng-4.7.3-fixed/src/mapedit/proto.h +--- xpilot-ng-4.7.3/src/mapedit/proto.h 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/mapedit/proto.h 2024-12-31 14:25:55.790083767 +0100 +@@ -73,15 +73,15 @@ + int ResizeWidth(HandlerInfo_t info); + int ResizeHeight(HandlerInfo_t info); + int OpenPreferencesPopup(HandlerInfo_t info); +-int OpenMapInfoPopup(void); +-int OpenRobotsPopup(void); +-int OpenVisibilityPopup(void); +-int OpenCannonsPopup(void); +-int OpenRoundsPopup(void); +-int OpenInitItemsPopup(void); +-int OpenMaxItemsPopup(void); +-int OpenProbsPopup(void); +-int OpenScoringPopup(void); ++int OpenMapInfoPopup(HandlerInfo_t info); ++int OpenRobotsPopup(HandlerInfo_t info); ++int OpenVisibilityPopup(HandlerInfo_t info); ++int OpenCannonsPopup(HandlerInfo_t info); ++int OpenRoundsPopup(HandlerInfo_t info); ++int OpenInitItemsPopup(HandlerInfo_t info); ++int OpenMaxItemsPopup(HandlerInfo_t info); ++int OpenProbsPopup(HandlerInfo_t info); ++int OpenScoringPopup(HandlerInfo_t info); + int ValidateCoordHandler(HandlerInfo_t info); + int ShowHoles(HandlerInfo_t info); + char MapData(int x, int y); +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/tools.c xpilot-ng-4.7.3-fixed/src/mapedit/tools.c +--- xpilot-ng-4.7.3/src/mapedit/tools.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/mapedit/tools.c 2024-12-31 14:26:29.168082279 +0100 +@@ -747,7 +747,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMapInfoPopup() ++int OpenMapInfoPopup(HandlerInfo_t info) + { + Window *temp; + +@@ -790,7 +790,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRobotsPopup() ++int OpenRobotsPopup(HandlerInfo_t info) + { + XMapWindow(display, robots); + return 0; +@@ -801,7 +801,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenVisibilityPopup() ++int OpenVisibilityPopup(HandlerInfo_t info) + { + XMapWindow(display, visibility); + return 0; +@@ -812,7 +812,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenCannonsPopup() ++int OpenCannonsPopup(HandlerInfo_t info) + { + XMapWindow(display, cannons); + return 0; +@@ -823,7 +823,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRoundsPopup() ++int OpenRoundsPopup(HandlerInfo_t info) + { + XMapWindow(display, rounds); + return 0; +@@ -834,7 +834,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenInitItemsPopup() ++int OpenInitItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, inititems); + return 0; +@@ -845,7 +845,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMaxItemsPopup() ++int OpenMaxItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, maxitems); + return 0; +@@ -856,7 +856,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenProbsPopup() ++int OpenProbsPopup(HandlerInfo_t info) + { + XMapWindow(display, probs); + return 0; +@@ -867,7 +867,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenScoringPopup() ++int OpenScoringPopup(HandlerInfo_t info) + { + XMapWindow(display, scoring); + return 0; +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/suibotdef.c xpilot-ng-4.7.3-fixed/src/server/suibotdef.c +--- xpilot-ng-4.7.3/src/server/suibotdef.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/suibotdef.c 2024-12-31 14:07:28.316133143 +0100 +@@ -338,12 +338,6 @@ + + /* } */ + +-struct collans { +- int line; +- int point; +- clvec_t moved; +-}; +- + static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2); + static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2){ /* Wall between two given points?*/ + +@@ -405,7 +399,7 @@ + /* ignore if there is enough time to deal with this object later */ + if((time_until_closest < 0) || (time_until_closest > maxtime)) + /*option instead of fixed value: options.dodgetime))*/ +- return; ++ return false; + + /* get the square of the distance */ + sqdistance = +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.c xpilot-ng-4.7.3-fixed/src/server/walls.c +--- xpilot-ng-4.7.3/src/server/walls.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/walls.c 2024-12-31 14:09:46.086127001 +0100 +@@ -54,12 +54,6 @@ + #error "This code assumes that negative numbers round upwards." + #endif + +-struct collans { +- int line; +- int point; +- clvec_t moved; +-}; +- + struct tl2 { + int base; + int x; +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.h xpilot-ng-4.7.3-fixed/src/server/walls.h +--- xpilot-ng-4.7.3/src/server/walls.h 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/walls.h 2024-12-31 14:04:50.198140193 +0100 +@@ -187,4 +187,11 @@ + + extern int num_polys, num_pstyles, num_estyles, num_bstyles; + ++struct collans { ++ int line; ++ int point; ++ clvec_t moved; ++}; ++ ++extern void Move_point(const move_t *move, struct collans *answer); + #endif From 88bf350b1d3de0f3d674b699b372f4366b95dcbf Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 17:31:26 +0100 Subject: [PATCH 3/3] tftp-hpa: 5.2 -> 5.2-untagged-2024-06-10 --- pkgs/by-name/tf/tftp-hpa/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tf/tftp-hpa/package.nix b/pkgs/by-name/tf/tftp-hpa/package.nix index f9946be7423ad..8a41255c83983 100644 --- a/pkgs/by-name/tf/tftp-hpa/package.nix +++ b/pkgs/by-name/tf/tftp-hpa/package.nix @@ -1,15 +1,18 @@ { lib, stdenv, - fetchurl, + fetchgit, + autoconf, + automake, }: stdenv.mkDerivation rec { pname = "tftp-hpa"; - version = "5.2"; - src = fetchurl { - url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz"; - sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; + version = "5.2-untagged-2024-06-10"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git"; + hash = "sha256-lTMldYO/cZdLj0UjOPPBHfYf2GBG0O+5lhP9ikqn3tY="; + rev = "2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1"; }; # Workaround build failure on -fno-common toolchains like upstream @@ -18,6 +21,15 @@ stdenv.mkDerivation rec { # `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ + autoconf + automake + ]; + meta = with lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; maintainers = with maintainers; [ raskin ];