diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-23 15:12:45 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-23 15:12:45 -0700 |
| commit | 7c30321204be672ef1c7bc13be53062ffb65fb2a (patch) | |
| tree | 4788722a11aa909cdeff2fc558dc6c18d113418e | |
| parent | Switch to arch packaged bullet-dp fo depends. (diff) | |
| download | openmw-7c30321204be672ef1c7bc13be53062ffb65fb2a.tar.xz | |
Rebuild against ffmpeg 5
Rename patch files to make them less vague.
| -rw-r--r-- | 1941.patch | 24 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
2 files changed, 34 insertions, 8 deletions
diff --git a/1941.patch b/1941.patch new file mode 100644 index 0000000..cd5e6c7 --- /dev/null +++ b/1941.patch @@ -0,0 +1,24 @@ +diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp +index 0a9641635f..997b4e30c6 100644 +--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp ++++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp +@@ -18,11 +18,14 @@ int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size) + std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream; + stream.clear(); + stream.read((char*)buf, buf_size); +- return stream.gcount(); ++ std::streamsize count = stream.gcount(); ++ if (count == 0) ++ return AVERROR_EOF; ++ return count; + } + catch (std::exception& ) + { +- return 0; ++ return AVERROR_UNKNOWN; + } + } + +-- +GitLab + @@ -11,36 +11,38 @@ pkgname=openmw pkgver=0.47.0 -pkgrel=6.2 +pkgrel=7 pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind" arch=('x86_64') url="http://www.openmw.org" license=('GPL3' 'MIT' 'custom') -depends=('openal' 'openscenegraph' 'mygui' 'qt5-base' 'ffmpeg4.4' 'sdl2' 'unshield' 'libxt' 'boost-libs' +depends=('openal' 'openscenegraph' 'mygui' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt' 'boost-libs' 'recastnavigation-openmw' 'bullet-dp') makedepends=('cmake' 'boost' 'doxygen' 'ninja') options=(lto) source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz" - "https://gitlab.com/OpenMW/openmw/-/merge_requests/1870.patch" - "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch") + openmw-1870.patch::"https://gitlab.com/OpenMW/openmw/-/merge_requests/1870.patch" + 1941.patch + openmw-98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch::"https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch") sha512sums=('517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b' '99f721bbeba43a0e259498bbf16ae24dba2a8554e5543fce265ef6c3cc544f4b28c6a13ed3aa51b1eea97fc0552fe056b028188f326dca0265096cf29988f504' + 'ca1b8601b4baca6929c928b9349e3b07d21992890d4c50c5ff4d537a5ab1b77f044c520af46e8f21480d37902e6329e5ec4459056ac9d8801ba0278d8391bcd7' '37dfc5611523bf158fe2b6c19bdc11ebd0a70837943183b16b1ec36e06df37c7e089586935753c7442720349d5a7e356dc4f11e79666af0c4d5146f8f64d4853') b2sums=('40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d' '8989cd81b4a61eb91123d15da6c3cbbf7d0fcf1e70561a1691c82de2cfb479a594635a8a7437989e054e293427b800bae44b1155eedf860c9320e9382620ea0b' + '9f5511b5b8a02fbfa669367339db9b76d2e4c99c3d285be9c83b30ee040e88c09dc00ee5d404f33e43bce2735fe6d6e40799cbc1ec60fa1759f6c7b997eb255c' '293027182d38b0b75aa46b9a4048bec3ccb57e1d200996c3340ba4b9a3512f5952d2b2da67be89e86c799312448b23ce5d4b56801002384b41428ac9f8fe77bd') prepare () { cd openmw-openmw-$pkgver - patch -Np1 -i "$srcdir"/1870.patch - patch -Np1 -i "$srcdir"/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch + patch -Np1 -i "$srcdir"/openmw-1870.patch + patch -Np1 -i "$srcdir"/1941.patch + patch -Np1 -i "$srcdir"/openmw-98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch } build() { cd ${pkgname}-${pkgname}-${pkgver} - export PKG_CONFIG_LIBDIR=/usr/lib/ffmpeg4.4/pkgconfig - # gcc 10.2 + qt 5.15 + pie = segfault export CFLAGS="$CFLAGS -O3" export CXXFLAGS="$CXXFLAGS -O3" |