Date: Fri, 31 Aug 2018 08:46:10 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478530 - in head/games/monster-masher: . files Message-ID: <201808310846.w7V8kAlj049249@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Aug 31 08:46:10 2018 New Revision: 478530 URL: https://svnweb.freebsd.org/changeset/ports/478530 Log: 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) Added: head/games/monster-masher/files/patch-src_sound.cpp (contents, props changed) Modified: head/games/monster-masher/Makefile Modified: head/games/monster-masher/Makefile ============================================================================== --- head/games/monster-masher/Makefile Fri Aug 31 08:16:18 2018 (r478529) +++ head/games/monster-masher/Makefile Fri Aug 31 08:46:10 2018 (r478530) @@ -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/libgnome 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 Added: head/games/monster-masher/files/patch-src_sound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/monster-masher/files/patch-src_sound.cpp Fri Aug 31 08:46:10 2018 (r478530) @@ -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); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808310846.w7V8kAlj049249>