svn commit: r409875 - in head/games/slade: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Tue Mar 1 15:56:24 UTC 2016
Author: danfe
Date: Tue Mar 1 15:56:22 2016
New Revision: 409875
URL: https://svnweb.freebsd.org/changeset/ports/409875
Log:
- Update to the official release version 3.1.1
- Make MIDI playback via FluidSynth optional
- Rename patches to chase new source structure
Reported by: portscout
Added:
head/games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.cpp
- copied, changed from r409874, head/games/slade/files/patch-src_AudioEntryPanel.cpp
head/games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.h
- copied, changed from r409874, head/games/slade/files/patch-src_AudioEntryPanel.h
Deleted:
head/games/slade/files/patch-src_AudioEntryPanel.cpp
head/games/slade/files/patch-src_AudioEntryPanel.h
Modified:
head/games/slade/Makefile
head/games/slade/distinfo
head/games/slade/files/patch-src_CMakeLists.txt
Modified: head/games/slade/Makefile
==============================================================================
--- head/games/slade/Makefile Tue Mar 1 15:09:07 2016 (r409874)
+++ head/games/slade/Makefile Tue Mar 1 15:56:22 2016 (r409875)
@@ -2,15 +2,14 @@
# $FreeBSD$
PORTNAME= slade
-DISTVERSION= 3.1.1_b3
+PORTVERSION= 3.1.1
CATEGORIES= games
MAINTAINER= danfe at FreeBSD.org
COMMENT= Modern editor for Doom-engine based games and source ports
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
- libsfml-system.so:${PORTSDIR}/devel/sfml \
+LIB_DEPENDS= libsfml-system.so:${PORTSDIR}/devel/sfml \
libftgl.so:${PORTSDIR}/graphics/ftgl \
libfreeimage.so:${PORTSDIR}/graphics/freeimage
@@ -24,8 +23,16 @@ USE_CXXSTD= c++11
PLIST_FILES= bin/slade share/slade3/slade.pk3
+OPTIONS_DEFINE= FLUIDSYNTH
+OPTIONS_DEFAULT= FLUIDSYNTH
+
+FLUIDSYNTH_DESC= MIDI playback support via FluidSynth
+FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_CMAKE_OFF= -DNO_FLUIDSYNTH:BOOL=ON
+
post-patch:
- @${REINPLACE_CMD} -e 's,"alsa","oss",' ${WRKSRC}/src/MIDIPlayer.cpp
+ @${REINPLACE_CMD} -e 's,"alsa","oss",' \
+ ${WRKSRC}/src/Audio/MIDIPlayer.cpp
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
Modified: head/games/slade/distinfo
==============================================================================
--- head/games/slade/distinfo Tue Mar 1 15:09:07 2016 (r409874)
+++ head/games/slade/distinfo Tue Mar 1 15:56:22 2016 (r409875)
@@ -1,2 +1,2 @@
-SHA256 (sirjuddington-SLADE-3.1.1_b3_GH0.tar.gz) = e91c43484ee1cf916053e368112bb3b7f494d3ee93e48c7185f488461cd69fd8
-SIZE (sirjuddington-SLADE-3.1.1_b3_GH0.tar.gz) = 4395605
+SHA256 (sirjuddington-SLADE-3.1.1_GH0.tar.gz) = da7efc529823772b561a2405dbbc8b59467f3dfc98b9d753af9b1836d3a97529
+SIZE (sirjuddington-SLADE-3.1.1_GH0.tar.gz) = 4368790
Modified: head/games/slade/files/patch-src_CMakeLists.txt
==============================================================================
--- head/games/slade/files/patch-src_CMakeLists.txt Tue Mar 1 15:09:07 2016 (r409874)
+++ head/games/slade/files/patch-src_CMakeLists.txt Tue Mar 1 15:56:22 2016 (r409875)
@@ -19,9 +19,9 @@
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} . ./dumb)
+-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(dumb ${FREEIMAGE_INCLUDE_DIR} ${SFML_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${GTK2_INCLUDE_DIRS} .)
++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})
Copied and modified: head/games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.cpp (from r409874, head/games/slade/files/patch-src_AudioEntryPanel.cpp)
==============================================================================
--- head/games/slade/files/patch-src_AudioEntryPanel.cpp Tue Mar 1 15:09:07 2016 (r409874, copy source)
+++ head/games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.cpp Tue Mar 1 15:56:22 2016 (r409875)
@@ -1,6 +1,6 @@
---- src/AudioEntryPanel.cpp.orig 2015-12-12 08:41:35 UTC
-+++ src/AudioEntryPanel.cpp
-@@ -89,15 +89,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindo
+--- src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp.orig 2016-02-28 02:57:06 UTC
++++ src/MainEditor/UI/EntryPanel/AudioEntryPanel.cpp
+@@ -100,15 +100,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindo
LOG_MESSAGE(3, "Windows Media Player installed, using wxMediaCtrl");
media_ctrl = new wxMediaCtrl(this, -1);
}
@@ -20,14 +20,14 @@
if (media_ctrl) sizer_main->Add(media_ctrl, 0);
#endif
sizer_main->Add(sizer_gb, 0, wxALIGN_CENTER);
-@@ -144,13 +146,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindo
- sound.setVolume(snd_volume);
- music.setVolume(snd_volume);
+@@ -155,13 +157,17 @@ AudioEntryPanel::AudioEntryPanel(wxWindo
+ sound->setVolume(snd_volume);
+ music->setVolume(snd_volume);
theMIDIPlayer->setVolume(snd_volume);
+#if wxUSE_MEDIACTRL
if (media_ctrl) media_ctrl->SetVolume(snd_volume*0.01);
+#endif
- mod.setVolume(snd_volume);
+ mod->setVolume(snd_volume);
//theGMEPlayer->setVolume(snd_volume);
//theOPLPlayer->setVolume(snd_volume);
@@ -38,7 +38,7 @@
toolbar->Show(false);
// Bind events
-@@ -497,6 +503,7 @@ bool AudioEntryPanel::openMod(MemChunk&
+@@ -513,6 +519,7 @@ bool AudioEntryPanel::openMod(MemChunk&
*******************************************************************/
bool AudioEntryPanel::openMedia(string filename)
{
@@ -46,7 +46,7 @@
// Attempt to open with wxMediaCtrl
if (media_ctrl && media_ctrl->Load(filename))
{
-@@ -511,6 +518,7 @@ bool AudioEntryPanel::openMedia(string f
+@@ -527,6 +534,7 @@ bool AudioEntryPanel::openMedia(string f
return true;
}
@@ -54,8 +54,8 @@
return false;
}
-@@ -533,8 +541,10 @@ void AudioEntryPanel::startStream()
- mod.play(); break;
+@@ -549,8 +557,10 @@ void AudioEntryPanel::startStream()
+ mod->play(); break;
case AUTYPE_MIDI:
theMIDIPlayer->play(); break;
+#if wxUSE_MEDIACTRL
@@ -65,8 +65,8 @@
}
}
-@@ -553,8 +563,10 @@ void AudioEntryPanel::stopStream()
- mod.pause(); break;
+@@ -569,8 +579,10 @@ void AudioEntryPanel::stopStream()
+ mod->pause(); break;
case AUTYPE_MIDI:
theMIDIPlayer->pause(); break;
+#if wxUSE_MEDIACTRL
@@ -76,8 +76,8 @@
}
}
-@@ -574,8 +586,10 @@ void AudioEntryPanel::resetStream()
- mod.stop(); break;
+@@ -590,8 +602,10 @@ void AudioEntryPanel::resetStream()
+ mod->stop(); break;
case AUTYPE_MIDI:
theMIDIPlayer->stop(); break;
+#if wxUSE_MEDIACTRL
@@ -87,8 +87,8 @@
}
}
-@@ -757,8 +771,10 @@ void AudioEntryPanel::onTimer(wxTimerEve
- pos = mod.getPlayingOffset().asMilliseconds(); break;
+@@ -773,8 +787,10 @@ void AudioEntryPanel::onTimer(wxTimerEve
+ pos = mod->getPlayingOffset().asMilliseconds(); break;
case AUTYPE_MIDI:
pos = theMIDIPlayer->getPosition(); break;
+#if wxUSE_MEDIACTRL
@@ -98,18 +98,18 @@
}
// Set slider
-@@ -769,7 +785,9 @@ void AudioEntryPanel::onTimer(wxTimerEve
- (audio_type == AUTYPE_SOUND && sound.getStatus() == sf::Sound::Stopped) ||
- (audio_type == AUTYPE_MUSIC && music.getStatus() == sf::Sound::Stopped) ||
- (audio_type == AUTYPE_MOD && mod.getStatus() == sf::Sound::Stopped) ||
+@@ -785,7 +801,9 @@ void AudioEntryPanel::onTimer(wxTimerEve
+ (audio_type == AUTYPE_SOUND && sound->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
(audio_type == AUTYPE_MEDIA && media_ctrl && media_ctrl->GetState() == wxMEDIASTATE_STOPPED) ||
+#endif
(audio_type == AUTYPE_MIDI && theMIDIPlayer && !theMIDIPlayer->isPlaying()))
{
timer_seek->Stop();
-@@ -793,8 +811,10 @@ void AudioEntryPanel::onSliderSeekChange
- mod.setPlayingOffset(sf::milliseconds(slider_seek->GetValue())); break;
+@@ -809,8 +827,10 @@ void AudioEntryPanel::onSliderSeekChange
+ mod->setPlayingOffset(sf::milliseconds(slider_seek->GetValue())); break;
case AUTYPE_MIDI:
theMIDIPlayer->setPosition(slider_seek->GetValue()); break;
+#if wxUSE_MEDIACTRL
@@ -119,8 +119,8 @@
}
}
-@@ -813,8 +833,10 @@ void AudioEntryPanel::onSliderVolumeChan
- music.setVolume(snd_volume); break;
+@@ -829,8 +849,10 @@ void AudioEntryPanel::onSliderVolumeChan
+ music->setVolume(snd_volume); break;
case AUTYPE_MIDI:
theMIDIPlayer->setVolume(snd_volume); break;
+#if wxUSE_MEDIACTRL
@@ -128,5 +128,5 @@
if (media_ctrl) media_ctrl->SetVolume(snd_volume*0.01); break;
+#endif
case AUTYPE_MOD:
- mod.setVolume(snd_volume); break;
+ mod->setVolume(snd_volume); break;
}
Copied and modified: head/games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.h (from r409874, head/games/slade/files/patch-src_AudioEntryPanel.h)
==============================================================================
--- head/games/slade/files/patch-src_AudioEntryPanel.h Tue Mar 1 15:09:07 2016 (r409874, copy source)
+++ head/games/slade/files/patch-src_MainEditor_UI_EntryPanel_AudioEntryPanel.h Tue Mar 1 15:56:22 2016 (r409875)
@@ -1,5 +1,5 @@
---- src/AudioEntryPanel.h.orig 2015-12-12 08:41:35 UTC
-+++ src/AudioEntryPanel.h
+--- src/MainEditor/UI/EntryPanel/AudioEntryPanel.h.orig 2015-12-12 08:41:35 UTC
++++ src/MainEditor/UI/EntryPanel/AudioEntryPanel.h
@@ -27,7 +27,9 @@ private:
wxSlider* slider_seek;
wxSlider* slider_volume;
More information about the svn-ports-all
mailing list