pkg3: fix build when revision collides with a previous commit

subrepo:
  subdir:   "libraries"
  merged:   "dc52a3228"
upstream:
  origin:   "https://github.com/Atmosphere-NX/Atmosphere-libs"
  branch:   "master"
  commit:   "dc52a3228"
git-subrepo:
  version:  "0.4.1"
  origin:   "???"
  commit:   "???"

fusee/build_package3.py

@@ -140,7 +140,7 @@ def main(argc, argv):
     # Parse arguments
     ams_dir   = argv[1]
     target    = '' if argv[2] == 'release' else ('_%s' % argv[2])
-    revision  = int(argv[3], 16)
+    revision  = int(argv[3][:8], 16)
     major     = int(argv[4])
     minor     = int(argv[5])
     micro     = int(argv[6])

libraries/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/Atmosphere-NX/Atmosphere-libs
 	branch = master
-	commit = 0c0bb8153ab5d56b2a428ba662dd1bff620b7404
-	parent = a1af1af74d465440b01744ccb054edaaaca0c192
+	commit = dc52a32285c62fbb68e701393ec3b4efdc452343
+	parent = 155f15819747ed31582dbc3929957b952c9d484f
 	method = merge
 	cmdver = 0.4.1

libraries/libstratosphere/source/ncm/ncm_host_content_storage_impl.hpp

@@ -40,7 +40,6 @@ namespace ams::ncm {
             }
         public:
             HostContentStorageImpl(RegisteredHostContent *registered_content) : registered_content(registered_content), disabled(false) { /* ... */ }
-            ~HostContentStorageImpl();
         public:
             /* Actual commands. */
             virtual Result GeneratePlaceHolderId(sf::Out<PlaceHolderId> out);

libraries/libstratosphere/source/ncm/ncm_registered_host_content.cpp

@@ -16,7 +16,7 @@
 #include <stratosphere.hpp>
 
 namespace ams::ncm {
-    
+
     class RegisteredHostContent::RegisteredPath : public util::IntrusiveListBaseNode<RegisteredPath> {
         NON_COPYABLE(RegisteredPath);
         NON_MOVEABLE(RegisteredPath);
@@ -24,8 +24,8 @@ namespace ams::ncm {
             ContentId content_id;
             Path path;
         public:
-            RegisteredPath(const ncm::ContentId &content_id, const Path &p) : content_id(content_id), path(p) { 
-                /* ... */ 
+            RegisteredPath(const ncm::ContentId &content_id, const Path &p) : content_id(content_id), path(p) {
+                /* ... */
             }
 
             ncm::ContentId GetContentId() const {
@@ -41,6 +41,10 @@ namespace ams::ncm {
             }
     };
 
+    RegisteredHostContent::~RegisteredHostContent() {
+        /* ... */
+    }
+
     Result RegisteredHostContent::RegisterPath(const ncm::ContentId &content_id, const ncm::Path &path) {
         std::scoped_lock lk(this->mutex);
 

stratosphere/loader/source/ldr_content_management.cpp

@@ -86,7 +86,7 @@ namespace ams::ldr {
         lr::Path path;
 
         /* Check that path registration is allowable. */
-        if (loc.storage_id == ncm::StorageId::Host) {
+        if (static_cast<ncm::StorageId>(loc.storage_id) == ncm::StorageId::Host) {
             AMS_ABORT_UNLESS(spl::IsDevelopment());
         }