update to 1.8.1.20240513 [release 1.8.1.20240513-1mamba;Wed Jun 26 2024]
This commit is contained in:
parent
d68d6fcc36
commit
b22f7aca82
@ -1,78 +0,0 @@
|
||||
--- AlephOne-20051119/Source_Files/Misc/sdl_widgets.h~ 2005-08-20 16:16:02.000000000 +0200
|
||||
+++ AlephOne-20051119/Source_Files/Misc/sdl_widgets.h 2006-10-19 16:07:14.000000000 +0200
|
||||
@@ -944,7 +944,7 @@
|
||||
virtual ~SelectorWidget () {}
|
||||
|
||||
protected:
|
||||
- SelectorWidget::SelectorWidget (widget* in_widget)
|
||||
+ SelectorWidget (widget* in_widget)
|
||||
: SDLWidgetWidget (in_widget)
|
||||
, m_callback (NULL)
|
||||
{}
|
||||
@@ -955,7 +955,7 @@
|
||||
class PopupSelectorWidget : public SelectorWidget
|
||||
{
|
||||
public:
|
||||
- PopupSelectorWidget::PopupSelectorWidget (w_select_popup* select_popup_w)
|
||||
+ PopupSelectorWidget (w_select_popup* select_popup_w)
|
||||
: SelectorWidget (select_popup_w)
|
||||
, m_select_popup (select_popup_w)
|
||||
{ select_popup_w->set_popup_callback (boost::bind(&PopupSelectorWidget::massage_callback, this, _1), NULL); }
|
||||
@@ -974,7 +974,7 @@
|
||||
class SelectSelectorWidget : public SelectorWidget
|
||||
{
|
||||
public:
|
||||
- SelectSelectorWidget::SelectSelectorWidget (w_select* select_w)
|
||||
+ SelectSelectorWidget (w_select* select_w)
|
||||
: SelectorWidget (select_w)
|
||||
, m_select (select_w)
|
||||
{ m_select->set_selection_changed_callback (boost::bind(&SelectSelectorWidget::massage_callback, this, _1)); }
|
||||
@@ -996,7 +996,7 @@
|
||||
class ColourSelectorWidget : public SelectSelectorWidget
|
||||
{
|
||||
public:
|
||||
- ColourSelectorWidget::ColourSelectorWidget (w_player_color* player_color_w)
|
||||
+ ColourSelectorWidget (w_player_color* player_color_w)
|
||||
: SelectSelectorWidget (player_color_w) {}
|
||||
|
||||
// We ignore the labels and use swatches of colour instead
|
||||
@@ -1028,7 +1028,7 @@
|
||||
class StaticTextWidget : public SDLWidgetWidget
|
||||
{
|
||||
public:
|
||||
- StaticTextWidget::StaticTextWidget (w_static_text* static_text_w)
|
||||
+ StaticTextWidget (w_static_text* static_text_w)
|
||||
: SDLWidgetWidget (static_text_w)
|
||||
, m_static_text (static_text_w)
|
||||
{}
|
||||
--- AlephOne-20051119/Source_Files/TCPMess/CommunicationsChannel.h~ 2005-10-01 23:54:32.000000000 +0200
|
||||
+++ AlephOne-20051119/Source_Files/TCPMess/CommunicationsChannel.h 2006-10-19 16:20:08.000000000 +0200
|
||||
@@ -95,7 +95,7 @@
|
||||
// Calls back message handlers (if appropriate)
|
||||
void dispatchIncomingMessages();
|
||||
|
||||
- bool CommunicationsChannel::isMessageAvailable();
|
||||
+ bool isMessageAvailable();
|
||||
|
||||
// Call does not return unless (1) times out (NULL); (2) disconnected (NULL); or
|
||||
// (3) some message received (pointer to inflated message object).
|
||||
--- AlephOne-20051119/Source_Files/Network/network_dialogs_sdl.cpp~ 2005-10-02 14:45:34.000000000 +0200
|
||||
+++ AlephOne-20051119/Source_Files/Network/network_dialogs_sdl.cpp 2006-10-19 16:25:41.000000000 +0200
|
||||
@@ -838,7 +838,7 @@
|
||||
class SdlGatherDialog : public GatherDialog
|
||||
{
|
||||
public:
|
||||
- SdlGatherDialog::SdlGatherDialog()
|
||||
+ SdlGatherDialog()
|
||||
{
|
||||
m_dialog.add(new w_static_text("GATHER NETWORK GAME", TITLE_FONT, TITLE_COLOR));
|
||||
|
||||
@@ -921,7 +921,7 @@
|
||||
class SdlJoinDialog : public JoinDialog
|
||||
{
|
||||
public:
|
||||
- SdlJoinDialog::SdlJoinDialog()
|
||||
+ SdlJoinDialog()
|
||||
{
|
||||
m_dialog.add(new w_static_text("JOIN NETWORK GAME", TITLE_FONT, TITLE_COLOR));
|
||||
m_dialog.add(new w_spacer());
|
||||
11
alephone-1.8.1.20240513-miniupnpc-2.2.8.patch
Normal file
11
alephone-1.8.1.20240513-miniupnpc-2.2.8.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- AlephOne-20240513/Source_Files/Network/PortForward.cpp.orig 2024-06-26 20:24:15.521431060 +0200
|
||||
+++ AlephOne-20240513/Source_Files/Network/PortForward.cpp 2024-06-26 20:24:38.340487716 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
char lanaddr[64];
|
||||
|
||||
- auto igd_found = UPNP_GetValidIGD(devlist.get(), &urls_, &data_, lanaddr, sizeof(lanaddr));
|
||||
+ auto igd_found = UPNP_GetValidIGD(devlist.get(), &urls_, &data_, lanaddr, sizeof(lanaddr), lanaddr, sizeof(lanaddr));
|
||||
if (!igd_found)
|
||||
{
|
||||
throw PortForwardException("Failed to discover IGD");
|
||||
@ -1,7 +1,7 @@
|
||||
%define pkgver %(echo %version | cut -d. -f3)
|
||||
%define pkgver %(echo %version | cut -d. -f4)
|
||||
Name: alephone
|
||||
Epoch: 1
|
||||
Version: 1.5.20220115
|
||||
Version: 1.8.1.20240513
|
||||
Release: 1mamba
|
||||
Summary: 3D first-person shooter game
|
||||
Group: Applications/Games
|
||||
@ -11,36 +11,33 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: https://alephone.lhowon.org/
|
||||
Source0: https://github.com/Aleph-One-Marathon/alephone/releases/download/release-%{pkgver}/AlephOne-%{pkgver}.tar.bz2
|
||||
Source1: alephone.png
|
||||
Patch: AlephOne-fix-build.patch
|
||||
Patch0: alephone-1.8.1.20240513-miniupnpc-2.2.8.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libGLU-devel
|
||||
BuildRequires: libSDL2-devel
|
||||
BuildRequires: libSDL2_ttf-devel
|
||||
BuildRequires: libalsa-devel
|
||||
BuildRequires: libavcodec-ffmpeg-devel
|
||||
BuildRequires: libavformat-ffmpeg-devel
|
||||
BuildRequires: libavutil-ffmpeg-devel
|
||||
BuildRequires: libavcodec-devel
|
||||
BuildRequires: libavformat-devel
|
||||
BuildRequires: libavutil-devel
|
||||
BuildRequires: libboost-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libglu-devel
|
||||
BuildRequires: libglvnd-devel
|
||||
BuildRequires: libmad-devel
|
||||
BuildRequires: libminiupnpc-devel
|
||||
BuildRequires: libopenal-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libsdl2_image-devel
|
||||
BuildRequires: libsdl2_net-devel
|
||||
BuildRequires: libsdl2_ttf-devel
|
||||
BuildRequires: libsndfile-devel
|
||||
BuildRequires: libspeex-devel
|
||||
BuildRequires: libspeexdsp-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libswresample-ffmpeg-devel
|
||||
BuildRequires: libswscale-ffmpeg-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: libswresample-devel
|
||||
BuildRequires: libswscale-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: libzzip-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: libminiupnpc-devel >= 0:2.2.8-1mamba
|
||||
Requires: alephone-data
|
||||
Provides: AlephOne
|
||||
Obsoletes: AlephOne < 1:1.4
|
||||
@ -52,9 +49,11 @@ Aleph One is an Open Source 3D first-person shooter game, based on the game Mara
|
||||
|
||||
%prep
|
||||
%setup -q -n AlephOne-%{pkgver}
|
||||
#%patch0 -p1
|
||||
%patch 0 -p1
|
||||
|
||||
%build
|
||||
export PKG_CONFIG_PATH="%{_libdir}/ffmpeg4/pkgconfig"
|
||||
|
||||
%configure
|
||||
|
||||
%make
|
||||
@ -97,6 +96,9 @@ EOF
|
||||
%doc AUTHORS COPYING
|
||||
|
||||
%changelog
|
||||
* Wed Jun 26 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.1.20240513-1mamba
|
||||
- update to 1.8.1.20240513
|
||||
|
||||
* Sun Jan 23 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.20220115-1mamba
|
||||
- update to 1.5.20220115
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user