Attachment 175636 Details for Bug 212866 – Fix from upstream.

[patch] Fix from upstream.

patch-games_7kaa (text/plain), 3.95 KB, created by kd-dev on 2016-10-11 19:37:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kd-dev

Created: 2016-10-11 19:37:59 UTC

Size: 3.95 KB

patch

obsolete

>Index: games/7kaa/Makefile
>===================================================================
>--- games/7kaa/Makefile	(revision 423785)
>+++ games/7kaa/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	7kaa
> PORTVERSION=	2.14.6
>+PORTREVISION=	1
> CATEGORIES=	games
> MASTER_SITES=	SF/skfans/7KAA%20${PORTVERSION}
> 
>Index: games/7kaa/files/patch-src_audio_openal_openal__audio.cpp
>===================================================================
>--- games/7kaa/files/patch-src_audio_openal_openal__audio.cpp	(nonexistent)
>+++ games/7kaa/files/patch-src_audio_openal_openal__audio.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/audio/openal/openal_audio.cpp.orig	2016-09-04 17:31:41 UTC
>++++ src/audio/openal/openal_audio.cpp
>+@@ -168,7 +168,8 @@ OpenALAudio::OpenALAudio()
>+ 
>+ OpenALAudio::~OpenALAudio()
>+ {
>+-	this->deinit();
>++	if (this->init_flag != 0)
>++		this->deinit();
>+ }
>+ 
>+ // Initialize the mid driver
>
>Property changes on: games/7kaa/files/patch-src_audio_openal_openal__audio.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: games/7kaa/files/patch-src_client_OMUSIC.cpp
>===================================================================
>--- games/7kaa/files/patch-src_client_OMUSIC.cpp	(nonexistent)
>+++ games/7kaa/files/patch-src_client_OMUSIC.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/client/OMUSIC.cpp.orig	2015-05-19 01:00:20 UTC
>++++ src/client/OMUSIC.cpp
>+@@ -81,7 +81,8 @@ Music::Music()
>+ // -------- begin of function Music::~Music ---------//
>+ Music::~Music()
>+ {
>+-	deinit();
>++	if (init_flag != 0)
>++		deinit();
>+ }
>+ // -------- end of function Music::~Music ---------//
>+ 
>
>Property changes on: games/7kaa/files/patch-src_client_OMUSIC.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: games/7kaa/files/patch-src_client_OSYS.cpp
>===================================================================
>--- games/7kaa/files/patch-src_client_OSYS.cpp	(nonexistent)
>+++ games/7kaa/files/patch-src_client_OSYS.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/client/OSYS.cpp.orig	2016-09-04 17:31:41 UTC
>++++ src/client/OSYS.cpp
>+@@ -240,6 +240,8 @@ void Sys::deinit()
>+ 
>+    //-------------------------------------//
>+ 
>++   deinit_directx();
>++
>+    init_flag = 0;
>+ }
>+ //--------- End of function Sys::deinit ---------//
>
>Property changes on: games/7kaa/files/patch-src_client_OSYS.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: games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp
>===================================================================
>--- games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp	(nonexistent)
>+++ games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/video/sdl/vga_sdl.cpp.orig	2016-09-04 17:31:41 UTC
>++++ src/video/sdl/vga_sdl.cpp
>+@@ -58,7 +58,8 @@ VgaSDL::VgaSDL()
>+ 
>+ VgaSDL::~VgaSDL()
>+ {
>+-   deinit();
>++   if (window != NULL)
>++      deinit();
>+ }
>+ //-------- End of function VgaSDL::~VgaSDL ----------//
>+ 
>
>Property changes on: games/7kaa/files/patch-src_video_sdl_vga__sdl.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

Actions: View | Diff

Attachments on bug 212866: 175017 | 175636