Date: Wed, 20 Sep 2017 19:04:01 +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: r450229 - in head/emulators/rpcs3: . files Message-ID: <201709201904.v8KJ41mm099714@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Sep 20 19:04:01 2017 New Revision: 450229 URL: https://svnweb.freebsd.org/changeset/ports/450229 Log: emulators/rpcs3: update to 0.0.3.348 Changes: https://github.com/RPCS3/rpcs3/compare/f0358f85...5c93acef Modified: head/emulators/rpcs3/Makefile (contents, props changed) head/emulators/rpcs3/distinfo (contents, props changed) head/emulators/rpcs3/files/extra-patch-no-thread_local (contents, props changed) Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Wed Sep 20 18:35:32 2017 (r450228) +++ head/emulators/rpcs3/Makefile Wed Sep 20 19:04:01 2017 (r450229) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.3-305 -DISTVERSIONSUFFIX= -gf0358f85 +DISTVERSION= 0.0.3-348 +DISTVERSIONSUFFIX= -g5c93acef CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -34,7 +34,8 @@ GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hi USES= cmake compiler:c++14-lang iconv:wchar_t localbase:ldflags \ openal:soft pkgconfig USE_GL= gl glew -USE_QT5= qmake_build buildtools_build core gui widgets +USE_QT5= qmake_build buildtools_build core dbus gui widgets +USE_XORG= x11 EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL}} EXTRA_PATCHES_FreeBSD_10.3= ${PATCHDIR}/extra-patch-no-thread_local CMAKE_ARGS+= -DUSE_SYSTEM_LIBPNG=on -DUSE_SYSTEM_FFMPEG=on @@ -46,8 +47,11 @@ PLIST_FILES= bin/${PORTNAME} \ share/icons/hicolor/48x48/apps/${PORTNAME}.png \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ -OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO -OPTIONS_DEFAULT=ALSA LLVM +OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN +OPTIONS_DEFAULT=ALSA LLVM VULKAN +.if !exists(${.CURDIR:H:H}/graphics/vulkan-sdk) +OPTIONS_EXCLUDE=VULKAN # XXX ports/222175 +.endif ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins @@ -67,8 +71,17 @@ LLVM_CMAKE_BOOL_OFF= WITHOUT_LLVM PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE +VULKAN_DESC= Vulkan renderer +# XXX Unbundle via CMAKE_ARGS+=-DVULKAN_PREBUILT=on +VULKAN_VARS= LICENSE+=APACHE20 +VULKAN_GH_TUPLE= KhronosGroup:glslang:3.0-1379-g0e07119a:glslang/Vulkan/glslang \ + KhronosGroup:Vulkan-LoaderAndValidationLayers:sdk-1.0.30.0-1550-g115665a3:vulkan_icd/Vulkan/Vulkan-LoaderAndValidationLayers +VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-sdk +VULKAN_CMAKE_BOOL= USE_VULKAN + post-patch: - @${REINPLACE_CMD} -e 's/"unknown"/"${GH_TAGNAME}"/' \ + @${REINPLACE_CMD} -e '/GIT_BRANCH/s/unknown/master/' \ + -e '/GIT_VERSION/s/unknown/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake .include <bsd.port.mk> Modified: head/emulators/rpcs3/distinfo ============================================================================== --- head/emulators/rpcs3/distinfo Wed Sep 20 18:35:32 2017 (r450228) +++ head/emulators/rpcs3/distinfo Wed Sep 20 19:04:01 2017 (r450229) @@ -1,6 +1,6 @@ -TIMESTAMP = 1505065599 -SHA256 (RPCS3-rpcs3-v0.0.3-305-gf0358f85_GH0.tar.gz) = e39b8db110c9a97fab347319b102507c7643b3e5b5ac7a20c0a9841f39ec6db1 -SIZE (RPCS3-rpcs3-v0.0.3-305-gf0358f85_GH0.tar.gz) = 4166246 +TIMESTAMP = 1505822827 +SHA256 (RPCS3-rpcs3-v0.0.3-348-g5c93acef_GH0.tar.gz) = b283e036663f52f88845b4fdc0d6ccd55361015914a481e96d4e419631b8263e +SIZE (RPCS3-rpcs3-v0.0.3-348-g5c93acef_GH0.tar.gz) = 4169501 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 3b2a7e21625d8cbeb3aa1841b8816f6cab0752e89008b9fc67a325c800f153b5 @@ -13,3 +13,7 @@ SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff2 SIZE (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 38809 SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1 SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883 +SHA256 (KhronosGroup-glslang-3.0-1379-g0e07119a_GH0.tar.gz) = f1caf9c76c0104d46128426e3bfd731938b3bf8b4b8cd9bf0102ac59cc4ea90f +SIZE (KhronosGroup-glslang-3.0-1379-g0e07119a_GH0.tar.gz) = 1786108 +SHA256 (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.30.0-1550-g115665a3_GH0.tar.gz) = d59f98eba91ed5b37f138a353c4e1cdff769a23e529650b0bf07b456dfedee58 +SIZE (KhronosGroup-Vulkan-LoaderAndValidationLayers-sdk-1.0.30.0-1550-g115665a3_GH0.tar.gz) = 3808601 Modified: head/emulators/rpcs3/files/extra-patch-no-thread_local ============================================================================== --- head/emulators/rpcs3/files/extra-patch-no-thread_local Wed Sep 20 18:35:32 2017 (r450228) +++ head/emulators/rpcs3/files/extra-patch-no-thread_local Wed Sep 20 19:04:01 2017 (r450229) @@ -1,9 +1,9 @@ FreeBSD 10.3 lacks __cxa_thread_atexit, so revert https://github.com/RPCS3/rpcs3/commit/c1450ad61627 ---- Utilities/Log.cpp.orig 2017-08-24 18:20:18 UTC +--- Utilities/Log.cpp.orig 2017-09-19 12:07:07 UTC +++ Utilities/Log.cpp -@@ -246,7 +246,7 @@ void logs::message::broadcast(const char* fmt, const f +@@ -255,7 +255,7 @@ void logs::message::broadcast(const char* fmt, const f } // Get text @@ -12,16 +12,16 @@ https://github.com/RPCS3/rpcs3/commit/c1450ad61627 fmt::raw_append(text, fmt, sup, args); std::string prefix = g_tls_log_prefix(); -@@ -266,7 +266,7 @@ void logs::message::broadcast(const char* fmt, const f +@@ -275,7 +275,7 @@ void logs::message::broadcast(const char* fmt, const f } // Store message additionally -- g_messages.emplace_back(stored_message{*this, stamp, std::move(prefix), text}); -+ g_messages.emplace_back(stored_message{*this, stamp, std::move(prefix), std::move(text)}); +- get_logger()->messages.emplace_back(stored_message{*this, stamp, std::move(prefix), text}); ++ get_logger()->messages.emplace_back(stored_message{*this, stamp, std::move(prefix), std::move(text)}); } } - -@@ -348,7 +348,7 @@ logs::file_listener::file_listener(const std::string& + +@@ -405,7 +405,7 @@ logs::file_listener::file_listener(const std::string& void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& _text) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709201904.v8KJ41mm099714>