Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] python3-pivy: update to 0.6.6
@ 2021-04-28 20:33 yopito
  2021-04-29  6:45 ` [PR PATCH] [Updated] " yopito
  2021-04-29 14:54 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 2 replies; 3+ messages in thread
From: yopito @ 2021-04-28 20:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1647 bytes --]

There is a new pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages pivy.066
https://github.com/void-linux/void-packages/pull/30565

[WIP] python3-pivy: update to 0.6.6
This PR requires PR #30564 to get merged first.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30565.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pivy.066-30565.patch --]
[-- Type: text/x-diff, Size: 2888 bytes --]

From 362f73dfb3d27385e01538f5c980c0e64d9112ab Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 26 Apr 2021 21:15:35 +0200
Subject: [PATCH] python3-pivy: update to 0.6.6

---
 srcpkgs/python3-pivy/template | 54 ++++-------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index a0844f8b7e0b..9940fe5cce01 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,66 +1,24 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
-version=0.6.5
-revision=2
+version=0.6.6
+revision=1
 wrksrc="pivy-${version}"
-build_style=python3-module
-hostmakedepends="python3-devel swig cmake"
+build_style=cmake
+hostmakedepends="python3-devel swig"
 makedepends="python3-devel coin3-devel"
 short_desc="Python3 bindings for the high-level 3D graphics library Coin"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="ISC"
 homepage="https://github.com/coin3d/pivy"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16f2e339e5c59a6438266abe491013a20f53267e596850efad1559564a2c1719
+checksum=27204574d894cc12aba5df5251770f731f326a3e7de4499e06b5f5809cc5659e
 
-# still relevant with pivy 0.6.5 ?
+# still relevant with pivy 0.6.6 ?
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*);;
 	ppc*) broken="{standard input}:3376761: Error: operand out of range";;
 esac
 
-# setup.py calls cmake directly, so can't rely on xbps's cmake crossbuild support:
-# let's recreate here. Upstream should switch to cmake on next release (0.6.6).
-
-pre_configure() {
-	[ -z "$CROSS_BUILD" ] && return 0
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
-		ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
-		ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
-		*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
-	esac
-	cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
-SET(CMAKE_SYSTEM_NAME Linux)
-SET(CMAKE_SYSTEM_VERSION 1)
-
-SET(CMAKE_C_COMPILER   ${CC})
-SET(CMAKE_CXX_COMPILER ${CXX})
-SET(CMAKE_CROSSCOMPILING TRUE)
-
-SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
-
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
-_EOF
-	cat >$XBPS_WRAPPERDIR/cmake <<_EOF
-#!/bin/sh
-/usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$wrksrc/cross_${XBPS_CROSS_TRIPLET}.cmake "$@"
-_EOF
-	chmod +x $XBPS_WRAPPERDIR/cmake
-}
-
 post_install() {
 	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] python3-pivy: update to 0.6.6
  2021-04-28 20:33 [PR PATCH] [WIP] python3-pivy: update to 0.6.6 yopito
@ 2021-04-29  6:45 ` yopito
  2021-04-29 14:54 ` [PR PATCH] [Merged]: " ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: yopito @ 2021-04-29  6:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages pivy.066
https://github.com/void-linux/void-packages/pull/30565

[WIP] python3-pivy: update to 0.6.6
This PR requires PR #30564 to get merged first.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30565.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pivy.066-30565.patch --]
[-- Type: text/x-diff, Size: 2888 bytes --]

From a0a8c15344b9af8e3667823a8b4b9421df76d357 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Thu, 29 Apr 2021 08:45:05 +0200
Subject: [PATCH] python3-pivy: update to 0.6.6

---
 srcpkgs/python3-pivy/template | 54 ++++-------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index a0844f8b7e0b..9940fe5cce01 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,66 +1,24 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
-version=0.6.5
-revision=2
+version=0.6.6
+revision=1
 wrksrc="pivy-${version}"
-build_style=python3-module
-hostmakedepends="python3-devel swig cmake"
+build_style=cmake
+hostmakedepends="python3-devel swig"
 makedepends="python3-devel coin3-devel"
 short_desc="Python3 bindings for the high-level 3D graphics library Coin"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="ISC"
 homepage="https://github.com/coin3d/pivy"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16f2e339e5c59a6438266abe491013a20f53267e596850efad1559564a2c1719
+checksum=27204574d894cc12aba5df5251770f731f326a3e7de4499e06b5f5809cc5659e
 
-# still relevant with pivy 0.6.5 ?
+# still relevant with pivy 0.6.6 ?
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*);;
 	ppc*) broken="{standard input}:3376761: Error: operand out of range";;
 esac
 
-# setup.py calls cmake directly, so can't rely on xbps's cmake crossbuild support:
-# let's recreate here. Upstream should switch to cmake on next release (0.6.6).
-
-pre_configure() {
-	[ -z "$CROSS_BUILD" ] && return 0
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
-		ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
-		ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
-		*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
-	esac
-	cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
-SET(CMAKE_SYSTEM_NAME Linux)
-SET(CMAKE_SYSTEM_VERSION 1)
-
-SET(CMAKE_C_COMPILER   ${CC})
-SET(CMAKE_CXX_COMPILER ${CXX})
-SET(CMAKE_CROSSCOMPILING TRUE)
-
-SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
-
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
-_EOF
-	cat >$XBPS_WRAPPERDIR/cmake <<_EOF
-#!/bin/sh
-/usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$wrksrc/cross_${XBPS_CROSS_TRIPLET}.cmake "$@"
-_EOF
-	chmod +x $XBPS_WRAPPERDIR/cmake
-}
-
 post_install() {
 	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: python3-pivy: update to 0.6.6
  2021-04-28 20:33 [PR PATCH] [WIP] python3-pivy: update to 0.6.6 yopito
  2021-04-29  6:45 ` [PR PATCH] [Updated] " yopito
@ 2021-04-29 14:54 ` ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-04-29 14:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1516 bytes --]

There's a merged pull request on the void-packages repository

python3-pivy: update to 0.6.6
https://github.com/void-linux/void-packages/pull/30565

Description:
This PR requires PR #30564 to get merged first.
Edit: PR #30564 merged.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-04-29 14:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-28 20:33 [PR PATCH] [WIP] python3-pivy: update to 0.6.6 yopito
2021-04-29  6:45 ` [PR PATCH] [Updated] " yopito
2021-04-29 14:54 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).