Index: head/games/monster-masher/Makefile =================================================================== --- head/games/monster-masher/Makefile (revision 478529) +++ head/games/monster-masher/Makefile (revision 478530) @@ -1,32 +1,32 @@ # Created by: Koop Mast # $FreeBSD$ 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 DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org COMMENT= Gnomemm puzzle game where you have to clean the caves of monsters LIB_DEPENDS= libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \ libgconfmm-2.6.so:devel/gconfmm26 \ libglademm-2.4.so:devel/libglademm24 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 post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/src/pixbuf-drawing.hpp .include Index: head/games/monster-masher/files/patch-src_sound.cpp =================================================================== --- head/games/monster-masher/files/patch-src_sound.cpp (nonexistent) +++ head/games/monster-masher/files/patch-src_sound.cpp (revision 478530) @@ -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 +-#include +- + #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); + } Property changes on: head/games/monster-masher/files/patch-src_sound.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property