openmw: revbump for ffmpeg6

This commit is contained in:
zlice 2023-08-30 09:12:09 -04:00 committed by classabbyamp
parent 741389e02c
commit 1d6566b25c
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
2 changed files with 72 additions and 2 deletions

View File

@ -0,0 +1,70 @@
--- a/apps/openmw/mwgui/controllers.hpp
+++ b/apps/openmw/mwgui/controllers.hpp
@@ -1,6 +1,7 @@
#ifndef MWGUI_CONTROLLERS_H
#define MWGUI_CONTROLLERS_H
+#include <cstdint>
#include <string>
#include <MyGUI_ControllerItem.h>
--- a/apps/openmw/mwgui/itemselection.hpp
+++ b/apps/openmw/mwgui/itemselection.hpp
@@ -1,6 +1,7 @@
#ifndef OPENMW_GAME_MWGUI_ITEMSELECTION_H
#define OPENMW_GAME_MWGUI_ITEMSELECTION_H
+#include <cstdint>
#include <MyGUI_Delegate.h>
#include "windowbase.hpp"
--- a/apps/openmw/mwgui/timeadvancer.hpp
+++ b/apps/openmw/mwgui/timeadvancer.hpp
@@ -1,6 +1,7 @@
#ifndef MWGUI_TIMEADVANCER_H
#define MWGUI_TIMEADVANCER_H
+#include <cstdint>
#include <MyGUI_Delegate.h>
namespace MWGui
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -1,6 +1,7 @@
#ifndef MWGUI_WIDGETS_H
#define MWGUI_WIDGETS_H
+#include <cstdint>
#include "../mwmechanics/stat.hpp"
#include <components/esm/effectlist.hpp>
--- a/apps/openmw/mwinput/controlswitch.hpp
+++ b/apps/openmw/mwinput/controlswitch.hpp
@@ -1,6 +1,7 @@
#ifndef MWINPUT_CONTROLSWITCH_H
#define MWINPUT_CONTROLSWITCH_H
+#include <cstdint>
#include <map>
#include <string>
--- a/components/misc/utf8stream.hpp
+++ b/components/misc/utf8stream.hpp
@@ -1,6 +1,7 @@
#ifndef MISC_UTF8ITER_HPP
#define MISC_UTF8ITER_HPP
+#include <cstdint>
#include <cstring>
#include <string>
#include <string_view>
--- a/components/myguiplatform/myguidatamanager.cpp
+++ b/components/myguiplatform/myguidatamanager.cpp
@@ -1,5 +1,6 @@
#include "myguidatamanager.hpp"
+#include <cstdint>
#include <memory>
#include <string>
#include <stdexcept>

View File

@ -1,7 +1,7 @@
# Template file for 'openmw' # Template file for 'openmw'
pkgname=openmw pkgname=openmw
version=0.48.0 version=0.48.0
revision=2 revision=3
build_style=cmake build_style=cmake
_recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea _recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea
_bullet_tag=3.17 _bullet_tag=3.17
@ -10,7 +10,7 @@ _bullet_tag=3.17
configure_args="-DDESIRED_QT_VERSION=5 -DOPENMW_USE_SYSTEM_BULLET=OFF configure_args="-DDESIRED_QT_VERSION=5 -DOPENMW_USE_SYSTEM_BULLET=OFF
-DOPENMW_LTO_BUILD=ON -DFETCHCONTENT_FULLY_DISCONNECTED=On" -DOPENMW_LTO_BUILD=ON -DFETCHCONTENT_FULLY_DISCONNECTED=On"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake" hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
makedepends="SDL2-devel boost-devel ffmpeg-devel libXt-devel makedepends="SDL2-devel boost-devel ffmpeg6-devel libXt-devel
libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel
liblz4-devel yaml-cpp-devel LuaJIT-devel" liblz4-devel yaml-cpp-devel LuaJIT-devel"
short_desc="Open Implementation of Morrowind's Engine" short_desc="Open Implementation of Morrowind's Engine"