Merge ~liushuyu-011/ubuntu/+source/ogre-1.12:ubuntu/devel into ubuntu/+source/ogre-1.12:ubuntu/devel

[Zixing Liu]

This MP fixes an FTBFS by adding a patch to adapt ogre-1.12 font loading to the new ImGUI API.

[Andreas Hasenack (ahasenack)]

Hi,

which bug are you trying to fix? You say it's an FTBFS, but it's not referenced in your MP, https://bugs.launchpad.net/ubuntu/+source/ogre-1.12 is empty, and the current package[1] in noble-proposed built just fine.

1. https://launchpad.net/ubuntu/+source/ogre-1.12/1.12.10+dfsg2-3.1~exp1ubuntu2

review: Needs Information

Unmerged commits

677bb17... by Zixing Liu on 2024-03-15

d/p/fix-imgui-freetype-api-deprecation.patch: add a patch to fix build with ...

... newer ImGUI

6b0d547... by Matthias Klose on 2024-03-02

1.12.10+dfsg2-3build3 (patches unapplied)

Imported using git-ubuntu import.

73e76d5... by Graham Inggs on 2024-01-20

1.12.10+dfsg2-3build2 (patches unapplied)

Imported using git-ubuntu import.

ec2b283... by Graham Inggs on 2022-12-26

1.12.10+dfsg2-3build1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index bf17248..597d30c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ogre-1.12 (1.12.10+dfsg2-3ubuntu1) noble; urgency=medium
+
+  * debian/patches/fix-imgui-freetype-api-deprecation.patch: Adapt to
+    new ImGUI FreeType API.
+
+ -- Zixing Liu <[e-mail]>  Fri, 15 Mar 2024 15:54:21 -0600
+
 ogre-1.12 (1.12.10+dfsg2-3build3) noble; urgency=medium
 
   * No-change rebuild for python3.12 t64.
diff --git a/debian/control b/debian/control
index 1ce5260..43c6083 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: ogre-1.12
 Priority: optional
 Section: libs
 Standards-Version: 4.5.1
-Maintainer: Debian Games Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Games Team <[e-mail]>
 Uploaders: Manuel A. Fernandez Montecelo <[e-mail]>,
            Simon Schmeisser <[e-mail]>
 Homepage: https://ogre3d.org/
diff --git a/debian/patches/fix-imgui-freetype-api-deprecation.patch b/debian/patches/fix-imgui-freetype-api-deprecation.patch
new file mode 100644
index 0000000..8b0bb6c
--- /dev/null
+++ b/debian/patches/fix-imgui-freetype-api-deprecation.patch
@@ -0,0 +1,19 @@
+Description: Adapt to new ImGUI FreeType API
+ The new API removed BuildFontAtlas function but split the previous function
+ into two smaller ones.
+Author: Zixing Liu <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2024-03-15
+
+--- ogre-1.12-1.12.10+dfsg2.orig/Components/Overlay/src/OgreImGuiOverlay.cpp
++++ ogre-1.12-1.12.10+dfsg2/Components/Overlay/src/OgreImGuiOverlay.cpp
+@@ -115,7 +115,8 @@ void ImGuiOverlay::ImGUIRenderable::crea
+     ImGuiIO& io = ImGui::GetIO();
+     if (io.Fonts->Fonts.empty())
+         io.Fonts->AddFontDefault();
+-    ImGuiFreeType::BuildFontAtlas(io.Fonts, 0);
++    io.Fonts->FontBuilderIO = ImGuiFreeType::GetBuilderForFreeType();
++    io.Fonts->FontBuilderFlags = 0;
+ 
+     unsigned char* pixels;
+     int width, height;
diff --git a/debian/patches/series b/debian/patches/series
index ef24b22..1bb9d90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ OgreGLSupport_2.patch
 OGREConfig_fix_plugin_dir.patch
 0009-Overlay-update-imgui-to-1.83.patch
 0010-CMake-rename-FeatureSummary.cmake-to-avoid-name-clas.patch
+fix-imgui-freetype-api-deprecation.patch