-
-
Notifications
You must be signed in to change notification settings - Fork 19.5k
openmw: 0.48.0 -> 0.49.0 #422562
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
openmw: 0.48.0 -> 0.49.0 #422562
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9a7dd53
mygui: 3.4.2 -> 3.4.3
SigmaSquadron e30b6c8
mygui: refactor
SigmaSquadron 261fc46
collada-dom: init at 2.5.1
SigmaSquadron 45bd9d6
openscenegraph: fix collada implementation
SigmaSquadron c1d0834
openmw: 0.48.0 -> 0.49.0
SigmaSquadron a58b98e
openmw: refactor
SigmaSquadron f63a34f
openmw-tes3mp: drop
SigmaSquadron File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,54 @@ | ||||||||
| { | ||||||||
| lib, | ||||||||
| stdenv, | ||||||||
| fetchFromGitHub, | ||||||||
| cmake, | ||||||||
| boost, | ||||||||
| libxml2, | ||||||||
| minizip, | ||||||||
| readline, | ||||||||
| }: | ||||||||
|
|
||||||||
| stdenv.mkDerivation (finalAttrs: { | ||||||||
| pname = "collada-dom"; | ||||||||
| version = "2.5.1"; | ||||||||
|
|
||||||||
| __structuredAttrs = true; | ||||||||
| strictDeps = true; | ||||||||
|
|
||||||||
| src = fetchFromGitHub { | ||||||||
| owner = "Gepetto"; | ||||||||
| repo = "collada-dom"; | ||||||||
| tag = "v${finalAttrs.version}"; | ||||||||
| hash = "sha256-DYdqrwRIrVq0BQqZB0vtZzADteJGVaJtFC5kC/cD250="; | ||||||||
| }; | ||||||||
|
|
||||||||
| postInstall = '' | ||||||||
| ln -s $out/include/*/* $out/include | ||||||||
| ''; | ||||||||
|
|
||||||||
| nativeBuildInputs = [ cmake ]; | ||||||||
|
|
||||||||
| buildInputs = [ | ||||||||
| boost | ||||||||
| libxml2 | ||||||||
| minizip | ||||||||
| readline | ||||||||
| ]; | ||||||||
|
|
||||||||
| meta = { | ||||||||
| description = "API that provides a C++ object representation of a COLLADA XML instance document"; | ||||||||
| longDescription = "This is a fork of [rdiankov/collada-dom](https://github.com/rdiankov/collada-dom) which has been unmaintained for six years."; | ||||||||
| homepage = "https://github.com/Gepetto/collada-dom"; | ||||||||
| changelog = "https://github.com/Gepetto/collada-dom/releases/tag/${finalAttrs.src.tag}"; | ||||||||
| license = lib.licenses.mit; | ||||||||
| maintainers = with lib.maintainers; [ | ||||||||
| sigmasquadron | ||||||||
| marius851000 | ||||||||
| ]; | ||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Since I maintain that fork, it would be better for me to get the right notifications about issues :) |
||||||||
| platforms = lib.platforms.all; | ||||||||
|
|
||||||||
| # Fails to build. | ||||||||
| badPlatforms = lib.platforms.darwin; | ||||||||
| }; | ||||||||
| }) | ||||||||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| { | ||
| lib, | ||
| stdenv, | ||
| fetchFromGitLab, | ||
| fetchpatch, | ||
|
|
||
| SDL2, | ||
| boost, | ||
| bullet, | ||
| cmake, | ||
| collada-dom, | ||
| ffmpeg, | ||
| libXt, | ||
| lua, | ||
| luajit, | ||
| lz4, | ||
| mygui, | ||
| openal, | ||
| openscenegraph, | ||
| pkg-config, | ||
| qt6Packages, | ||
| recastnavigation, | ||
| unshield, | ||
| yaml-cpp, | ||
|
|
||
| GLPreference ? "GLVND", | ||
| }: | ||
| let | ||
| inherit (stdenv.hostPlatform) isDarwin isLinux isAarch64; | ||
| isAarch64Linux = isLinux && isAarch64; | ||
| in | ||
| assert lib.assertOneOf "GLPreference" GLPreference [ | ||
| "GLVND" | ||
| "LEGACY" | ||
| ]; | ||
| stdenv.mkDerivation (finalAttrs: { | ||
| pname = "openmw"; | ||
| version = "0.49.0"; | ||
|
|
||
| __structuredAttrs = true; | ||
| strictDeps = true; | ||
|
|
||
| osg' = (openscenegraph.override { colladaSupport = true; }).overrideAttrs (oldAttrs: { | ||
| patches = (oldAttrs.patches or [ ]) ++ [ | ||
| (fetchpatch { | ||
| # Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW. | ||
| name = "darwin-osg-plugins-fix.patch"; | ||
| url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/1305497c009dc0e7a6a70fe14f0a2f92b96cbcb4/macos/osg.patch"; | ||
| hash = "sha256-G8Y+fnR6FRGxECWrei/Ixch3A3PkRfH6b5q9iawsSCY="; | ||
| }) | ||
| ]; | ||
| cmakeFlags = | ||
| (oldAttrs.cmakeFlags or [ ]) | ||
| ++ [ | ||
| "-Wno-dev" | ||
| (lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference) | ||
| (lib.cmakeBool "BUILD_OSG_PLUGINS_BY_DEFAULT" false) | ||
| (lib.cmakeBool "BUILD_OSG_DEPRECATED_SERIALIZERS" false) | ||
| ] | ||
| ++ (map (plugin: lib.cmakeBool "BUILD_OSG_PLUGIN_${plugin}" true) [ | ||
| "BMP" | ||
| "DAE" | ||
| "DDS" | ||
| "FREETYPE" | ||
| "JPEG" | ||
| "OSG" | ||
| "PNG" | ||
| "TGA" | ||
| ]); | ||
| }); | ||
|
|
||
| bullet' = bullet.overrideAttrs (oldAttrs: { | ||
| cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ | ||
| "-Wno-dev" | ||
| (lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference) | ||
| (lib.cmakeBool "USE_DOUBLE_PRECISION" true) | ||
| (lib.cmakeBool "BULLET2_MULTITHREADING" true) | ||
| ]; | ||
| }); | ||
|
|
||
| src = fetchFromGitLab { | ||
| owner = "OpenMW"; | ||
| repo = "openmw"; | ||
| tag = "openmw-${finalAttrs.version}"; | ||
| hash = "sha256-Eyjn3jPpo0d7XENg0Ea/3MN60lZBSUAMkz1UtTiIP80="; | ||
| }; | ||
|
|
||
| postPatch = '' | ||
| sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12 | ||
| '' | ||
| # Don't fix Darwin app bundle | ||
| + lib.optionalString isDarwin '' | ||
| sed -i '/fixup_bundle/d' CMakeLists.txt | ||
| ''; | ||
|
|
||
| nativeBuildInputs = [ | ||
| cmake | ||
| pkg-config | ||
| ] | ||
| ++ (with qt6Packages; [ | ||
| wrapQtAppsHook | ||
| ]); | ||
|
|
||
| # If not set, OSG plugin .so files become shell scripts on Darwin. | ||
| dontWrapQtApps = isDarwin; | ||
|
|
||
| buildInputs = [ | ||
| SDL2 | ||
| boost | ||
| collada-dom | ||
| ffmpeg | ||
| libXt | ||
| (if isAarch64Linux then lua else luajit) | ||
| lz4 | ||
| mygui | ||
| openal | ||
| recastnavigation | ||
| unshield | ||
| yaml-cpp | ||
| ] | ||
| ++ (with qt6Packages; [ | ||
| qttools | ||
| ]) | ||
| ++ (with finalAttrs; [ | ||
| bullet' | ||
| osg' | ||
| ]); | ||
|
|
||
| cmakeFlags = [ | ||
| (lib.cmakeFeature "OpenGL_GL_PREFERENCE" GLPreference) | ||
| (lib.cmakeBool "USE_LUAJIT" (!isAarch64Linux)) | ||
| (lib.cmakeBool "OPENMW_USE_SYSTEM_RECASTNAVIGATION" true) | ||
| (lib.cmakeBool "OPENMW_OSX_DEPLOYMENT" isDarwin) | ||
| ]; | ||
|
|
||
| meta = { | ||
| description = "Unofficial open source engine reimplementation of the game Morrowind"; | ||
| changelog = "https://gitlab.com/OpenMW/openmw/-/blob/${finalAttrs.src.tag}/CHANGELOG.md"; | ||
| homepage = "https://openmw.org"; | ||
| license = lib.licenses.gpl3Plus; | ||
| maintainers = with lib.maintainers; [ | ||
| marius851000 | ||
| sigmasquadron | ||
| ]; | ||
| platforms = with lib.platforms; linux ++ darwin ++ windows; | ||
| # Nixpkgs' NT infrastructure is currently incapable of building this. | ||
| badPlatforms = lib.platforms.windows; | ||
| }; | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 0 additions & 41 deletions
41
pkgs/games/openmw/0001-function-inclusion-fixes-for-gcc14.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.