From a5a43bf4e90513fec2ae62cdff7ab011d5b2aac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 22 Oct 2020 14:01:20 +0200 Subject: [PATCH] libogre: update to 1.12.9 --- common/shlibs | 19 +++++++++---------- srcpkgs/libogre/patches/musl_sysctl.patch | 12 ------------ srcpkgs/libogre/template | 12 ++++-------- 3 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/libogre/patches/musl_sysctl.patch diff --git a/common/shlibs b/common/shlibs index 4e65cadfaa1..1485c95d49d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1650,16 +1650,15 @@ libuwac0.so.0 libfreerdp-2.2.0_1 libcppunit-1.14.so.0 libcppunit-1.14.0_1 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1 -libOgreRTShaderSystem.so.1.10.11 libogre-1.10.11_2 -libOgreTerrain.so.1.10.11 libogre-1.10.11_2 -libOgrePaging.so.1.10.11 libogre-1.10.11_2 -libOgreProperty.so.1.10.11 libogre-1.10.11_2 -libOgreHLMS.so.1.10.11 libogre-1.10.11_2 -libOgreMeshLodGenerator.so.1.10.11 libogre-1.10.11_2 -libOgreVolume.so.1.10.11 libogre-1.10.11_2 -libOgreBites.so.1.10.11 libogre-1.10.11_2 -libOgreMain.so.1.10.11 libogre-1.10.11_2 -libOgreOverlay.so.1.10.11 libogre-1.10.11_2 +libOgreMain.so.1.12.9 libogre-1.12.9_1 +libOgreBites.so.1.12.9 libogre-1.12.9_1 +libOgreOverlay.so.1.12.9 libogre-1.12.9_1 +libOgreProperty.so.1.12.9 libogre-1.12.9_1 +libOgreTerrain.so.1.12.9 libogre-1.12.9_1 +libOgreVolume.so.1.12.9 libogre-1.12.9_1 +libOgreRTShaderSystem.so.1.12.9 libogre-1.12.9_1 +libOgreMeshLodGenerator.so.1.12.9 libogre-1.12.9_1 +libOgrePaging.so.1.12.9 libogre-1.12.9_1 libglut.so.3 libfreeglut-2.8.1_1 libogmrip-gtk.so.1 ogmrip-1.0.0_1 libogmdvd.so.1 ogmrip-1.0.0_1 diff --git a/srcpkgs/libogre/patches/musl_sysctl.patch b/srcpkgs/libogre/patches/musl_sysctl.patch deleted file mode 100644 index ce8a8402d2a..00000000000 --- a/srcpkgs/libogre/patches/musl_sysctl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- OgreMain/src/OgrePlatformInformation.cpp 2015-08-03 22:41:03.964820685 +0200 -+++ OgreMain/src/OgrePlatformInformation.cpp 2015-08-03 22:54:13.043818347 +0200 -@@ -43,7 +43,9 @@ - #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID - #include - #elif OGRE_CPU == OGRE_CPU_ARM -+ #if defined(__GLIBC__) - #include -+ #endif - #if __MACH__ - #if defined(__GLIBC__) - #include diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template index d94aa7497b5..784e3a648ba 100644 --- a/srcpkgs/libogre/template +++ b/srcpkgs/libogre/template @@ -1,30 +1,26 @@ # Template file for 'ogre' pkgname=libogre -version=1.10.11 -revision=5 +version=1.12.9 +revision=1 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr \ - -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ -DOGRE_INSTALL_SAMPLES=TRUE \ -DOGRE_INSTALL_DOCS=TRUE \ - -DOGRE_INSTALL_MEDIA=TRUE \ -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \ -DCMAKE_BUILD_TYPE=Release" hostmakedepends="pkg-config graphviz doxygen dejavu-fonts-ttf" makedepends="boost-devel freetype-devel libXaw-devel libXrandr-devel MesaLib-devel zziplib-devel libcppunit-devel glu-devel libatomic-devel - freeimage-devel python3-devel" + freeimage-devel pugixml-devel python3-devel" short_desc="Scene-oriented, flexible 3D engine" maintainer="Enno Boland " homepage="http://www.ogre3d.org" license="MIT" distfiles="https://github.com/OGRECave/ogre/archive/v$version.tar.gz" -checksum=ff2e666201c1dfddee2fe53ba4825f19385eb3b0d4ad8c3872d8084076826d8d +checksum=028e7d0bbfce8fd254e1102666b07b7cbb9379321e88885d82feee5e061342aa make_build_target="all OgreDoc" wrksrc=ogre-$version -CXXFLAGS="-fcheck-new -fno-delete-null-pointer-checks -fno-lifetime-dse" - pre_configure() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then find -name CMakeLists.txt -exec sed -i "{}" \