Re: update alephone and marathon game files

2020-09-12 Thread Pamela Mosiejczuk
Sound, normal/windowed mode, gameplay all fine. Tested local network 
play with kmos@ (pew pew pew!)


OK pamela@

On 2020-09-11 16:22, Peter Hessler wrote:

Update for AlephOne and the Marathon game files to the recent 1.3.1 release.

Major Changes:
 Uses SDL 2 for much-improved compatibility with new operating systems
 Better support for game controllers
 Better performance for the software renderer
 Improved mouse control options, with settings for Classic and Modern
 mouse control
 Better support for high-dpi displays
 New controls dialog, which allows simultaneous key, mouse, and
 controller bindings
 More authentic static effect when using OpenGL
 Adds a stash for sharing info between Lua states
 Better support for Unicode characters in Windows (should fix Rubicon X)
 Better support for original Marathon scenarios including Trojan,
 which now works fully
 A separate 64-bit Windows build is available
 Better master volume and music volume controls
 Video export bitrate depends on the video resolution, which leads to
 much improved export at 1080p with default settings
 Mac apps are now notarized by Apple
 Original games now default to more authentic settings on first
 install; high res plugins are still included but are not enabled by 
default

Plays well for me on amd64

OK?


Index: games/alephone/alephone/Makefile
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- games/alephone/alephone/Makefile12 Jul 2019 20:46:14 -  1.30
+++ games/alephone/alephone/Makefile11 Sep 2020 18:06:10 -
@@ -1,12 +1,13 @@
  # $OpenBSD: Makefile,v 1.30 2019/07/12 20:46:14 sthen Exp $
  
+DPB_PROPERTIES =	parallel

+
  DIST_SUBDIR ?=alephone
  COMMENT = open source game engine based on Marathon 2: Durandal
  
-DATE =			20150620

+DATE = 20200904
  DISTNAME =AlephOne-${DATE}
-PKGNAME =  alephone-1.2.1
-REVISION = 6
+PKGNAME =  alephone-1.3.1
  
  EXTRACT_SUFX =		.tar.bz2

  CATEGORIES =  games x11
@@ -20,10 +21,10 @@ PERMIT_PACKAGE =Yes
  
  MASTER_SITES =		https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${DATE}/
  
-WANTLIB +=		GL GLU c m pthread ${COMPILER_LIBCXX} z

-WANTLIB += SDL SDL_net SDL_image SDL_ttf mad png sndfile
-WANTLIB += smpeg speex speexdsp vorbisfile zzip
-WANTLIB += avcodec avformat avutil swscale boost_filesystem boost_system curl
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
+WANTLIB += SDL2_ttf avcodec avformat avutil boost_filesystem boost_system
+WANTLIB += c curl expat m mad png sndfile speex speexdsp swscale
+WANTLIB += vorbisfile z zzip
  
  COMPILER =		base-clang ports-gcc base-gcc
  
