summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--games/lwjgl3/Makefile28
-rw-r--r--games/multimc/Makefile28
-rw-r--r--games/multimc/distinfo6
-rw-r--r--games/multimc/files/patch-CMakeLists.txt12
-rw-r--r--games/multimc/files/patch-launcher_DesktopServices.cpp (renamed from games/multimc/files/patch-api_gui_DesktopServices.cpp)4
-rw-r--r--games/multimc/files/patch-launcher_FileSystem.cpp (renamed from games/multimc/files/patch-api_logic_FileSystem.cpp)6
-rw-r--r--games/multimc/files/patch-launcher_FileSystem__test.cpp (renamed from games/multimc/files/patch-api_logic_FileSystem__test.cpp)4
-rw-r--r--games/multimc/files/patch-launcher_MultiMC.cpp (renamed from games/multimc/files/patch-application_MultiMC.cpp)6
-rw-r--r--games/multimc/files/patch-launcher_UpdateController.cpp (renamed from games/multimc/files/patch-application_UpdateController.cpp)4
-rw-r--r--games/multimc/files/patch-launcher_install__prereqs.cmake.in (renamed from games/multimc/files/patch-application_install__prereqs.cmake.in)4
-rw-r--r--games/multimc/files/patch-launcher_java_JavaUtils.cpp (renamed from games/multimc/files/patch-api_logic_java_JavaUtils.cpp)4
-rw-r--r--games/multimc/files/patch-launcher_minecraft_MinecraftInstance.cpp (renamed from games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp)6
-rw-r--r--games/multimc/files/patch-launcher_minecraft_OpSys.cpp (renamed from games/multimc/files/patch-api_logic_minecraft_OpSys.cpp)4
-rw-r--r--games/multimc/files/patch-launcher_minecraft_OpSys.h (renamed from games/multimc/files/patch-api_logic_minecraft_OpSys.h)4
-rw-r--r--games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp (renamed from games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp)6
-rw-r--r--games/multimc/files/patch-launcher_minecraft_launch_PrintInstanceInfo.cpp (renamed from games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp)4
-rw-r--r--games/multimc/files/patch-launcher_tools_MCEditTool.cpp (renamed from games/multimc/files/patch-api_logic_tools_MCEditTool.cpp)4
-rw-r--r--games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp2
-rw-r--r--games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp6
-rw-r--r--games/multimc/pkg-plist5
20 files changed, 85 insertions, 62 deletions
diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile
index cb46f42..03edb20 100644
--- a/games/lwjgl3/Makefile
+++ b/games/lwjgl3/Makefile
@@ -15,14 +15,32 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libdyncall_s.a:devel/dyncall
LIB_DEPENDS= libglfw.so:graphics/glfw \
libopenal.so:audio/openal-soft \
libopus.so:audio/opus \
- libOpenCL.so:devel/ocl-icd
-
-USES= gl gnome xorg pkgconfig
+ libOpenCL.so:devel/ocl-icd \
+ libatk-bridge-2.0.so:accessibility/at-spi2-atk \
+ libatspi.so:accessibility/at-spi2-core \
+ libdbus-1.so:devel/dbus \
+ libepoll-shim.so:devel/libepoll-shim \
+ libepoxy.so:graphics/libepoxy \
+ libexpat.so:textproc/expat2 \
+ libffi.so:devel/libffi \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libfribidi.so:converters/fribidi \
+ libgraphite2.so:graphics/graphite2 \
+ libharfbuzz.so:print/harfbuzz \
+ libpcre.so:devel/pcre \
+ libpng16.so:graphics/png \
+ libwayland-client.so:graphics/wayland \
+ libwayland-cursor.so:graphics/wayland \
+ libwayland-egl.so:graphics/wayland \
+ libxkbcommon.so:x11/libxkbcommon
+
+USES= gl gnome xorg pkgconfig iconv
USE_ANT= yes
USE_GL= gl egl glesv2
-USE_GNOME= gtk30 glib20
+USE_GNOME= gtk30 glib20 cairo gdkpixbuf2
USE_JAVA= yes
-USE_XORG= x11
+USE_XORG= x11 pixman xau xcb xcomposite xcursor xdamage xdmcp xext xfixes xi xinerama xrandr xrender
MAKE_ENV+= LWJGL_BUILD_OFFLINE=true
ALL_TARGET= all release
diff --git a/games/multimc/Makefile b/games/multimc/Makefile
index e05c5b6..005eaee 100644
--- a/games/multimc/Makefile
+++ b/games/multimc/Makefile
@@ -1,5 +1,5 @@
PORTNAME= multimc
-DISTVERSION= 0.6.12
+DISTVERSION= 0.6.13
CATEGORIES= games java
MAINTAINER= me@cameronkatri.com
@@ -8,19 +8,35 @@ COMMENT= Minecraft launcher with the ability to manage multiple instances
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING.md
+LIB_DEPENDS= libGLdispatch.so:graphics/libglvnd \
+ libdouble-conversion.so:devel/double-conversion \
+ libfreetype.so:print/freetype2 \
+ libgraphite2.so:graphics/graphite2 \
+ libharfbuzz.so:print/harfbuzz \
+ libicudata.so:devel/icu \
+ libicui18n.so:devel/icu \
+ libicuuc.so:devel/icu \
+ libpcre.so:devel/pcre \
+ libpcre2-16.so:devel/pcre2 \
+ libpng16.so:graphics/png \
+ libzstd.so:archivers/zstd \
+
RUN_DEPENDS= lwjgl>=2.9.3:games/lwjgl \
${JAVAJARDIR}/lwjgl3/lwjgl.jar:games/lwjgl3
-USES= cmake compiler:c++14-lang qt:5
+USES= cmake compiler:c++14-lang gettext-runtime gl gnome iconv qt:5 xorg
USE_GITHUB= yes
GH_ACCOUNT= MultiMC
GH_PROJECT= MultiMC5
GH_TUPLE= MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus \
MultiMC:quazip:3691d57:quazip/libraries/quazip
-USE_LDCONFIG= yes
+USE_GL= gl
+USE_GNOME= glib20
USE_JAVA= 1.8+
+USE_LDCONFIG= yes
USE_QT= core concurrent gui network testlib_build widgets xml \
buildtools_build qmake_build
+USE_XORG= x11 xau xcb xdmcp
CMAKE_ARGS= -DMultiMC_LAYOUT="lin-system"
CXXFLAGS+= -Wno-inconsistent-missing-override \
@@ -29,9 +45,9 @@ CXXFLAGS+= -Wno-inconsistent-missing-override \
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libMultiMC_*.so
- ${INSTALL_DATA} ${WRKSRC}/application/package/linux/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
- ${INSTALL_DATA} ${WRKSRC}/application/resources/multimc/scalable/multimc.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
+ ${INSTALL_DATA} ${WRKSRC}/launcher/package/linux/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
+ ${INSTALL_DATA} ${WRKSRC}/launcher/resources/multimc/scalable/multimc.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
${INSTALL_SCRIPT} ${FILESDIR}/multimc-minecraft-runtime ${STAGEDIR}${PREFIX}/bin/
.include <bsd.port.mk>
diff --git a/games/multimc/distinfo b/games/multimc/distinfo
index a3c83dc..a0d442a 100644
--- a/games/multimc/distinfo
+++ b/games/multimc/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1626036200
-SHA256 (MultiMC-MultiMC5-0.6.12_GH0.tar.gz) = c251744b77d93db4ead56940b7b81d30dc5390fb86a1676d3f0364cc4e570185
-SIZE (MultiMC-MultiMC5-0.6.12_GH0.tar.gz) = 2389805
+TIMESTAMP = 1632941077
+SHA256 (MultiMC-MultiMC5-0.6.13_GH0.tar.gz) = af083b41bda801c6d2b6639a2b7a8cfa3a472b1b5942a5af485900449343b967
+SIZE (MultiMC-MultiMC5-0.6.13_GH0.tar.gz) = 2493423
SHA256 (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 14f16c8e6dc264017684774cdd9c6f149855e464895b28c29f9f55ea76d34f1a
SIZE (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 47406
SHA256 (MultiMC-quazip-3691d57_GH0.tar.gz) = 17a9457360053fa2c6c849c75fa760383036bd14d7d8f7bd0d958bfc2a584009
diff --git a/games/multimc/files/patch-CMakeLists.txt b/games/multimc/files/patch-CMakeLists.txt
deleted file mode 100644
index 4769c4d..0000000
--- a/games/multimc/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig 2019-07-13 18:18:48 UTC
-+++ CMakeLists.txt
-@@ -38,6 +38,9 @@ if(UNIX AND APPLE)
- endif()
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
-
-+# Fix build with Qt 5.13
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
-+
- ##################################### Set Application options #####################################
-
- ######## Set URLs ########
diff --git a/games/multimc/files/patch-api_gui_DesktopServices.cpp b/games/multimc/files/patch-launcher_DesktopServices.cpp
index eb4fd15..0bc36b6 100644
--- a/games/multimc/files/patch-api_gui_DesktopServices.cpp
+++ b/games/multimc/files/patch-launcher_DesktopServices.cpp
@@ -1,5 +1,5 @@
---- api/gui/DesktopServices.cpp.orig 2019-02-20 23:45:36 UTC
-+++ api/gui/DesktopServices.cpp
+--- launcher/DesktopServices.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/DesktopServices.cpp
@@ -7,7 +7,7 @@
/**
* This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.
diff --git a/games/multimc/files/patch-api_logic_FileSystem.cpp b/games/multimc/files/patch-launcher_FileSystem.cpp
index 22c10d8..0543fae 100644
--- a/games/multimc/files/patch-api_logic_FileSystem.cpp
+++ b/games/multimc/files/patch-launcher_FileSystem.cpp
@@ -1,6 +1,6 @@
---- api/logic/FileSystem.cpp.orig 2019-03-07 17:30:10 UTC
-+++ api/logic/FileSystem.cpp
-@@ -398,7 +398,7 @@ QString getDesktopDir()
+--- launcher/FileSystem.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/FileSystem.cpp
+@@ -403,7 +403,7 @@ QString getDesktopDir()
bool createShortCut(QString location, QString dest, QStringList args, QString name,
QString icon)
{
diff --git a/games/multimc/files/patch-api_logic_FileSystem__test.cpp b/games/multimc/files/patch-launcher_FileSystem__test.cpp
index ad6a41b..c50df7e 100644
--- a/games/multimc/files/patch-api_logic_FileSystem__test.cpp
+++ b/games/multimc/files/patch-launcher_FileSystem__test.cpp
@@ -1,5 +1,5 @@
---- api/logic/FileSystem_test.cpp.orig 2019-03-07 17:32:17 UTC
-+++ api/logic/FileSystem_test.cpp
+--- launcher/FileSystem_test.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/FileSystem_test.cpp
@@ -119,7 +119,7 @@ slots:
// this is only valid on linux
diff --git a/games/multimc/files/patch-application_MultiMC.cpp b/games/multimc/files/patch-launcher_MultiMC.cpp
index e2691e4..10a72e5 100644
--- a/games/multimc/files/patch-application_MultiMC.cpp
+++ b/games/multimc/files/patch-launcher_MultiMC.cpp
@@ -1,6 +1,6 @@
---- application/MultiMC.cpp.orig 2019-03-08 00:50:32 UTC
-+++ application/MultiMC.cpp
-@@ -324,7 +324,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplicatio
+--- launcher/MultiMC.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/MultiMC.cpp
+@@ -487,7 +487,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplicatio
// Set up paths
{
// Root path is used for updates.
diff --git a/games/multimc/files/patch-application_UpdateController.cpp b/games/multimc/files/patch-launcher_UpdateController.cpp
index ab49773..4dc9b99 100644
--- a/games/multimc/files/patch-application_UpdateController.cpp
+++ b/games/multimc/files/patch-launcher_UpdateController.cpp
@@ -1,5 +1,5 @@
---- application/UpdateController.cpp.orig 2019-03-08 00:52:03 UTC
-+++ application/UpdateController.cpp
+--- launcher/UpdateController.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/UpdateController.cpp
@@ -90,7 +90,7 @@ void UpdateController::installUpdates()
qDebug() << "Installing updates.";
#ifdef Q_OS_WIN
diff --git a/games/multimc/files/patch-application_install__prereqs.cmake.in b/games/multimc/files/patch-launcher_install__prereqs.cmake.in
index 8ca7a44..4a442c3 100644
--- a/games/multimc/files/patch-application_install__prereqs.cmake.in
+++ b/games/multimc/files/patch-launcher_install__prereqs.cmake.in
@@ -1,5 +1,5 @@
---- application/install_prereqs.cmake.in.orig 2019-03-08 00:54:15 UTC
-+++ application/install_prereqs.cmake.in
+--- launcher/install_prereqs.cmake.in.orig 2021-09-08 22:27:46 UTC
++++ launcher/install_prereqs.cmake.in
@@ -23,5 +23,4 @@ set(gp_cmd_paths ${gp_cmd_paths}
)
diff --git a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp b/games/multimc/files/patch-launcher_java_JavaUtils.cpp
index 4bad181..156841e 100644
--- a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp
+++ b/games/multimc/files/patch-launcher_java_JavaUtils.cpp
@@ -1,5 +1,5 @@
---- api/logic/java/JavaUtils.cpp.orig 2021-07-16 14:03:58 UTC
-+++ api/logic/java/JavaUtils.cpp
+--- launcher/java/JavaUtils.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/java/JavaUtils.cpp
@@ -31,7 +31,7 @@ JavaUtils::JavaUtils()
{
}
diff --git a/games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp b/games/multimc/files/patch-launcher_minecraft_MinecraftInstance.cpp
index 67276a6..c073576 100644
--- a/games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_MinecraftInstance.cpp
@@ -1,6 +1,6 @@
---- api/logic/minecraft/MinecraftInstance.cpp.orig 2019-03-08 14:41:15 UTC
-+++ api/logic/minecraft/MinecraftInstance.cpp
-@@ -161,7 +161,11 @@ QString MinecraftInstance::binRoot() const
+--- launcher/minecraft/MinecraftInstance.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/minecraft/MinecraftInstance.cpp
+@@ -181,7 +181,11 @@ QString MinecraftInstance::binRoot() const
QString MinecraftInstance::getNativePath() const
{
diff --git a/games/multimc/files/patch-api_logic_minecraft_OpSys.cpp b/games/multimc/files/patch-launcher_minecraft_OpSys.cpp
index 3879286..2b21d80 100644
--- a/games/multimc/files/patch-api_logic_minecraft_OpSys.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_OpSys.cpp
@@ -1,5 +1,5 @@
---- api/logic/minecraft/OpSys.cpp.orig 2019-03-09 16:23:18 UTC
-+++ api/logic/minecraft/OpSys.cpp
+--- launcher/minecraft/OpSys.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/minecraft/OpSys.cpp
@@ -17,6 +17,8 @@
OpSys OpSys_fromString(QString name)
diff --git a/games/multimc/files/patch-api_logic_minecraft_OpSys.h b/games/multimc/files/patch-launcher_minecraft_OpSys.h
index 5286946..21899b8 100644
--- a/games/multimc/files/patch-api_logic_minecraft_OpSys.h
+++ b/games/multimc/files/patch-launcher_minecraft_OpSys.h
@@ -1,5 +1,5 @@
---- api/logic/minecraft/OpSys.h.orig 2019-03-09 16:25:37 UTC
-+++ api/logic/minecraft/OpSys.h
+--- launcher/minecraft/OpSys.h.orig 2021-09-08 22:27:46 UTC
++++ launcher/minecraft/OpSys.h
@@ -18,6 +18,7 @@
enum OpSys
{
diff --git a/games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp b/games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp
index e981539..eb49eba 100644
--- a/games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp
@@ -1,5 +1,5 @@
---- api/logic/minecraft/launch/ExtractNatives.cpp.orig 2017-12-18 00:19:43 UTC
-+++ api/logic/minecraft/launch/ExtractNatives.cpp
+--- launcher/minecraft/launch/ExtractNatives.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/minecraft/launch/ExtractNatives.cpp
@@ -23,6 +23,14 @@
#include "FileSystem.h"
#include <QDir>
@@ -14,4 +14,4 @@
+
static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement)
{
- if (!target.endsWith(suffix))
+ if (!target.endsWith(suffix))
diff --git a/games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp b/games/multimc/files/patch-launcher_minecraft_launch_PrintInstanceInfo.cpp
index be5c158..7e02127 100644
--- a/games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_launch_PrintInstanceInfo.cpp
@@ -1,5 +1,5 @@
---- api/logic/minecraft/launch/PrintInstanceInfo.cpp.orig 2019-03-07 21:42:07 UTC
-+++ api/logic/minecraft/launch/PrintInstanceInfo.cpp
+--- launcher/minecraft/launch/PrintInstanceInfo.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/minecraft/launch/PrintInstanceInfo.cpp
@@ -19,8 +19,9 @@
#include "PrintInstanceInfo.h"
#include <launch/LaunchTask.h>
diff --git a/games/multimc/files/patch-api_logic_tools_MCEditTool.cpp b/games/multimc/files/patch-launcher_tools_MCEditTool.cpp
index 81d3825..b644a0f 100644
--- a/games/multimc/files/patch-api_logic_tools_MCEditTool.cpp
+++ b/games/multimc/files/patch-launcher_tools_MCEditTool.cpp
@@ -1,5 +1,5 @@
---- api/logic/tools/MCEditTool.cpp.orig 2019-03-09 18:30:20 UTC
-+++ api/logic/tools/MCEditTool.cpp
+--- launcher/tools/MCEditTool.cpp.orig 2021-09-08 22:27:46 UTC
++++ launcher/tools/MCEditTool.cpp
@@ -52,7 +52,7 @@ QString MCEditTool::getProgramPath()
#else
const QString mceditPath = path();
diff --git a/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp b/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp
index 859c764..7175349 100644
--- a/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp
+++ b/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp
@@ -1,4 +1,4 @@
---- libraries/iconfix/internal/qiconloader.cpp.orig 2019-03-09 17:22:58 UTC
+--- libraries/iconfix/internal/qiconloader.cpp.orig 2021-09-08 22:27:46 UTC
+++ libraries/iconfix/internal/qiconloader.cpp
@@ -320,7 +320,7 @@ Description: Make it so that the QIcon loader honors /
icon theme specification.
diff --git a/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp b/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp
index d3d6d0b..74e972d 100644
--- a/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp
+++ b/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp
@@ -1,6 +1,6 @@
---- libraries/systeminfo/src/sys_unix.cpp.orig 2019-03-09 17:25:33 UTC
+--- libraries/systeminfo/src/sys_unix.cpp.orig 2021-09-08 22:27:46 UTC
+++ libraries/systeminfo/src/sys_unix.cpp
-@@ -18,6 +18,7 @@ Sys::KernelInfo Sys::getKernelInfo()
+@@ -47,6 +47,7 @@ Sys::KernelInfo Sys::getKernelInfo()
uint64_t Sys::getSystemRam()
{
std::string token;
@@ -8,7 +8,7 @@
std::ifstream file("/proc/meminfo");
while(file >> token)
{
-@@ -36,6 +37,19 @@ uint64_t Sys::getSystemRam()
+@@ -65,6 +66,19 @@ uint64_t Sys::getSystemRam()
// ignore rest of the line
file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
}
diff --git a/games/multimc/pkg-plist b/games/multimc/pkg-plist
index b3a7126..270e398 100644
--- a/games/multimc/pkg-plist
+++ b/games/multimc/pkg-plist
@@ -1,9 +1,10 @@
bin/multimc
-lib/libMultiMC_gui.so
+bin/multimc-minecraft-runtime
lib/libMultiMC_iconfix.so
-lib/libMultiMC_logic.so
lib/libMultiMC_nbt++.so
lib/libMultiMC_quazip.so
lib/libMultiMC_rainbow.so
+share/applications/multimc.desktop
+share/icons/hicolor/scalable/apps/multimc.svg
%%DATADIR%%/jars/JavaCheck.jar
%%DATADIR%%/jars/NewLaunch.jar