Date: Mon, 23 Feb 2015 07:50:24 +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: r379647 - in head/devel/rlvm: . files Message-ID: <201502230750.t1N7oONL060705@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Feb 23 07:50:23 2015 New Revision: 379647 URL: https://svnweb.freebsd.org/changeset/ports/379647 QAT: https://qat.redports.org/buildarchive/r379647/ Log: Update to 0.14.0.20150223 (snapshot) ChangeLog: - Remove optional decoders (png, jpg, mp3) - Change "override" to "final" in some places - Upstream some changes from FreeBSD port, see https://github.com/eglaysher/rlvm/pull/64 Deleted: head/devel/rlvm/files/patch-src_systems_sdl_sdl__graphics__system.cc head/devel/rlvm/files/patch-vendor_xclannad_wavfile.cc Modified: head/devel/rlvm/Makefile head/devel/rlvm/distinfo head/devel/rlvm/files/patch-SConstruct Modified: head/devel/rlvm/Makefile ============================================================================== --- head/devel/rlvm/Makefile Mon Feb 23 07:47:10 2015 (r379646) +++ head/devel/rlvm/Makefile Mon Feb 23 07:50:23 2015 (r379647) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rlvm -PORTVERSION= 0.14 +PORTVERSION= 0.14.0.20150223 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org @@ -14,16 +14,13 @@ BUILD_DEPENDS= ${LOCALBASE}/include/utf8 LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ libboost_serialization.so:${PORTSDIR}/devel/boost-libs \ libguichan.so:${PORTSDIR}/devel/guichan \ - libGLEW.so:${PORTSDIR}/graphics/glew \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ - libsmpeg.so:${PORTSDIR}/multimedia/smpeg + libGLEW.so:${PORTSDIR}/graphics/glew RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu USE_GITHUB= yes GH_ACCOUNT= eglaysher -GH_TAGNAME= release-${PORTVERSION} -GH_COMMIT= b88bfe0 +GH_TAGNAME= ${GH_COMMIT} # release-${PORTVERSION} +GH_COMMIT= 589e3d2 USES= compiler:c++11-lib pkgconfig scons USE_GL= yes Modified: head/devel/rlvm/distinfo ============================================================================== --- head/devel/rlvm/distinfo Mon Feb 23 07:47:10 2015 (r379646) +++ head/devel/rlvm/distinfo Mon Feb 23 07:50:23 2015 (r379647) @@ -1,2 +1,2 @@ -SHA256 (rlvm-0.14.tar.gz) = a50a22016cbf87b0ed4d26a14e687c4540b01a2cf836a7f1471c0a9b50ebd8d5 -SIZE (rlvm-0.14.tar.gz) = 1933830 +SHA256 (rlvm-0.14.0.20150223.tar.gz) = 3480e72a84cdea492c0bf74126567182dfbef4361324ce3c373a4698379a7de4 +SIZE (rlvm-0.14.0.20150223.tar.gz) = 1930018 Modified: head/devel/rlvm/files/patch-SConstruct ============================================================================== --- head/devel/rlvm/files/patch-SConstruct Mon Feb 23 07:47:10 2015 (r379646) +++ head/devel/rlvm/files/patch-SConstruct Mon Feb 23 07:50:23 2015 (r379647) @@ -13,49 +13,6 @@ LIBS = ["z"], -@@ -87,13 +91,6 @@ else: - if GetOption("fullstatic"): - env["FULL_STATIC_BUILD"] = True - --# Auto select the number of processors --if os.path.exists('/proc'): -- cpus = len([l for l in open('/proc/cpuinfo') if l.startswith('processor\t')]) --else: -- cpus = 1 --env.SetOption('num_jobs', cpus + 1) -- - # Use timestamps change, followed by MD5 for speed - env.Decider('MD5-timestamp') - -@@ -277,11 +274,15 @@ if not config.CheckGuichan(): - print "(Using included copy of guichan)" - subcomponents.append("guichan") - -+# Get the configuration from sdl and freetype -+env.ParseConfig("sdl-config --cflags") -+env.ParseConfig("freetype-config --cflags --libs") -+ - # Really optional libraries that jagarl's file loaders take advantage of if on - # the system. - config.CheckLibWithHeader('png', 'png.h', "cpp") --config.CheckLibWithHeader('jpeg', 'jpeglib.h', "cpp") --config.CheckLibWithHeader('mad', 'mad.h', "cpp") -+config.CheckLibWithHeader('jpeg', 'jconfig.h', "cpp") -+config.CheckLibWithHeader('smpeg', 'smpeg/smpeg.h', "cpp") - - env = config.Finish() - -@@ -291,10 +292,6 @@ env = config.Finish() - if env['PLATFORM'] == 'darwin': - env.Append(LIBS=["SDL", "intl", "iconv"]) - --# Get the configuration from sdl and freetype --env.ParseConfig("sdl-config --cflags") --env.ParseConfig("freetype-config --cflags --libs") -- - ######################################################################### - ## Building subcomponent functions - ######################################################################### @@ -314,7 +311,6 @@ if GetOption('release'): # Now add release optimizations to the environment env.Append(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502230750.t1N7oONL060705>