Date: Sat, 25 Apr 2015 14:17:26 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384732 - in head/games/openbor: . files Message-ID: <201504251417.t3PEHQ8A037679@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Apr 25 14:17:25 2015 New Revision: 384732 URL: https://svnweb.freebsd.org/changeset/ports/384732 Log: - Update to r4157 snapshot - Normalize patch filenames ChangeLog (trimmed): - Fix openborvariant("in_sound_options") - Major refactor of WebM playback code - Support playback of WebM videos with no audio track - Support screenshots and fullscreen flip during WebM playback - Fix aspect ratio of WebM videos in OpenGL mode - Fix nestegg bug where all floats would be read as 0.0 on big-endian - Avoid displaying garbage as first frame of video - Improve WebM error logging Added: head/games/openbor/files/patch-sdl_sdlport.c - copied unchanged from r384336, head/games/openbor/files/patch-sdl__sdlport.c head/games/openbor/files/patch-source_ramlib_ram.c - copied, changed from r384336, head/games/openbor/files/patch-source__ramlib__ram.c Deleted: head/games/openbor/files/patch-sdl__sdlport.c head/games/openbor/files/patch-source__ramlib__ram.c Modified: head/games/openbor/Makefile head/games/openbor/distinfo Modified: head/games/openbor/Makefile ============================================================================== --- head/games/openbor/Makefile Sat Apr 25 14:17:15 2015 (r384731) +++ head/games/openbor/Makefile Sat Apr 25 14:17:25 2015 (r384732) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openbor -PORTVERSION= 3.0.r4138 +PORTVERSION= 3.0.r4157 CATEGORIES= games MASTER_SITES= LOCAL/jbeich \ https://svn.code.sf.net/p/${PORTNAME}/engine/engine/:svn Modified: head/games/openbor/distinfo ============================================================================== --- head/games/openbor/distinfo Sat Apr 25 14:17:15 2015 (r384731) +++ head/games/openbor/distinfo Sat Apr 25 14:17:25 2015 (r384732) @@ -1,2 +1,2 @@ -SHA256 (openbor-3.0.r4138.tar.xz) = e99b4c0b6f1bd3eee8332f1a078ebb1d05b08ac5e9b504cde24ef532bb1307a3 -SIZE (openbor-3.0.r4138.tar.xz) = 3451504 +SHA256 (openbor-3.0.r4157.tar.xz) = 727fba847a5af1ece42b42d84ae60c3dbbb4bb9b79ffb1c843e3303edfe9de4c +SIZE (openbor-3.0.r4157.tar.xz) = 3887812 Copied: head/games/openbor/files/patch-sdl_sdlport.c (from r384336, head/games/openbor/files/patch-sdl__sdlport.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openbor/files/patch-sdl_sdlport.c Sat Apr 25 14:17:25 2015 (r384732, copy of r384336, head/games/openbor/files/patch-sdl__sdlport.c) @@ -0,0 +1,30 @@ +--- sdl/sdlport.c.orig 2013-12-29 14:05:10 UTC ++++ sdl/sdlport.c +@@ -6,6 +6,11 @@ + * Copyright (c) 2004 - 2014 OpenBOR Team + */ + ++#include <errno.h> ++#include <unistd.h> ++#include <err.h> ++#include <sys/stat.h> ++ + #include "sdlport.h" + #include "packfile.h" + #include "ram.h" +@@ -92,6 +97,15 @@ int main(int argc, char *argv[]) + #ifdef ANDROID + dirExists(rootDir, 1); + chdir(rootDir); ++#else ++ { ++ if (chdir(getenv("HOME")) != 0) ++ err(1, "cannot cd to $HOME"); ++ if (mkdir(".openbor", 0755) != 0 && errno != EEXIST) ++ err(1, "cannot mkdir $HOME/.openbor"); ++ if (chdir(".openbor") != 0) ++ err(1, "cannot cd to $HOME/.openbor"); ++ } + #endif + dirExists(paksDir, 1); + dirExists(savesDir, 1); Copied and modified: head/games/openbor/files/patch-source_ramlib_ram.c (from r384336, head/games/openbor/files/patch-source__ramlib__ram.c) ============================================================================== --- head/games/openbor/files/patch-source__ramlib__ram.c Mon Apr 20 07:47:39 2015 (r384336, copy source) +++ head/games/openbor/files/patch-source_ramlib_ram.c Sat Apr 25 14:17:25 2015 (r384732) @@ -1,6 +1,6 @@ ---- source/ramlib/ram.c.orig 2013-12-29 14:05:10 UTC +--- source/ramlib/ram.c.orig 2015-04-18 21:21:56 UTC +++ source/ramlib/ram.c -@@ -27,6 +27,21 @@ +@@ -25,6 +25,21 @@ #include <mach/task.h> #include <mach/mach.h> #include <mach/mach_init.h> @@ -22,38 +22,31 @@ #elif LINUX #include <sys/sysinfo.h> #include <unistd.h> -@@ -50,6 +65,8 @@ +@@ -48,7 +63,10 @@ static u64 systemRam = 0x00000000; -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && \ -+ !defined(__FreeBSD_kernel__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #ifndef DARWIN - #ifndef WIN - #ifndef XBOX -@@ -60,10 +77,13 @@ static unsigned long stackSize = 0x00000 +-#if !(defined(WIN) || defined(LINUX) || defined(DARWIN)) ++#if !(defined(WIN) || defined(LINUX) || defined(DARWIN) || \ ++ defined(__DragonFly__) || defined(__FreeBSD__) || \ ++ defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \ ++ defined(__OpenBSD__)) + static unsigned long elfOffset = 0x00000000; + static unsigned long stackSize = 0x00000000; #endif - #endif - #endif -+#endif - +@@ -56,7 +74,10 @@ static unsigned long stackSize = 0x00000 ///////////////////////////////////////////////////////////////////////////// // Symbols -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && \ -+ !defined(__FreeBSD_kernel__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #ifndef DARWIN - #ifndef WIN - #ifndef XBOX -@@ -81,6 +101,7 @@ extern unsigned long start; - #endif - #endif - #endif -+#endif - - ///////////////////////////////////////////////////////////////////////////// - // Functions -@@ -107,6 +128,49 @@ u64 getFreeRam(int byte_size) +-#if !(defined(WIN) || defined(LINUX) || defined(DARWIN)) ++#if !(defined(WIN) || defined(LINUX) || defined(DARWIN) || \ ++ defined(__DragonFly__) || defined(__FreeBSD__) || \ ++ defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \ ++ defined(__OpenBSD__)) + #if (__GNUC__ > 3) + extern unsigned long _end; + extern unsigned long _start; +@@ -93,6 +114,49 @@ u64 getFreeRam(int byte_size) return 0; } return (u64)(((vms.inactive_count + vms.free_count) * size) / byte_size); @@ -103,7 +96,7 @@ #elif LINUX struct sysinfo info; sysinfo(&info); -@@ -147,11 +211,29 @@ void setSystemRam() +@@ -133,11 +197,29 @@ void setSystemRam() stat.dwLength = sizeof(MEMORYSTATUS); GlobalMemoryStatus(&stat); systemRam = stat.dwTotalPhys; @@ -138,24 +131,19 @@ #elif LINUX struct sysinfo info; sysinfo(&info); -@@ -194,6 +276,8 @@ void setSystemRam() +@@ -180,7 +262,10 @@ void setSystemRam() stackSize = 0x00000000; systemRam = getFreeRam(BYTES); #endif -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && \ -+ !defined(__FreeBSD_kernel__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #ifndef DARWIN - #ifndef WIN - #ifndef XBOX -@@ -205,6 +289,7 @@ void setSystemRam() - #endif +-#if !(defined(WIN) || defined(LINUX) || defined(DARWIN) || defined(SYMBIAN)) ++#if !(defined(WIN) || defined(LINUX) || defined(DARWIN) || defined(SYMBIAN) || \ ++ defined(__DragonFly__) || defined(__FreeBSD__) || \ ++ defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \ ++ defined(__OpenBSD__)) + stackSize = (int)&_end - (int)&_start + ((int)&_start - elfOffset); #endif - #endif -+#endif getRamStatus(BYTES); - } - -@@ -234,6 +319,42 @@ u64 getUsedRam(int byte_size) +@@ -212,6 +297,42 @@ u64 getUsedRam(int byte_size) return 0; } return info.resident_size / byte_size;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504251417.t3PEHQ8A037679>