Merge ~j-rivero/ubuntu/+source/ogre-next:ubuntu/devel into ubuntu/+source/ogre-next:ubuntu/devel

[Jose Luis Rivero]

Include the OGRE-Next CMake Module to facilitate build.
Fix the autopkgtest execution.

From the work of bumping the version to 2.3.3 there was a large cleanup of custom code in d/rules that ended up with the lack of the installation of the CMake Module in d/extras. The OGRE-Next project does not provide any CMake module ready to use we are inheriting this from previous version 2.2.5 already in Noble.

The merge-request should fix the problems with autopkgtest and facilitate the transition from noble-proposed currently blocked.

@Dave Jones: adding you as a reviewer since you were the uploader for ogre-2.3.3. Not sure if this is the right procedure for this kind of follow-ups.

Code builds fine here: https://code.launchpad.net/~j-rivero/+archive/ubuntu/ogre-next-recipe/+build/28119759

[Pushkar Kulkarni (pushkarnk)]

Thanks for the MP! I filed a bug report yesterday, before noticing this. It might help to add the LP# in the changelog.

https://bugs.launchpad.net/ubuntu/+source/ogre-next/+bug/2062378

3440a9f... by Jose Luis Rivero on 2024-04-19

Include launchpad bug 2062378

Signed-off-by: Jose Luis Rivero <email address hidden>

[Jose Luis Rivero (j-rivero)]

Thanks Pushkar for the bug. I've added it to the d/changelog entry.

[Dave Jones (waveform)]

This looks like it builds fine and passes autopkgtests locally on an arm64 box. I'll sponsor shortly.

review: Approve

Unmerged commits

3440a9f... by Jose Luis Rivero on 2024-04-19

Include launchpad bug 2062378

Signed-off-by: Jose Luis Rivero <email address hidden>

1157754... by Jose Luis Rivero on 2024-04-17

Update d/changelog

Signed-off-by: Jose Luis Rivero <email address hidden>

ceac5df... by Jose Luis Rivero on 2024-04-17

Cleanup debug messages from OGRE-Next Module

Signed-off-by: Jose Luis Rivero <email address hidden>

53cd5c1... by Jose Luis Rivero on 2024-04-17

Include the OGRE-Next CMake Module

Signed-off-by: Jose Luis Rivero <email address hidden>

b0bb82f... by Jose Luis Rivero on 2024-04-17

Merge remote-tracking branch 'ubuntu/ubuntu/devel' into ubuntu/devel

f4f60bc... by Jose Luis Rivero on 2024-03-09

Update d/changelog

Signed-off-by: Jose Luis Rivero <email address hidden>

a590b64... by Jose Luis Rivero on 2024-03-09

[PATCH] Fix armhf vulkan build

Signed-off-by: Jose Luis Rivero <email address hidden>

7d84f42... by Jose Luis Rivero on 2024-03-09

Update d/changelog

Signed-off-by: Jose Luis Rivero <email address hidden>

bba8030... by Jose Luis Rivero on 2024-03-09

[PATCH] Avoid shaderrc vulkan dependency

Signed-off-by: Jose Luis Rivero <email address hidden>

1b581a8... by Jose Luis Rivero on 2024-03-09

Fix vulkan dep on noble

