[skip-ci] speed-dreams: update to 2.2.2-rc2, added patch for new openscenegraph

This commit is contained in:
Francesco Marinucci 2018-10-23 15:19:35 +02:00
parent 9dea348772
commit d7d54a6d3a
2 changed files with 43 additions and 10 deletions

View File

@ -1,8 +1,8 @@
pkgbase=speed-dreams
pkgname=('speed-dreams' 'speed-dreams-data')
pkgver=2.2.1
_pkgver=2.2.1-r6404
pkgrel=1
pkgver=2.2.2
_pkgver=$pkgver-rc2-r6527
pkgrel=2
pkgdesc="A racing simulator with rich graphics and physics"
arch=('x86_64')
url="http://speed-dreams.sourceforge.net/"
@ -21,13 +21,15 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-
"http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-wip-cars-and-tracks-${_pkgver}.tar.xz"
"http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-hq-cars-and-tracks-${_pkgver}.tar.xz"
"http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-more-hq-cars-and-tracks-${_pkgver}.tar.xz"
"${pkgname}.desktop")
md5sums=('a1a296ab737d5144f1f570f4cabc7937'
'0a9b1572d0660c60fa0553195578a36a'
'3413d9d5e2111cd9e87628df5818d2b4'
'e4efd3b16e53a54c23e606947739abe5'
'b6079ca11202595ac312a28262e793ee'
'634f8cb8f4f96686c8049c8a025e72d0')
"${pkgname}.desktop"
"osgvolume.patch")
md5sums=('956bda0acbcb89eaa2ca742dbedc8941'
'5d55831ca9371f8a55cc5616f9612164'
'bc183b3e80c742bc249f630cb029920c'
'ed11647ad2d479dc4012ffd79375b995'
'd615eda2c443a2e5ce74cf45d5374062'
'634f8cb8f4f96686c8049c8a025e72d0'
'd8a34db622604400bb247acd8b68b837')
prepare() {
# extract these manually as bsdtar can't handle these
@ -36,6 +38,7 @@ prepare() {
tar xf "${pkgname}-src-wip-cars-and-tracks-${_pkgver}.tar.xz"
tar xf "${pkgname}-src-hq-cars-and-tracks-${_pkgver}.tar.xz"
tar xf "${pkgname}-src-more-hq-cars-and-tracks-${_pkgver}.tar.xz"
patch -Np1 <osgvolume.patch
}
build() {

View File

@ -0,0 +1,30 @@
--- src/src/modules/graphic/osggraph/Render/OsgRender.cpp 2018-02-24 03:43:40.000000000 +0100
+++ src/src/modules/graphic/osggraph/Render/OsgRender_patched.cpp 2018-10-23 14:33:11.711890849 +0200
@@ -30,7 +30,6 @@
#include <osgViewer/Viewer>
#include <osgParticle/PrecipitationEffect>
#include <osgShadow/ShadowedScene>
-#include <osgShadow/ShadowVolume>
#include <osgShadow/ShadowTexture>
#include <osgShadow/ShadowMap>
#include <osgShadow/SoftShadowMap>
@@ -546,9 +545,6 @@
{
osg::DisplaySettings::instance()->setMinimumNumStencilBits(8);
- osg::ref_ptr<osgShadow::ShadowVolume> sv = new osgShadow::ShadowVolume;
- sv->setDynamicShadowVolumes(1);
- sv->setDrawMode(osgShadow::ShadowVolumeGeometry::GEOMETRY);
shadowRoot = new osgShadow::ShadowedScene;
shadowRoot->setReceivesShadowTraversalMask(rcvShadowMask);
--- src/src/modules/graphic/osggraph/Render/OsgRender.cpp 2018-10-23 14:35:51.460381457 +0200
+++ src/src/modules/graphic/osggraph/Render/OsgRender_patched.cpp 2018-10-23 14:50:45.569855326 +0200
@@ -549,7 +549,6 @@
shadowRoot = new osgShadow::ShadowedScene;
shadowRoot->setReceivesShadowTraversalMask(rcvShadowMask);
shadowRoot->setCastsShadowTraversalMask(castShadowMask);
- shadowRoot->setShadowTechnique((sv.get()));
}
else if (ShadowIndex == 6)
{