Skip to content

Commit

Permalink
package/ogre: bump to version 1.12.9
Browse files Browse the repository at this point in the history
Remove upstream patch [1].

tinyxml has been replaced by pugixml [2].

Switch to git download method since github release without
the complete source code in the tarball [3].

Update indentation of hash file (two spaces).

The sdl2-config.cmake generated by sdl2 package is broken for
cross-compilation since it add /usr/include/SDL2 in CFLAGS.

Such flags are unsafe for cross-compilation since it mixes
headers for the host and target.

sdl2-config.cmake must be removed from staging since
we are using autotools build system to build sdl2 package
[4][5].

ogre 1.12.7 only include <sys/sysctl.h> for iOS in order to
build with glibc >= 2.32 [6].

[1] OGRECave/ogre@de4d5c9
[2] OGRECave/ogre@3381033
[3] OGRECave/ogre#1332 (comment)
[4] https://bugzilla.libsdl.org/show_bug.cgi?id=4597
[5] OGRECave/ogre#1568
[6] OGRECave/ogre@8ec086e

Signed-off-by: Romain Naour <romain.naour@gmail.com>
  • Loading branch information
RomainNaour committed Dec 7, 2020
1 parent 262a7f6 commit ac897b0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 63 deletions.

This file was deleted.

1 change: 1 addition & 0 deletions package/ogre/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ config BR2_PACKAGE_OGRE
depends on BR2_USE_WCHAR # use wchar_t
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_LIBFREEIMAGE
select BR2_PACKAGE_PUGIXML
select BR2_PACKAGE_SDL2
select BR2_PACKAGE_SDL2_OPENGL
select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11
Expand Down
4 changes: 2 additions & 2 deletions package/ogre/ogre.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# sha256 locally computed
sha256 163e7700e319532d4389ecba91e3ab88551f78610886fa36f8f262f9a5080988 ogre-1.12.0.tar.gz
sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8 LICENSE
sha256 d07342016fbb4b6a4158cb12724c2c75b406eea2c5327dd48d9302cf812df8ba ogre-v1.12.9.tar.gz
sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8 LICENSE
14 changes: 10 additions & 4 deletions package/ogre/ogre.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@
#
################################################################################

OGRE_VERSION = 1.12.0
OGRE_SITE = $(call github,OGRECave,ogre,v$(OGRE_VERSION))
OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml)
OGRE_VERSION = v1.12.9
OGRE_SITE = https://github.com/OGRECave/ogre
OGRE_SITE_METHOD = git
OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins)
OGRE_LICENSE_FILES = LICENSE
OGRE_INSTALL_STAGING = YES

# Ogre use a bundled version of tinyxml
# Download with imgui submodule (https://github.com/ocornut/imgui
OGRE_GIT_SUBMODULES = YES

OGRE_DEPENDENCIES = host-pkgconf \
freetype \
libfreeimage \
libgl \
pugixml \
sdl2 \
xlib_libX11 \
xlib_libXaw \
Expand All @@ -27,9 +31,11 @@ OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU

# Unbundle freetype and zziplib.
# Disable java and nvidia cg support.
# Disable imgui overlay to avoid extra download from CMake.
OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \
-DOGRE_BUILD_COMPONENT_JAVA=OFF \
-DOGRE_BUILD_PLUGIN_CG=OFF \
-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=OFF \
-DOGRE_INSTALL_DOCS=OFF \
-DCMAKE_C_FLAGS="$(OGRE_CFLAGS)" \
-DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)"
Expand Down

0 comments on commit ac897b0

Please sign in to comment.