Download raw body.
UPDATE: Alephone 1.10
Looking for testers of Alephone.
I have disabled the GL backend for the time being
as a workaround for a linking issue.
This builds with both FFmpeg 4 and 6.
A few audio deps dropped. Sound moved to using OpenAL.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/alephone/alephone/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile 15 Nov 2023 20:28:23 -0000 1.35
+++ Makefile 16 Nov 2024 08:47:50 -0000
@@ -1,15 +1,14 @@
DPB_PROPERTIES = parallel
-DIST_SUBDIR ?= alephone
COMMENT = open source game engine based on Marathon 2: Durandal
-DATE = 20200904
+DATE = 20240822
DISTNAME = AlephOne-${DATE}
-PKGNAME = alephone-1.3.1
-REVISION = 0
-
-EXTRACT_SUFX = .tar.bz2
+PKGNAME = alephone-1.10
CATEGORIES = games x11
+EXTRACT_SUFX = .tar.bz2
+
+DIST_SUBDIR ?= alephone
HOMEPAGE = https://alephone.lhowon.org/
@@ -20,25 +19,22 @@ PERMIT_PACKAGE = Yes
SITES = https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${DATE}/
-WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
+WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image SDL2_net
WANTLIB += SDL2_ttf avcodec avformat avutil boost_filesystem boost_system
-WANTLIB += c curl expat m mad png sndfile speex speexdsp swscale
-WANTLIB += vorbisfile z zzip
+WANTLIB += c curl m openal png sndfile swresample swscale z zzip
+
+# GL GLU
-COMPILER = base-clang ports-gcc base-gcc
-CXXFLAGS_base-clang = -std=c++14
+# C++17
+COMPILER = base-clang ports-gcc
-BUILD_DEPENDS = devel/automake/${AUTOMAKE_VER} \
- devel/autoconf/${AUTOCONF_VER}
LIB_DEPENDS = archivers/zziplib \
+ audio/openal \
devel/boost \
devel/sdl2-net \
devel/sdl2-image \
devel/sdl2-ttf \
- audio/libmad \
audio/libsndfile \
- audio/speex \
- audio/libvorbis \
graphics/ffmpeg \
net/curl
@@ -46,18 +42,11 @@ RUN_DEPENDS = devel/desktop-file-utils
x11/gtk+4,-guic \
misc/shared-mime-info
-USE_BZIP2 = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
-AUTOCONF_VER = 2.65
-AUTOMAKE_VER = 1.16
-CONFIGURE_ENV = AUTOCONF_VERSION=${AUTOCONF_VER} \
- AUTOMAKE_VERSION=${AUTOMAKE_VER} \
- CPPFLAGS=-I${LOCALBASE}/include
-
-.include <bsd.port.arch.mk>
-.if ${PROPERTIES:Mclang}
-CXXFLAGS += -Wno-c++11-narrowing -Wno-deprecated-register
-.endif
+CONFIGURE_ARGS += --disable-opengl \
+ --without-miniupnpc
+CONFIGURE_ENV = CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/alephone/alephone/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 12 Sep 2020 19:29:40 -0000 1.11
+++ distinfo 16 Nov 2024 08:47:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (alephone/AlephOne-20200904.tar.bz2) = kCJ6tt2shq+LGO7uIt/Etm6+CDl5829wnLc0nG4dk40=
-SIZE (alephone/AlephOne-20200904.tar.bz2) = 5567722
+SHA256 (alephone/AlephOne-20240822.tar.bz2) = Es2Uo0RIJHYeO/60XiHVLJe9Eoan8DREtAI2KGjuLaM=
+SIZE (alephone/AlephOne-20240822.tar.bz2) = 6057110
Index: patches/patch-Source_Files_CSeries_csalerts_sdl_cpp
===================================================================
RCS file: patches/patch-Source_Files_CSeries_csalerts_sdl_cpp
diff -N patches/patch-Source_Files_CSeries_csalerts_sdl_cpp
--- patches/patch-Source_Files_CSeries_csalerts_sdl_cpp 11 Mar 2022 19:04:04 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: Source_Files/CSeries/csalerts_sdl.cpp
---- Source_Files/CSeries/csalerts_sdl.cpp.orig
-+++ Source_Files/CSeries/csalerts_sdl.cpp
-@@ -32,6 +32,7 @@ April 22, 2003 (Woody Zenfell):
- #include <stdio.h>
-
- #include "Logging.h"
-+#include <unistd.h>
-
- #include "sdl_dialogs.h"
- #include "sdl_widgets.h"
Index: patches/patch-Source_Files_Misc_sdl_dialogs_cpp
===================================================================
RCS file: patches/patch-Source_Files_Misc_sdl_dialogs_cpp
diff -N patches/patch-Source_Files_Misc_sdl_dialogs_cpp
--- patches/patch-Source_Files_Misc_sdl_dialogs_cpp 11 Mar 2022 19:04:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: Source_Files/Misc/sdl_dialogs.cpp
---- Source_Files/Misc/sdl_dialogs.cpp.orig
-+++ Source_Files/Misc/sdl_dialogs.cpp
-@@ -1697,7 +1697,7 @@ void tab_placer::visible(bool visible)
-
- dialog::dialog() : active_widget(NULL), mouse_widget(0), active_widget_num(UNONE), done(false),
- cursor_was_visible(false), parent_dialog(NULL),
-- processing_function(NULL), placer(0), last_redraw(0)
-+ processing_function(0), placer(0), last_redraw(0)
- {
- }
-
Index: patches/patch-Source_Files_Misc_sdl_widgets_cpp
===================================================================
RCS file: patches/patch-Source_Files_Misc_sdl_widgets_cpp
diff -N patches/patch-Source_Files_Misc_sdl_widgets_cpp
--- patches/patch-Source_Files_Misc_sdl_widgets_cpp 11 Mar 2022 19:04:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-Index: Source_Files/Misc/sdl_widgets.cpp
---- Source_Files/Misc/sdl_widgets.cpp.orig
-+++ Source_Files/Misc/sdl_widgets.cpp
-@@ -773,7 +773,7 @@ void w_select_button::place(const SDL_Rect &r, placeme
-
- static const char* sNoValidOptionsString = "(no valid options)"; // XXX should be moved outside compiled code e.g. to MML
-
--w_select::w_select(size_t s, const char **l) : widget(LABEL_WIDGET), labels(l), we_own_labels(false), selection(s), selection_changed_callback(NULL), utf8(false)
-+w_select::w_select(size_t s, const char **l) : widget(LABEL_WIDGET), labels(l), we_own_labels(false), selection(s), selection_changed_callback(0), utf8(false)
- {
- num_labels = 0;
- if(labels) {
-@@ -1177,7 +1177,7 @@ void w_color_picker::draw(SDL_Surface *s) const
- */
-
- w_text_entry::w_text_entry(size_t max_c, const char *initial_text)
-- : widget(TEXT_ENTRY_WIDGET), enter_pressed_callback(NULL), value_changed_callback(NULL), max_chars(max_c), enable_mac_roman(false)
-+ : widget(TEXT_ENTRY_WIDGET), enter_pressed_callback(0), value_changed_callback(0), max_chars(max_c), enable_mac_roman(false)
- {
- // Initialize buffer
- buf = new char[max_chars + 1];
-@@ -2371,7 +2371,7 @@ void w_select_popup::gotSelected ()
- static const char* const sFileChooserInvalidFileString = "(no valid selection)";
-
- w_file_chooser::w_file_chooser(const char* inDialogPrompt, Typecode inTypecode)
-- : w_select_button("", NULL, NULL, true), typecode(inTypecode)
-+ : w_select_button("", 0, NULL, true), typecode(inTypecode)
- {
- strncpy(dialog_prompt, inDialogPrompt, sizeof(dialog_prompt));
- set_selection(sFileChooserInvalidFileString);
Index: patches/patch-Source_Files_Misc_sdl_widgets_h
===================================================================
RCS file: patches/patch-Source_Files_Misc_sdl_widgets_h
diff -N patches/patch-Source_Files_Misc_sdl_widgets_h
--- patches/patch-Source_Files_Misc_sdl_widgets_h 11 Mar 2022 19:04:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-Index: Source_Files/Misc/sdl_widgets.h
---- Source_Files/Misc/sdl_widgets.h.orig
-+++ Source_Files/Misc/sdl_widgets.h
-@@ -288,12 +288,12 @@ class w_button_base : public widget { (protected)
-
- class w_button : public w_button_base {
- public:
-- w_button(const char *text, action_proc proc = NULL, void *arg = NULL) : w_button_base(text, proc, arg, BUTTON_WIDGET) {}
-+ w_button(const char *text, action_proc proc = 0, void *arg = NULL) : w_button_base(text, proc, arg, BUTTON_WIDGET) {}
- };
-
- class w_tiny_button : public w_button_base {
- public:
-- w_tiny_button(const char *text, action_proc proc = NULL, void *arg = NULL) : w_button_base(text, proc, arg, TINY_BUTTON) {}
-+ w_tiny_button(const char *text, action_proc proc = 0, void *arg = NULL) : w_button_base(text, proc, arg, TINY_BUTTON) {}
- };
-
- class w_hyperlink : public w_button_base {
-@@ -854,7 +854,7 @@ class w_string_list : public w_list<string> { (private
-
- class w_select_popup : public w_select_button {
- public:
-- w_select_popup (action_proc p = NULL, void *a = NULL);
-+ w_select_popup (action_proc p = 0, void *a = NULL);
-
- void set_labels (const vector<string>& inLabels);/* {labels = inLabels;}*/
- void set_selection (int value);
-@@ -1131,7 +1131,7 @@ class ToggleWidget : public SDLWidgetWidget, public Bi
- ToggleWidget (w_toggle* toggle)
- : SDLWidgetWidget (toggle)
- , m_toggle (toggle)
-- , m_callback (NULL)
-+ , m_callback (0)
- { m_toggle->set_selection_changed_callback (boost::bind(&ToggleWidget::massage_callback, this, _1)); }
-
- void set_callback (ControlHitCallback callback) { m_callback = callback; }
-@@ -1169,7 +1169,7 @@ class SelectorWidget : public SDLWidgetWidget, public
- protected:
- SelectorWidget (widget* in_widget)
- : SDLWidgetWidget (in_widget)
-- , m_callback (NULL)
-+ , m_callback (0)
- {}
-
- ControlHitCallback m_callback;
-@@ -1253,7 +1253,7 @@ class ButtonWidget : public SDLWidgetWidget (public)
- ButtonWidget (w_button_base* button)
- : SDLWidgetWidget (button)
- , m_button (button)
-- , m_callback (NULL)
-+ , m_callback (0)
- { m_button->set_callback (bounce_callback, this); }
-
- void set_callback (ControlHitCallback callback) { m_callback = callback; }
Index: patches/patch-Source_Files_Network_Metaserver_SdlMetaserverClientUi_cpp
===================================================================
RCS file: patches/patch-Source_Files_Network_Metaserver_SdlMetaserverClientUi_cpp
diff -N patches/patch-Source_Files_Network_Metaserver_SdlMetaserverClientUi_cpp
--- patches/patch-Source_Files_Network_Metaserver_SdlMetaserverClientUi_cpp 11 Mar 2022 19:04:05 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: Source_Files/Network/Metaserver/SdlMetaserverClientUi.cpp
---- Source_Files/Network/Metaserver/SdlMetaserverClientUi.cpp.orig
-+++ Source_Files/Network/Metaserver/SdlMetaserverClientUi.cpp
-@@ -64,7 +64,7 @@ class SdlMetaserverClientUi : public MetaserverClientU
- placer->add(new w_spacer(), true);
-
- table_placer *players_games_placer = new table_placer(2, get_theme_space(SPACER_WIDGET));
-- w_players_in_room* players_in_room_w = new w_players_in_room(NULL, 216, get_theme_space(METASERVER_PLAYERS));
-+ w_players_in_room* players_in_room_w = new w_players_in_room(0, 216, get_theme_space(METASERVER_PLAYERS));
-
- players_games_placer->col_flags(1, placeable::kFill);
- players_games_placer->dual_add(players_in_room_w, d);
-@@ -119,7 +119,7 @@ class SdlMetaserverClientUi : public MetaserverClientU
- entry_cancel_placer->dual_add(chatentry_w, d);
- entry_cancel_placer->add_flags();
-
-- w_tiny_button* cancel_w = new w_tiny_button("CANCEL", NULL, &d);
-+ w_tiny_button* cancel_w = new w_tiny_button("CANCEL", 0, &d);
- entry_cancel_placer->dual_add(cancel_w, d);
-
- placer->add_flags(placeable::kFill);
Index: patches/patch-Source_Files_Network_network_dialogs_cpp
===================================================================
RCS file: patches/patch-Source_Files_Network_network_dialogs_cpp
diff -N patches/patch-Source_Files_Network_network_dialogs_cpp
--- patches/patch-Source_Files_Network_network_dialogs_cpp 11 Mar 2022 19:04:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: Source_Files/Network/network_dialogs.cpp
---- Source_Files/Network/network_dialogs.cpp.orig
-+++ Source_Files/Network/network_dialogs.cpp
-@@ -2420,7 +2420,7 @@ class SdlGatherDialog : public GatherDialog (public)
-
- // m_dialog.add(new w_static_text("Players on Network"));
-
-- w_joining_players_in_room* foundplayers_w = new w_joining_players_in_room(NULL, 320, 3);
-+ w_joining_players_in_room* foundplayers_w = new w_joining_players_in_room(0, 320, 3);
- placer->dual_add(foundplayers_w, m_dialog);
-
- horizontal_placer *autogather_placer = new horizontal_placer(get_theme_space(ITEM_WIDGET), true);
Index: patches/patch-Source_Files_Sound_SoundManager_cpp
===================================================================
RCS file: patches/patch-Source_Files_Sound_SoundManager_cpp
diff -N patches/patch-Source_Files_Sound_SoundManager_cpp
--- patches/patch-Source_Files_Sound_SoundManager_cpp 11 Mar 2022 19:04:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Directly include iostream for cerr (newer Boost versions no longer pull it in for us)
-upstream rev 5012
-
-Index: Source_Files/Sound/SoundManager.cpp
---- Source_Files/Sound/SoundManager.cpp.orig
-+++ Source_Files/Sound/SoundManager.cpp
-@@ -22,6 +22,7 @@ SOUND.C
-
- #include <iostream>
-
-+#include <iostream>
- #include "SoundManager.h"
- #include "ReplacementSounds.h"
- #include "sound_definitions.h"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/alephone/alephone/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 11 Mar 2022 19:04:05 -0000 1.7
+++ pkg/PLIST 16 Nov 2024 08:47:50 -0000
@@ -49,10 +49,6 @@ share/AlephOne/Plugins/Default_Theme/thu
share/AlephOne/Plugins/Default_Theme/tiny_button_c.bmp
share/AlephOne/Plugins/Default_Theme/tiny_button_l.bmp
share/AlephOne/Plugins/Default_Theme/tiny_button_r.bmp
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/mimetypes/
share/icons/hicolor/128x128/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/128x128/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/128x128/mimetypes/application-x-alephone-musa.png
@@ -62,8 +58,6 @@ share/icons/hicolor/128x128/mimetypes/ap
share/icons/hicolor/128x128/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/128x128/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/128x128/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/mimetypes/
share/icons/hicolor/16x16/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/16x16/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/16x16/mimetypes/application-x-alephone-musa.png
@@ -73,8 +67,6 @@ share/icons/hicolor/16x16/mimetypes/appl
share/icons/hicolor/16x16/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/16x16/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/16x16/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/mimetypes/
share/icons/hicolor/22x22/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/22x22/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/22x22/mimetypes/application-x-alephone-musa.png
@@ -84,8 +76,6 @@ share/icons/hicolor/22x22/mimetypes/appl
share/icons/hicolor/22x22/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/22x22/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/22x22/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/mimetypes/
share/icons/hicolor/24x24/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/24x24/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/24x24/mimetypes/application-x-alephone-musa.png
@@ -95,8 +85,6 @@ share/icons/hicolor/24x24/mimetypes/appl
share/icons/hicolor/24x24/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/24x24/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/24x24/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/256x256/
-share/icons/hicolor/256x256/mimetypes/
share/icons/hicolor/256x256/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/256x256/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/256x256/mimetypes/application-x-alephone-musa.png
@@ -106,8 +94,6 @@ share/icons/hicolor/256x256/mimetypes/ap
share/icons/hicolor/256x256/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/256x256/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/256x256/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/mimetypes/
share/icons/hicolor/32x32/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/32x32/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/32x32/mimetypes/application-x-alephone-musa.png
@@ -117,8 +103,6 @@ share/icons/hicolor/32x32/mimetypes/appl
share/icons/hicolor/32x32/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/32x32/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/32x32/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/mimetypes/
share/icons/hicolor/48x48/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/48x48/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/48x48/mimetypes/application-x-alephone-musa.png
@@ -128,8 +112,6 @@ share/icons/hicolor/48x48/mimetypes/appl
share/icons/hicolor/48x48/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/48x48/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/48x48/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/mimetypes/
share/icons/hicolor/64x64/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/64x64/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/64x64/mimetypes/application-x-alephone-musa.png
@@ -139,8 +121,6 @@ share/icons/hicolor/64x64/mimetypes/appl
share/icons/hicolor/64x64/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/64x64/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/64x64/mimetypes/text-x-alephone-mml.png
-share/icons/hicolor/96x96/
-share/icons/hicolor/96x96/mimetypes/
share/icons/hicolor/96x96/mimetypes/application-x-alephone-fila.png
share/icons/hicolor/96x96/mimetypes/application-x-alephone-imga.png
share/icons/hicolor/96x96/mimetypes/application-x-alephone-musa.png
@@ -150,8 +130,6 @@ share/icons/hicolor/96x96/mimetypes/appl
share/icons/hicolor/96x96/mimetypes/application-x-alephone-shpa.png
share/icons/hicolor/96x96/mimetypes/application-x-alephone-snda.png
share/icons/hicolor/96x96/mimetypes/text-x-alephone-mml.png
-share/mime/
-share/mime/packages/
share/mime/packages/alephone.xml
@tag update-mime-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
UPDATE: Alephone 1.10