@@ -31,10 +32,9 @@ BUILD_DEPENDS =		devel/automake/${AUTOMA

devel/autoconf/${AUTOCONF_VER}
  LIB_DEPENDS = archivers/zziplib \
devel/boost \
-   devel/sdl-net \
-   devel/sdl-image \
-   devel/sdl-ttf \
-   devel/smpeg \
+   devel/sdl2-net \
+   devel/sdl2-image \
+   devel/sdl2-ttf \
audio/libmad \
audio/libsndfile \
audio/speex \
@@ -42,11 +42,15 @@ LIB_DEPENDS =   archivers/zziplib \
graphics/ffmpeg \
net/curl
  
+RUN_DEPENDS =		devel/desktop-file-utils \

+   x11/gtk+3,-guic \
+   misc/shared-mime-info
+
  USE_BZIP2 =   Yes
  USE_GMAKE =   Yes
  CONFIGURE_STYLE = gnu
-AUTOCONF_VER = 2.61
-AUTOMAKE_VER = 1.9
+AUTOCONF_VER = 2.65
+AUTOMAKE_VER = 1.16
  CONFIGURE_ENV =   AUTOCONF_VERSION=${AUTOCONF_VER} \
AUTOMAKE_VERSION=${AUTOMAKE_VER} \
CPPFLAGS=-I${LOCALBASE}/include
Index: games/alephone/alephone/distinfo
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- games/alephone/alephone/distinfo2 Feb 2016 10:17:44 -   1.10
+++ games/alephone/alephone/distinfo11 Sep 2020 13:08:40 -
@@ -1,2 +1,2 @@
-SHA256 (alephone/AlephOne-20150620.tar.bz2) = 
wPNg37dKYmT5XTdRA6dAAJMM8EOf+wRk+RX1N5RD4TM=
-SIZE (alephone/AlephOne-20150620.tar.bz2) = 5031898
+SHA256 (alephone/AlephOne-20200904.tar.bz2) = 
kCJ6tt2shq+LGO7uIt/Etm6+CDl5829wnLc0nG4dk40=
+SIZE (alephone/AlephOne-20200904.tar.bz2) = 5567722
Index: games/alephone/alephone/patches/patch-Source_Files_FFmpeg_

update alephone and marathon game files

2020-09-11 Thread Peter Hessler
Update for AlephOne and the Marathon game files to the recent 1.3.1 release.

Major Changes:
Uses SDL 2 for much-improved compatibility with new operating systems
Better support for game controllers
Better performance for the software renderer
Improved mouse control options, with settings for Classic and Modern
mouse control
Better support for high-dpi displays
New controls dialog, which allows simultaneous key, mouse, and
controller bindings
More authentic static effect when using OpenGL
Adds a stash for sharing info between Lua states
Better support for Unicode characters in Windows (should fix Rubicon X)
Better support for original Marathon scenarios including Trojan,
which now works fully
A separate 64-bit Windows build is available
Better master volume and music volume controls
Video export bitrate depends on the video resolution, which leads to
much improved export at 1080p with default settings
Mac apps are now notarized by Apple
Original games now default to more authentic settings on first
install; high res plugins are still included but are not enabled by 
default

Plays well for me on amd64

OK?


Index: games/alephone/alephone/Makefile
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- games/alephone/alephone/Makefile12 Jul 2019 20:46:14 -  1.30
+++ games/alephone/alephone/Makefile11 Sep 2020 18:06:10 -
@@ -1,12 +1,13 @@
 #  $OpenBSD: Makefile,v 1.30 2019/07/12 20:46:14 sthen Exp $
 
+DPB_PROPERTIES =   parallel
+
 DIST_SUBDIR ?= alephone
 COMMENT =  open source game engine based on Marathon 2: Durandal
 
-DATE = 20150620
+DATE = 20200904
 DISTNAME = AlephOne-${DATE}
-PKGNAME =  alephone-1.2.1
-REVISION = 6
+PKGNAME =  alephone-1.3.1
 
 EXTRACT_SUFX = .tar.bz2
 CATEGORIES =   games x11
@@ -20,10 +21,10 @@ PERMIT_PACKAGE =Yes
 
 MASTER_SITES = 
https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${DATE}/
 
-WANTLIB += GL GLU c m pthread ${COMPILER_LIBCXX} z
-WANTLIB += SDL SDL_net SDL_image SDL_ttf mad png sndfile
-WANTLIB += smpeg speex speexdsp vorbisfile zzip
-WANTLIB += avcodec avformat avutil swscale boost_filesystem boost_system curl
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
+WANTLIB += SDL2_ttf avcodec avformat avutil boost_filesystem boost_system
+WANTLIB += c curl expat m mad png sndfile speex speexdsp swscale
+WANTLIB += vorbisfile z zzip
 
 COMPILER = base-clang ports-gcc base-gcc
 
@@ -31,10 +32,9 @@ BUILD_DEPENDS =  devel/automake/${AUTOMA
devel/autoconf/${AUTOCONF_VER}
 LIB_DEPENDS =  archivers/zziplib \
devel/boost \
-   devel/sdl-net \
-   devel/sdl-image \
-   devel/sdl-ttf \
-   devel/smpeg \
+   devel/sdl2-net \
+   devel/sdl2-image \
+   devel/sdl2-ttf \
audio/libmad \
audio/libsndfile \
audio/speex \
@@ -42,11 +42,15 @@ LIB_DEPENDS =   archivers/zziplib \
graphics/ffmpeg \
net/curl
 
+RUN_DEPENDS =  devel/desktop-file-utils \
+   x11/gtk+3,-guic \
+   misc/shared-mime-info
+
 USE_BZIP2 =Yes
 USE_GMAKE =Yes
 CONFIGURE_STYLE =  gnu
-AUTOCONF_VER = 2.61
-AUTOMAKE_VER = 1.9
+AUTOCONF_VER = 2.65
+AUTOMAKE_VER = 1.16
 CONFIGURE_ENV =AUTOCONF_VERSION=${AUTOCONF_VER} \
AUTOMAKE_VERSION=${AUTOMAKE_VER} \
CPPFLAGS=-I${LOCALBASE}/include
Index: games/alephone/alephone/distinfo
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- games/alephone/alephone/distinfo2 Feb 2016 10:17:44 -   1.10
+++ games/alephone/alephone/distinfo11 Sep 2020 13:08:40 -
@@ -1,2 +1,2 @@
-SHA256 (alephone/AlephOne-20150620.tar.bz2) = 
wPNg37dKYmT5XTdRA6dAAJMM8EOf+wRk+RX1N5RD4TM=
-SIZE (alephone/AlephOne-20150620.tar.bz2) = 5031898
+SHA256 (alephone/AlephOne-20200904.tar.bz2) = 
kCJ6tt2shq+LGO7uIt/Etm6+CDl5829wnLc0nG4dk40=
+SIZE (alephone/AlephOne-20200904.tar.bz2) = 5567722
Index: games/alephone/alephone/patches/patch-Source_Files_FFmpeg_Movie_cpp
===
RCS file: games/alephone/alephone/patches/patch-