From owner-svn-ports-head@freebsd.org Fri Nov 15 23:39:03 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13B8D1B3BA6; Fri, 15 Nov 2019 23:39:03 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47FFDQ6gGrz44Gy; Fri, 15 Nov 2019 23:39:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2A5E207CF; Fri, 15 Nov 2019 23:39:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAFNd24I067846; Fri, 15 Nov 2019 23:39:02 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAFNd1UB067841; Fri, 15 Nov 2019 23:39:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201911152339.xAFNd1UB067841@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 15 Nov 2019 23:39:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517712 - in head/games/valyriatear: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/valyriatear: . files X-SVN-Commit-Revision: 517712 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2019 23:39:03 -0000 Author: amdmi3 Date: Fri Nov 15 23:39:01 2019 New Revision: 517712 URL: https://svnweb.freebsd.org/changeset/ports/517712 Log: - Update to 1.1.0 Added: head/games/valyriatear/files/patch-CMake_Modules_FindGLEW.cmake (contents, props changed) head/games/valyriatear/files/patch-src_CMakeLists.txt (contents, props changed) head/games/valyriatear/files/patch-src_utils_src_utils_ustring.cpp (contents, props changed) Deleted: head/games/valyriatear/files/patch-src-utils-ustring.cpp head/games/valyriatear/files/patch-src_engine_video_video.cpp head/games/valyriatear/files/patch-src_main.cpp Modified: head/games/valyriatear/Makefile head/games/valyriatear/distinfo head/games/valyriatear/pkg-plist Modified: head/games/valyriatear/Makefile ============================================================================== --- head/games/valyriatear/Makefile Fri Nov 15 23:34:57 2019 (r517711) +++ head/games/valyriatear/Makefile Fri Nov 15 23:39:01 2019 (r517712) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= valyriatear -PORTVERSION= 1.0.0 -PORTREVISION= 11 +PORTVERSION= 1.1.0 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -21,15 +20,15 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ USE_GITHUB= yes GH_ACCOUNT= Bertram25 GH_PROJECT= ValyriaTear -GH_TAGNAME= ${PORTVERSION}-gcc5 # contains relevant tolua++ fixes +GH_TUPLE= ValyriaTear:luabind:76d4061:luabind/src/luabind \ + ValyriaTear:vt-utils:299411e:utils/src/utils USES= alias cmake compiler:c++11-lang gettext-tools gl gnome iconv \ lua:51 openal sdl xorg CMAKE_ARGS= -DUSE_PCH_COMPILATION=OFF -USE_SDL= sdl image ttf -USE_GL= gl glu +USE_SDL= sdl2 image2 ttf2 +USE_GL= gl glu glew USE_XORG= x11 xext sm ice -USE_CXXSTD= c++03 INSTALLS_ICONS= yes LLD_UNSAFE= yes @@ -39,7 +38,7 @@ PORTDATA= * OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -NLS_CMAKE_OFF= -DDISABLE_TRANSLATIONS:BOOL=OFF +#NLS_CMAKE_OFF= -DDISABLE_TRANSLATIONS:BOOL=ON # broken, so be happy with just not installing translation files NLS_USES= gettext post-patch: Modified: head/games/valyriatear/distinfo ============================================================================== --- head/games/valyriatear/distinfo Fri Nov 15 23:34:57 2019 (r517711) +++ head/games/valyriatear/distinfo Fri Nov 15 23:39:01 2019 (r517712) @@ -1,3 +1,7 @@ -TIMESTAMP = 1491391131 -SHA256 (Bertram25-ValyriaTear-1.0.0-1.0.0-gcc5_GH0.tar.gz) = c15beceb0bbb2315604a52ae050d02e08fe414da87de4d5e035faa10a8d97e9e -SIZE (Bertram25-ValyriaTear-1.0.0-1.0.0-gcc5_GH0.tar.gz) = 100883404 +TIMESTAMP = 1573667905 +SHA256 (Bertram25-ValyriaTear-1.1.0_GH0.tar.gz) = b284ea240eff83e83f1c55c1504a6629a5a20eb8c10b854f36423093c31d80fe +SIZE (Bertram25-ValyriaTear-1.1.0_GH0.tar.gz) = 116812274 +SHA256 (ValyriaTear-luabind-76d4061_GH0.tar.gz) = 1730a0ae592d4a21fc345708cd9eb187879e8b1e3d959e6956b926fed677963b +SIZE (ValyriaTear-luabind-76d4061_GH0.tar.gz) = 189716 +SHA256 (ValyriaTear-vt-utils-299411e_GH0.tar.gz) = 4b87f6f209da06ccd3f5c228fcf9cd6235f7963267f0c4f2217ffe8450f11a9a +SIZE (ValyriaTear-vt-utils-299411e_GH0.tar.gz) = 41918 Added: head/games/valyriatear/files/patch-CMake_Modules_FindGLEW.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/valyriatear/files/patch-CMake_Modules_FindGLEW.cmake Fri Nov 15 23:39:01 2019 (r517712) @@ -0,0 +1,28 @@ +--- CMake/Modules/FindGLEW.cmake.orig 2019-09-22 13:29:24 UTC ++++ CMake/Modules/FindGLEW.cmake +@@ -23,24 +23,11 @@ IF (WIN32) + DOC "The GLEW library") + ELSE (WIN32) + FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h +- /usr/include +- /usr/local/include +- /sw/include +- /opt/local/include +- ${GLEW_ROOT_DIR}/include + DOC "The directory where GL/glew.h resides") + + # Prefer the static library. + FIND_LIBRARY( GLEW_LIBRARY +- NAMES libGLEW.a GLEW +- PATHS +- /usr/lib64 +- /usr/lib +- /usr/local/lib64 +- /usr/local/lib +- /sw/lib +- /opt/local/lib +- ${GLEW_ROOT_DIR}/lib ++ NAMES GLEW + DOC "The GLEW library") + ENDIF (WIN32) + Added: head/games/valyriatear/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/valyriatear/files/patch-src_CMakeLists.txt Fri Nov 15 23:39:01 2019 (r517712) @@ -0,0 +1,15 @@ +--- src/CMakeLists.txt.orig 2019-09-22 13:29:24 UTC ++++ src/CMakeLists.txt +@@ -104,10 +104,10 @@ IF (NOT DISABLE_TRANSLATIONS) + SET(EXTRA_LIBRARIES ws2_32 winmm) + FIND_PACKAGE(LibIntl REQUIRED) + FIND_PACKAGE(Iconv REQUIRED) +- ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS) + FIND_PACKAGE(LibIntl REQUIRED) + FIND_PACKAGE(LibIconv REQUIRED) +- ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") ++ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FIND_PACKAGE(LibIntl REQUIRED) + ELSEIF (CMAKE_SYSTEM_NAME STREQUAL SunOS) + # explicit linking to libintl is required on Solaris Added: head/games/valyriatear/files/patch-src_utils_src_utils_ustring.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/valyriatear/files/patch-src_utils_src_utils_ustring.cpp Fri Nov 15 23:39:01 2019 (r517712) @@ -0,0 +1,11 @@ +--- src/utils/src/utils/ustring.cpp.orig 2018-10-19 17:18:23 UTC ++++ src/utils/src/utils/ustring.cpp +@@ -171,7 +171,7 @@ static bool UTF8ToUTF16(const std::string& source, uin + return false; + } + +-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__) ++#if defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109 + // We are using an iconv API that uses const char* + const char *sourceChar = source.c_str(); + #else Modified: head/games/valyriatear/pkg-plist ============================================================================== --- head/games/valyriatear/pkg-plist Fri Nov 15 23:34:57 2019 (r517711) +++ head/games/valyriatear/pkg-plist Fri Nov 15 23:39:01 2019 (r517712) @@ -3,11 +3,16 @@ share/appdata/valyriatear.appdata.xml share/applications/valyriatear.desktop share/icons/hicolor/48x48/apps/valyriatear.png %%NLS%%share/locale/de/LC_MESSAGES/valyriatear.mo -%%NLS%%share/locale/en@quot/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/es/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/fr/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/gd/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/gl/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/it/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/ja/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/nl_NL/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/pt_PT/LC_MESSAGES/valyriatear.mo %%NLS%%share/locale/ru/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/sv/LC_MESSAGES/valyriatear.mo +%%NLS%%share/locale/uk_UA/LC_MESSAGES/valyriatear.mo