<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/06dc4154c3609bbd46886046f4ec408c04a2a04d">https://github.com/macports/macports-ports/commit/06dc4154c3609bbd46886046f4ec408c04a2a04d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 06dc415 scummvm: update to 1.90, add devel subport
</span>06dc415 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 06dc4154c3609bbd46886046f4ec408c04a2a04d
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sat Jun 24 15:49:31 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> scummvm: update to 1.90, add devel subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> enables all possible features
</span><span style='display:block; white-space:pre;color:#404040;'> assume maintainership
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/53847
</span>---
emulators/scummvm/Portfile | 136 +++++++++++++++++----
.../scummvm/files/patch-scummvm-sdl2indet.diff | 11 ++
2 files changed, 123 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/Portfile b/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87cffc3..f50d52d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +1,132 @@
</span> PortSystem 1.0
name scummvm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.7.0
</span> platforms darwin
categories emulators games
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:ken.cunningham.webuse @kencu} openmaintainer
</span> license {GPL-2 BSD}
description cross-platform interpreter for several adventure engines
long_description \
ScummVM is a cross-platform interpreter for several point-and-click \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- adventure engines. This includes all SCUMM-based adventures by LucasArts, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Simon the Sorcerer by AdventureSoft, and Beneath a Steel Sky and Broken \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Sword 2 by Revolution.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adventure engines. A current list of playable games is available at \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <https://www.scummvm.org/compatibility/>.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://scummvm.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/${name}/${name}/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9c70db2cdc6631d6d8d6ac108c0cd58f1387e030
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://scummvm.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port follows the release version of ${name}, which is typically updated every \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 6 months. If for some reason this port does not build or function as desired, try \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the ${name}-devel port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites http://scummvm.org/frs/${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums sha256 813d7d8a76e3d05b45001d37451368711dadc32899ecf907df1cc7abfb1754d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 464a5039b7e1391141c223825f166d74f2bef3aa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port follows the master version of ${name}, which is typically updated every few weeks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup scummvm scummvm 9bb9c0d58eea71292d05b4e5515c48ba53d1f194
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3c52f92a5e3b2c91cc0257cc3964ad64af2239fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 263984780c5e4ba5cad671198dda8fa3b7f0a04beaea2dbe0b7640a4c7e0fa10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-scummvm-sdl2indet.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libsdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_net \
</span> port:libmad \
port:libogg \
port:libvorbis \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-sdl-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mad-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ogg-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-vorbis-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-flac-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zlib-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtheora \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fluidsynth \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:faad2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libedit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:portaudio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span> --enable-release \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-plugins \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --default-dynamic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sdlnet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libcurl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-theoradec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-all-engines \
</span> --enable-verbose-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args INSTALL=/usr/bin/install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant cxx11 description {build with c++11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # scummvm builds fine without c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # I'm not sure if there is any advantage to enabling c++11 support at present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but keep it here as a variant in case someone finds there is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-c++11
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mpeg2 description {add mpeg2 support - has many dependencies} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this builds fine, but libmpeg2 is old (2008) and pulls in a lot of deps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and I'm not sure if any games actually use this - make it optional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-mpeg2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmpeg2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python2_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-kbproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXau \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXdmcp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libice \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libpthread-stubs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libxcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-randrproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-renderproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-videoproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xcb-proto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xextproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/patch-scummvm-sdl2indet.diff b/emulators/scummvm/files/patch-scummvm-sdl2indet.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1f6f6df73
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/files/patch-scummvm-sdl2indet.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.old 2017-03-22 17:12:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-03-22 17:13:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1254,7 +1254,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sdlnet-prefix=*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arg=`echo $ac_option | cut -d '=' -f 2`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SDL_NET_CFLAGS="-I$arg/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SDL_NET_CFLAGS="-I$arg/include/SDL2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_NET_LIBS="-L$arg/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --backend=*)
</span></pre><pre style='margin:0'>
</pre>