Signed-off-by: Jose Luis Rivero <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 4e524d4..36f8444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ogre-next (2.3.3+dfsg-0ubuntu2) noble; urgency=medium
+
+  * Include the OGRE-Next Module in the installation.
+    (LP: #2062378)
+  * Cleanup debug message from Ogre-Next module
+
+ -- Jose Luis Rivero <[e-mail]>  Fri, 19 Apr 2024 14:18:04 +0200
+
 ogre-next (2.3.3+dfsg-0ubuntu1) noble; urgency=medium
 
   * New upstream version 2.3.3+dfsg
diff --git a/debian/extras/OGRE-NextConfig.cmake b/debian/extras/OGRE-NextConfig.cmake
index 921f583..67b656b 100644
--- a/debian/extras/OGRE-NextConfig.cmake
+++ b/debian/extras/OGRE-NextConfig.cmake
@@ -190,9 +190,7 @@ endif()
 # locate Ogre include files
 
 find_path(OGRE-Next_CONFIG_INCLUDE_DIR NAMES OgreBuildSettings.h HINTS ${OGRE-Next_INC_SEARCH_PATH} ${OGRE-Next_FRAMEWORK_INCLUDES} ${OGRE-Next_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "OGRE-Next")
-message(STATUS "${OGRE-Next_CONFIG_INCLUDE_DIR}")
 find_path(OGRE-Next_INCLUDE_DIR NAMES OgreRoot.h HINTS ${OGRE-Next_CONFIG_INCLUDE_DIR} ${OGRE-Next_INC_SEARCH_PATH} ${OGRE-Next_FRAMEWORK_INCLUDES} ${OGRE-Next_PKGC_INCLUDE_DIRS} PATH_SUFFIXES "OGRE-Next")
-message(STATUS "${OGRE-Next_INCLUDE_DIR}")
 set(OGRE-Next_INCOMPATIBLE FALSE)
 
 if (OGRE-Next_INCLUDE_DIR)
@@ -238,13 +236,9 @@ else ()
   set(OGRE-Next_INCOMPATIBLE FALSE)
 endif ()
 
-message(STATUS "1. waypoint ${OGRE-Next_INCOMPATIBLE}")
-
 find_library(OGRE-Next_LIBRARY_REL NAMES ${OGRE-Next_LIBRARY_NAMES} HINTS ${OGRE-Next_LIB_SEARCH_PATH} ${OGRE-Next_PKGC_LIBRARY_DIRS} ${OGRE-Next_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel")
 find_library(OGRE-Next_LIBRARY_DBG NAMES ${OGRE-Next_LIBRARY_NAMES_DBG} HINTS ${OGRE-Next_LIB_SEARCH_PATH} ${OGRE-Next_PKGC_LIBRARY_DIRS} ${OGRE-Next_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Debug")
 
-message(STATUS "REL ${OGRE-Next_LIBRARY_REL}")
-message(STATUS "DBG ${OGRE-Next_LIBRARY_DBG}")
 make_library_set(OGRE-Next_LIBRARY)
 
 if (OGRE-Next_INCOMPATIBLE)
@@ -265,14 +259,10 @@ endif()
 
 mark_as_advanced(OGRE-Next_CONFIG_INCLUDE_DIR OGRE-Next_MEDIA_DIR OGRE-Next_PLUGIN_DIR_REL OGRE-Next_PLUGIN_DIR_DBG)
 
-message(STATUS "2. waypoint ${OGRE-Next_FOUND}")
-
 if (NOT OGRE-Next_FOUND)
   return()
 endif ()
 
-message(STATUS "3. waypoint ${OGRE-Next_FOUND}")
-
 # look for required Ogre dependencies in case of static build and/or threading
 if (OGRE-Next_STATIC)
   set(OGRE-Next_DEPS_FOUND TRUE)
diff --git a/debian/rules b/debian/rules
index c13aea2..0bd67ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,12 +29,16 @@ override_dh_auto_configure:
 		-DOGRE_GLSUPPORT_USE_EGL_HEADLESS:BOOL=TRUE \
 		-DOGRE_GLSUPPORT_USE_GLX:BOOL=TRUE $(EXTRA_CMAKE_FLAGS)
 
-# TODO: REVERT
 override_dh_auto_build-indep:
 	dh_auto_build -i
 	# generate doxygen API doc
 	dh_auto_build -i -- OgreDoc
 
+execute_before_dh_install:
+	# Inject the custom cmake configure file from extras
+	install -m644 debian/extras/OGRE-NextConfig.cmake \
+	              debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/OGRE-Next/cmake/
+
 override_dh_installchangelogs:
 	dh_installchangelogs -- Docs/ChangeLog.html