cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to valyriatear-1.1.0

Browse Source 
Changelog: https://github.com/ValyriaTear/ValyriaTear/releases/tag/1.1.0
ok solene@
This commit is contained in:
bcallah 2019-09-22 21:39:53 +00:00
parent c3efcb09f4
commit e7fa670ef5
12 changed files with 1686 additions and 1776 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
games/valyriatear/Makefile
View File

@ -1,14 +1,10 @@
# $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:26 sthen Exp $
# $OpenBSD: Makefile,v 1.28 2019/09/22 21:39:53 bcallah Exp $
V = 1.1.0
COMMENT = free J-RPG game
DISTNAME = ValyriaTear-src-with-deps-${V}
PKGNAME = valyriatear-${V}
CATEGORIES = games x11
REVISION = 10
PKGNAME = valyriatear-${GH_TAGNAME}
GH_ACCOUNT = Bertram25
GH_PROJECT = ValyriaTear
GH_TAGNAME = 1.0.0
HOMEPAGE = https://valyriatear.blogspot.com/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@ -16,14 +12,17 @@ MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# Main game is GPLv2+
# Art/music a variety of CC and GPL.
# Fonts are OFL 1.1
# For specific details, see the LICENSES file.
# For specific details, see the LICENSES.txt file.
PERMIT_PACKAGE = Yes
WANTLIB += GL GLU ICE SDL SDL_image SDL_ttf SM X11 Xext c iconv intl m
WANTLIB += ogg openal png pthread ${COMPILER_LIBCXX} vorbis vorbisfile
WANTLIB += z ${MODLUA_WANTLIB}
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE SDL2 SDL2_image
WANTLIB += SDL2_ttf SM X11 Xext c iconv intl lua5.1 m ogg openal
WANTLIB += png vorbis vorbisfile z
COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES = https://github.com/ValyriaTear/ValyriaTear/releases/download/${V}/
# C++11
COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/lua
@ -34,24 +33,21 @@ BUILD_DEPENDS = devel/boost>=1.52 \
LIB_DEPENDS = audio/libogg \
audio/libvorbis \
audio/openal \
devel/sdl-image \
devel/sdl-ttf
devel/sdl2-image \
devel/sdl2-ttf \
graphics/glew
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
# PCH (Precompiled Headers) are known to be broken so disable
# the use of PCH.
CONFIGURE_ARGS+= -DUSE_PCH_COMPILATION=Off
WRKDIST = ${WRKDIR}/ValyriaTear-${GH_TAGNAME}
WRKDIST = ${WRKDIR}/ValyriaTear
NO_TEST = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/valyriatear
${INSTALL_DATA} ${WRKSRC}/{COPYING.{CC{-BY-3,-BY-SA-3,0},GPL-{2,3}},LICENSES,MANUAL} ${PREFIX}/share/doc/valyriatear
${INSTALL_DATA} ${WRKSRC}/img/fonts/{GPL,OFL-1.1}.txt ${PREFIX}/share/doc/valyriatear
${INSTALL_DATA} ${WRKSRC}/{COPYING.{CC{-BY-3,-BY-SA-3,0},GPL-{2,3}},LICENSES.txt,MANUAL} ${PREFIX}/share/doc/valyriatear
${INSTALL_DATA} ${WRKSRC}/data/fonts/{GPL,OFL-1.1}.txt ${PREFIX}/share/doc/valyriatear
${INSTALL_MAN} ${WRKSRC}/doc/valyriatear.6 ${PREFIX}/man/man6
.include <bsd.port.mk>

