* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
@ 2020-09-25 5:41 ` ericonr
2020-09-25 6:35 ` ericonr
` (25 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 5:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698731758
Comment:
Also need to drop some noarchs.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
2020-09-25 5:41 ` ericonr
@ 2020-09-25 6:35 ` ericonr
2020-09-25 7:26 ` [PR PATCH] [Updated] " ericonr
` (24 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 6:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698750234
Comment:
@thypon could we updatae clementine to an rc release? Our current releaseis 4 years old. https://github.com/clementine-player/Clementine/releases
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
2020-09-25 5:41 ` ericonr
2020-09-25 6:35 ` ericonr
@ 2020-09-25 7:26 ` ericonr
2020-09-25 7:26 ` ericonr
` (23 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
[WIP] Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 34319 bytes --]
From a3210074109f8cd8c6227f29a2120acc2883a292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/37] glew: update to 2.2.0.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..673abd6bb2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..36e1520a22a 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,7 +1,7 @@
# Template build file for 'glew'.
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://glew.sourceforge.net"
license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
make_install_target="install.all"
do_build() {
From d26d81f807e9d0f9e0fae117f478e229dd88679c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/37] DarkRadiant: revbump for glew.
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..8b60e4df7a1 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
From e1b09ed40f179932a80573e227b9c8da0356d3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/37] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From 8090fa9e094da1de4a6cc12328e4fa3115436400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/37] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From 0bddaede43b2eb5e66ecdcd770da4c0271d02cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/37] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 8a908440eb90ae8ecc852d7db728017db0627c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/37] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From b15e5ee6a3fc741d90c998ca958340f629ad5720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/37] cegui: revbump for glew, drop noarch.
---
srcpkgs/cegui/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 78f0c103ba7..0c640df2ecd 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=2
+revision=3
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
@@ -55,14 +55,12 @@ post_install() {
}
cegui-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/cegui-${version%%.*}
}
}
cegui-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/build/doc/doxygen/html usr/share/doc/${sourcepkg}
From dd7319cc045e4b9a51156d8ef2d79b12f7466f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 08/37] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From 0d02471d14fe85ee167a09e5e04d70631ef91ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 09/37] clementine: revbump for glew.
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..d5077118652 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.3.1
-revision=27
+revision=28
_commit=75f18dab23f0842713a4200a7e362efd51b12e31
wrksrc="Clementine-${_commit}"
build_style=cmake
From 0ed258e1b614733b21ecd4a4e873c4629dc0c79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/37] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From d8b27c746c0578d77400bd7fb140da7af548c81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/37] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From e40cf65b355c9879003afb00f6d3a8cdb60943d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/37] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From 2bc768ff1ba51c0587d6d2c33358971c7b64d3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/37] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From cdd696a7815f26320c9489d5342bdddccded1632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 14/37] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From de0e2f97061bad3a5a2d8ed186830b3208f49213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 15/37] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From db7da8d65f15f9f26faf1ef88165c1150191fb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/37] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From 3a65adb1a083d47545d178861a26642392465aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/37] hugin: revbump for glew.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..d57e7f047ee 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
pycompile_module="hpi.py hsi.py"
From ced9cd5a47177cc8c8f045080ce391ff7e82c1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/37] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 621dc8badac0104739589e7a0297f367150fea1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/37] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 4e23e0fb75132cd932aa77f37f66887502b23115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/37] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 43214dec0479aaedcde86e6ee1e870c3aec30c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 21/37] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From e82b63ef1421a8ebfbd5841993fb19282e8e0090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 22/37] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From bbc196c1b3926cb77f070bfb64628a243c5d714d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/37] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From 172c5c17f74ff1a41302a5233d01aa9f73778ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/37] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From bc3c0511a6ee5ecfec48402aba41dd7fbfd23eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/37] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From 94f95b74ee8b251f7b2de976e2513b9aa5511ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/37] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 29 +++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 68 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..91ce79065b0
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,29 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,4 @@
++#define _POSIX_C_SOURCE 200809L
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 46a2fe3bd2758e05e09a5fd0d3a969e148ea1d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 27/37] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 29c69c01596ced2b4b1f8a7efc81a341347c9c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 28/37] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From bc1c02d2cff62c11af2e18c965d5c07598a94d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/37] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From aa0762ca654ac4684a71b641750fed3cbbd6c1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/37] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From 707902222c5cae2706760e6c9c71604c59aa1f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/37] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From 94db1be5340eb668aaac0cb4ca062320b26784ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/37] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 4a5e6d6a3c7864b8de413de57b79582e4ed1f9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 33/37] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From 1cd5e9822d49cc50eb4ca1dd47d109f33bd20281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 34/37] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From d2b62518c6231acd678c6cf6da50293376d0b82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/37] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From 0dd0adce193cce0d66324add2ea61d92ffa9670f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 36/37] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 43877b182a2346259ece52e0222a210a69211945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 37/37] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (2 preceding siblings ...)
2020-09-25 7:26 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-25 7:26 ` ericonr
2020-09-25 7:50 ` ericonr
` (22 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698770592
Comment:
Paraview is broken for musl, I didn't attempt to fix.
Clementine is the only one failing to build.
Took the opportunity to update opentoonz as well @bra1nwave
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (3 preceding siblings ...)
2020-09-25 7:26 ` ericonr
@ 2020-09-25 7:50 ` ericonr
2020-09-25 8:07 ` [PR PATCH] [Updated] " ericonr
` (21 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 7:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698770592
Comment:
Paraview is broken for musl, I didn't attempt to fix.
Clementine is the only one failing to build.
Took the opportunity to update opentoonz as well @bra1nwave
I quickly tested opentoonz, kicad, supertuxkart, supertux2 and endless-sky, on x86_64-musl. Have built only paraview on glibc. Cross compilation hasn't been tested yet.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (4 preceding siblings ...)
2020-09-25 7:50 ` ericonr
@ 2020-09-25 8:07 ` ericonr
2020-09-25 11:36 ` pullmoll
` (20 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
[WIP] Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 34319 bytes --]
From a3210074109f8cd8c6227f29a2120acc2883a292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/37] glew: update to 2.2.0.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..673abd6bb2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..36e1520a22a 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,7 +1,7 @@
# Template build file for 'glew'.
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://glew.sourceforge.net"
license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
make_install_target="install.all"
do_build() {
From d26d81f807e9d0f9e0fae117f478e229dd88679c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/37] DarkRadiant: revbump for glew.
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..8b60e4df7a1 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
From e1b09ed40f179932a80573e227b9c8da0356d3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/37] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From 8090fa9e094da1de4a6cc12328e4fa3115436400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/37] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From 0bddaede43b2eb5e66ecdcd770da4c0271d02cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/37] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 8a908440eb90ae8ecc852d7db728017db0627c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/37] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From b15e5ee6a3fc741d90c998ca958340f629ad5720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/37] cegui: revbump for glew, drop noarch.
---
srcpkgs/cegui/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 78f0c103ba7..0c640df2ecd 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=2
+revision=3
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
@@ -55,14 +55,12 @@ post_install() {
}
cegui-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/cegui-${version%%.*}
}
}
cegui-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/build/doc/doxygen/html usr/share/doc/${sourcepkg}
From dd7319cc045e4b9a51156d8ef2d79b12f7466f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 08/37] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From 0d02471d14fe85ee167a09e5e04d70631ef91ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 09/37] clementine: revbump for glew.
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..d5077118652 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.3.1
-revision=27
+revision=28
_commit=75f18dab23f0842713a4200a7e362efd51b12e31
wrksrc="Clementine-${_commit}"
build_style=cmake
From 0ed258e1b614733b21ecd4a4e873c4629dc0c79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/37] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From d8b27c746c0578d77400bd7fb140da7af548c81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/37] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From e40cf65b355c9879003afb00f6d3a8cdb60943d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/37] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From 2bc768ff1ba51c0587d6d2c33358971c7b64d3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/37] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From cdd696a7815f26320c9489d5342bdddccded1632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 14/37] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From de0e2f97061bad3a5a2d8ed186830b3208f49213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 15/37] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From db7da8d65f15f9f26faf1ef88165c1150191fb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/37] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From 3a65adb1a083d47545d178861a26642392465aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/37] hugin: revbump for glew.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..d57e7f047ee 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
pycompile_module="hpi.py hsi.py"
From ced9cd5a47177cc8c8f045080ce391ff7e82c1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/37] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 621dc8badac0104739589e7a0297f367150fea1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/37] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 4e23e0fb75132cd932aa77f37f66887502b23115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/37] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 43214dec0479aaedcde86e6ee1e870c3aec30c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 21/37] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From e82b63ef1421a8ebfbd5841993fb19282e8e0090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 22/37] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From bbc196c1b3926cb77f070bfb64628a243c5d714d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/37] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From 172c5c17f74ff1a41302a5233d01aa9f73778ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/37] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From bc3c0511a6ee5ecfec48402aba41dd7fbfd23eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/37] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From 94f95b74ee8b251f7b2de976e2513b9aa5511ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/37] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 29 +++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 68 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..91ce79065b0
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,29 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,4 @@
++#define _POSIX_C_SOURCE 200809L
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 46a2fe3bd2758e05e09a5fd0d3a969e148ea1d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 27/37] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 29c69c01596ced2b4b1f8a7efc81a341347c9c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 28/37] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From bc1c02d2cff62c11af2e18c965d5c07598a94d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/37] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From aa0762ca654ac4684a71b641750fed3cbbd6c1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/37] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From 707902222c5cae2706760e6c9c71604c59aa1f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/37] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From 94db1be5340eb668aaac0cb4ca062320b26784ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/37] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 4a5e6d6a3c7864b8de413de57b79582e4ed1f9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 33/37] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From 1cd5e9822d49cc50eb4ca1dd47d109f33bd20281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 34/37] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From d2b62518c6231acd678c6cf6da50293376d0b82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/37] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From 0dd0adce193cce0d66324add2ea61d92ffa9670f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 36/37] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 43877b182a2346259ece52e0222a210a69211945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 37/37] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (5 preceding siblings ...)
2020-09-25 8:07 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-25 11:36 ` pullmoll
2020-09-25 11:39 ` pullmoll
` (19 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: pullmoll @ 2020-09-25 11:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698880325
Comment:
FWIW I'm working on cegui to integrate `cegui-data` into the main package and fix cross building so the cross packages have `libCEGUIOpenGLRenderer.so` for e.g. TSC to become cross compilable.
You could perhaps change cegui to remove `depends="… cegui-data"` and instead add `replaces="cegui-data"` here.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (6 preceding siblings ...)
2020-09-25 11:36 ` pullmoll
@ 2020-09-25 11:39 ` pullmoll
2020-09-25 14:38 ` ericonr
` (18 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: pullmoll @ 2020-09-25 11:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698880325
Comment:
FWIW I'm working on cegui to integrate `cegui-data` into the main package and fix cross building so the cross packages have `libCEGUIOpenGLRenderer.so` for e.g. TSC to become cross compilable.
You could perhaps change cegui to remove `depends="… cegui-data"` and instead add `replaces="cegui-data"` here.
I'll also probably remove `cegui-sample` altogether because it prevents or at least compilcates cross building.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (7 preceding siblings ...)
2020-09-25 11:39 ` pullmoll
@ 2020-09-25 14:38 ` ericonr
2020-09-25 14:56 ` pullmoll
` (17 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698967302
Comment:
I'm not sure I understand why the `replaces` line is necessary. Can you show me a branch with these changes applied?
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (8 preceding siblings ...)
2020-09-25 14:38 ` ericonr
@ 2020-09-25 14:56 ` pullmoll
2020-09-25 15:01 ` pullmoll
` (16 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: pullmoll @ 2020-09-25 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698977601
Comment:
I have no branch but am working on a clone of master. I'll just push the update(s) once I'm done and you can then update the revbump for cegui.
A replaces is necessary whenever a package vanishes. Existing installations expect to find a former subpackage update and since there will be no `cegui-data` anymore, the replaces tells xbps that it is now contained in the main package.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (9 preceding siblings ...)
2020-09-25 14:56 ` pullmoll
@ 2020-09-25 15:01 ` pullmoll
2020-09-25 15:02 ` pullmoll
` (15 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: pullmoll @ 2020-09-25 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698977601
Comment:
I have no branch but am working on a clone of master. I'll just push the update(s) once I'm done and you can then update the revbump for cegui.
A replaces is necessary whenever a package vanishes. Existing installations expect to find a former subpackage update and since there will be no `cegui-data` anymore, the replaces tells xbps that it is now contained in the main package.
I prefer this since a arch-specific separate -data package is more or less useless.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (10 preceding siblings ...)
2020-09-25 15:01 ` pullmoll
@ 2020-09-25 15:02 ` pullmoll
2020-09-25 15:19 ` ahesford
` (14 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: pullmoll @ 2020-09-25 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 613 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698977601
Comment:
I have no branch but am working on a clone of master. I'll just push the update(s) once I'm done and you can then update the revbump for cegui.
A replaces is necessary whenever a package vanishes. Existing installations expect to find a former subpackage update and since there will be no `cegui-data` anymore, the replaces tells xbps that it is now contained in the main package.
I prefer this since an arch-specific separate -data package is more or less useless.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (11 preceding siblings ...)
2020-09-25 15:02 ` pullmoll
@ 2020-09-25 15:19 ` ahesford
2020-09-25 15:51 ` ahesford
` (13 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2020-09-25 15:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-698990310
Comment:
`replaces` is necessary when merging subpackages because you want the newer combined package to remove old subpackages when upgrading, otherwise XBPS will detect conflicts. See what I did in `python3-matplotlib`.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (12 preceding siblings ...)
2020-09-25 15:19 ` ahesford
@ 2020-09-25 15:51 ` ahesford
2020-09-25 17:20 ` [PR PATCH] [Updated] " ericonr
` (12 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2020-09-25 15:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-699007291
Comment:
No problem building or running `endless-sky` with the new `glew`
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (13 preceding siblings ...)
2020-09-25 15:51 ` ahesford
@ 2020-09-25 17:20 ` ericonr
2020-09-25 17:23 ` ericonr
` (11 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
[WIP] Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 34646 bytes --]
From 181ea97d0b1fc1c4a5ece5c16f38dc5886ba4a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/37] glew: update to 2.2.0, xlintify.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..673abd6bb2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..a55fc7e21ff 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,17 +1,17 @@
-# Template build file for 'glew'.
+# Template file for 'glew'
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
+make_install_target="install.all"
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
-short_desc="The OpenGL Extension Wrangler Library"
+short_desc="OpenGL Extension Wrangler Library"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause, MIT, GPL-2.0-or-later"
homepage="http://glew.sourceforge.net"
-license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-make_install_target="install.all"
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
From 38e5ad4e49886342d311dc484c84e596121d46b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/37] DarkRadiant: revbump for glew.
Also add boost-devel to checkdepends.
---
srcpkgs/DarkRadiant/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..fdc430cdf52 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,13 +1,14 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
hostmakedepends="automake gettext libtool pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+checkdepends="boost-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From d93992c7ef77d292f4c98019bca0974dac4ebf10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/37] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From e3756a9b46524db4857096669601d49544ff6d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/37] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From ab49a7c44b22cb9627072509bd15dfe4e1a87f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/37] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From c7170fa64e83be517fa2047a1f0a68e05e69e31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/37] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From 37dfba033c105a92b91e37fdc137bc039e3c1ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/37] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From 4b21b27fc4209984d9ce6ec8bd42bfa021885dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 08/37] clementine: revbump for glew.
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..d5077118652 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.3.1
-revision=27
+revision=28
_commit=75f18dab23f0842713a4200a7e362efd51b12e31
wrksrc="Clementine-${_commit}"
build_style=cmake
From a252bbbdee21c50b29174eeefd4da6a594ae8f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 09/37] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From 0361a990cd46bb6e31d9931fc54c88d104d07a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/37] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From 24b201e71baa3844ecbf641c16db8cb6e0284d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/37] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From ff1cb8852bec389f44172019c948e1259ac62a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/37] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From 78ab60eb9a14585e2c87603c4f4a71b2dc776c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/37] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From dadf29e440dcc5c88db7b2068eddf0b46dd732e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 14/37] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From fe0a3da4c1b41cfcbb315a39a0e1a1a587c37a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 15/37] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From f4c76eb01489c3f4aa034ef714726f777fd459cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/37] hugin: revbump for glew.
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..d57e7f047ee 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
pycompile_module="hpi.py hsi.py"
From 16ba52dfc5aad65e527bfe8b8123e300a41f816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/37] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 6433b5b031e9f1ddc435099c6e45cfc6580a4b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/37] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From d44ccfa0d9b170b117e0dc89961b5c14ecbe7ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/37] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 41c56fdb1ce5c7d17cf3e11b298f05234d0176f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/37] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From ee1485278dd41703bc3577a1ed4b70848e39bfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 21/37] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From b9f116439c02c45e6c02815ece73488d46550876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 22/37] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From c46e80b997d53dbd5c249862af546c0c73022e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/37] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 47bfd9a9fdc8f00722c0694f2fa2030da73db5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/37] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From 336eb80374a092d51b701329d6e473acf52cc68d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/37] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 30 ++++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 69 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..fb69095d27f
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,30 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,5 @@
++#define _POSIX_C_SOURCE 200809L
++#undef _GNU_SOURCE
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 57c1ea3580956751fc2dd7de322ba48965752507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/37] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 6e847c05ff3b6e7a648c18d725e081d620e36413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 27/37] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From 60b6a0c16190d5f03640b136ca8ad481fee59e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 28/37] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From d87b6c815c503929a7cd49085da56ff18c110710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/37] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From 35c8cb314c560b5d4f7703788a8e2684c692a524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/37] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From ecb1804f21373c5f870c50c0d63b1a2a9a063385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/37] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 8b57820a6725c481b48bc50f8b9840984a9389dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/37] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From 60bd1f4c3cd552c7aaf0b49f74c219f306d97a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 33/37] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From 26cc84fb3da7a433aacdc3ef524759bbafcccb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 34/37] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From c24c9279c7a4857e923fbd49bc0b402ce2553d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/37] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 0ccd39c2bc8ceadc5c3c7ecf1e4eb192b1138469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 36/37] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
From c5bcfc203d920ba96870e0c961b35556927a09d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 14:07:02 -0300
Subject: [PATCH 37/37] cegui: revbump for glew.
---
srcpkgs/cegui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index d2cbcc26a82..2b04106aad5 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=3
+revision=4
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (14 preceding siblings ...)
2020-09-25 17:20 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-25 17:23 ` ericonr
2020-09-25 18:57 ` ericonr
` (10 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 17:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
[WIP] Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 35699 bytes --]
From 181ea97d0b1fc1c4a5ece5c16f38dc5886ba4a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/37] glew: update to 2.2.0, xlintify.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..673abd6bb2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..a55fc7e21ff 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,17 +1,17 @@
-# Template build file for 'glew'.
+# Template file for 'glew'
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
+make_install_target="install.all"
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
-short_desc="The OpenGL Extension Wrangler Library"
+short_desc="OpenGL Extension Wrangler Library"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause, MIT, GPL-2.0-or-later"
homepage="http://glew.sourceforge.net"
-license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-make_install_target="install.all"
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
From 38e5ad4e49886342d311dc484c84e596121d46b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/37] DarkRadiant: revbump for glew.
Also add boost-devel to checkdepends.
---
srcpkgs/DarkRadiant/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..fdc430cdf52 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,13 +1,14 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
hostmakedepends="automake gettext libtool pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+checkdepends="boost-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From d93992c7ef77d292f4c98019bca0974dac4ebf10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/37] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From e3756a9b46524db4857096669601d49544ff6d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/37] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From ab49a7c44b22cb9627072509bd15dfe4e1a87f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/37] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From c7170fa64e83be517fa2047a1f0a68e05e69e31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/37] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From 37dfba033c105a92b91e37fdc137bc039e3c1ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/37] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From 4b21b27fc4209984d9ce6ec8bd42bfa021885dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 08/37] clementine: revbump for glew.
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..d5077118652 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.3.1
-revision=27
+revision=28
_commit=75f18dab23f0842713a4200a7e362efd51b12e31
wrksrc="Clementine-${_commit}"
build_style=cmake
From a252bbbdee21c50b29174eeefd4da6a594ae8f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 09/37] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From 0361a990cd46bb6e31d9931fc54c88d104d07a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/37] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From 24b201e71baa3844ecbf641c16db8cb6e0284d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/37] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From ff1cb8852bec389f44172019c948e1259ac62a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/37] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From 78ab60eb9a14585e2c87603c4f4a71b2dc776c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/37] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From dadf29e440dcc5c88db7b2068eddf0b46dd732e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 14/37] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From fe0a3da4c1b41cfcbb315a39a0e1a1a587c37a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 15/37] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From 7524c5e23ed2a619937c4633a219b8448d0de820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/37] hugin: revbump for glew, xlintify.
---
srcpkgs/hugin/template | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..1c93467bc09 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,10 +1,9 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
-pycompile_module="hpi.py hsi.py"
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
@@ -27,13 +26,13 @@ else
fi
pre_configure() {
- # workaround for cmake to find wx-config-gtk3
- # can be removed once there is only one 'wx-config'
- if [ "$CROSS_BUILD" ]; then
- # cannot override wxWidgets_CONFIG_EXECUTABLE set in
- # the cross toolchain file otherwise
- ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
- else
- sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
- fi
+ # workaround for cmake to find wx-config-gtk3
+ # can be removed once there is only one 'wx-config'
+ if [ "$CROSS_BUILD" ]; then
+ # cannot override wxWidgets_CONFIG_EXECUTABLE set in
+ # the cross toolchain file otherwise
+ ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+ else
+ sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+ fi
}
From 64ab20a84fa270fbb8cfd2a1cbf02ffd84b164ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/37] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 526012167888bf098b25f34c5192f28d8121dc71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/37] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 878d2ada53f1e69767955a21cc82e8f0579f27f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/37] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 076748be1f2aa4ffa28a9cde9accd2344b5ac036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/37] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From c91bbaa38045ee45a02d5bf2f4f84b5f56f26ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 21/37] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From acad7440ad4f6ffb7ac3c00a2c23837d69e43743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 22/37] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From 260f04cd181345a358ce2cd0a1e362594ecab684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/37] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 96d6317071515e05b60d39a1db528c8debdad357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/37] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From 93e9e945261475e6294790b0c5b8c3695dfb92c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/37] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 30 ++++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 69 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..fb69095d27f
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,30 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,5 @@
++#define _POSIX_C_SOURCE 200809L
++#undef _GNU_SOURCE
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 4136fe6866ea403ed23826ff23f145c9497b4083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/37] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 9cad5f9c4861ffc6c3e588deefe4abd51c668322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 27/37] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From 497b6b7b5bf068bd0bcbb47ad6130f038f5b338c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 28/37] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From efcc737afbbaa445cb8acf5c55bca42980eab08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/37] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From 0c641ced2f0962a12ec21f7f216fb89289c949ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/37] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From 489e669721db0ae05b082a766e04280ff7692e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/37] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From c3bae6064090ac0c07f15bb0aa0013545022b983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/37] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From dc849385fe7a4989163ddf731d8412458a64b6c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 33/37] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From da43552294c9c406b4e3408b349bc0327b2d0d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 34/37] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From b12e529d5b12792156ca8495ef80a8510a5bcd9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/37] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 69a13e4e9da7e48bee2c2c7f6c0a1179e993d2c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 36/37] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
From 725f3ba6ee5be749bdcb000bfc031a71d0a03432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 14:07:02 -0300
Subject: [PATCH 37/37] cegui: revbump for glew.
---
srcpkgs/cegui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index d2cbcc26a82..2b04106aad5 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=3
+revision=4
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] [WIP] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (15 preceding siblings ...)
2020-09-25 17:23 ` ericonr
@ 2020-09-25 18:57 ` ericonr
2020-09-25 19:02 ` ericonr
` (9 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
[WIP] Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 39225 bytes --]
From 181ea97d0b1fc1c4a5ece5c16f38dc5886ba4a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/37] glew: update to 2.2.0, xlintify.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..673abd6bb2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..a55fc7e21ff 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,17 +1,17 @@
-# Template build file for 'glew'.
+# Template file for 'glew'
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
+make_install_target="install.all"
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
-short_desc="The OpenGL Extension Wrangler Library"
+short_desc="OpenGL Extension Wrangler Library"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause, MIT, GPL-2.0-or-later"
homepage="http://glew.sourceforge.net"
-license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-make_install_target="install.all"
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
From 38e5ad4e49886342d311dc484c84e596121d46b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/37] DarkRadiant: revbump for glew.
Also add boost-devel to checkdepends.
---
srcpkgs/DarkRadiant/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..fdc430cdf52 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,13 +1,14 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
hostmakedepends="automake gettext libtool pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+checkdepends="boost-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From d93992c7ef77d292f4c98019bca0974dac4ebf10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/37] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From e3756a9b46524db4857096669601d49544ff6d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/37] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From ab49a7c44b22cb9627072509bd15dfe4e1a87f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/37] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From c7170fa64e83be517fa2047a1f0a68e05e69e31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/37] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From 37dfba033c105a92b91e37fdc137bc039e3c1ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/37] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From 0726809292f98029da17e01c5cdc5bf5f93e3b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 08/37] clementine: update to 1.4.0rc1-343.
---
srcpkgs/clementine/patches/QPainterPath.patch | 36 -------------------
srcpkgs/clementine/patches/musl.patch | 12 ++++---
srcpkgs/clementine/template | 17 ++++-----
3 files changed, 16 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/clementine/patches/QPainterPath.patch
diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch
deleted file mode 100644
index 271b8c1d724..00000000000
--- a/srcpkgs/clementine/patches/QPainterPath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
-index 3067f72..c9789d3 100644
---- a/src/widgets/freespacebar.cpp
-+++ b/src/widgets/freespacebar.cpp
-@@ -20,6 +20,7 @@
-
- #include <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int FreeSpaceBar::kBarHeight = 20;
- const int FreeSpaceBar::kBarBorderRadius = 8;
-diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
-index 9d95716..30cef7d 100644
---- a/src/widgets/osdpretty.cpp
-+++ b/src/widgets/osdpretty.cpp
-@@ -26,6 +26,7 @@
- #include <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
-index 581a0de..27b81f7 100644
---- a/src/widgets/sliderwidget.cpp
-+++ b/src/widgets/sliderwidget.cpp
-@@ -24,6 +24,7 @@
- #include <QBrush>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
diff --git a/srcpkgs/clementine/patches/musl.patch b/srcpkgs/clementine/patches/musl.patch
index c976dbb42d7..ad39814196e 100644
--- a/srcpkgs/clementine/patches/musl.patch
+++ b/srcpkgs/clementine/patches/musl.patch
@@ -1,15 +1,17 @@
---- a/logging.cpp 2017-09-22 21:33:36.030774014 +0200
-+++ b/ext/libclementine-common/core/logging.cpp 2017-09-22 21:35:34.327766268 +0200
+diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
+index 8012c0c..ce77c77 100644
+--- ext/libclementine-common/core/logging.cpp
++++ ext/libclementine-common/core/logging.cpp
@@ -21,7 +21,7 @@
- #include <QtGlobal>
-
#include <cxxabi.h>
+
+ #include <QtGlobal>
-#ifdef Q_OS_UNIX
+#if defined Q_OS_UNIX && defined __GLIBC__
#include <execinfo.h>
#endif
-@@ -249,7 +249,7 @@
+@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
}
void DumpStackTrace() {
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..d4fc5236845 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,9 +1,12 @@
# Template file for 'clementine'
pkgname=clementine
-version=1.3.1
-revision=27
-_commit=75f18dab23f0842713a4200a7e362efd51b12e31
-wrksrc="Clementine-${_commit}"
+_prefix=1.4.0rc1
+_suffix=343
+_commit=gb49afcc5b
+version=${_prefix}.${_suffix}
+_fullver=${_prefix}-${_suffix}-${_commit}
+wrksrc=${pkgname}-${_fullver}
+revision=1
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
@@ -19,9 +22,8 @@ short_desc="Modern music player and library organizer"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
-checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
-patch_args="-Np1"
+distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz"
+checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397
build_options="spotify"
case "$XBPS_TARGET_MACHINE" in
@@ -33,7 +35,6 @@ case "$XBPS_TARGET_MACHINE" in
fi
;;
esac
-
subpackages="$(vopt_if spotify clementine-spotify)"
post_install() {
From 84ac4e11bb366424f04855e8ef4352c9ee57f479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 09/37] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From 565274b5f443f43ffa8b9d38bf89fac90602606f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/37] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From 62015345800efa6b9a3af583564279c202702f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/37] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From 597c528cd5d0c5f0d0ff3f7de97fb2baf4e2f511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/37] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From 8c38606723c2cff4ae71d5c1fcce43f2ca2aee8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/37] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From aaa4eeb73859d4a7ef6616310e24278f6790d214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 14/37] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From f003783365f85dc694fadc44b78cdf9ba39d7c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 15/37] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From ed22ca6c582ba6510d24593bea4480c8268b4718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/37] hugin: revbump for glew, xlintify.
---
srcpkgs/hugin/template | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..1c93467bc09 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,10 +1,9 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
-pycompile_module="hpi.py hsi.py"
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
@@ -27,13 +26,13 @@ else
fi
pre_configure() {
- # workaround for cmake to find wx-config-gtk3
- # can be removed once there is only one 'wx-config'
- if [ "$CROSS_BUILD" ]; then
- # cannot override wxWidgets_CONFIG_EXECUTABLE set in
- # the cross toolchain file otherwise
- ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
- else
- sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
- fi
+ # workaround for cmake to find wx-config-gtk3
+ # can be removed once there is only one 'wx-config'
+ if [ "$CROSS_BUILD" ]; then
+ # cannot override wxWidgets_CONFIG_EXECUTABLE set in
+ # the cross toolchain file otherwise
+ ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+ else
+ sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+ fi
}
From 2a430edc4c38ae8bfe70c851e29cbd7a58ad72e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/37] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 2c63871163813d8fad536dbf3bcf4e9d56b7e833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/37] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 7b519ca6a9ef6b9c630bf8847ac44c74591bbdf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/37] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 1e13186b0e1a55e485b910f67c3afbe50856af84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/37] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From 42f223f8a8d37bea465eedc59292c3a29a35f407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 21/37] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From edc638a95da97238a7a820bb5e69cd56718be81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 22/37] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From fd9bb892a72bb729105aaaae6fb8e3d7a974f35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/37] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From bea7eb27696c9c59d039a79ac086f99d97d6bf56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/37] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From 2e8e4e488efbefc4ff98184e59ed024676cef388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/37] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 30 ++++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 69 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..fb69095d27f
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,30 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,5 @@
++#define _POSIX_C_SOURCE 200809L
++#undef _GNU_SOURCE
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From cf15ec63ae8aed161c109057e13d9e3b2e28dc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/37] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 03776773b5fd74109f713598a627e17679fa0f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 27/37] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From a5cb0f7f81f9a52df0b1b7406e822d310660b72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 28/37] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From 9f419364bc2887b16ef37ed8d1c6b552264c341c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/37] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From 61291334f3c6d40603f2563585715be6e174ea55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/37] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From b9672fa6d274b9655f208384a7d6415c3d573a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/37] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 961a64dbdaa08539ec2feebcde5d2160abbe6169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/37] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From 0cb0b0b7d4497da4aead4c17630fa1ef2894f3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 33/37] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From 9757d22218f874d3c88088fbd48670a3e535a5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 34/37] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From c8633bb37cbc17882f502511ab6f6c33a58daf5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/37] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 2aeb6a7db47492dc30cea94c6d6efdc6e4c0fae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 36/37] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
From 929be8b61ffafddd84f7f5cb18590f59e88e1ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 14:07:02 -0300
Subject: [PATCH 37/37] cegui: revbump for glew.
---
srcpkgs/cegui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index d2cbcc26a82..2b04106aad5 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=3
+revision=4
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (16 preceding siblings ...)
2020-09-25 18:57 ` ericonr
@ 2020-09-25 19:02 ` ericonr
2020-09-25 21:41 ` hippi777
` (8 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-25 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-699101304
Comment:
Clementine launches on musl and glibc; cross compilation for `armv7l-musl` has been tested for all cross packages.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (17 preceding siblings ...)
2020-09-25 19:02 ` ericonr
@ 2020-09-25 21:41 ` hippi777
2020-09-27 21:49 ` ericonr
` (7 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: hippi777 @ 2020-09-25 21:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 445 bytes --]
New comment by hippi777 on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-699169483
Comment:
hi folks! :)
does clementine still leak memory? :D i used it for a while some years ago, but it always ate slowly my ram, while i dunno if thats still the case, nor if it only leaks on erroneous tracks or whatever... i would drop it as a favor to its possible users, but its none of my business... :D
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (18 preceding siblings ...)
2020-09-25 21:41 ` hippi777
@ 2020-09-27 21:49 ` ericonr
2020-09-27 23:37 ` [PR PATCH] [Updated] " ericonr
` (6 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-27 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-699692418
Comment:
Clementine is seg faulting despite having worked previously :D
Not sure what the proper fix can be.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (19 preceding siblings ...)
2020-09-27 21:49 ` ericonr
@ 2020-09-27 23:37 ` ericonr
2020-09-27 23:41 ` ericonr
` (5 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-27 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 39838 bytes --]
From 23114cfae09bff8c82d7c126aef5c0d0923e17b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/37] glew: update to 2.2.0, xlintify.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index aae753c73a1..c03d4d1c505 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..a55fc7e21ff 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,17 +1,17 @@
-# Template build file for 'glew'.
+# Template file for 'glew'
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
+make_install_target="install.all"
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
-short_desc="The OpenGL Extension Wrangler Library"
+short_desc="OpenGL Extension Wrangler Library"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause, MIT, GPL-2.0-or-later"
homepage="http://glew.sourceforge.net"
-license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-make_install_target="install.all"
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
From e4f079040159f379c29257fc03ccfb06da70d13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/37] DarkRadiant: revbump for glew.
Also add boost-devel to checkdepends.
---
srcpkgs/DarkRadiant/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..fdc430cdf52 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,13 +1,14 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
hostmakedepends="automake gettext libtool pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+checkdepends="boost-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From 9c3b11764fe44f667ed91934d85fc474f0f4ee61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/37] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From 5c83c527cf216a79be59e803660fcec9822b7d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/37] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From 9e235d02627ff4d50c4534e94270aa910ed92454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/37] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 3fdc7e9f04be8fc30fa37a2315a1377025ff7505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/37] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From ec02d496302d738ce4e972bec4dc9761d6f3e70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/37] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From 10893b8f6416ef2e5e6757e090a38c3772bdf1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 08/37] clementine: update to 1.4.0rc1.
Using 1.4.0rc1-343.
---
srcpkgs/clementine/patches/QPainterPath.patch | 36 -------------------
srcpkgs/clementine/patches/musl.patch | 12 ++++---
srcpkgs/clementine/template | 18 +++++-----
3 files changed, 15 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/clementine/patches/QPainterPath.patch
diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch
deleted file mode 100644
index 271b8c1d724..00000000000
--- a/srcpkgs/clementine/patches/QPainterPath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
-index 3067f72..c9789d3 100644
---- a/src/widgets/freespacebar.cpp
-+++ b/src/widgets/freespacebar.cpp
-@@ -20,6 +20,7 @@
-
- #include <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int FreeSpaceBar::kBarHeight = 20;
- const int FreeSpaceBar::kBarBorderRadius = 8;
-diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
-index 9d95716..30cef7d 100644
---- a/src/widgets/osdpretty.cpp
-+++ b/src/widgets/osdpretty.cpp
-@@ -26,6 +26,7 @@
- #include <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
-index 581a0de..27b81f7 100644
---- a/src/widgets/sliderwidget.cpp
-+++ b/src/widgets/sliderwidget.cpp
-@@ -24,6 +24,7 @@
- #include <QBrush>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
diff --git a/srcpkgs/clementine/patches/musl.patch b/srcpkgs/clementine/patches/musl.patch
index c976dbb42d7..ad39814196e 100644
--- a/srcpkgs/clementine/patches/musl.patch
+++ b/srcpkgs/clementine/patches/musl.patch
@@ -1,15 +1,17 @@
---- a/logging.cpp 2017-09-22 21:33:36.030774014 +0200
-+++ b/ext/libclementine-common/core/logging.cpp 2017-09-22 21:35:34.327766268 +0200
+diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
+index 8012c0c..ce77c77 100644
+--- ext/libclementine-common/core/logging.cpp
++++ ext/libclementine-common/core/logging.cpp
@@ -21,7 +21,7 @@
- #include <QtGlobal>
-
#include <cxxabi.h>
+
+ #include <QtGlobal>
-#ifdef Q_OS_UNIX
+#if defined Q_OS_UNIX && defined __GLIBC__
#include <execinfo.h>
#endif
-@@ -249,7 +249,7 @@
+@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
}
void DumpStackTrace() {
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..e7f3dcde2cd 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,11 +1,11 @@
# Template file for 'clementine'
pkgname=clementine
-version=1.3.1
-revision=27
-_commit=75f18dab23f0842713a4200a7e362efd51b12e31
-wrksrc="Clementine-${_commit}"
+_fullver=1.4.0rc1-343-gb49afcc5b
+version=${_fullver%%-*}
+wrksrc=${pkgname}-${_fullver}
+revision=1
build_style=cmake
-configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON"
hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
@@ -13,15 +13,14 @@ makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
- qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel"
+ qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel projectM-devel"
depends="desktop-file-utils"
short_desc="Modern music player and library organizer"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
-checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
-patch_args="-Np1"
+distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz"
+checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397
build_options="spotify"
case "$XBPS_TARGET_MACHINE" in
@@ -33,7 +32,6 @@ case "$XBPS_TARGET_MACHINE" in
fi
;;
esac
-
subpackages="$(vopt_if spotify clementine-spotify)"
post_install() {
From b6e16022b8e0857b9d653c5609d2161739479307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 09/37] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From 0e7ba41a1ca46c509bbd4b222d42258793b5eb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/37] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From 5b4ff29bfacb87e9d29e5cc518861196f3c8d254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/37] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From bdc5c21815cfda0390bd0c8d97037d622ec96700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/37] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From b096db11cfc4c37b12a87a959f5473257133b3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/37] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From 1018254a21b13c77f46b4f00633f9c0bcdfcf9da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 14/37] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From 8745f46ef458cd2943c724d16d520ecf0500c436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 15/37] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From e2e33d03e0233e695353d1c1d5feb54169947082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/37] hugin: revbump for glew, xlintify.
---
srcpkgs/hugin/template | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..1c93467bc09 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,10 +1,9 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
-pycompile_module="hpi.py hsi.py"
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
@@ -27,13 +26,13 @@ else
fi
pre_configure() {
- # workaround for cmake to find wx-config-gtk3
- # can be removed once there is only one 'wx-config'
- if [ "$CROSS_BUILD" ]; then
- # cannot override wxWidgets_CONFIG_EXECUTABLE set in
- # the cross toolchain file otherwise
- ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
- else
- sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
- fi
+ # workaround for cmake to find wx-config-gtk3
+ # can be removed once there is only one 'wx-config'
+ if [ "$CROSS_BUILD" ]; then
+ # cannot override wxWidgets_CONFIG_EXECUTABLE set in
+ # the cross toolchain file otherwise
+ ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+ else
+ sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+ fi
}
From 7fee7faccff5e91ca0bf00fcb0af6369fc555bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/37] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 532a605797c76a1ebdaf6de58b89ff7428f23b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/37] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 865d7d0a59bdea202d0f3aac597f8bf1fce660db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/37] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 12ae72bee5c08a6c1dc3bee49c9e98e2142d0e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/37] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From 155e65d5debe1f539679263facc41d771cbeafd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 21/37] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From 495d345365f18d02efe76f2cc724e7090bd1053a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 22/37] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From 43766038ba302494ba158c84410de13774ef14d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/37] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From f0976b63ec6b92cde26c2d07a7b08ab9de300b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/37] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From f32b0e07ed108591caab4be4c51907ced41a1ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/37] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 30 ++++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 69 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..fb69095d27f
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,30 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,5 @@
++#define _POSIX_C_SOURCE 200809L
++#undef _GNU_SOURCE
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 55e532aa0a61a1cb277006e0cf5c50b90e687556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/37] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From c7b4e94ba5e4d29ce46b9a993ee9ff94b72459cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 27/37] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From fde63fc5961503b4feeeabd2c1b4a793ccc1a2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 28/37] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From 3033d5ddef9be37d9f70352b91afb928dee3b91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/37] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From 8fee45eae2f5fb598189df7bc55c53e82a6d9f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/37] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From 43664714b9cfe101e15711d5dc1a40749470d279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/37] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 78684cfb6e25202979c0a7816c14a2c3954d8a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/37] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From c698456928b88ef72ba2e9778fea804797fbba59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 33/37] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From 0d8338b96558145dab0f16bf700e2a15f8327ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 34/37] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From 692973b3f23df35b5a11c32cd7294f3e7db2d96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/37] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From c9406a6e3937d0ea450e32124d577e84f649d448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 36/37] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
From ab4b581f7b48d1bb6101957f67b0a627e87c2ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 14:07:02 -0300
Subject: [PATCH 37/37] cegui: revbump for glew.
---
srcpkgs/cegui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index d2cbcc26a82..2b04106aad5 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=3
+revision=4
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (20 preceding siblings ...)
2020-09-27 23:37 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-27 23:41 ` ericonr
2020-09-27 23:42 ` [PR PATCH] [Updated] " ericonr
` (4 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-27 23:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-699704027
Comment:
"It's alive!"
On Wayland, Clementine simply segfaults on musl, on glibc it complains about not knowing the current backend. @Johnnynator have you ever noticed this issue? It does work if I let it choose its backend, so I'd say this PR is ready. It pulls in stuff from #25135 , so imma close that.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (21 preceding siblings ...)
2020-09-27 23:41 ` ericonr
@ 2020-09-27 23:42 ` ericonr
2020-09-27 23:43 ` ericonr
` (3 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-27 23:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 42044 bytes --]
From 23114cfae09bff8c82d7c126aef5c0d0923e17b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/38] glew: update to 2.2.0, xlintify.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index aae753c73a1..c03d4d1c505 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..a55fc7e21ff 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,17 +1,17 @@
-# Template build file for 'glew'.
+# Template file for 'glew'
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
+make_install_target="install.all"
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
-short_desc="The OpenGL Extension Wrangler Library"
+short_desc="OpenGL Extension Wrangler Library"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause, MIT, GPL-2.0-or-later"
homepage="http://glew.sourceforge.net"
-license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-make_install_target="install.all"
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
From e4f079040159f379c29257fc03ccfb06da70d13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/38] DarkRadiant: revbump for glew.
Also add boost-devel to checkdepends.
---
srcpkgs/DarkRadiant/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..fdc430cdf52 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,13 +1,14 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
hostmakedepends="automake gettext libtool pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+checkdepends="boost-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From 9c3b11764fe44f667ed91934d85fc474f0f4ee61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/38] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From 5c83c527cf216a79be59e803660fcec9822b7d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/38] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From 9e235d02627ff4d50c4534e94270aa910ed92454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/38] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 3fdc7e9f04be8fc30fa37a2315a1377025ff7505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/38] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From ec02d496302d738ce4e972bec4dc9761d6f3e70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/38] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From da8d00ccb08ee126f4d93deddf3d11fa815f9db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 08/38] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From 3220eff01c43a14cc4e473f83db3a822fcbeaa70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 09/38] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From 8b5f10f2b86fa54668e7e3029499c75635cb027b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/38] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From 9be93fabba4a5703bd92c9d2d597663625014f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/38] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From aba8a6e9f7b2167d037d5774ef09f848d62a1143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/38] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From 07e8880c3a3a315d43fc10b09a746c9458284d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/38] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From 47a04eeda0fb802486ed7b3a5c9bdc83ab05ce03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 14/38] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From 9af3cd0452618c6e948796074ccd7ca1db989d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 15/38] hugin: revbump for glew, xlintify.
---
srcpkgs/hugin/template | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..1c93467bc09 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,10 +1,9 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
-pycompile_module="hpi.py hsi.py"
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
@@ -27,13 +26,13 @@ else
fi
pre_configure() {
- # workaround for cmake to find wx-config-gtk3
- # can be removed once there is only one 'wx-config'
- if [ "$CROSS_BUILD" ]; then
- # cannot override wxWidgets_CONFIG_EXECUTABLE set in
- # the cross toolchain file otherwise
- ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
- else
- sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
- fi
+ # workaround for cmake to find wx-config-gtk3
+ # can be removed once there is only one 'wx-config'
+ if [ "$CROSS_BUILD" ]; then
+ # cannot override wxWidgets_CONFIG_EXECUTABLE set in
+ # the cross toolchain file otherwise
+ ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+ else
+ sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+ fi
}
From d8200a3eeccbc28a642739f5917b2d53f4165e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/38] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 1bea57cd9288360e8f0abdcd805595a496e7f32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/38] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 11ce349ef478df2cd78217ea2735c4866cbf5435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/38] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 296c895bda328c1510aece042869f12727fd71e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/38] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From 6a2145b6866396d9f6717ccce606ecb20b0b3b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/38] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From 9f69985d83c06c8d972a2786fffe3342cbef7807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 21/38] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From 053c8b3f29f35054b36c4d0c8f76cb5ad95ff162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 22/38] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 43ea18235eb9d3b16de8482b106b6d651114ca0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/38] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From d616b9517d5367a536cee61e07646b77d5a4c7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/38] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 30 ++++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 69 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..fb69095d27f
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,30 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,5 @@
++#define _POSIX_C_SOURCE 200809L
++#undef _GNU_SOURCE
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 0e9561dcf085408e98041a90a6555fc22f687397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/38] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 2b6da456764e7630fb64f14a0f336d5adf992dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/38] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From fa930ac3e63e3464751d675d8c3c93a16a13ad3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 27/38] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From 1a5a7b54311d2bf5fb90e5090756689c3500e732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 28/38] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From a0cc67430dcc3b60af5b013a8c491c2aeace05da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/38] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From f731006be595cc51486361554371d256703c60e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/38] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 92bbddfc163b8cbaaed449185596fa64a4717361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/38] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From 9bfbcb1142b2abe48916f14c363ea6efe945fc37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/38] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From c7d61ffa60a27ed49fd78d0f51309aef4402c9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 33/38] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From c11b7397a5934d17531ab1d62b0e61bed3db5c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 34/38] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 14e2c2fdfab86a3b9d8d59921b4e6b4cc5bf5345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/38] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
From a3c48dccec9ef8ee78f8c776e361715d99aafdd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 14:07:02 -0300
Subject: [PATCH 36/38] cegui: revbump for glew.
---
srcpkgs/cegui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index d2cbcc26a82..2b04106aad5 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=3
+revision=4
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
From 5943edc8f0c102575bfabe42799bc0a7135813e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 27 Sep 2020 20:41:40 -0300
Subject: [PATCH 37/38] projectM: split into -devel subpackage.
Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.
---
common/shlibs | 1 +
srcpkgs/projectM-devel | 1 +
srcpkgs/projectM/template | 20 ++++++++++++++++++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/projectM-devel
diff --git a/common/shlibs b/common/shlibs
index c03d4d1c505..c3b3472bc74 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -765,6 +765,7 @@ libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
libpulse-simple.so.0 libpulseaudio-1.0_1
libpulsecommon-13.0.so libpulseaudio-13.0_1
libpulsecore-13.0.so libpulseaudio-13.0_1
+libprojectM.so.3 projectM-3.1.7_2
liborc-0.4.so.0 orc-0.4.11_1
liborc-test-0.4.so.0 orc-0.4.11_1
libgmime-2.6.so.0 gmime-2.6.4_1
diff --git a/srcpkgs/projectM-devel b/srcpkgs/projectM-devel
new file mode 120000
index 00000000000..80ca2de8e22
--- /dev/null
+++ b/srcpkgs/projectM-devel
@@ -0,0 +1 @@
+projectM
\ No newline at end of file
diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index ca2b22afdd9..563fa77563f 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
# Template file for 'projectM'
pkgname=projectM
version=3.1.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--datadir=/usr/libexec"
hostmakedepends="pkg-config qt5-host-tools automake libtool which"
@@ -17,5 +17,21 @@ checksum=30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel"
- export LDFLAGS+=" -lfts"
+ LDFLAGS="-lfts"
fi
+
+post_install() {
+ # fix location of desktop files
+ mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
+}
+
+projectM-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From 25a99b26ce24cab1b4cfb28c151c0307fe357e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 38/38] clementine: update to 1.4.0rc1, use system projectM.
Using 1.4.0rc1-343.
---
srcpkgs/clementine/patches/QPainterPath.patch | 36 -------------------
srcpkgs/clementine/patches/musl.patch | 12 ++++---
srcpkgs/clementine/template | 18 +++++-----
3 files changed, 15 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/clementine/patches/QPainterPath.patch
diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch
deleted file mode 100644
index 271b8c1d724..00000000000
--- a/srcpkgs/clementine/patches/QPainterPath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
-index 3067f72..c9789d3 100644
---- a/src/widgets/freespacebar.cpp
-+++ b/src/widgets/freespacebar.cpp
-@@ -20,6 +20,7 @@
-
- #include <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int FreeSpaceBar::kBarHeight = 20;
- const int FreeSpaceBar::kBarBorderRadius = 8;
-diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
-index 9d95716..30cef7d 100644
---- a/src/widgets/osdpretty.cpp
-+++ b/src/widgets/osdpretty.cpp
-@@ -26,6 +26,7 @@
- #include <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
-index 581a0de..27b81f7 100644
---- a/src/widgets/sliderwidget.cpp
-+++ b/src/widgets/sliderwidget.cpp
-@@ -24,6 +24,7 @@
- #include <QBrush>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
diff --git a/srcpkgs/clementine/patches/musl.patch b/srcpkgs/clementine/patches/musl.patch
index c976dbb42d7..ad39814196e 100644
--- a/srcpkgs/clementine/patches/musl.patch
+++ b/srcpkgs/clementine/patches/musl.patch
@@ -1,15 +1,17 @@
---- a/logging.cpp 2017-09-22 21:33:36.030774014 +0200
-+++ b/ext/libclementine-common/core/logging.cpp 2017-09-22 21:35:34.327766268 +0200
+diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
+index 8012c0c..ce77c77 100644
+--- ext/libclementine-common/core/logging.cpp
++++ ext/libclementine-common/core/logging.cpp
@@ -21,7 +21,7 @@
- #include <QtGlobal>
-
#include <cxxabi.h>
+
+ #include <QtGlobal>
-#ifdef Q_OS_UNIX
+#if defined Q_OS_UNIX && defined __GLIBC__
#include <execinfo.h>
#endif
-@@ -249,7 +249,7 @@
+@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
}
void DumpStackTrace() {
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..e7f3dcde2cd 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,11 +1,11 @@
# Template file for 'clementine'
pkgname=clementine
-version=1.3.1
-revision=27
-_commit=75f18dab23f0842713a4200a7e362efd51b12e31
-wrksrc="Clementine-${_commit}"
+_fullver=1.4.0rc1-343-gb49afcc5b
+version=${_fullver%%-*}
+wrksrc=${pkgname}-${_fullver}
+revision=1
build_style=cmake
-configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON"
hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
@@ -13,15 +13,14 @@ makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
- qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel"
+ qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel projectM-devel"
depends="desktop-file-utils"
short_desc="Modern music player and library organizer"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
-checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
-patch_args="-Np1"
+distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz"
+checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397
build_options="spotify"
case "$XBPS_TARGET_MACHINE" in
@@ -33,7 +32,6 @@ case "$XBPS_TARGET_MACHINE" in
fi
;;
esac
-
subpackages="$(vopt_if spotify clementine-spotify)"
post_install() {
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (22 preceding siblings ...)
2020-09-27 23:42 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-27 23:43 ` ericonr
2020-09-28 2:22 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-27 23:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25078#issuecomment-699704344
Comment:
Need to fix cross for projectM.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (23 preceding siblings ...)
2020-09-27 23:43 ` ericonr
@ 2020-09-28 2:22 ` ericonr
2020-09-28 2:56 ` ericonr
2020-09-28 2:56 ` [PR PATCH] [Merged]: " ericonr
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-28 2:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 42159 bytes --]
From 23114cfae09bff8c82d7c126aef5c0d0923e17b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/38] glew: update to 2.2.0, xlintify.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index aae753c73a1..c03d4d1c505 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..a55fc7e21ff 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,17 +1,17 @@
-# Template build file for 'glew'.
+# Template file for 'glew'
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
+make_install_target="install.all"
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
-short_desc="The OpenGL Extension Wrangler Library"
+short_desc="OpenGL Extension Wrangler Library"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause, MIT, GPL-2.0-or-later"
homepage="http://glew.sourceforge.net"
-license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-make_install_target="install.all"
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
From e4f079040159f379c29257fc03ccfb06da70d13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/38] DarkRadiant: revbump for glew.
Also add boost-devel to checkdepends.
---
srcpkgs/DarkRadiant/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..fdc430cdf52 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,13 +1,14 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
hostmakedepends="automake gettext libtool pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+checkdepends="boost-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From 9c3b11764fe44f667ed91934d85fc474f0f4ee61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/38] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From 5c83c527cf216a79be59e803660fcec9822b7d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/38] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From 9e235d02627ff4d50c4534e94270aa910ed92454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/38] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 3fdc7e9f04be8fc30fa37a2315a1377025ff7505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/38] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From ec02d496302d738ce4e972bec4dc9761d6f3e70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/38] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From da8d00ccb08ee126f4d93deddf3d11fa815f9db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 08/38] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From 3220eff01c43a14cc4e473f83db3a822fcbeaa70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 09/38] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From 8b5f10f2b86fa54668e7e3029499c75635cb027b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/38] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From 9be93fabba4a5703bd92c9d2d597663625014f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/38] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From aba8a6e9f7b2167d037d5774ef09f848d62a1143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/38] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From 07e8880c3a3a315d43fc10b09a746c9458284d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/38] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From 47a04eeda0fb802486ed7b3a5c9bdc83ab05ce03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 14/38] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From 9af3cd0452618c6e948796074ccd7ca1db989d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 15/38] hugin: revbump for glew, xlintify.
---
srcpkgs/hugin/template | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..1c93467bc09 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,10 +1,9 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
-pycompile_module="hpi.py hsi.py"
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
@@ -27,13 +26,13 @@ else
fi
pre_configure() {
- # workaround for cmake to find wx-config-gtk3
- # can be removed once there is only one 'wx-config'
- if [ "$CROSS_BUILD" ]; then
- # cannot override wxWidgets_CONFIG_EXECUTABLE set in
- # the cross toolchain file otherwise
- ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
- else
- sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
- fi
+ # workaround for cmake to find wx-config-gtk3
+ # can be removed once there is only one 'wx-config'
+ if [ "$CROSS_BUILD" ]; then
+ # cannot override wxWidgets_CONFIG_EXECUTABLE set in
+ # the cross toolchain file otherwise
+ ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+ else
+ sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+ fi
}
From d8200a3eeccbc28a642739f5917b2d53f4165e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/38] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 1bea57cd9288360e8f0abdcd805595a496e7f32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/38] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 11ce349ef478df2cd78217ea2735c4866cbf5435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/38] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 296c895bda328c1510aece042869f12727fd71e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/38] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From 6a2145b6866396d9f6717ccce606ecb20b0b3b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/38] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From 9f69985d83c06c8d972a2786fffe3342cbef7807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 21/38] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From 053c8b3f29f35054b36c4d0c8f76cb5ad95ff162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 22/38] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 43ea18235eb9d3b16de8482b106b6d651114ca0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/38] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From d616b9517d5367a536cee61e07646b77d5a4c7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/38] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 30 ++++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 69 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..fb69095d27f
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,30 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,5 @@
++#define _POSIX_C_SOURCE 200809L
++#undef _GNU_SOURCE
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 0e9561dcf085408e98041a90a6555fc22f687397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/38] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 2b6da456764e7630fb64f14a0f336d5adf992dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/38] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From fa930ac3e63e3464751d675d8c3c93a16a13ad3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 27/38] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From 1a5a7b54311d2bf5fb90e5090756689c3500e732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 28/38] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From a0cc67430dcc3b60af5b013a8c491c2aeace05da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/38] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From f731006be595cc51486361554371d256703c60e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/38] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 92bbddfc163b8cbaaed449185596fa64a4717361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/38] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From 9bfbcb1142b2abe48916f14c363ea6efe945fc37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/38] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From c7d61ffa60a27ed49fd78d0f51309aef4402c9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 33/38] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From c11b7397a5934d17531ab1d62b0e61bed3db5c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 34/38] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 14e2c2fdfab86a3b9d8d59921b4e6b4cc5bf5345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/38] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
From a3c48dccec9ef8ee78f8c776e361715d99aafdd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 14:07:02 -0300
Subject: [PATCH 36/38] cegui: revbump for glew.
---
srcpkgs/cegui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index d2cbcc26a82..2b04106aad5 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=3
+revision=4
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
From ac587cb124849d7edefaa897db05d2d029fd2178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 27 Sep 2020 20:41:40 -0300
Subject: [PATCH 37/38] projectM: split into -devel subpackage.
Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.
---
common/shlibs | 1 +
srcpkgs/projectM-devel | 1 +
srcpkgs/projectM/template | 23 +++++++++++++++++++++--
3 files changed, 23 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/projectM-devel
diff --git a/common/shlibs b/common/shlibs
index c03d4d1c505..c3b3472bc74 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -765,6 +765,7 @@ libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
libpulse-simple.so.0 libpulseaudio-1.0_1
libpulsecommon-13.0.so libpulseaudio-13.0_1
libpulsecore-13.0.so libpulseaudio-13.0_1
+libprojectM.so.3 projectM-3.1.7_2
liborc-0.4.so.0 orc-0.4.11_1
liborc-test-0.4.so.0 orc-0.4.11_1
libgmime-2.6.so.0 gmime-2.6.4_1
diff --git a/srcpkgs/projectM-devel b/srcpkgs/projectM-devel
new file mode 120000
index 00000000000..80ca2de8e22
--- /dev/null
+++ b/srcpkgs/projectM-devel
@@ -0,0 +1 @@
+projectM
\ No newline at end of file
diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index ca2b22afdd9..d7e5c0fa547 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
# Template file for 'projectM'
pkgname=projectM
version=3.1.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--datadir=/usr/libexec"
hostmakedepends="pkg-config qt5-host-tools automake libtool which"
@@ -17,5 +17,24 @@ checksum=30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel"
- export LDFLAGS+=" -lfts"
+ LDFLAGS="-lfts"
fi
+
+post_install() {
+ if [ ! "$CROSS_BUILD" ]; then
+ # fix location of desktop files
+ # TODO: find out why these files aren't generated for the cross build
+ mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
+ fi
+}
+
+projectM-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From 1daef5ee3bc603b3e70c3d84cf16e983fe6abb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 38/38] clementine: update to 1.4.0rc1, use system projectM.
Using 1.4.0rc1-343.
---
srcpkgs/clementine/patches/QPainterPath.patch | 36 -------------------
srcpkgs/clementine/patches/musl.patch | 12 ++++---
srcpkgs/clementine/template | 18 +++++-----
3 files changed, 15 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/clementine/patches/QPainterPath.patch
diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch
deleted file mode 100644
index 271b8c1d724..00000000000
--- a/srcpkgs/clementine/patches/QPainterPath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
-index 3067f72..c9789d3 100644
---- a/src/widgets/freespacebar.cpp
-+++ b/src/widgets/freespacebar.cpp
-@@ -20,6 +20,7 @@
-
- #include <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int FreeSpaceBar::kBarHeight = 20;
- const int FreeSpaceBar::kBarBorderRadius = 8;
-diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
-index 9d95716..30cef7d 100644
---- a/src/widgets/osdpretty.cpp
-+++ b/src/widgets/osdpretty.cpp
-@@ -26,6 +26,7 @@
- #include <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
-index 581a0de..27b81f7 100644
---- a/src/widgets/sliderwidget.cpp
-+++ b/src/widgets/sliderwidget.cpp
-@@ -24,6 +24,7 @@
- #include <QBrush>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
diff --git a/srcpkgs/clementine/patches/musl.patch b/srcpkgs/clementine/patches/musl.patch
index c976dbb42d7..ad39814196e 100644
--- a/srcpkgs/clementine/patches/musl.patch
+++ b/srcpkgs/clementine/patches/musl.patch
@@ -1,15 +1,17 @@
---- a/logging.cpp 2017-09-22 21:33:36.030774014 +0200
-+++ b/ext/libclementine-common/core/logging.cpp 2017-09-22 21:35:34.327766268 +0200
+diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
+index 8012c0c..ce77c77 100644
+--- ext/libclementine-common/core/logging.cpp
++++ ext/libclementine-common/core/logging.cpp
@@ -21,7 +21,7 @@
- #include <QtGlobal>
-
#include <cxxabi.h>
+
+ #include <QtGlobal>
-#ifdef Q_OS_UNIX
+#if defined Q_OS_UNIX && defined __GLIBC__
#include <execinfo.h>
#endif
-@@ -249,7 +249,7 @@
+@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
}
void DumpStackTrace() {
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..e7f3dcde2cd 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,11 +1,11 @@
# Template file for 'clementine'
pkgname=clementine
-version=1.3.1
-revision=27
-_commit=75f18dab23f0842713a4200a7e362efd51b12e31
-wrksrc="Clementine-${_commit}"
+_fullver=1.4.0rc1-343-gb49afcc5b
+version=${_fullver%%-*}
+wrksrc=${pkgname}-${_fullver}
+revision=1
build_style=cmake
-configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON"
hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
@@ -13,15 +13,14 @@ makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
- qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel"
+ qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel projectM-devel"
depends="desktop-file-utils"
short_desc="Modern music player and library organizer"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
-checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
-patch_args="-Np1"
+distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz"
+checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397
build_options="spotify"
case "$XBPS_TARGET_MACHINE" in
@@ -33,7 +32,6 @@ case "$XBPS_TARGET_MACHINE" in
fi
;;
esac
-
subpackages="$(vopt_if spotify clementine-spotify)"
post_install() {
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Updated] Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (24 preceding siblings ...)
2020-09-28 2:22 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-28 2:56 ` ericonr
2020-09-28 2:56 ` [PR PATCH] [Merged]: " ericonr
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-28 2:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glew
https://github.com/void-linux/void-packages/pull/25078
Update Glew to 2.2.0
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
A patch file from https://github.com/void-linux/void-packages/pull/25078.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glew-25078.patch --]
[-- Type: text/x-diff, Size: 42016 bytes --]
From 23114cfae09bff8c82d7c126aef5c0d0923e17b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:04:31 -0300
Subject: [PATCH 01/38] glew: update to 2.2.0, xlintify.
---
common/shlibs | 2 +-
srcpkgs/glew/template | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index aae753c73a1..c03d4d1c505 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -755,7 +755,7 @@ libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
libxml++-2.6.so.2 libxml++-2.32.0_1
libxml++-3.0.so.1 libxml++3.0-3.0.1_1
libftgl.so.2 ftgl-2.1.2_1
-libGLEW.so.2.1 glew-2.1.0_1
+libGLEW.so.2.2 glew-2.2.0_1
libsndfile.so.1 libsndfile-1.0.20_1
libspeex.so.1 libspeex-1.1_1
libspeexdsp.so.1 speexdsp-1.2rc2_1
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index d61c041c511..a55fc7e21ff 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -1,17 +1,17 @@
-# Template build file for 'glew'.
+# Template file for 'glew'
pkgname=glew
-version=2.1.0
-revision=2
+version=2.2.0
+revision=1
build_style=gnu-makefile
+make_install_target="install.all"
hostmakedepends="pkg-config"
makedepends="libXext-devel libXmu-devel libXi-devel glu-devel"
-short_desc="The OpenGL Extension Wrangler Library"
+short_desc="OpenGL Extension Wrangler Library"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause, MIT, GPL-2.0-or-later"
homepage="http://glew.sourceforge.net"
-license="BSD, MIT, GPL-2"
distfiles="${SOURCEFORGE_SITE}/glew/glew-${version}.tgz"
-checksum=04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-make_install_target="install.all"
+checksum=d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
do_build() {
sed -i -e "s|lib64|lib|" config/Makefile.linux
From e4f079040159f379c29257fc03ccfb06da70d13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 02/38] DarkRadiant: revbump for glew.
Also add boost-devel to checkdepends.
---
srcpkgs/DarkRadiant/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 28778e85f77..fdc430cdf52 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,13 +1,14 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.8.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"
hostmakedepends="automake gettext libtool pkg-config"
makedepends="ftgl-devel glew-devel libjpeg-turbo-devel libsigc++-devel
libvorbis-devel libxml2-devel wxWidgets-gtk3-devel python3-devel freealut-devel"
+checkdepends="boost-devel"
short_desc="Map editor for The Dark Mod and other idTech4/Doom3-based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From 9c3b11764fe44f667ed91934d85fc474f0f4ee61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:12 -0300
Subject: [PATCH 03/38] PrusaSlicer: revbump for glew.
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 0546ec0f8d3..aa195fe6ac8 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.2.0
-revision=3
+revision=4
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From 5c83c527cf216a79be59e803660fcec9822b7d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 04/38] SLADE: revbump for glew.
---
srcpkgs/SLADE/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 35d47e2678a..21bac8fe31f 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
From 9e235d02627ff4d50c4534e94270aa910ed92454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 05/38] blender: revbump for glew.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a74962b7089..559a5311288 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=2.83.6
-revision=1
+revision=2
archs="x86_64* i686* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 3fdc7e9f04be8fc30fa37a2315a1377025ff7505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 06/38] bzflag: revbump for glew.
---
srcpkgs/bzflag/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index a116be5406e..95a2c37185a 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
# Template file for 'bzflag'
pkgname=bzflag
version=2.4.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
From ec02d496302d738ce4e972bec4dc9761d6f3e70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 07/38] cegui07: revbump for glew, drop noarch.
---
srcpkgs/cegui07/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index b5d0f735ffb..24b148e7507 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -1,7 +1,7 @@
# Template file for 'cegui07'
pkgname=cegui07
version=0.7.9
-revision=7
+revision=8
wrksrc="CEGUI-${version}"
build_style=gnu-configure
configure_args="--disable-samples"
@@ -68,14 +68,12 @@ post_install() {
cegui07-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/CEGUI
}
}
cegui07-doc_package() {
short_desc+=" - documentation"
- archs=noarch
pkg_install() {
vmkdir usr/share/doc/${sourcepkg}
vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
From da8d00ccb08ee126f4d93deddf3d11fa815f9db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 08/38] dreamchess: revbump for glew.
---
srcpkgs/dreamchess/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dreamchess/template b/srcpkgs/dreamchess/template
index c7f3dcb6f90..eaace11daa8 100644
--- a/srcpkgs/dreamchess/template
+++ b/srcpkgs/dreamchess/template
@@ -1,7 +1,7 @@
# Template file for 'dreamchess'
pkgname=dreamchess
version=0.3.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="bison flex"
makedepends="SDL2_image-devel SDL2_mixer-devel glew-devel pugixml-devel mxml-devel"
From 3220eff01c43a14cc4e473f83db3a822fcbeaa70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 09/38] endless-sky: revbump for glew.
---
srcpkgs/endless-sky/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index be7745631ff..bb0215fd6f0 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky'
pkgname=endless-sky
version=0.9.12
-revision=2
+revision=3
build_style=scons
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
libopenal-devel libpng-devel"
From 8b5f10f2b86fa54668e7e3029499c75635cb027b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 10/38] endless-sky-gl21: revbump for glew, drop noarch.
---
srcpkgs/endless-sky-gl21/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index ead1c34e626..5bb8355dc57 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -1,7 +1,7 @@
# Template file for 'endless-sky-gl21'
pkgname=endless-sky-gl21
version=0.9.2.20170822
-revision=1
+revision=2
_commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91
wrksrc="endless-sky-${_commit}"
build_style=scons
@@ -18,7 +18,6 @@ checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
endless-sky-gl21-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/games/endless-sky
}
From 9be93fabba4a5703bd92c9d2d597663625014f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 11/38] fifengine: revbump for glew.
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index cd74d3dd494..ca631983149 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=4
+revision=5
build_style=cmake
pycompile_module="fife"
hostmakedepends="swig python3"
From aba8a6e9f7b2167d037d5774ef09f848d62a1143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 12/38] flightgear: revbump for glew, drop noarch.
---
srcpkgs/flightgear/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 324a4e3d156..5313f97d0c5 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
version=2020.1.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -54,7 +54,6 @@ post_install() {
flightgear-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
From 07e8880c3a3a315d43fc10b09a746c9458284d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:14 -0300
Subject: [PATCH 13/38] freeorion: revbump for glew, drop noarch.
---
srcpkgs/freeorion/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 3078bee0d7b..c6c96ab56b2 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.9
-revision=1
+revision=2
_release=${version}_2020-02-02.db53471
wrksrc=src-tarball
build_style=cmake
@@ -25,7 +25,6 @@ post_extract() {
freeorion-data_package() {
short_desc+=" - data files"
license="GPL-2.0-or-later, CC-BY-SA-3.0"
- archs=noarch
pkg_install() {
vmove usr/share/freeorion
}
From 47a04eeda0fb802486ed7b3a5c9bdc83ab05ce03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 14/38] gource: revbump for glew.
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index c895031c6cc..577fc4efd27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
hostmakedepends="pkg-config"
From 9af3cd0452618c6e948796074ccd7ca1db989d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 15/38] hugin: revbump for glew, xlintify.
---
srcpkgs/hugin/template | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 40142a3f79d..1c93467bc09 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,10 +1,9 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.2.0
-revision=2
+revision=3
wrksrc="${pkgname}-${version}"
build_style=cmake
-pycompile_module="hpi.py hsi.py"
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
@@ -27,13 +26,13 @@ else
fi
pre_configure() {
- # workaround for cmake to find wx-config-gtk3
- # can be removed once there is only one 'wx-config'
- if [ "$CROSS_BUILD" ]; then
- # cannot override wxWidgets_CONFIG_EXECUTABLE set in
- # the cross toolchain file otherwise
- ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
- else
- sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
- fi
+ # workaround for cmake to find wx-config-gtk3
+ # can be removed once there is only one 'wx-config'
+ if [ "$CROSS_BUILD" ]; then
+ # cannot override wxWidgets_CONFIG_EXECUTABLE set in
+ # the cross toolchain file otherwise
+ ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+ else
+ sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+ fi
}
From d8200a3eeccbc28a642739f5917b2d53f4165e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 16/38] kicad: revbump for glew.
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 27b63ea8a58..84a2a7eb1bb 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
From 1bea57cd9288360e8f0abdcd805595a496e7f32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 17/38] logstalgia: revbump for glew.
---
srcpkgs/logstalgia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index d1e40dad98f..554d33c6507 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,7 +1,7 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.2
-revision=2
+revision=3
wrksrc="$pkgname-$version"
build_style=gnu-configure
hostmakedepends="pkg-config"
From 11ce349ef478df2cd78217ea2735c4866cbf5435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 18/38] mediastreamer: revbump for glew.
---
srcpkgs/mediastreamer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index 107e6f59e0e..7578627b976 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,7 +1,7 @@
# Template file for 'mediastreamer'
pkgname=mediastreamer
version=4.4.0
-revision=1
+revision=2
build_style=cmake
wrksrc="mediastreamer2-${version}"
configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0"
From 296c895bda328c1510aece042869f12727fd71e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 19/38] mesa-demos: revbump for glew.
---
srcpkgs/mesa-demos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index b0bbe252980..a10713008e1 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
# Template file for 'mesa-demos'
pkgname=mesa-demos
version=8.4.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel libfreeglut-devel"
From 6a2145b6866396d9f6717ccce606ecb20b0b3b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:15 -0300
Subject: [PATCH 20/38] opencsg: revbump for glew.
---
srcpkgs/opencsg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencsg/template b/srcpkgs/opencsg/template
index 0758b33ed06..7a3a63cf85d 100644
--- a/srcpkgs/opencsg/template
+++ b/srcpkgs/opencsg/template
@@ -2,7 +2,7 @@
pkgname="opencsg"
version="1.4.2"
-revision=2
+revision=3
short_desc="A library that does image-based CSG rendering using OpenGL"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2"
From 9f69985d83c06c8d972a2786fffe3342cbef7807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 21/38] openmsx: revbump for glew.
---
srcpkgs/openmsx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 07dceb71dc5..8475c00fd31 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,7 +1,7 @@
# Template file for 'openmsx'
pkgname=openmsx
version=0.15.0
-revision=2
+revision=3
hostmakedepends="pkg-config python"
makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
From 053c8b3f29f35054b36c4d0c8f76cb5ad95ff162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 22/38] openscad: revbump for glew.
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 48af4eafb53..49fed1660be 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2019.05
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 43ea18235eb9d3b16de8482b106b6d651114ca0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 23/38] openspades: revbump for glew.
---
srcpkgs/openspades/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openspades/template b/srcpkgs/openspades/template
index 3917eec9af7..216f6dcc3ca 100644
--- a/srcpkgs/openspades/template
+++ b/srcpkgs/openspades/template
@@ -4,7 +4,7 @@
# into a -data subpackage !!!
pkgname=openspades
version=0.1.3
-revision=1
+revision=2
archs="x86_64* i686*"
create_wrksrc=true
build_wrksrc="openspades-${version}"
From d616b9517d5367a536cee61e07646b77d5a4c7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 24/38] opentoonz: update to 1.4.0.
---
.../patches/Fix-Qt-5.13-build-error.patch | 21 -----------
srcpkgs/opentoonz/patches/QPainterPath.patch | 35 +++++++++++++++++++
srcpkgs/opentoonz/patches/musl.patch | 2 +-
srcpkgs/opentoonz/patches/musl2.patch | 30 ++++++++++++++++
srcpkgs/opentoonz/template | 6 ++--
5 files changed, 69 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
create mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch
create mode 100644 srcpkgs/opentoonz/patches/musl2.patch
diff --git a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch b/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
deleted file mode 100644
index 2149b2c3c01..00000000000
--- a/srcpkgs/opentoonz/patches/Fix-Qt-5.13-build-error.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From adae1528d6f580d56b5499c97b30acfb84af4390 Mon Sep 17 00:00:00 2001
-From: manongjohn <manongjohn@users.noreply.github.com>
-Date: Tue, 9 Jul 2019 23:19:16 -0400
-Subject: [PATCH] Fix Qt 5.13 build error (#2665)
-
----
- toonz/sources/include/tfxattributes.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/toonz/sources/include/tfxattributes.h b/toonz/sources/include/tfxattributes.h
-index 224a94426..92245cb8d 100644
---- toonz/sources/include/tfxattributes.h
-+++ toonz/sources/include/tfxattributes.h
-@@ -5,6 +5,7 @@
-
- #include "tgeometry.h"
- #include <QStack>
-+#include <QList>
-
- #undef DVAPI
- #undef DVVAR
diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch
new file mode 100644
index 00000000000..cc9ac227f74
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/QPainterPath.patch
@@ -0,0 +1,35 @@
+From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Tue, 9 Jun 2020 09:47:56 +0200
+Subject: [PATCH] Fix build with Qt 5.15.
+
+QPainterPath is no longer included indirectly.
+---
+ toonz/sources/tnztools/toolutils.cpp | 1 +
+ toonz/sources/toonzqt/functionpanel.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp
+index 1ceff93722..db4032f737 100644
+--- toonz/sources/tnztools/toolutils.cpp
++++ toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget> // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
+index 4cc6612634..b6a0c09239 100644
+--- toonz/sources/toonzqt/functionpanel.cpp
++++ toonz/sources/toonzqt/functionpanel.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt includes
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QWheelEvent>
+ #include <QMenu>
diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch
index 4ad393812b2..3b382d499ab 100644
--- a/srcpkgs/opentoonz/patches/musl.patch
+++ b/srcpkgs/opentoonz/patches/musl.patch
@@ -16,7 +16,7 @@
#ifdef LINUX
-#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
++#include <unistd.h>
#endif
// forward declaration
diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch
new file mode 100644
index 00000000000..fb69095d27f
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/musl2.patch
@@ -0,0 +1,30 @@
+Based on https://github.com/opentoonz/opentoonz/pull/3500
+
+diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+index da51594e..c3a9da17 100644
+--- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
++++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+@@ -1,3 +1,5 @@
++#define _POSIX_C_SOURCE 200809L
++#undef _GNU_SOURCE
+ #include <cerrno>
+ #include <cstring> /* memset */
+ #include <vector>
+@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。
+ 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない
+ */
+ errmsg += ::strerror(erno);
+-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++#elif !defined(__APPLE__)
+ /*
+ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r()
+@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3
+ if (0 == ret) {
+ errmsg += buff;
+ } else if (-1 == ret) {
+- swtich(errno) {
++ switch(errno) {
+ case EINVAL:
+ errmsg +=
+ "strerror_r() gets Error : The value of errnum is not a "
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 9f3dedd5d8d..cb6fed95dd7 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=a5dd0286a58017a086a3533016b9b4f54ada25a230c62de63b995bc04d0cd5a8
+checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9
pre_configure() {
# Upstream uses their own modified version of tiff
From 0e9561dcf085408e98041a90a6555fc22f687397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 25/38] paraview: revbump for glew.
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index bb05dcaf5ce..556c5cca228 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=1
+revision=2
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From 2b6da456764e7630fb64f14a0f336d5adf992dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:16 -0300
Subject: [PATCH 26/38] pioneer: revbump for glew, drop noarch.
---
srcpkgs/pioneer/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index b8eb8607375..ad0f1955948 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,7 +1,7 @@
# Template file for 'pioneer'
pkgname=pioneer
version=20200203
-revision=1
+revision=2
build_style=cmake
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
@@ -33,7 +33,6 @@ pioneer-modelcompiler_package() {
pioneer-data_package() {
short_desc+=" - data"
- archs=noarch
pkg_install() {
vmove usr/share/pioneer
}
From fa930ac3e63e3464751d675d8c3c93a16a13ad3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 27/38] ppsspp: revbump for glew.
---
srcpkgs/ppsspp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index d568881fff6..dc9f0913aa0 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.10.3
-revision=1
+revision=2
lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
From 1a5a7b54311d2bf5fb90e5090756689c3500e732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 28/38] residualvm: revbump for glew.
---
srcpkgs/residualvm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 38cba292bba..4a9ed863296 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
# Template file for 'residualvm'
pkgname=residualvm
version=0.3.1
-revision=3
+revision=4
build_style=configure
configure_args="--prefix=/usr --enable-all-engines --enable-release
--enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
From a0cc67430dcc3b60af5b013a8c491c2aeace05da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 29/38] slop: revbump for glew.
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bd6e7a32292..79839a6fdca 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From f731006be595cc51486361554371d256703c60e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 30/38] solvespace: revbump for glew.
---
srcpkgs/solvespace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 06c16a0d069..377c0e4cbd1 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,7 +1,7 @@
# Template file for 'solvespace'
pkgname=solvespace
version=2.3
-revision=2
+revision=3
wrksrc=solvespace
build_style=cmake
hostmakedepends="pkg-config"
From 92bbddfc163b8cbaaed449185596fa64a4717361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 31/38] supertux2: revbump for glew, drop noarch.
---
srcpkgs/supertux2/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4b7053c6b95..e0637ee9bbc 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.2
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
@@ -22,7 +22,6 @@ checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
supertux2-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/supertux2
}
From 9bfbcb1142b2abe48916f14c363ea6efe945fc37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:17 -0300
Subject: [PATCH 32/38] supertuxkart: revbump for glew.
---
srcpkgs/supertuxkart/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index 11a12a1dd85..fdacba9b730 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=1
+revision=2
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
From c7d61ffa60a27ed49fd78d0f51309aef4402c9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 33/38] vice: revbump for glew.
---
srcpkgs/vice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index c87cde31408..2410a750671 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -1,7 +1,7 @@
# Template file for 'vice'
pkgname=vice
version=3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
$(vopt_enable sdl2 sdlui2)
From c11b7397a5934d17531ab1d62b0e61bed3db5c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 34/38] warzone2100: revbump for glew, drop noarch.
---
srcpkgs/warzone2100/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index cc425c6072a..a73c6c8a734 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
# Template file for 'warzone2100'
pkgname=warzone2100
version=3.4.1
-revision=1
+revision=2
wrksrc="warzone2100"
build_style=cmake
configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -19,7 +19,6 @@ checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
nocross="fails to detect SDL2 when cross-compiling"
warzone2100-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/doc
From 14e2c2fdfab86a3b9d8d59921b4e6b4cc5bf5345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:18 -0300
Subject: [PATCH 35/38] widelands: revbump for glew, drop noarch.
---
srcpkgs/widelands/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 061040d9ae4..6cee85087ea 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=2
+revision=3
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -43,7 +43,6 @@ post_install() {
}
widelands-data_package() {
- archs=noarch
short_desc+=" - data files"
pkg_install() {
vmove usr/share/widelands
From a3c48dccec9ef8ee78f8c776e361715d99aafdd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 14:07:02 -0300
Subject: [PATCH 36/38] cegui: revbump for glew.
---
srcpkgs/cegui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index d2cbcc26a82..2b04106aad5 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -1,7 +1,7 @@
# Template file for 'cegui'
pkgname=cegui
version=0.8.7.20190225
-revision=3
+revision=4
_githash=bfc6a841de45b8e63040d33b9cccc67745337f4e
wrksrc="${pkgname}-${_githash}"
build_style=cmake
From ac587cb124849d7edefaa897db05d2d029fd2178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 27 Sep 2020 20:41:40 -0300
Subject: [PATCH 37/38] projectM: split into -devel subpackage.
Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.
---
common/shlibs | 1 +
srcpkgs/projectM-devel | 1 +
srcpkgs/projectM/template | 23 +++++++++++++++++++++--
3 files changed, 23 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/projectM-devel
diff --git a/common/shlibs b/common/shlibs
index c03d4d1c505..c3b3472bc74 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -765,6 +765,7 @@ libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
libpulse-simple.so.0 libpulseaudio-1.0_1
libpulsecommon-13.0.so libpulseaudio-13.0_1
libpulsecore-13.0.so libpulseaudio-13.0_1
+libprojectM.so.3 projectM-3.1.7_2
liborc-0.4.so.0 orc-0.4.11_1
liborc-test-0.4.so.0 orc-0.4.11_1
libgmime-2.6.so.0 gmime-2.6.4_1
diff --git a/srcpkgs/projectM-devel b/srcpkgs/projectM-devel
new file mode 120000
index 00000000000..80ca2de8e22
--- /dev/null
+++ b/srcpkgs/projectM-devel
@@ -0,0 +1 @@
+projectM
\ No newline at end of file
diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index ca2b22afdd9..d7e5c0fa547 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
# Template file for 'projectM'
pkgname=projectM
version=3.1.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--datadir=/usr/libexec"
hostmakedepends="pkg-config qt5-host-tools automake libtool which"
@@ -17,5 +17,24 @@ checksum=30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel"
- export LDFLAGS+=" -lfts"
+ LDFLAGS="-lfts"
fi
+
+post_install() {
+ if [ ! "$CROSS_BUILD" ]; then
+ # fix location of desktop files
+ # TODO: find out why these files aren't generated for the cross build
+ mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
+ fi
+}
+
+projectM-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From 9a2a7b3a3640d7b2296c3df680b23817dd9015c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 25 Sep 2020 00:05:13 -0300
Subject: [PATCH 38/38] clementine: update to 1.4.0rc1, use system projectM.
Using 1.4.0rc1-343.
---
srcpkgs/clementine/patches/QPainterPath.patch | 36 -------------------
srcpkgs/clementine/patches/musl.patch | 12 ++++---
srcpkgs/clementine/template | 17 +++++----
3 files changed, 15 insertions(+), 50 deletions(-)
delete mode 100644 srcpkgs/clementine/patches/QPainterPath.patch
diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch
deleted file mode 100644
index 271b8c1d724..00000000000
--- a/srcpkgs/clementine/patches/QPainterPath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
-index 3067f72..c9789d3 100644
---- a/src/widgets/freespacebar.cpp
-+++ b/src/widgets/freespacebar.cpp
-@@ -20,6 +20,7 @@
-
- #include <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
-
- const int FreeSpaceBar::kBarHeight = 20;
- const int FreeSpaceBar::kBarBorderRadius = 8;
-diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
-index 9d95716..30cef7d 100644
---- a/src/widgets/osdpretty.cpp
-+++ b/src/widgets/osdpretty.cpp
-@@ -26,6 +26,7 @@
- #include <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
-index 581a0de..27b81f7 100644
---- a/src/widgets/sliderwidget.cpp
-+++ b/src/widgets/sliderwidget.cpp
-@@ -24,6 +24,7 @@
- #include <QBrush>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
diff --git a/srcpkgs/clementine/patches/musl.patch b/srcpkgs/clementine/patches/musl.patch
index c976dbb42d7..ad39814196e 100644
--- a/srcpkgs/clementine/patches/musl.patch
+++ b/srcpkgs/clementine/patches/musl.patch
@@ -1,15 +1,17 @@
---- a/logging.cpp 2017-09-22 21:33:36.030774014 +0200
-+++ b/ext/libclementine-common/core/logging.cpp 2017-09-22 21:35:34.327766268 +0200
+diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
+index 8012c0c..ce77c77 100644
+--- ext/libclementine-common/core/logging.cpp
++++ ext/libclementine-common/core/logging.cpp
@@ -21,7 +21,7 @@
- #include <QtGlobal>
-
#include <cxxabi.h>
+
+ #include <QtGlobal>
-#ifdef Q_OS_UNIX
+#if defined Q_OS_UNIX && defined __GLIBC__
#include <execinfo.h>
#endif
-@@ -249,7 +249,7 @@
+@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
}
void DumpStackTrace() {
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 04c0cf55f67..f10318f8809 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,11 +1,11 @@
# Template file for 'clementine'
pkgname=clementine
-version=1.3.1
-revision=27
-_commit=75f18dab23f0842713a4200a7e362efd51b12e31
-wrksrc="Clementine-${_commit}"
+_fullver=1.4.0rc1-343-gb49afcc5b
+version=${_fullver%%-*}
+wrksrc=${pkgname}-${_fullver}
+revision=1
build_style=cmake
-configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON"
hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
@@ -13,15 +13,14 @@ makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
- qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel"
+ qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel projectM-devel"
depends="desktop-file-utils"
short_desc="Modern music player and library organizer"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
-checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
-patch_args="-Np1"
+distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz"
+checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397
build_options="spotify"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PR PATCH] [Merged]: Update Glew to 2.2.0
2020-09-25 5:35 [PR PATCH] [WIP] Update Glew to 2.2.0 ericonr
` (25 preceding siblings ...)
2020-09-28 2:56 ` ericonr
@ 2020-09-28 2:56 ` ericonr
26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-09-28 2:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
There's a merged pull request on the void-packages repository
Update Glew to 2.2.0
https://github.com/void-linux/void-packages/pull/25078
Description:
Currently `clementine` and `opentoonz` are FTBFS. The first one is some missing constants, which I guess we'll have to track down, and the latter needs simple `QPainter` patching, like everything else.
^ permalink raw reply [flat|nested] 28+ messages in thread