svn commit: r422911 - in head/devel/rlvm: . files
Jan Beich
jbeich at FreeBSD.org
Thu Sep 29 09:02:56 UTC 2016
Author: jbeich
Date: Thu Sep 29 09:02:54 2016
New Revision: 422911
URL: https://svnweb.freebsd.org/changeset/ports/422911
Log:
devel/rlvm: update to 0.14.67 (20160730 snapshot)
Switch to |git describe --tags| versioning scheme. Tag offsets better
show the amount of changes happenning between snapshots.
Changes: https://github.com/eglaysher/rlvm/compare/373a3db...9350209
Added:
head/devel/rlvm/files/extra-patch-gcc48 (contents, props changed)
Modified:
head/devel/rlvm/Makefile (contents, props changed)
head/devel/rlvm/distinfo (contents, props changed)
head/devel/rlvm/files/patch-test_medium__object__promotion.cc (contents, props changed)
Modified: head/devel/rlvm/Makefile
==============================================================================
--- head/devel/rlvm/Makefile Thu Sep 29 09:01:48 2016 (r422910)
+++ head/devel/rlvm/Makefile Thu Sep 29 09:02:54 2016 (r422911)
@@ -1,7 +1,9 @@
# $FreeBSD$
PORTNAME= rlvm
-PORTVERSION= 0.14.0.20150425
+DISTVERSIONPREFIX= release-
+DISTVERSION= 0.14-67
+DISTVERSIONSUFFIX= -g9350209
CATEGORIES= devel games
MAINTAINER= jbeich at FreeBSD.org
@@ -18,7 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/de
USE_GITHUB= yes
GH_ACCOUNT= eglaysher
-GH_TAGNAME= 373a3db # release-${PORTVERSION}
USES= compiler:c++11-lib pkgconfig scons
USE_GL= glew glu
@@ -27,12 +28,15 @@ USE_SDL= image mixer ttf
EXCLUDE= GLEW SDL_image SDL_mixer SDL_ttf gmock gtest guichan \
luabind utf8cpp # leaving only pygame, xclannad, *.cpp
EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude vendor/,}
+CFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
+LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps)
MAKE_ARGS= VERBOSE=1
INSTALLS_ICONS= yes
PORTDOCS= AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes
-CFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
-LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps)
+# XXX 9.x EOL to phase out USES=compiler, unblocking lang/gcc update
+EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${CHOSEN_COMPILER_TYPE}}
+EXTRA_PATCHES_FreeBSD_gcc= ${PATCHDIR}/extra-patch-gcc48
OPTIONS_DEFINE= DEBUG DOCS NLS TEST
OPTIONS_GROUP= JAPANESE_FONT
Modified: head/devel/rlvm/distinfo
==============================================================================
--- head/devel/rlvm/distinfo Thu Sep 29 09:01:48 2016 (r422910)
+++ head/devel/rlvm/distinfo Thu Sep 29 09:02:54 2016 (r422911)
@@ -1,2 +1,3 @@
-SHA256 (eglaysher-rlvm-0.14.0.20150425-373a3db_GH0.tar.gz) = 35fdabf1ded01f397a6736bd60ac13ccb614d88dcbec8192fbe4510f5b80b7aa
-SIZE (eglaysher-rlvm-0.14.0.20150425-373a3db_GH0.tar.gz) = 1929198
+TIMESTAMP = 1475126655
+SHA256 (eglaysher-rlvm-release-0.14-67-g9350209_GH0.tar.gz) = 70a48aeca8e9298c1c5d3e4c7c4d9abd49bfc96e1afad5f2141039feb304df50
+SIZE (eglaysher-rlvm-release-0.14-67-g9350209_GH0.tar.gz) = 1895634
Added: head/devel/rlvm/files/extra-patch-gcc48
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/rlvm/files/extra-patch-gcc48 Thu Sep 29 09:02:54 2016 (r422911)
@@ -0,0 +1,16 @@
+https://github.com/eglaysher/rlvm/issues/80
+
+diff --git src/base/notification_registrar.cc src/base/notification_registrar.cc
+index 2b9d99d..2a6f63f 100644
+--- src/base/notification_registrar.cc
++++ src/base/notification_registrar.cc
+@@ -46,7 +46,8 @@
+ }
+
+ Record record = { observer, type, source };
+- auto found = std::find(registered_.cbegin(), registered_.cend(), record);
++ RecordVector::iterator found = std::find(
++ registered_.begin(), registered_.end(), record);
+ registered_.erase(found);
+
+ // This can be NULL if our owner outlives the NotificationService, e.g. if our
Modified: head/devel/rlvm/files/patch-test_medium__object__promotion.cc
==============================================================================
--- head/devel/rlvm/files/patch-test_medium__object__promotion.cc Thu Sep 29 09:01:48 2016 (r422910)
+++ head/devel/rlvm/files/patch-test_medium__object__promotion.cc Thu Sep 29 09:02:54 2016 (r422911)
@@ -1,7 +1,7 @@
To workaround the following error
unknown file: Failure
- C++ exception with description "ExpressionPiece::GetStringValue() invalid on this object" thrown in the test body.
+ C++ exception with description "ExpressionPiece::GetIntegerValue() invalid on object of type 2" thrown in the test body.
[ FAILED ] MediumObjectPoromotion/PromotionTest.BgLayerPromotion/49, where GetParam() = ("recMulti", 1, (3, "\"file\"$\xFF\0\0\0\0$\xFF\xFF\0\0\0"), true) (1 ms)
--- test/medium_object_promotion.cc~
More information about the svn-ports-head
mailing list