Page MenuHomeSolus
Files F11047305

D2460.id5938.diff
No OneTemporary
Actions

D2460.id5938.diff
View Options

diff --git a/files/glslang_tests.patch b/files/glslang_tests.patch
new file mode 100644
--- /dev/null
+++ b/files/glslang_tests.patch
@@ -0,0 +1,21 @@
+--- glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a/Test/runtests
++++ glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a-new/Test/runtests
+@@ -2,8 +2,8 @@
+
+ TARGETDIR=localResults
+ BASEDIR=baseResults
+-EXE=../build/install/bin/glslangValidator
+-REMAPEXE=../build/install/bin/spirv-remap
++EXE=../solusBuildDir/StandAlone/glslangValidator
++REMAPEXE=../solusBuildDir/StandAlone/spirv-remap
+ HASERROR=0
+ mkdir -p localResults
+
+
+--- glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a/Test/glslangValidator
++++ glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a-new/Test/glslangValidator
+@@ -1,2 +1,2 @@
+ #!/usr/bin/env bash
+-../build/install/bin/glslangValidator $*
++../solusBuildDir/StandAlone/glslangValidator $*
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,25 +1,26 @@
name : glslang
-version : 3.20
-release : 5
+version : 5.1
+release : 6
source :
- - git|https://github.com/KhronosGroup/glslang.git : 82ead04c39c6a4b7fa153d692b26181091c43c15
+ - git|https://github.com/KhronosGroup/glslang.git : 097047a919be0bdebe106e8de593697dada054c5
license : MIT
component : xorg.graphics
+libsplit : no
+emul32 : yes
summary : Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
description: |
Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
-builddeps :
- - bison
-libsplit : no
-emul32 : yes
setup : |
- %cmake .
+ %patch -p1 < $pkgfiles/glslang_tests.patch
+
+ mkdir solusBuildDir && cd solusBuildDir
+ %cmake -DCMAKE_INSTALL_LIBDIR=%libdir% \
+ -GNinja ..
build : |
- %make
+ %meson_build
install : |
- %make_install
- if [[ ! -z "${EMUL32BUILD}" ]]; then
- mv $installdir/usr/lib $installdir/usr/lib32
- else
- mv $installdir/usr/lib $installdir/usr/lib64
- fi
+ %meson_install
+check : |
+ cd Test
+ ./runtests
+
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>glslang</Name>
<Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>MIT</License>
<PartOf>xorg.graphics</PartOf>
@@ -29,7 +29,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="5">glslang-devel</Dependency>
+ <Dependency release="6">glslang-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/lib*.a</Path>
@@ -42,7 +42,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="5">glslang</Dependency>
+ <Dependency release="6">glslang</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -50,12 +50,12 @@
</Files>
</Package>
<History>
- <Update release="5">
- <Date>2018-01-29</Date>
- <Version>3.2</Version>
+ <Update release="6">
+ <Date>2018-03-07</Date>
+ <Version>5.1</Version>
<Comment>Packaging update</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:12 PM (3 h, 2 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5836218
Default Alt Text
D2460.id5938.diff (3 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.