mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

Update SLADE to version 3.1.3.

Browse Source 
Reported by:	portscout
This commit is contained in:
Alexey Dokuchaev 2018-12-13 16:30:37 +00:00
parent 726e688e81
commit 8b702f0de0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=487373
5 changed files with 120 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
games/slade/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= slade PORTNAME= slade
PORTVERSION= 3.1.1.5 PORTVERSION= 3.1.3
PORTREVISION= 5
CATEGORIES= games CATEGORIES= games
MAINTAINER= danfe@FreeBSD.org MAINTAINER= danfe@FreeBSD.org
@ -25,7 +24,13 @@ USE_WX= 3.0+
USE_GL= glew USE_GL= glew
USE_CXXSTD= c++11 USE_CXXSTD= c++11
PLIST_FILES= bin/slade share/slade3/slade.pk3 CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}" \
-DWX_GTK3:BOOL=OFF -DNO_WEBVIEW:BOOL=ON
PLIST_FILES= bin/slade share/slade3/slade.pk3 \
share/appdata/net.mancubus.SLADE.appdata.xml \
share/applications/net.mancubus.SLADE.desktop \
share/icons/net.mancubus.SLADE.png
OPTIONS_DEFINE= FLUIDSYNTH OPTIONS_DEFINE= FLUIDSYNTH
OPTIONS_DEFAULT= FLUIDSYNTH OPTIONS_DEFAULT= FLUIDSYNTH
@ -38,5 +43,9 @@ post-patch:
@${REINPLACE_CMD} -e 's,"alsa","oss", ; \ @${REINPLACE_CMD} -e 's,"alsa","oss", ; \
/share\/sounds\/sf2/s,/usr,${LOCALBASE},g' \ /share\/sounds\/sf2/s,/usr,${LOCALBASE},g' \
${WRKSRC}/src/Audio/MIDIPlayer.cpp ${WRKSRC}/src/Audio/MIDIPlayer.cpp
@${REINPLACE_CMD} -e 's,OpenBSD,${OPSYS},' \
${WRKSRC}/src/External/zreaders/portable_endian.h
@${REINPLACE_CMD} -e 's,wxVSCROLL,static_cast<long>(&),' \
${WRKSRC}/src/MapEditor/UI/Dialogs/ActionSpecialDialog.cpp
.include <bsd.port.mk> .include <bsd.port.mk>

6
games/slade/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1484663152 TIMESTAMP = 1544256590
SHA256 (sirjuddington-SLADE-3.1.1.5_GH0.tar.gz) = 1b1c9e8267d8749f6087297ec629d1ca81777bb1b74e51853508a570e4368e2a SHA256 (sirjuddington-SLADE-3.1.3_GH0.tar.gz) = caa5027dfed00b7faf6ef783e84d04bd018816223e002e6eeca2f7ccaeac91f5
SIZE (sirjuddington-SLADE-3.1.1.5_GH0.tar.gz) = 4385905 SIZE (sirjuddington-SLADE-3.1.3_GH0.tar.gz) = 5887853

46
games/slade/files/patch-src_CMakeLists.txt
View File

@ -1,27 +1,33 @@
--- src/CMakeLists.txt.orig 2015-12-12 08:41:35 UTC --- src/CMakeLists.txt.orig 2018-11-25 00:21:04 UTC
+++ src/CMakeLists.txt +++ src/CMakeLists.txt
@@ -6,6 +6,14 @@ find_package(wxWidgets 3.0 COMPONENTS st @@ -16,7 +16,11 @@ unset(WITH_WXPATH CACHE)
endif (USE_WEBVIEW_STARTPAGE) set( CL_WX_CONFIG wx-config )
include(${wxWidgets_USE_FILE})
if (UNIX OR MINGW)
- execute_process(COMMAND which ${CL_WX_CONFIG} OUTPUT_VARIABLE WX_TOOL OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT wxWidgets_CONFIG_EXECUTABLE)
+ execute_process(COMMAND which ${CL_WX_CONFIG} OUTPUT_VARIABLE WX_TOOL OUTPUT_STRIP_TRAILING_WHITESPACE)
+ else()
+ set(WX_TOOL ${wxWidgets_CONFIG_EXECUTABLE})
+ endif()
if (NOT WX_TOOL)
message(FATAL_ERROR
"\nNo functional wx_config script was found in your PATH.\nIs the wxWidgets development package installed?\nIf you built wxWidgets yourself, you can specify the path to your built wx-config executable via WITH_WXPATH\neg. -DWITH_WXPATH=\"/path/to/wx-config/\""
@@ -52,7 +54,16 @@ if (WX_GTK3)
set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
endif (WX_GTK3)
-SET(WX_LIBS std aui gl stc richtext propgrid media)
+# Work around find_package(wxWidgets...) inability to detect absence of some +# Work around find_package(wxWidgets...) inability to detect absence of some
+# optional components (e.g., media) +# optional components (e.g., media)
+find_library(WX_MEDIA wx_gtk2u_media-3.0) +find_library(WX_MEDIA wx_gtk2u_media-3.0)
+if (NOT WX_MEDIA) +if (NOT WX_MEDIA)
+ message(STATUS "wx_gtk2u_media-3.0 not found, removing from wxWidgets_LIBRARIES.") + message(STATUS "wx_gtk2u_media-3.0 not found, building without MP3 playback support.")
+ list(REMOVE_ITEM wxWidgets_LIBRARIES -lwx_gtk2u_media-3.0) +else (WX_MEDIA)
+endif(NOT WX_MEDIA) + SET(WX_LIBS ${WX_LIBS} media)
+endif ()
+ +
if (USE_SFML_RENDERWINDOW) +SET(WX_LIBS std aui gl stc richtext propgrid ${WX_LIBS})
set(SFML_FIND_COMPONENTS system audio window graphics) if (NO_WEBVIEW)
ADD_DEFINITIONS(-DUSE_SFML_RENDERWINDOW) SET(WX_LIBS ${WX_LIBS} html)
@@ -57,7 +65,8 @@ endif() else (NO_WEBVIEW)
if(NOT ${GLEW_FOUND})
message(SEND_ERROR "GLEW required.")
endif()
-include_directories(${FREEIMAGE_INCLUDE_DIR} ${SFML_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${GTK2_INCLUDE_DIRS} . ./External/dumb ./Application)
+# Put local `dumb' directory first to avoid conflict with `audio/dumb' port
+include_directories(External/dumb ${FREEIMAGE_INCLUDE_DIR} ${SFML_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${GTK2_INCLUDE_DIRS} . Application)
if (NOT NO_FLUIDSYNTH)
include_directories(${FLUIDSYNTH_INCLUDE_DIR})

140
games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.cpp
View File

@ -1,52 +1,52 @@
--- src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp.orig 2016-02-28 02:57:06 UTC --- src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp.orig 2018-11-25 00:21:04 UTC
+++ src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp +++ src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp
@@ -100,15 +100,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindo @@ -93,15 +93,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindow* parent) :
LOG_MESSAGE(3, "Windows Media Player installed, using wxMediaCtrl"); LOG_MESSAGE(3, "Windows Media Player installed, using wxMediaCtrl");
media_ctrl = new wxMediaCtrl(this, -1); media_ctrl_ = new wxMediaCtrl(this, -1);
} }
-#else -#else
+#elif wxUSE_MEDIACTRL +#elif wxUSE_MEDIACTRL
// Create wxMediaCtrl // Create wxMediaCtrl
media_ctrl = new wxMediaCtrl(this, -1); media_ctrl_ = new wxMediaCtrl(this, -1);
+#else +#else
+ LOG_MESSAGE(1, "wxWidgets is built without media support, MP3 playback disabled."); + LOG_MESSAGE(1, "wxWidgets is built without media support, MP3 playback disabled.");
#endif #endif
// Setup sizer // Setup sizer
wxGridBagSizer* sizer_gb = new wxGridBagSizer(4, 4); wxGridBagSizer* sizer_gb = new wxGridBagSizer(UI::pad(), UI::pad());
sizer_main->AddStretchSpacer(); sizer_main_->AddStretchSpacer();
-#ifndef __WXOSX__ -#ifndef __WXOSX__
+#if wxUSE_MEDIACTRL && !defined(__WXOSX__) +#if wxUSE_MEDIACTRL && !defined(__WXOSX__)
if (media_ctrl) sizer_main->Add(media_ctrl, 0); if (media_ctrl_) sizer_main_->Add(media_ctrl_, 0);
#endif #endif
sizer_main->Add(sizer_gb, 0, wxALIGN_CENTER); sizer_main_->Add(sizer_gb, 0, wxALIGN_CENTER);
@@ -155,13 +157,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindo @@ -163,13 +165,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindow* parent) :
sound->setVolume(snd_volume); sound_->setVolume(snd_volume);
music->setVolume(snd_volume); music_->setVolume(snd_volume);
theMIDIPlayer->setVolume(snd_volume); theMIDIPlayer->setVolume(snd_volume);
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
if (media_ctrl) media_ctrl->SetVolume(snd_volume*0.01); if (media_ctrl_) media_ctrl_->SetVolume(snd_volume*0.01);
+#endif +#endif
mod->setVolume(snd_volume); mod_->setVolume(snd_volume);
//theGMEPlayer->setVolume(snd_volume); //theGMEPlayer->setVolume(snd_volume);
//theOPLPlayer->setVolume(snd_volume); //theOPLPlayer->setVolume(snd_volume);
// Disable general entrypanel buttons // Disable general entrypanel buttons
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
if (media_ctrl) media_ctrl->Show(false); if (media_ctrl_) media_ctrl_->Show(false);
+#endif +#endif
toolbar->Show(false); toolbar_->Show(false);
// Bind events // Bind events
@@ -513,6 +519,7 @@ bool AudioEntryPanel::openMod(MemChunk& @@ -533,6 +539,7 @@ bool AudioEntryPanel::openMod(MemChunk& data)
*******************************************************************/ // ----------------------------------------------------------------------------
bool AudioEntryPanel::openMedia(string filename) bool AudioEntryPanel::openMedia(string filename)
{ {
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
// Attempt to open with wxMediaCtrl // Attempt to open with wxMediaCtrl
if (media_ctrl && media_ctrl->Load(filename)) if (media_ctrl_ && media_ctrl_->Load(filename))
{ {
@@ -527,6 +534,7 @@ bool AudioEntryPanel::openMedia(string f @@ -547,6 +554,7 @@ bool AudioEntryPanel::openMedia(string filename)
return true; return true;
} }
@ -54,79 +54,79 @@
return false; return false;
} }
@@ -549,8 +557,10 @@ void AudioEntryPanel::startStream() @@ -571,8 +579,10 @@ void AudioEntryPanel::startStream()
mod->play(); break; mod_->play(); break;
case AUTYPE_MIDI: case MIDI:
theMIDIPlayer->play(); break; theMIDIPlayer->play(); break;
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
case AUTYPE_MEDIA: case Media:
if (media_ctrl) media_ctrl->Play(); break; if (media_ctrl_) media_ctrl_->Play(); break;
+#endif +#endif
default:
break;
} }
} @@ -595,8 +605,10 @@ void AudioEntryPanel::stopStream()
mod_->pause(); break;
@@ -569,8 +579,10 @@ void AudioEntryPanel::stopStream() case MIDI:
mod->pause(); break;
case AUTYPE_MIDI:
theMIDIPlayer->pause(); break; theMIDIPlayer->pause(); break;
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
case AUTYPE_MEDIA: case Media:
if (media_ctrl) media_ctrl->Pause(); break; if (media_ctrl_) media_ctrl_->Pause(); break;
+#endif +#endif
default:
break;
} }
} @@ -620,8 +632,10 @@ void AudioEntryPanel::resetStream()
mod_->stop(); break;
@@ -590,8 +602,10 @@ void AudioEntryPanel::resetStream() case MIDI:
mod->stop(); break;
case AUTYPE_MIDI:
theMIDIPlayer->stop(); break; theMIDIPlayer->stop(); break;
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
case AUTYPE_MEDIA: case Media:
if (media_ctrl) media_ctrl->Stop(); break; if (media_ctrl_) media_ctrl_->Stop(); break;
+#endif +#endif
default:
break;
} }
} @@ -823,8 +837,10 @@ void AudioEntryPanel::onTimer(wxTimerEvent& e)
pos = mod_->getPlayingOffset().asMilliseconds(); break;
@@ -773,8 +787,10 @@ void AudioEntryPanel::onTimer(wxTimerEve case MIDI:
pos = mod->getPlayingOffset().asMilliseconds(); break;
case AUTYPE_MIDI:
pos = theMIDIPlayer->getPosition(); break; pos = theMIDIPlayer->getPosition(); break;
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
case AUTYPE_MEDIA: case Media:
if (media_ctrl) pos = media_ctrl->Tell(); break; if (media_ctrl_) pos = media_ctrl_->Tell(); break;
+#endif +#endif
default:
break;
} }
@@ -837,7 +853,9 @@ void AudioEntryPanel::onTimer(wxTimerEvent& e)
// Set slider (audio_type_ == Sound && sound_->getStatus() == sf::Sound::Stopped) ||
@@ -785,7 +801,9 @@ void AudioEntryPanel::onTimer(wxTimerEve (audio_type_ == Music && music_->getStatus() == sf::Sound::Stopped) ||
(audio_type == AUTYPE_SOUND && sound->getStatus() == sf::Sound::Stopped) || (audio_type_ == Mod && mod_->getStatus() == sf::Sound::Stopped) ||
(audio_type == AUTYPE_MUSIC && music->getStatus() == sf::Sound::Stopped) ||
(audio_type == AUTYPE_MOD && mod->getStatus() == sf::Sound::Stopped) ||
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
(audio_type == AUTYPE_MEDIA && media_ctrl && media_ctrl->GetState() == wxMEDIASTATE_STOPPED) || (audio_type_ == Media && media_ctrl_ && media_ctrl_->GetState() == wxMEDIASTATE_STOPPED) ||
+#endif +#endif
(audio_type == AUTYPE_MIDI && theMIDIPlayer && !theMIDIPlayer->isPlaying())) (audio_type_ == MIDI && theMIDIPlayer && !theMIDIPlayer->isPlaying()))
{ {
timer_seek->Stop(); timer_seek_->Stop();
@@ -809,8 +827,10 @@ void AudioEntryPanel::onSliderSeekChange @@ -863,8 +881,10 @@ void AudioEntryPanel::onSliderSeekChanged(wxCommandEve
mod->setPlayingOffset(sf::milliseconds(slider_seek->GetValue())); break; mod_->setPlayingOffset(sf::milliseconds(slider_seek_->GetValue())); break;
case AUTYPE_MIDI: case MIDI:
theMIDIPlayer->setPosition(slider_seek->GetValue()); break; theMIDIPlayer->setPosition(slider_seek_->GetValue()); break;
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
case AUTYPE_MEDIA: case Media:
if (media_ctrl) media_ctrl->Seek(slider_seek->GetValue()); break; if (media_ctrl_) media_ctrl_->Seek(slider_seek_->GetValue()); break;
+#endif +#endif
default:
break;
} }
} @@ -887,8 +907,10 @@ void AudioEntryPanel::onSliderVolumeChanged(wxCommandE
music_->setVolume(snd_volume); break;
@@ -829,8 +849,10 @@ void AudioEntryPanel::onSliderVolumeChan case MIDI:
music->setVolume(snd_volume); break;
case AUTYPE_MIDI:
theMIDIPlayer->setVolume(snd_volume); break; theMIDIPlayer->setVolume(snd_volume); break;
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
case AUTYPE_MEDIA: case Media:
if (media_ctrl) media_ctrl->SetVolume(snd_volume*0.01); break; if (media_ctrl_) media_ctrl_->SetVolume(snd_volume*0.01); break;
+#endif +#endif
case AUTYPE_MOD: case Mod:
mod->setVolume(snd_volume); break; mod_->setVolume(snd_volume); break;
} default:

