diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-04-07 12:14:09 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-04-07 12:14:09 +0800 |
commit | e282774e68dc4e1826517a3dd4ab09714adcca26 (patch) | |
tree | 8df14fab1d395256c8ca920be88a2eb417486b76 /patches | |
parent | 415bfb74fd52b200f21031e78a4ca9fd5e595978 (diff) |
Make it build & install, USING Portage, on Gentoo
Gentoo uses lib64, just like Fedora, and has libexec too.
The necessary step to install dependencies is part of the ebuild script
now (tracked in another repo, ebuild.git).
One thing I forgot to mention on the commit in that ebuild repo is,
unzip.h is provided on Gentoo only by minizip, and not minizip-ng cause
somehow the (minizip) "compat" USE flag couldn't be turned on somehow,
and there was no "minizip" (without -ng) package on Gentoo, but it was
achievable by setting the "minizip" USE flag on the zlib (again, without
-ng) package.
The queue header inclusion is needed cause its absence would cause the
compiling to fail on Portage (though it compiled when building the
viewer manually without Portage).
Also, using the prebuilt Meshoptimizer caused some linking errors when
using Portage (though, again, it linked when building the viewer
manually without Portage), hence Meshoptimizer is built from source as
part of the CMake configuration on Gentoo, differing from fellow Linux
distros.
Now Collada DOM, firstly the unpack destination directory is moved to
inside the build directory now, to make it uniform with other 3rd-party
files, just for less confusion. Secondly, since the patching that takes
effect is the one done by Portage, it would kill the process when there
are offending failed patchings (ones that generate .rej, reject files),
and they are the vcxproj patchings which aren't used anyway. Thirdly,
the hash checking on the downloaded file, that would fail anyway since
Portage doesn't allow any downloading that isn't part of the ebuild,
unfortunately has to be skipped so the emerge process wouldn't be killed
just because of it. Ebuild has its own sum checking (though this means
this particular file is not checked on other platforms, but other files
aren't checked either anyway yet).
Last but not least, the XDG Application category is removed because it's
considered deprecated by Portage, though not fatal, but the viewer is
already shown well in the Internet (Network) submenu anyway on unix
desktops.
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collada-dom-v2.3-r8.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/patches/collada-dom-v2.3-r8.patch b/patches/collada-dom-v2.3-r8.patch index c72c014340..b24ae2746b 100644 --- a/patches/collada-dom-v2.3-r8.patch +++ b/patches/collada-dom-v2.3-r8.patch @@ -389,116 +389,6 @@ index 15b1e6a..023814d 100644 $(obj): includeOpts := $(includeOpts) # Call createObjRule with a source file path -diff --git a/projects/vc142-1.4/dom-static.vcxproj b/projects/vc142-1.4/dom-static.vcxproj -index 555ca4c..b87c231 100644 ---- a/projects/vc142-1.4/dom-static.vcxproj -+++ b/projects/vc142-1.4/dom-static.vcxproj -@@ -122,13 +122,11 @@ - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>OldStyle</DebugInformationFormat> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> -- <LanguageStandard>stdcpp17</LanguageStandard> -+ <LanguageStandard>stdcpp20</LanguageStandard> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - </ClCompile> - <Lib> -@@ -143,13 +141,11 @@ - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>OldStyle</DebugInformationFormat> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> -- <LanguageStandard>stdcpp17</LanguageStandard> -+ <LanguageStandard>stdcpp20</LanguageStandard> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - </ClCompile> - <Lib> -diff --git a/projects/vc142-1.4/dom.vcxproj b/projects/vc142-1.4/dom.vcxproj -index 04b0a11..0c57fd4 100644 ---- a/projects/vc142-1.4/dom.vcxproj -+++ b/projects/vc142-1.4/dom.vcxproj -@@ -149,15 +149,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libxml2.lib;Bcrypt.lib;zlib.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x32.lib;libboost_filesystem-mt-x32.lib;libboost_system-mt-x32.lib;%(AdditionalDependencies)</AdditionalDependencies> -@@ -180,15 +179,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libxml2.lib;Bcrypt.lib;zlib.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x64.lib;libboost_filesystem-mt-x64.lib;libboost_system-mt-x64.lib;%(AdditionalDependencies)</AdditionalDependencies> -diff --git a/projects/vc142-1.4/domTest.vcxproj b/projects/vc142-1.4/domTest.vcxproj -index 5daeaa3..362ca6f 100644 ---- a/projects/vc142-1.4/domTest.vcxproj -+++ b/projects/vc142-1.4/domTest.vcxproj -@@ -133,15 +133,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libcollada14dom23.lib;libboost_filesystem-mt-x32.lib;libboost_system-mt-x32.lib;%(AdditionalDependencies)</AdditionalDependencies> -@@ -161,15 +160,14 @@ - <ClCompile> - <AdditionalIncludeDirectories>..\..\include;..\..\include\1.4;..\..\stage\packages\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -- <DisableLanguageExtensions>false</DisableLanguageExtensions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <WholeProgramOptimization>true</WholeProgramOptimization> -- <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <MultiProcessorCompilation>true</MultiProcessorCompilation> -+ <LanguageStandard>stdcpp20</LanguageStandard> - </ClCompile> - <Link> - <AdditionalDependencies>libcollada14dom23.lib;libboost_filesystem-mt-x64.lib;libboost_system-mt-x64.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/src/1.4/CMakeLists.txt b/src/1.4/CMakeLists.txt index 17fbaea..d0d5939 100644 --- a/src/1.4/CMakeLists.txt |