mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-05 06:27:37 +00:00
games/monster-masher: Remove esound dependency
Since libgnome 2.30 gnome_sound_connection_get() always returns -1 [1], so calling esd_sample_play() can never work. [1] https://developer.gnome.org/libgnome/stable/libgnome-gnome-sound.html#gnome-sound-connection-get PR: 230695 Submitted by: tobik Approved by: kwm (maintainer timeout, 2 weeks)
This commit is contained in:
parent
4ee3a387ce
commit
5217212a38
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=478530
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= monster
|
||||
PORTVERSION= 1.8.1
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= games gnome
|
||||
MASTER_SITES= http://people.iola.dk/olau/monster-masher/source/
|
||||
PKGNAMESUFFIX= -masher
|
||||
@ -18,10 +18,10 @@ LIB_DEPENDS= libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \
|
||||
|
||||
USES= compiler:c++11-lang pathfix gettext gmake pkgconfig tar:bzip2
|
||||
USE_CXXSTD= c++11
|
||||
USE_GNOME= gnomeprefix intlhack libgnome esound
|
||||
USE_GNOME= gnomeprefix intlhack libgnome
|
||||
GNU_CONFIGURE= yes
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib -lesd
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
|
||||
GCONF_SCHEMAS= monster-masher.schemas
|
||||
|
||||
|
33
games/monster-masher/files/patch-src_sound.cpp
Normal file
33
games/monster-masher/files/patch-src_sound.cpp
Normal file
@ -0,0 +1,33 @@
|
||||
Remove esound dependency. In recent versions of libgnome,
|
||||
gnome_sound_connection_get() always returns -1, so esd_sample_play()
|
||||
can never work.
|
||||
|
||||
--- src/sound.cpp.orig 2018-08-17 12:52:26 UTC
|
||||
+++ src/sound.cpp
|
||||
@@ -18,9 +18,6 @@
|
||||
* USA.
|
||||
*/
|
||||
|
||||
-#include <libgnome/gnome-sound.h>
|
||||
-#include <esd.h>
|
||||
-
|
||||
#include "sound.hpp"
|
||||
|
||||
|
||||
@@ -40,16 +37,4 @@ Sound::~Sound()
|
||||
|
||||
void Sound::play(const std::string &name)
|
||||
{
|
||||
- int id;
|
||||
-
|
||||
- cache_map::iterator i = cache.find(name);
|
||||
- if (i != cache.end())
|
||||
- id = i->second;
|
||||
- else {
|
||||
- id = gnome_sound_sample_load(name.c_str(),
|
||||
- (MONSTER_MASHER_SOUND_DIR + name).c_str());
|
||||
- cache.insert(make_pair(name, id));
|
||||
- }
|
||||
-
|
||||
- esd_sample_play(gnome_sound_connection_get(), id);
|
||||
}
|
Loading…
Reference in New Issue
Block a user