4
games/valyriatear/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ValyriaTear-1.0.0.tar.gz) = z7b8Gh+2d95MZ9IJJFbMRTxneJBZJ0CKlyMNA87cWh4=
SIZE (ValyriaTear-1.0.0.tar.gz) = 100847837
SHA256 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = M9fDqmpCBHDPZRYxoIWsyxwYmRehO+oN579SG4dkVXg=
SIZE (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 117039173

6
games/valyriatear/patches/patch-src_CMakeLists_txt
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2018/10/24 09:42:44 bentley Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.4 2019/09/22 21:39:53 bcallah Exp $
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -87,6 +87,7 @@ IF (NOT DISABLE_TRANSLATIONS)
FIND_PACKAGE(LibIntl REQUIRED)
@@ -109,6 +109,7 @@ IF (NOT DISABLE_TRANSLATIONS)
FIND_PACKAGE(LibIconv REQUIRED)
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
FIND_PACKAGE(LibIntl REQUIRED)
+ SET(EXTRA_LIBRARIES iconv)

16
games/valyriatear/patches/patch-src_common_options_handler_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_common_options_handler_cpp,v 1.1 2018/04/28 18:10:04 bcallah Exp $
clang6 fix
Index: src/common/options_handler.cpp
--- src/common/options_handler.cpp.orig
+++ src/common/options_handler.cpp
@@ -618,7 +618,7 @@ void GameOptionsMenuHandler::_RefreshLanguageOptions()
_language_options_menu.SetSelection(0);
if (warnAboutMissingFiles) {
- std::string mo_filename = lang + "/LC_MESSAGES/"APPSHORTNAME".mo";
+ std::string mo_filename = lang + "/LC_MESSAGES/" APPSHORTNAME ".mo";
PRINT_WARNING << "Couldn't locate gettext .mo file: '" << mo_filename << "'." << std::endl
<< "The " << lang << " translation will be disabled." << std::endl;
}

16
games/valyriatear/patches/patch-src_engine_system_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_engine_system_cpp,v 1.1 2018/04/28 18:10:04 bcallah Exp $
clang6 fix
Index: src/engine/system.cpp
--- src/engine/system.cpp.orig
+++ src/engine/system.cpp
@@ -351,7 +351,7 @@ bool SystemEngine::IsLanguageAvailable(const std::stri
std::string mo_filename = _Reinitl10n();
mo_filename.append("/");
mo_filename.append(lang);
- mo_filename.append("/LC_MESSAGES/"APPSHORTNAME".mo");
+ mo_filename.append("/LC_MESSAGES/" APPSHORTNAME ".mo");
// Note: English is always available as it's the default language
if (lang == "en@quot")

25
games/valyriatear/patches/patch-src_engine_video_video_cpp
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_engine_video_video_cpp,v 1.1 2018/04/28 18:10:04 bcallah Exp $
clang6 fix
Index: src/engine/video/video.cpp
--- src/engine/video/video.cpp.orig
+++ src/engine/video/video.cpp
@@ -434,7 +434,7 @@ bool VideoEngine::ApplySettings()
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
- if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == false) {
+ if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == NULL) {
// RGB values of 1 for each and 8 for depth seemed to be sufficient.
// 565 and 16 here because it works with them on this computer.
// NOTE from prophile: this ought to be changed to 5558
@@ -447,7 +447,7 @@ bool VideoEngine::ApplySettings()
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
- if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == false) {
+ if(SDL_SetVideoMode(_temp_width, _temp_height, 0, flags) == NULL) {
IF_PRINT_WARNING(VIDEO_DEBUG) << "SDL_SetVideoMode() failed with error: " << SDL_GetError() << std::endl;
_temp_fullscreen = _fullscreen;

13
games/valyriatear/patches/patch-src_luabind_luabind_detail_object_rep_hpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_luabind_luabind_detail_object_rep_hpp,v 1.1 2017/05/22 18:26:30 espie Exp $
Index: src/luabind/luabind/detail/object_rep.hpp
--- src/luabind/luabind/detail/object_rep.hpp.orig
+++ src/luabind/luabind/detail/object_rep.hpp
@@ -28,6 +28,7 @@
#include <luabind/config.hpp>
#include <luabind/detail/instance_holder.hpp>
#include <luabind/detail/ref.hpp>
+#include <cstdlib>
namespace luabind { namespace detail
{

30
games/valyriatear/patches/patch-src_luabind_luabind_object_hpp
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_luabind_luabind_object_hpp,v 1.1 2015/06/29 08:04:42 jasper Exp $
From 76411d4dd3d82abaa4732cf7160e6a11ab79ac3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <gaetan.lehmann@gmail.com>
Date: Wed, 28 Jan 2015 09:46:14 +0100
Subject: [PATCH] Fixed luabind compilation when using boost 1.57
--- src/luabind/luabind/object.hpp.orig Thu Sep 4 21:17:54 2014
+++ src/luabind/luabind/object.hpp Mon Jun 29 10:03:44 2015
@@ -546,6 +546,9 @@ namespace detail
handle m_key;
};
+// Not used anymore with boost 1.57
+#if BOOST_VERSION < 105700
+
// Needed because of some strange ADL issues.
#define LUABIND_OPERATOR_ADL_WKND(op) \
@@ -567,7 +570,9 @@ namespace detail
LUABIND_OPERATOR_ADL_WKND(!=)
#undef LUABIND_OPERATOR_ADL_WKND
-
+
+#endif // BOOST_VERSION < 105700
+
} // namespace detail
namespace adl

16
games/valyriatear/patches/patch-src_main_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_main_cpp,v 1.3 2018/04/28 18:10:04 bcallah Exp $
clang6 fix
Index: src/main.cpp
--- src/main.cpp.orig
+++ src/main.cpp
@@ -459,7 +459,7 @@ int main(int argc, char *argv[])
chdir(path.c_str());
#elif (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SOLARIS)) && !defined(RELEASE_BUILD)
// Look for data files in DATADIR only if they are not available in the current directory.
- if(std::ifstream("dat/config/settings.lua") == NULL) {
+ if(!std::ifstream("dat/config/settings.lua")) {
if(chdir(PKG_DATADIR) != 0) {
throw Exception("ERROR: failed to change directory to data location", __FILE__, __LINE__, __FUNCTION__);
}

16
games/valyriatear/patches/patch-src_main_options_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_main_options_cpp,v 1.1 2018/04/28 18:10:04 bcallah Exp $
clang6 fix
Index: src/main_options.cpp
--- src/main_options.cpp.orig
+++ src/main_options.cpp
@@ -147,7 +147,7 @@ bool ParseSecondaryOptions(const std::string &vars, st
void PrintUsage()
{
std::cout
- << "usage: "APPSHORTNAME" [options]" << std::endl
+ << "usage: " APPSHORTNAME " [options]" << std::endl
<< " --check/-c :: checks all files for integrity" << std::endl
<< " --debug/-d <args> :: enables debug statements in specified sections of the" << std::endl
<< " program, where <args> can be:" << std::endl

61
games/valyriatear/patches/patch-src_utils_utils_files_cpp
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-src_utils_utils_files_cpp,v 1.1 2018/04/28 18:10:04 bcallah Exp $
clang6 fixes
Index: src/utils/utils_files.cpp
--- src/utils/utils_files.cpp.orig
+++ src/utils/utils_files.cpp
@@ -279,7 +279,7 @@ static void _CopyOldSaveFiles(const std::string &desti
if(!pw)
return;
- std::string old_path = std::string(pw->pw_dir) + "/."APPSHORTNAME"/";
+ std::string old_path = std::string(pw->pw_dir) + "/." APPSHORTNAME "/";
if(!DoesFileExist(old_path))
return; // Nothing to do.
#elif defined _WIN32
@@ -330,7 +330,7 @@ static void _CopyOldSettingsFile(const std::string &de
if(!pw)
return; // Nothing to do
- std::string old_file = std::string(pw->pw_dir) + "/."APPSHORTNAME"/settings.lua";
+ std::string old_file = std::string(pw->pw_dir) + "/." APPSHORTNAME "/settings.lua";
if(!DoesFileExist(old_file))
return; // Nothing to do.
@@ -387,7 +387,7 @@ static const std::string _SetupUserDataPath()
// $XDG_DATA_HOME/valyriatear/
// equals to: ~/.local/share/valyriatear/ most of the time
if (getenv("XDG_DATA_HOME")) {
- std::string path = std::string(getenv("XDG_DATA_HOME")) + "/"APPSHORTNAME"/";
+ std::string path = std::string(getenv("XDG_DATA_HOME")) + "/" APPSHORTNAME "/";
if(!DoesFileExist(path))
MakeDirectory(path);
_CopyOldSaveFiles(path);
@@ -403,7 +403,7 @@ static const std::string _SetupUserDataPath()
path += "/share/";
if(!DoesFileExist(path))
MakeDirectory(path);
- path += "/"APPSHORTNAME"/";
+ path += "/" APPSHORTNAME "/";
if(!DoesFileExist(path))
MakeDirectory(path);
_CopyOldSaveFiles(path);
@@ -448,7 +448,7 @@ static const std::string _SetupUserConfigPath()
// $XDG_CONFIG_HOME/valyriatear/
// equals to: ~/.config/valyriatear/ most of the time
if (getenv("XDG_CONFIG_HOME")) {
- std::string path = std::string(getenv("XDG_CONFIG_HOME")) + "/"APPSHORTNAME"/";
+ std::string path = std::string(getenv("XDG_CONFIG_HOME")) + "/" APPSHORTNAME "/";
if(!DoesFileExist(path))
MakeDirectory(path);
_CopyOldSettingsFile(path);
@@ -462,7 +462,7 @@ static const std::string _SetupUserConfigPath()
std::string path = std::string(pw->pw_dir) + "/.config/";
if(!DoesFileExist(path))
MakeDirectory(path);
- path += "/"APPSHORTNAME"/";
+ path += "/" APPSHORTNAME "/";
if(!DoesFileExist(path))
MakeDirectory(path);
_CopyOldSettingsFile(path);

3219
games/valyriatear/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff