Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 21 Aug 2020 10:19:10 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545585 - in head/games/sdlpop: . files
Message-ID:  <202008211019.07LAJA88039233@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pkubaj
Date: Fri Aug 21 10:19:10 2020
New Revision: 545585
URL: https://svnweb.freebsd.org/changeset/ports/545585

Log:
  games/sdlpop: update to 1.21

Modified:
  head/games/sdlpop/Makefile
  head/games/sdlpop/distinfo
  head/games/sdlpop/files/patch-seg009.c

Modified: head/games/sdlpop/Makefile
==============================================================================
--- head/games/sdlpop/Makefile	Fri Aug 21 10:10:10 2020	(r545584)
+++ head/games/sdlpop/Makefile	Fri Aug 21 10:19:10 2020	(r545585)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdlpop
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.20
+DISTVERSION=	1.21
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org

Modified: head/games/sdlpop/distinfo
==============================================================================
--- head/games/sdlpop/distinfo	Fri Aug 21 10:10:10 2020	(r545584)
+++ head/games/sdlpop/distinfo	Fri Aug 21 10:19:10 2020	(r545585)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571059593
-SHA256 (NagyD-SDLPoP-v1.20_GH0.tar.gz) = dbb75398dee2224bcee648602ad23e469b936a2b7ea962a8a01b091b989f25b6
-SIZE (NagyD-SDLPoP-v1.20_GH0.tar.gz) = 623338
+TIMESTAMP = 1598004600
+SHA256 (NagyD-SDLPoP-v1.21_GH0.tar.gz) = b252fbc931498057499787aa293917636c4f217d860b432df0f53cfa49b02b49
+SIZE (NagyD-SDLPoP-v1.21_GH0.tar.gz) = 627869

Modified: head/games/sdlpop/files/patch-seg009.c
==============================================================================
--- head/games/sdlpop/files/patch-seg009.c	Fri Aug 21 10:10:10 2020	(r545584)
+++ head/games/sdlpop/files/patch-seg009.c	Fri Aug 21 10:19:10 2020	(r545585)
@@ -1,16 +1,16 @@
---- seg009.c.orig	2018-03-17 16:33:14 UTC
+--- seg009.c.orig	2020-08-20 18:22:40 UTC
 +++ seg009.c
-@@ -192,7 +192,7 @@ static FILE* open_dat_from_root_or_data_
+@@ -327,7 +327,7 @@ static FILE* open_dat_from_root_or_data_dir(const char
  	// if failed, try if the DAT file can be opened in the data/ directory, instead of the main folder
  	if (fp == NULL) {
  		char data_path[POP_MAX_PATH];
--		snprintf(data_path, sizeof(data_path), "data/%s", filename);
-+		snprintf(data_path, sizeof(data_path), "%%DATADIR%%/%s", filename);
+-		snprintf_check(data_path, sizeof(data_path), "data/%s", filename);
++		snprintf_check(data_path, sizeof(data_path), "%%DATADIR%%/%s", filename);
  
          if (!file_exists(data_path)) {
              find_exe_dir();
-@@ -1755,7 +1755,7 @@ const int max_sound_id = 58;
- char** sound_names = NULL;
+@@ -1949,7 +1949,7 @@ const int sound_channel = 0;
+ const int max_sound_id = 58;
  
  void load_sound_names() {
 -	const char* names_path = locate_file("data/music/names.txt");
@@ -18,16 +18,16 @@
  	if (sound_names != NULL) return;
  	FILE* fp = fopen(names_path,"rt");
  	if (fp==NULL) return;
-@@ -1805,7 +1805,7 @@ sound_buffer_type* load_sound(int index)
+@@ -1999,7 +1999,7 @@ sound_buffer_type* load_sound(int index) {
  					fp = fopen(filename, "rb");
  				}
  				if (fp == NULL && !skip_normal_data_files) {
--					snprintf(filename, sizeof(filename), "data/music/%s.ogg", sound_name(index));
-+					snprintf(filename, sizeof(filename), "%%DATADIR%%/music/%s.ogg", sound_name(index));
+-					snprintf_check(filename, sizeof(filename), "data/music/%s.ogg", sound_name(index));
++					snprintf_check(filename, sizeof(filename), "%%DATADIR%%/music/%s.ogg", sound_name(index));
  					fp = fopen(locate_file(filename), "rb");
  				}
  				if (fp == NULL) {
-@@ -2108,7 +2108,7 @@ void __pascal far set_gr_mode(byte grmod
+@@ -2304,7 +2304,7 @@ void __pascal far set_gr_mode(byte grmode) {
  	SDL_SetHint(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, "1");
  #endif
  	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE |
@@ -36,7 +36,7 @@
  		sdlperror("SDL_Init");
  		quit(1);
  	}
-@@ -2147,7 +2147,7 @@ void __pascal far set_gr_mode(byte grmod
+@@ -2363,7 +2363,7 @@ void __pascal far set_gr_mode(byte grmode) {
  #endif
  	}
  
@@ -45,12 +45,12 @@
  	if (icon == NULL) {
  		sdlperror("Could not load icon");
  	} else {
-@@ -2364,7 +2364,7 @@ void load_from_opendats_metadata(int res
+@@ -2580,7 +2580,7 @@ void load_from_opendats_metadata(int resource_id, cons
  			if (len >= 5 && filename_no_ext[len-4] == '.') {
  				filename_no_ext[len-4] = '\0'; // terminate, so ".DAT" is deleted from the filename
  			}
--			snprintf(image_filename,sizeof(image_filename),"data/%s/res%d.%s",filename_no_ext, resource_id, extension);
-+			snprintf(image_filename,sizeof(image_filename),"%%DATADIR%%/%s/res%d.%s",filename_no_ext, resource_id, extension);
+-			snprintf_check(image_filename,sizeof(image_filename),"data/%s/res%d.%s",filename_no_ext, resource_id, extension);
++			snprintf_check(image_filename,sizeof(image_filename),"%%DATADIR%%/%s/res%d.%s",filename_no_ext, resource_id, extension);
  			if (!use_custom_levelset) {
  				//printf("loading (binary) %s",image_filename);
  				fp = fopen(locate_file(image_filename), "rb");

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008211019.07LAJA88039233>