18
games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.h
View File

@ -1,12 +1,12 @@
--- src/MainEditor/UI/EntryPanel/AudioEntryPanel.h.orig 2015-12-12 08:41:35 UTC --- src/MainEditor/UI/EntryPanel/AudioEntryPanel.h.orig 2018-11-25 00:21:04 UTC
+++ src/MainEditor/UI/EntryPanel/AudioEntryPanel.h +++ src/MainEditor/UI/EntryPanel/AudioEntryPanel.h
@@ -27,7 +27,9 @@ private: @@ -46,7 +46,9 @@ class AudioEntryPanel : public EntryPanel (private)
wxSlider* slider_seek; wxSlider* slider_seek_ = nullptr;
wxSlider* slider_volume; wxSlider* slider_volume_ = nullptr;
wxTimer* timer_seek; wxTimer* timer_seek_ = nullptr;
+#if wxUSE_MEDIACTRL +#if wxUSE_MEDIACTRL
wxMediaCtrl* media_ctrl; wxMediaCtrl* media_ctrl_ = nullptr;
+#endif +#endif
wxStaticText* txt_title; wxStaticText* txt_title_ = nullptr;
wxStaticText* txt_track; wxStaticText* txt_track_ = nullptr;
wxTextCtrl* txt_info; wxTextCtrl* txt_info_ = nullptr;