From 8bf21c5d51127151422b7a17369f0b3dceea80d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 25 Aug 2023 07:18:58 +0700 Subject: [PATCH] openmw: fix build, update checksum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They did retag 0.48.0: --- ../openmw-openmw-0.48.0.tar.gz +++ hostdir/sources/openmw-0.48.0/openmw-openmw-0.48.0.tar.gz ├── openmw-openmw-0.48.0.tar │ ├── openmw-openmw-0.48.0/docs/requirements.txt │ │ @@ -1,3 +1,4 @@ │ │ parse_cmake │ │ sphinx==1.8.5 │ │ docutils==0.17.1 │ │ +jinja2==3.0.0 │ ├── openmw-openmw-0.48.0/docs/source/generate_luadoc.sh │ │ @@ -40,14 +40,15 @@ │ │ make install │ │ PATH=$PATH:~/luarocks/bin │ │ │ │ echo "Install openmwluadocumentor" │ │ cd ~ │ │ git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git │ │ cd openmw-luadocumentor/luarocks │ │ + git checkout 156b1ad3597c739e51f537afe08d8d7ad1e95671 │ │ luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec │ │ luarocks --local install openmwluadocumentor-0.1.1-1.src.rock │ │ fi │ │ │ │ DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" │ │ FILES_DIR=$DOCS_SOURCE_DIR/../../files │ │ OUTPUT_DIR=$DOCS_SOURCE_DIR/reference/lua-scripting/generated_html --- srcpkgs/openmw/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 3462591ec17..2f987fec0aa 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -8,7 +8,7 @@ _bullet_tag=3.17 # System bullet doesn't use double precision (double precision would break vdrift) # LTO gives a measurable performance boost, while not hurting compile time too much configure_args="-DDESIRED_QT_VERSION=5 -DOPENMW_USE_SYSTEM_BULLET=OFF - -DOPENMW_LTO_BUILD=ON" + -DOPENMW_LTO_BUILD=ON -DFETCHCONTENT_FULLY_DISCONNECTED=On" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="SDL2-devel boost-devel ffmpeg-devel libXt-devel libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel @@ -21,7 +21,7 @@ changelog="https://openmw.org/2023/openmw-0-48-0-released/" distfiles="https://gitlab.com/OpenMW/openmw/-/archive/openmw-${version}/openmw-openmw-${version}.tar.gz https://github.com/recastnavigation/recastnavigation/archive/${_recast_commit}.tar.gz https://github.com/bulletphysics/bullet3/archive/refs/tags/${_bullet_tag}.tar.gz" -checksum="ebcc1e217479306a92036aabf6f8225a3d228759eef6255cda57fb8566b9d388 +checksum="be97b8e900853c43dde8816f2ce49801fb672cffdf48ac7af9782abfb8a74af4 c647e307d6cc62ba00bfd888e82da83844bf1e72f2c98bed2f1d95bac229b950 baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61" @@ -29,10 +29,6 @@ if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then broken="https://gitlab.com/OpenMW/openmw/issues/564" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" -fi - post_extract() { mv openmw-openmw-${version}/* . mkdir -p build/fetched