From 70ab8a8191d2dbea538d6f0de077cfeff12001a7 Mon Sep 17 00:00:00 2001 From: Morris Zuss Date: May 07 2022 12:14:44 +0000 Subject: updpkg: libre/openmw 0.47.0 & dependencies --- diff --git a/libre/openmw/PKGBUILD b/libre/openmw/PKGBUILD index 378cdc9..dacc808 100644 --- a/libre/openmw/PKGBUILD +++ b/libre/openmw/PKGBUILD @@ -2,24 +2,26 @@ # Contributor (Arch): Sandy Carter # Contributor: André Silva pkgname=openmw -pkgver=0.45.0 +pkgver=0.47.0 pkgrel=1 pkgrel+=.parabola1 pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind" -pkgdesc+=", without without downloader/installer wizard" +pkgdesc+=", without downloader/installer wizard" arch=('x86_64') -arch+=('i686') url="http://www.openmw.org" license=('GPL3' 'MIT' 'custom') -depends=('openal' 'openscenegraph34' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt') +depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt' 'boost-libs' 'recastnavigation' 'bullet-double') makedepends=('cmake' 'boost' 'doxygen' 'ninja') -source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz" - disable_wizard.patch) -sha256sums=('b63cf971f406ef5f28019f65e9e2bd9641a227459ede45d147562917f67e1c64' - 'bb60055d501186cada01e151551a3db5c1d67c3ae6584a2799eef0e273ba14eb') +source=("https://github.com/OpenMW/openmw/archive/refs/tags/openmw-${pkgver}.tar.gz" + "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch" + "disable_wizard.patch") +sha512sums=('517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b' + '37dfc5611523bf158fe2b6c19bdc11ebd0a70837943183b16b1ec36e06df37c7e089586935753c7442720349d5a7e356dc4f11e79666af0c4d5146f8f64d4853' + '98d2db21ab7362840f02bd8651914b11443c9d6d539fd0976e6580809bf16b80f3f907e332a3ae18db97e4f3ee12bdb7e1faf322bfaae6bf08efd64863c14081') prepare() { - mkdir build + mkdir -p "${pkgname}-${pkgname}-${pkgver}/build" + cd "${pkgname}-${pkgname}-${pkgver}" # this patch could be upstreamed # when the user is missing game data (the default case), @@ -27,22 +29,26 @@ prepare() { # even though it could have detected that the wizard was not compiled (BUILD_WIZARD=OFF) # then if the user presses the wizard button, # it fails with a GUI warning about the non-existing wizard - cd "$srcdir"/$pkgname-$pkgname-$pkgver - patch -p1 < "$srcdir"/disable_wizard.patch + patch -p1 < ${srcdir}/disable_wizard.patch + + # Assume SIGSTKSZ is not a constant + patch -Np1 -i "$srcdir"/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch } build() { - cd build - cmake "../$pkgname-$pkgname-$pkgver" \ + cd "${pkgname}-${pkgname}-${pkgver}/build" + + #export PKG_CONFIG_LIBDIR=/usr/lib/ffmpeg4.4/pkgconfig + + cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DDESIRED_QT_VERSION=5 \ - -DBUILD_ESSIMPORTER=OFF \ - -DBUILD_WIZARD=OFF \ - -GNinja - ninja + -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON \ + -DBUILD_WIZARD=OFF + make } package() { - DESTDIR="$pkgdir" ninja -C build install + cd "${pkgname}-${pkgname}-${pkgver}/build" + DESTDIR="${pkgdir}" make install } diff --git a/libre/openmw/disable_wizard.patch b/libre/openmw/disable_wizard.patch index f9d4a4d..f3f9cc5 100644 --- a/libre/openmw/disable_wizard.patch +++ b/libre/openmw/disable_wizard.patch @@ -1,8 +1,7 @@ -diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt -index bfc08a7..031f989 100644 ---- a/apps/launcher/CMakeLists.txt -+++ b/apps/launcher/CMakeLists.txt -@@ -119,4 +119,8 @@ if (BUILD_WITH_CODE_COVERAGE) +diff --unified --recursive --text openmw-openmw-0.47.0.orig/apps/launcher/CMakeLists.txt openmw-openmw-0.47.0.new/apps/launcher/CMakeLists.txt +--- openmw-openmw-0.47.0.orig/apps/launcher/CMakeLists.txt 2021-10-10 17:17:03.000000000 +0100 ++++ openmw-openmw-0.47.0.new/apps/launcher/CMakeLists.txt 2022-05-07 11:35:12.730905488 +0100 +@@ -109,4 +109,8 @@ target_link_libraries(openmw-launcher gcov) endif() @@ -12,24 +11,21 @@ index bfc08a7..031f989 100644 +else() + add_definitions(-DBUILD_WIZARD_ENABLED=0) +endif() -diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp -index 2982a30..4d286c7 100644 ---- a/apps/launcher/maindialog.cpp -+++ b/apps/launcher/maindialog.cpp -@@ -148,7 +148,7 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog() - { +diff --unified --recursive --text openmw-openmw-0.47.0.orig/apps/launcher/maindialog.cpp openmw-openmw-0.47.0.new/apps/launcher/maindialog.cpp +--- openmw-openmw-0.47.0.orig/apps/launcher/maindialog.cpp 2021-10-10 17:17:03.000000000 +0100 ++++ openmw-openmw-0.47.0.new/apps/launcher/maindialog.cpp 2022-05-07 11:35:00.070905557 +0100 +@@ -155,6 +155,7 @@ if (!setupLauncherSettings()) return FirstRunDialogResultFailure; -- + +if (BUILD_WIZARD_ENABLED) // parabola patch - disable wizard if (mLauncherSettings.value(QString("General/firstrun"), QString("true")) == QLatin1String("true")) { QMessageBox msgBox; -@@ -385,7 +385,7 @@ bool Launcher::MainDialog::setupGameData() +@@ -402,6 +403,7 @@ + + Q_UNUSED(skipButton); // Suppress compiler unused warning - QAbstractButton *wizardButton = - msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole); -- +if (!BUILD_WIZARD_ENABLED) msgBox.removeButton(wizardButton) ; // parabola patch - disable wizard msgBox.exec(); diff --git a/pcr/bullet-double/PKGBUILD b/pcr/bullet-double/PKGBUILD new file mode 100644 index 0000000..074d840 --- /dev/null +++ b/pcr/bullet-double/PKGBUILD @@ -0,0 +1,99 @@ +# Maintainer: Morris Zuss +# Contributor: Sven-Hendrik Haase +# Contributor: Christoph Zeiler + +pkgbase=bullet-double +pkgname=('bullet-double' 'bullet-double-docs' 'python-pybullet-double') +pkgver=3.24 +pkgrel=1 +pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" +pkgdesc+=", with double precision support" +arch=('x86_64' 'i686') +url="http://www.bulletphysics.com/Bullet/" +license=("ZLIB") +makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'glu' 'python' 'python-numpy' 'python-setuptools' 'ninja') +source=("$pkgname-$pkgver.tar.gz::https://github.com/bulletphysics/bullet3/archive/refs/tags/${pkgver}.tar.gz" + bullet3_examplebrowser.sh) +sha512sums=('0f8cf009e50853b2ff461414893f09f752774dac3fb51ba158ef670865b61140a13567cadbf7b19d643d24d6207a23f825773edb86234591f83bd19e3fb3d054' + '8741ad94b6c46c226d89aebc8ab06d8a11bac3c04d3f0a2bf7a7524792a3375aa7bf7d295410b16fbeb4c348a31057b4570acdebe9bbaea251f44daca8d9fe81') + +prepare() { + cd bullet3-${pkgver} + sed -i '/SET_TARGET_PROPERTIES(pybullet PROPERTIES PREFIX/d' examples/pybullet/CMakeLists.txt +} + +build() { + cd bullet3-${pkgver} + + cmake \ + -Bbuild \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=1 \ + -DINSTALL_LIBS=1 \ + -DINSTALL_EXTRA_LIBS=1 \ + -DBUILD_PYBULLET=ON \ + -DBUILD_PYBULLET_NUMPY=ON \ + -DBUILD_OPENGL3_DEMOS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=YES \ + -DUSE_DOUBLE_PRECISION=ON + + ninja -C build + + python setup.py build + doxygen +} + +package_bullet-double() { + optdepends=('glu: for the example browser' + 'python: python bindings' + 'python-numpy: python bindings' + 'bullet-docs: documentation') + provides=('bullet') + conflicts=('bullet') + + cd bullet3-${pkgver} + + DESTDIR="${pkgdir}" ninja -C build install + + cd build + + install -Dm755 examples/ExampleBrowser/libBulletExampleBrowserLib.so.${pkgver} "${pkgdir}"/usr/lib/libBulletExampleBrowserLib.so.${pkgver} + install -Dm755 examples/OpenGLWindow/libOpenGLWindow.so "${pkgdir}"/usr/lib/libOpenGLWindow.so + install -Dm755 examples/ThirdPartyLibs/Gwen/libgwen.so "${pkgdir}"/usr/lib/libgwen.so + install -Dm755 examples/ThirdPartyLibs/BussIK/libBussIK.so "${pkgdir}"/usr/lib/libBussIK.so + install -Dm755 "${srcdir}"/bullet3_examplebrowser.sh "${pkgdir}"/usr/bin/bullet3_examplebrowser + install -Dm755 examples/ExampleBrowser/App_ExampleBrowser "${pkgdir}"/opt/bullet/App_ExampleBrowser + cp -r data "${pkgdir}"/opt/bullet/ + + install -Dm644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgbase}/LICENSE +} + +package_python-pybullet-double() { + pkgdesc="Bullet Python bindings" + depends+=('bullet' 'gcc-libs') + provides=('python-pybullet') + conflicts=('python-pybullet') + + cd bullet3-${pkgver} + + install -Dm755 build/examples/pybullet/libpybullet.so.${pkgver} "${pkgdir}"/usr/lib/libpybullet.so.${pkgver} + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_bullet-double-docs() { + pkgdesc="Documentation for bullet" + provides=('bullet-docs') + conflicts=('bullet-docs') + cd bullet3-${pkgver} + + # install docs + install -Dm644 docs/GPU_rigidbody_using_OpenCL.pdf "${pkgdir}"/usr/share/doc/bullet/GPU_rigidbody_using_OpenCL.pdf + install -Dm644 docs/Bullet_User_Manual.pdf "${pkgdir}"/usr/share/doc/bullet/Bullet_User_Manual.pdf + install -Dm644 docs/BulletQuickstart.pdf "${pkgdir}"/usr/share/doc/bullet/BulletQuickstart.pdf + cp -r html "${pkgdir}"/usr/share/doc/bullet/html +} +# vim: sw=2 ts=2 et: diff --git a/pcr/bullet-double/bullet3_examplebrowser.sh b/pcr/bullet-double/bullet3_examplebrowser.sh new file mode 100644 index 0000000..8cfd780 --- /dev/null +++ b/pcr/bullet-double/bullet3_examplebrowser.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +cd /opt/bullet +./App_ExampleBrowser diff --git a/pcr/recastnavigation/PKGBUILD b/pcr/recastnavigation/PKGBUILD new file mode 100644 index 0000000..fa25bee --- /dev/null +++ b/pcr/recastnavigation/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Morris Zuss + +pkgname=recastnavigation +pkgver=1.5.1 +pkgrel=1 +pkgdesc="Navigation-mesh Toolset for Games" +arch=(x86_64 i686) +url="https://github.com/recastnavigation/recastnavigation" +license=(ZLIB) +depends=(glut sdl2) +makedepends=(cmake git) +source=("git+https://github.com/recastnavigation/recastnavigation.git") +sha512sums=("SKIP") + +prepare() { + mkdir -p "${pkgname}/build" + cd "${pkgname}" +} + +build() { + cd "${pkgname}/build" + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON \ + -DRECASTNAVIGATION_DEMO=OFF \ + -DRECASTNAVIGATION_TESTS=OFF \ + -DRECASTNAVIGATION_EXAMPLES=OFF + make +} + +package() { + cd "${pkgname}/build" + DESTDIR="${pkgdir}" make install + install -Dm644 ../License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +}