Attachment 213670 Details for Bug 245771 – additional improvements on top of submitter's patch

[patch] additional improvements on top of submitter's patch

games_alephone.diff (text/plain), 10.19 KB, created by Fernando Apesteguía on 2020-04-22 07:56:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2020-04-22 07:56:49 UTC

Size: 10.19 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 532184)
>+++ Makefile	(working copy)
>@@ -2,21 +2,28 @@
> # $FreeBSD$
> 
> PORTNAME=	alephone
>-PORTVERSION=	20150620
>-PORTREVISION=	20
>+DISTVERSION=	20190331
> CATEGORIES=	games
>-MASTER_SITES=	SF/marathon/Aleph%20One/2015-06-20
>-DISTNAME=	AlephOne-${PORTVERSION}
> 
> MAINTAINER=	fiziologus@gmail.com
>-COMMENT=	The open source version of Bungie's Marathon game
>+COMMENT=	Open source version of Bungie's Marathon game
> 
>+LICENSE=	GPLv3
>+
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
>+LIB_DEPENDS=	libexpat.so:textproc/expat2
> 
>-USES=		compiler:c++11-lang gl gmake localbase pkgconfig sdl tar:bzip2 
>-USE_CXXSTD=	gnu++98
>-USE_SDL=	image net sdl ttf
>-USE_GL=		yes
>+
>+USES=		autoreconf compiler:c++11-lang gmake localbase \
>+		pkgconfig shared-mime-info sdl gl tar:bzip2
>+
>+USE_SDL=	sdl2 image2 net2 ttf2
>+USE_GL=		gl glu
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	Aleph-One-Marathon
>+GH_TAGNAME=	release-20190331
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-alsa
> 
>@@ -25,7 +32,7 @@
> DATADIR=	${PREFIX}/share/AlephOne
> 
> OPTIONS_DEFINE=	MAD FFMPEG OGG SPEEX SMPEG ZZIP PNG CURL SNDFILE DOCS
>-OPTIONS_DEFAULT=MAD OGG SPEEX SMPEG ZZIP PNG CURL SNDFILE
>+OPTIONS_DEFAULT=MAD FFMPEG OGG SPEEX SMPEG ZZIP PNG CURL SNDFILE
> 
> FFMPEG_DESC=	Use ffmpeg for film export and playback
> SMPEG_DESC=	Use SMPEG for movie playback
>@@ -33,7 +40,6 @@
> 
> MAD_LIB_DEPENDS=	libmad.so:audio/libmad
> MAD_CONFIGURE_WITH=	mad
>-FFMPEG_BROKEN=		fails to build with FFMPEG=on
> FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
> FFMPEG_CONFIGURE_WITH=	ffmpeg
> OGG_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
>@@ -40,7 +46,7 @@
> OGG_CONFIGURE_WITH=	vorbis
> SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
> SPEEX_CONFIGURE_WITH=	speex
>-SMPEG_LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
>+SMPEG_LIB_DEPENDS=	libsmpeg2.so:multimedia/smpeg2
> SMPEG_CONFIGURE_WITH=	smpeg
> ZZIP_LIB_DEPENDS=	libzzip.so:devel/zziplib
> ZZIP_CONFIGURE_WITH=	zzip
>Index: distinfo
>===================================================================
>--- distinfo	(revision 532184)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (AlephOne-20150620.tar.bz2) = c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133
>-SIZE (AlephOne-20150620.tar.bz2) = 5031898
>+TIMESTAMP = 1587472217
>+SHA256 (Aleph-One-Marathon-alephone-20190331-release-20190331_GH0.tar.gz) = eee993933d7c24c4dbf8caf5a0fc41ec98cbff31c9f99564de2781030a0ec2f2
>+SIZE (Aleph-One-Marathon-alephone-20190331-release-20190331_GH0.tar.gz) = 6677609
>Index: files/patch-Source__Files_Misc_interface.cpp
>===================================================================
>--- files/patch-Source__Files_Misc_interface.cpp	(nonexistent)
>+++ files/patch-Source__Files_Misc_interface.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- Source_Files/Misc/interface.cpp.orig	2019-04-01 02:56:30 UTC
>++++ Source_Files/Misc/interface.cpp
>+@@ -150,7 +150,7 @@ extern TP2PerfGlobals perf_globals;
>+ #include "Statistics.h"
>+ 
>+ #ifdef HAVE_SMPEG
>+-#include <smpeg/smpeg.h>
>++#include <smpeg2/smpeg.h>
>+ #endif
>+ #ifdef HAVE_FFMPEG
>+ #include "SDL_ffmpeg.h"
>
>Property changes on: files/patch-Source__Files_Misc_interface.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
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(nonexistent)
>+++ files/patch-configure.ac	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2019-04-01 02:56:30 UTC
>++++ configure.ac
>+@@ -267,7 +267,7 @@ AX_CHECK_FEATURE_PKG([vorbis], [VORBISFILE],
>+                      [VORBISFILE], [vorbisfile])
>+ 
>+ AX_CHECK_FEATURE_LIB([smpeg], [SMPEG],
>+-                     [smpeg/smpeg.h], [smpeg], [SMPEG_new])
>++                     [smpeg2/smpeg.h], [smpeg2], [SMPEG_new])
>+ 
>+ AX_CHECK_FEATURE_PKG([speex], [SPEEX], [speex], [speex])
>+ AS_IF([test "x$have_speex" = "xtrue"],
>
>Property changes on: files/patch-configure.ac
>___________________________________________________________________
>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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 532184)
>+++ pkg-plist	(working copy)
>@@ -45,3 +45,85 @@
> %%DATADIR%%/Plugins/Default_Theme/tiny_button_c.bmp
> %%DATADIR%%/Plugins/Default_Theme/tiny_button_l.bmp
> %%DATADIR%%/Plugins/Default_Theme/tiny_button_r.bmp
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/128x128/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/128x128/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/16x16/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/16x16/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/22x22/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/22x22/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/24x24/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/24x24/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/256x256/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/256x256/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/32x32/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/32x32/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/48x48/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/48x48/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/64x64/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/64x64/mimetypes/text-x-alephone-mml.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-fila.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-imga.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-musa.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-phya.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-scea.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-sgaa.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-shpa.png
>+share/icons/hicolor/96x96/mimetypes/application-x-alephone-snda.png
>+share/icons/hicolor/96x96/mimetypes/text-x-alephone-mml.png
>+share/mime/packages/alephone.xml

Flags:

fernape: maintainer-approval? (fiziologus)

Actions: View | Diff

Attachments on bug 245771: 213613 | 213634 | 213667 | 213670 | 213674