Skip to content

Commit e504e82

Browse files
author
Anthony Mallet
committed
[graphics/ogre-next] Always PREFER robotpkg package
The ubuntu-24.04 ogre-next package has a couple of undefined symbols, that makes it unusable with graphics/gz-rendering. An issue has been reported, but it does not seem to have made any progress since then: https://bugs.launchpad.net/ubuntu/+source/ogre-next/+bug/2063359
1 parent 3a0dc45 commit e504e82

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

graphics/ogre-next/depend.mk

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,21 @@
22
# Created: Anthony Mallet on Wed, 12 Feb 2025
33
#
44

5-
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
6-
OGRE_NEXT_DEPEND_MK:= ${OGRE_NEXT_DEPEND_MK}+
5+
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
6+
OGRE_NEXT_DEPEND_MK:= ${OGRE_NEXT_DEPEND_MK}+
77

88
ifeq (+,$(DEPEND_DEPTH))
9-
DEPEND_PKG+= ogre-next
9+
DEPEND_PKG+= ogre-next
1010
endif
1111

1212
ifeq (+,$(OGRE_NEXT_DEPEND_MK)) # ------------------------------------------
1313

14-
include ../../mk/robotpkg.prefs.mk # for OPSYS
15-
ifeq (Ubuntu,${OPSYS})
16-
ifneq (,$(filter 18.04% 20.04% 22.04%,${OS_VERSION}))
17-
PREFER.ogre-next?= robotpkg
18-
endif
19-
PREFER.ogre-next?= system
20-
endif
2114
PREFER.ogre-next?= robotpkg
2215

2316
DEPEND_USE+= ogre-next
2417

25-
DEPEND_ABI.ogre-next?= ogre-next>=2
26-
DEPEND_DIR.ogre-next?= ../../graphics/ogre-next
18+
DEPEND_ABI.ogre-next?= ogre-next>=2
19+
DEPEND_DIR.ogre-next?= ../../graphics/ogre-next
2720

2821
SYSTEM_SEARCH.ogre-next=\
2922
'include/OGRE-{Next,[0-9]*}/Ogre.h' \
@@ -32,4 +25,4 @@ SYSTEM_SEARCH.ogre-next=\
3225

3326
endif # OGRE_NEXT_DEPEND_MK ------------------------------------------------
3427

35-
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
28+
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}

0 commit comments

Comments
 (0)